diff --git a/.ci/integration.cloudbuild.yaml b/.ci/integration.cloudbuild.yaml
index 604be42499..96bbbd8b9b 100644
--- a/.ci/integration.cloudbuild.yaml
+++ b/.ci/integration.cloudbuild.yaml
@@ -171,6 +171,23 @@ steps:
           alloydbainl \
           alloydbainl
 
+  - id: "alloydb-omni"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "AlloyDB Omni" \
+          alloydbomni \
+          postgres
+
   - id: "bigtable"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -295,6 +312,25 @@ steps:
           cloudhealthcare \
           cloudhealthcare
 
+  - id: "cloud-logging-admin"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "LOGADMIN_PROJECT=$PROJECT_ID"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Cloud Logging Admin" \
+          cloudloggingadmin \
+          cloudloggingadmin
+
   - id: "postgres"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -318,6 +354,30 @@ steps:
           postgressql \
           postgresexecutesql
 
+  - id: "cockroachdb"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "COCKROACHDB_DATABASE=$_DATABASE_NAME"
+      - "COCKROACHDB_PORT=$_COCKROACHDB_PORT"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["COCKROACHDB_USER", "COCKROACHDB_HOST","CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "CockroachDB" \
+          cockroachdb \
+          cockroachdbsql \
+          cockroachdbexecutesql \
+          cockroachdblisttables \
+          cockroachdblistschemas
+
   - id: "spanner"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -657,7 +717,7 @@ steps:
           "Looker" \
           looker \
           looker
-    
+
   - id: "mindsdb"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -845,7 +905,7 @@ steps:
           "Snowflake" \
           snowflake \
           snowflake
- 
+
   - id: "cassandra"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -887,16 +947,16 @@ steps:
         tar -C /usr/local -xzf go.tar.gz
         export PATH="/usr/local/go/bin:$$PATH"
 
-        go test -v ./internal/sources/oracle/... \
+        go test -v ./tests/oracle/... \
           -coverprofile=oracle_coverage.out \
           -coverpkg=./internal/sources/oracle/...,./internal/tools/oracle/...
-        
+
         # Coverage check
         total_coverage=$(go tool cover -func=oracle_coverage.out | grep "total:" | awk '{print $3}')
         echo "Oracle total coverage: $total_coverage"
         coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
-        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 20)}'; then
-            echo "Coverage failure: $total_coverage is below 20%."
+        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 60)}'; then
+            echo "Coverage failure: $total_coverage is below 60%."
             exit 1
         fi
 
@@ -1093,6 +1153,11 @@ availableSecrets:
       env: MARIADB_HOST
     - versionName: projects/$PROJECT_ID/secrets/mongodb_uri/versions/latest
       env: MONGODB_URI
+    - versionName: projects/$PROJECT_ID/secrets/cockroachdb_user/versions/latest
+      env: COCKROACHDB_USER
+    - versionName: projects/$PROJECT_ID/secrets/cockroachdb_host/versions/latest
+      env: COCKROACHDB_HOST
+
 
 options:
   logging: CLOUD_LOGGING_ONLY
@@ -1153,6 +1218,9 @@ substitutions:
   _SINGLESTORE_PORT: "3308"
   _SINGLESTORE_DATABASE: "singlestore"
   _SINGLESTORE_USER: "root"
+  _COCKROACHDB_HOST: 127.0.0.1
+  _COCKROACHDB_PORT: "26257"
+  _COCKROACHDB_USER: "root"
   _MARIADB_PORT: "3307"
   _MARIADB_DATABASE: test_database
   _SNOWFLAKE_DATABASE: "test"
diff --git a/.ci/quickstart_test/run_go_tests.sh b/.ci/quickstart_test/run_go_tests.sh
deleted file mode 100644
index 43874931b2..0000000000
--- a/.ci/quickstart_test/run_go_tests.sh
+++ /dev/null
@@ -1,125 +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.
-
-#!/bin/bash
-
-set -e
-
-TABLE_NAME="hotels_go"
-QUICKSTART_GO_DIR="docs/en/getting-started/quickstart/go"
-SQL_FILE=".ci/quickstart_test/setup_hotels_sample.sql"
-
-PROXY_PID=""
-TOOLBOX_PID=""
-
-install_system_packages() {
-  apt-get update && apt-get install -y \
-    postgresql-client \
-    wget \
-    gettext-base  \
-    netcat-openbsd
-}
-
-start_cloud_sql_proxy() {
-  wget "https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.10.0/cloud-sql-proxy.linux.amd64" -O /usr/local/bin/cloud-sql-proxy
-  chmod +x /usr/local/bin/cloud-sql-proxy
-  cloud-sql-proxy "${CLOUD_SQL_INSTANCE}" &
-  PROXY_PID=$!
-
-  for i in {1..30}; do
-    if nc -z 127.0.0.1 5432; then
-      echo "Cloud SQL Proxy is up and running."
-      return
-    fi
-    sleep 1
-  done
-
-  echo "Cloud SQL Proxy failed to start within the timeout period."
-  exit 1
-}
-
-setup_toolbox() {
-  TOOLBOX_YAML="/tools.yaml"
-  echo "${TOOLS_YAML_CONTENT}" > "$TOOLBOX_YAML"
-  if [ ! -f "$TOOLBOX_YAML" ]; then echo "Failed to create tools.yaml"; exit 1; fi
-  wget "https://storage.googleapis.com/genai-toolbox/v${VERSION}/linux/amd64/toolbox" -O "/toolbox"
-  chmod +x "/toolbox"
-  /toolbox --tools-file "$TOOLBOX_YAML" &
-  TOOLBOX_PID=$!
-  sleep 2
-}
-
-setup_orch_table() {
-  export TABLE_NAME
-  envsubst < "$SQL_FILE" | psql -h "$PGHOST" -p "$PGPORT" -U "$DB_USER" -d "$DATABASE_NAME"
-}
-
-run_orch_test() {
-  local orch_dir="$1"
-  local orch_name
-  orch_name=$(basename "$orch_dir")
-
-  if [ "$orch_name" == "openAI" ]; then
-      echo -e "\nSkipping framework '${orch_name}': Temporarily excluded."
-      return
-  fi
-
-  (
-    set -e
-    setup_orch_table
-
-    echo "--- Preparing module for $orch_name ---"
-    cd "$orch_dir"
-
-    if [ -f "go.mod" ]; then
-      go mod tidy
-    fi
-
-    cd ..
-
-    export ORCH_NAME="$orch_name"
-
-    echo "--- Running tests for $orch_name ---"
-    go test -v ./...
-  )
-}
-
-cleanup_all() {
-  echo "--- Final cleanup: Shutting down processes and dropping table ---"
-  if [ -n "$TOOLBOX_PID" ]; then
-    kill $TOOLBOX_PID || true
-  fi
-  if [ -n "$PROXY_PID" ]; then
-    kill $PROXY_PID || true
-  fi
-}
-trap cleanup_all EXIT
-
-# Main script execution
-install_system_packages
-start_cloud_sql_proxy
-
-export PGHOST=127.0.0.1
-export PGPORT=5432
-export PGPASSWORD="$DB_PASSWORD"
-export GOOGLE_API_KEY="$GOOGLE_API_KEY"
-
-setup_toolbox
-
-for ORCH_DIR in "$QUICKSTART_GO_DIR"/*/; do
-  if [ ! -d "$ORCH_DIR" ]; then
-    continue
-  fi
-  run_orch_test "$ORCH_DIR"
-done
diff --git a/.ci/quickstart_test/run_js_tests.sh b/.ci/quickstart_test/run_js_tests.sh
deleted file mode 100644
index 71816542f5..0000000000
--- a/.ci/quickstart_test/run_js_tests.sh
+++ /dev/null
@@ -1,125 +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.
-
-#!/bin/bash
-
-set -e
-
-TABLE_NAME="hotels_js"
-QUICKSTART_JS_DIR="docs/en/getting-started/quickstart/js"
-SQL_FILE=".ci/quickstart_test/setup_hotels_sample.sql"
-
-# Initialize process IDs to empty at the top of the script
-PROXY_PID=""
-TOOLBOX_PID=""
-
-install_system_packages() {
-  apt-get update && apt-get install -y \
-    postgresql-client \
-    wget \
-    gettext-base  \
-    netcat-openbsd
-}
-
-start_cloud_sql_proxy() {
-  wget "https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.10.0/cloud-sql-proxy.linux.amd64" -O /usr/local/bin/cloud-sql-proxy
-  chmod +x /usr/local/bin/cloud-sql-proxy
-  cloud-sql-proxy "${CLOUD_SQL_INSTANCE}" &
-  PROXY_PID=$!
-
-  for i in {1..30}; do
-    if nc -z 127.0.0.1 5432; then
-      echo "Cloud SQL Proxy is up and running."
-      return
-    fi
-    sleep 1
-  done
-
-  echo "Cloud SQL Proxy failed to start within the timeout period."
-  exit 1
-}
-
-setup_toolbox() {
-  TOOLBOX_YAML="/tools.yaml"
-  echo "${TOOLS_YAML_CONTENT}" > "$TOOLBOX_YAML"
-  if [ ! -f "$TOOLBOX_YAML" ]; then echo "Failed to create tools.yaml"; exit 1; fi
-  wget "https://storage.googleapis.com/genai-toolbox/v${VERSION}/linux/amd64/toolbox" -O "/toolbox"
-  chmod +x "/toolbox"
-  /toolbox --tools-file "$TOOLBOX_YAML" &
-  TOOLBOX_PID=$!
-  sleep 2
-}
-
-setup_orch_table() {
-  export TABLE_NAME
-  envsubst < "$SQL_FILE" | psql -h "$PGHOST" -p "$PGPORT" -U "$DB_USER" -d "$DATABASE_NAME"
-}
-
-run_orch_test() {
-  local orch_dir="$1"
-  local orch_name
-  orch_name=$(basename "$orch_dir")
-
-  (
-    set -e
-    echo "--- Preparing environment for $orch_name ---"
-    setup_orch_table
-
-    cd "$orch_dir"
-    echo "Installing dependencies for $orch_name..."
-    if [ -f "package-lock.json" ]; then
-      npm ci
-    else
-      npm install
-    fi
-
-    cd ..
-
-    echo "--- Running tests for $orch_name ---"
-    export ORCH_NAME="$orch_name"
-    node --test quickstart.test.js
-
-    echo "--- Cleaning environment for $orch_name ---"
-    rm -rf "${orch_name}/node_modules"
-  )
-}
-
-cleanup_all() {
-  echo "--- Final cleanup: Shutting down processes and dropping table ---"
-  if [ -n "$TOOLBOX_PID" ]; then
-    kill $TOOLBOX_PID || true
-  fi
-  if [ -n "$PROXY_PID" ]; then
-    kill $PROXY_PID || true
-  fi
-}
-trap cleanup_all EXIT
-
-# Main script execution
-install_system_packages
-start_cloud_sql_proxy
-
-export PGHOST=127.0.0.1
-export PGPORT=5432
-export PGPASSWORD="$DB_PASSWORD"
-export GOOGLE_API_KEY="$GOOGLE_API_KEY"
-
-setup_toolbox
-
-for ORCH_DIR in "$QUICKSTART_JS_DIR"/*/; do
-  if [ ! -d "$ORCH_DIR" ]; then
-    continue
-  fi
-  run_orch_test "$ORCH_DIR"
-done
diff --git a/.ci/quickstart_test/run_py_tests.sh b/.ci/quickstart_test/run_py_tests.sh
deleted file mode 100644
index 3d559838d9..0000000000
--- a/.ci/quickstart_test/run_py_tests.sh
+++ /dev/null
@@ -1,115 +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.
-
-#!/bin/bash
-
-set -e
-
-TABLE_NAME="hotels_python"
-QUICKSTART_PYTHON_DIR="docs/en/getting-started/quickstart/python"
-SQL_FILE=".ci/quickstart_test/setup_hotels_sample.sql"
-
-PROXY_PID=""
-TOOLBOX_PID=""
-
-install_system_packages() {
-  apt-get update && apt-get install -y \
-    postgresql-client \
-    python3-venv \
-    wget \
-    gettext-base  \
-    netcat-openbsd
-}
-
-start_cloud_sql_proxy() {
-  wget "https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.10.0/cloud-sql-proxy.linux.amd64" -O /usr/local/bin/cloud-sql-proxy
-  chmod +x /usr/local/bin/cloud-sql-proxy
-  cloud-sql-proxy "${CLOUD_SQL_INSTANCE}" &
-  PROXY_PID=$!
-
-  for i in {1..30}; do
-    if nc -z 127.0.0.1 5432; then
-      echo "Cloud SQL Proxy is up and running."
-      return
-    fi
-    sleep 1
-  done
-
-  echo "Cloud SQL Proxy failed to start within the timeout period."
-  exit 1
-}
-
-setup_toolbox() {
-  TOOLBOX_YAML="/tools.yaml"
-  echo "${TOOLS_YAML_CONTENT}" > "$TOOLBOX_YAML"
-  if [ ! -f "$TOOLBOX_YAML" ]; then echo "Failed to create tools.yaml"; exit 1; fi
-  wget "https://storage.googleapis.com/genai-toolbox/v${VERSION}/linux/amd64/toolbox" -O "/toolbox"
-  chmod +x "/toolbox"
-  /toolbox --tools-file "$TOOLBOX_YAML" &
-  TOOLBOX_PID=$!
-  sleep 2
-}
-
-setup_orch_table() {
-  export TABLE_NAME
-  envsubst < "$SQL_FILE" | psql -h "$PGHOST" -p "$PGPORT" -U "$DB_USER" -d "$DATABASE_NAME"
-}
-
-run_orch_test() {
-  local orch_dir="$1"
-  local orch_name
-  orch_name=$(basename "$orch_dir")
-  (
-    set -e
-    setup_orch_table
-    cd "$orch_dir"
-    local VENV_DIR=".venv"
-    python3 -m venv "$VENV_DIR"
-    source "$VENV_DIR/bin/activate"
-    pip install -r requirements.txt
-    echo "--- Running tests for $orch_name ---"
-    cd ..
-    ORCH_NAME="$orch_name" pytest
-    rm -rf "$VENV_DIR"
-  )
-}
-
-cleanup_all() {
-  echo "--- Final cleanup: Shutting down processes and dropping table ---"
-  if [ -n "$TOOLBOX_PID" ]; then
-    kill $TOOLBOX_PID || true
-  fi
-  if [ -n "$PROXY_PID" ]; then
-    kill $PROXY_PID || true
-  fi
-}
-trap cleanup_all EXIT
-
-# Main script execution
-install_system_packages
-start_cloud_sql_proxy
-
-export PGHOST=127.0.0.1
-export PGPORT=5432
-export PGPASSWORD="$DB_PASSWORD"
-export GOOGLE_API_KEY="$GOOGLE_API_KEY"
-
-setup_toolbox
-
-for ORCH_DIR in "$QUICKSTART_PYTHON_DIR"/*/; do
-  if [ ! -d "$ORCH_DIR" ]; then
-    continue
-  fi
-  run_orch_test "$ORCH_DIR"
-done
diff --git a/.ci/sample_tests/pre_post_processing/py.integration.cloudbuild.yaml b/.ci/sample_tests/pre_post_processing/py.integration.cloudbuild.yaml
new file mode 100644
index 0000000000..5844226428
--- /dev/null
+++ b/.ci/sample_tests/pre_post_processing/py.integration.cloudbuild.yaml
@@ -0,0 +1,57 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+steps:
+  - name: "${_IMAGE}"
+    id: "py-pre-post-processing-test"
+    entrypoint: "bash"
+    args:
+      - -c
+      - |
+        set -ex
+        chmod +x .ci/sample_tests/run_tests.sh
+        .ci/sample_tests/run_tests.sh
+    env:
+      - "CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}"
+      - "GCP_PROJECT=${_GCP_PROJECT}"
+      - "DATABASE_NAME=${_DATABASE_NAME}"
+      - "DB_USER=${_DB_USER}"
+      - "TARGET_ROOT=${_TARGET_ROOT}"
+      - "TARGET_LANG=${_TARGET_LANG}"
+      - "TABLE_NAME=${_TABLE_NAME}"
+      - "SQL_FILE=${_SQL_FILE}"
+      - "AGENT_FILE_PATTERN=${_AGENT_FILE_PATTERN}"
+    secretEnv: ["TOOLS_YAML_CONTENT", "GOOGLE_API_KEY", "DB_PASSWORD"]
+
+availableSecrets:
+  secretManager:
+    - versionName: projects/${_GCP_PROJECT}/secrets/${_TOOLS_YAML_SECRET}/versions/5
+      env: "TOOLS_YAML_CONTENT"
+    - versionName: projects/${_GCP_PROJECT_NUMBER}/secrets/${_API_KEY_SECRET}/versions/latest
+      env: "GOOGLE_API_KEY"
+    - versionName: projects/${_GCP_PROJECT}/secrets/${_DB_PASS_SECRET}/versions/latest
+      env: "DB_PASSWORD"
+
+timeout: 1200s
+
+substitutions:
+  _TARGET_LANG: "python"
+  _IMAGE: "gcr.io/google.com/cloudsdktool/cloud-sdk:537.0.0"
+  _TARGET_ROOT: "docs/en/samples/pre_post_processing/python"
+  _TABLE_NAME: "hotels_py_pre_post_processing"
+  _SQL_FILE: ".ci/sample_tests/setup_hotels.sql"
+  _AGENT_FILE_PATTERN: "agent.py"
+
+options:
+  logging: CLOUD_LOGGING_ONLY
\ No newline at end of file
diff --git a/.ci/quickstart_test/go.integration.cloudbuild.yaml b/.ci/sample_tests/quickstart/go.integration.cloudbuild.yaml
similarity index 84%
rename from .ci/quickstart_test/go.integration.cloudbuild.yaml
rename to .ci/sample_tests/quickstart/go.integration.cloudbuild.yaml
index cf9128ce60..24b14bfc26 100644
--- a/.ci/quickstart_test/go.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/quickstart/go.integration.cloudbuild.yaml
@@ -23,13 +23,18 @@ steps:
       - |
         set -ex
         export VERSION=$(cat ./cmd/version.txt)
-        chmod +x .ci/quickstart_test/run_go_tests.sh
-        .ci/quickstart_test/run_go_tests.sh
+        chmod +x .ci/sample_tests/run_tests.sh
+        .ci/sample_tests/run_tests.sh
     env:
       - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
       - 'GCP_PROJECT=${_GCP_PROJECT}'
       - 'DATABASE_NAME=${_DATABASE_NAME}'
       - 'DB_USER=${_DB_USER}'
+      - 'TARGET_ROOT=docs/en/getting-started/quickstart/go'
+      - 'TARGET_LANG=go'
+      - 'TABLE_NAME=hotels_go'
+      - 'SQL_FILE=.ci/sample_tests/setup_hotels.sql'
+      - 'AGENT_FILE_PATTERN=quickstart.go'
     secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
 
 availableSecrets:
diff --git a/.ci/quickstart_test/js.integration.cloudbuild.yaml b/.ci/sample_tests/quickstart/js.integration.cloudbuild.yaml
similarity index 84%
rename from .ci/quickstart_test/js.integration.cloudbuild.yaml
rename to .ci/sample_tests/quickstart/js.integration.cloudbuild.yaml
index cbf4e8547f..6e5aac6b07 100644
--- a/.ci/quickstart_test/js.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/quickstart/js.integration.cloudbuild.yaml
@@ -23,13 +23,18 @@ steps:
       - |
         set -ex
         export VERSION=$(cat ./cmd/version.txt)
-        chmod +x .ci/quickstart_test/run_js_tests.sh
-        .ci/quickstart_test/run_js_tests.sh
+        chmod +x .ci/sample_tests/run_tests.sh
+        .ci/sample_tests/run_tests.sh
     env:
       - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
       - 'GCP_PROJECT=${_GCP_PROJECT}'
       - 'DATABASE_NAME=${_DATABASE_NAME}'
       - 'DB_USER=${_DB_USER}'
+      - 'TARGET_ROOT=docs/en/getting-started/quickstart/js'
+      - 'TARGET_LANG=js'
+      - 'TABLE_NAME=hotels_js'
+      - 'SQL_FILE=.ci/sample_tests/setup_hotels.sql'
+      - 'AGENT_FILE_PATTERN=quickstart.js'
     secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
 
 availableSecrets:
diff --git a/.ci/quickstart_test/py.integration.cloudbuild.yaml b/.ci/sample_tests/quickstart/py.integration.cloudbuild.yaml
similarity index 84%
rename from .ci/quickstart_test/py.integration.cloudbuild.yaml
rename to .ci/sample_tests/quickstart/py.integration.cloudbuild.yaml
index 8fd3834d6c..da8daf678f 100644
--- a/.ci/quickstart_test/py.integration.cloudbuild.yaml
+++ b/.ci/sample_tests/quickstart/py.integration.cloudbuild.yaml
@@ -23,13 +23,18 @@ steps:
       - |
         set -ex
         export VERSION=$(cat ./cmd/version.txt)
-        chmod +x .ci/quickstart_test/run_py_tests.sh
-        .ci/quickstart_test/run_py_tests.sh
+        chmod +x .ci/sample_tests/run_tests.sh
+        .ci/sample_tests/run_tests.sh
     env:
       - 'CLOUD_SQL_INSTANCE=${_CLOUD_SQL_INSTANCE}'
       - 'GCP_PROJECT=${_GCP_PROJECT}'
       - 'DATABASE_NAME=${_DATABASE_NAME}'
       - 'DB_USER=${_DB_USER}'
+      - 'TARGET_ROOT=docs/en/getting-started/quickstart/python'
+      - 'TARGET_LANG=python'
+      - 'TABLE_NAME=hotels_python'
+      - 'SQL_FILE=.ci/sample_tests/setup_hotels.sql'
+      - 'AGENT_FILE_PATTERN=quickstart.py'
     secretEnv: ['TOOLS_YAML_CONTENT', 'GOOGLE_API_KEY', 'DB_PASSWORD']
 
 availableSecrets:
diff --git a/.ci/sample_tests/run_tests.sh b/.ci/sample_tests/run_tests.sh
new file mode 100644
index 0000000000..5de9234eb0
--- /dev/null
+++ b/.ci/sample_tests/run_tests.sh
@@ -0,0 +1,202 @@
+# Copyright 2026 Google LLC
+# 
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# 
+#      http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -e
+
+# --- Configuration (from Environment Variables) ---
+# TARGET_ROOT: The directory to search for tests (e.g., docs/en/getting-started/quickstart/js)
+# TARGET_LANG: python, js, go
+# TABLE_NAME: Database table name to use
+# SQL_FILE: Path to the SQL setup file
+# AGENT_FILE_PATTERN: Filename to look for (e.g., quickstart.js or agent.py)
+
+VERSION=$(cat ./cmd/version.txt)
+
+# Process IDs & Logs
+PROXY_PID=""
+TOOLBOX_PID=""
+PROXY_LOG="cloud_sql_proxy.log"
+TOOLBOX_LOG="toolbox_server.log"
+
+install_system_packages() {
+  echo "Installing system packages..."
+  apt-get update && apt-get install -y \
+    postgresql-client \
+    wget \
+    gettext-base  \
+    netcat-openbsd
+    
+  if [[ "$TARGET_LANG" == "python" ]]; then
+    apt-get install -y python3-venv
+  fi
+}
+
+start_cloud_sql_proxy() {
+  echo "Starting Cloud SQL Proxy..."
+  wget -q "https://storage.googleapis.com/cloud-sql-connectors/cloud-sql-proxy/v2.10.0/cloud-sql-proxy.linux.amd64" -O /usr/local/bin/cloud-sql-proxy
+  chmod +x /usr/local/bin/cloud-sql-proxy
+  cloud-sql-proxy "${CLOUD_SQL_INSTANCE}" > "$PROXY_LOG" 2>&1 &
+  PROXY_PID=$!
+
+  # Health Check
+  for i in {1..30}; do
+    if nc -z 127.0.0.1 5432; then
+      echo "Cloud SQL Proxy is up and running."
+      return
+    fi
+    sleep 1
+  done
+  echo "ERROR: Cloud SQL Proxy failed to start. Logs:"
+  cat "$PROXY_LOG"
+  exit 1
+}
+
+setup_toolbox() {
+  echo "Setting up Toolbox server..."
+  TOOLBOX_YAML="/tools.yaml"
+  echo "${TOOLS_YAML_CONTENT}" > "$TOOLBOX_YAML"
+  wget -q "https://storage.googleapis.com/genai-toolbox/v${VERSION}/linux/amd64/toolbox" -O "/toolbox"
+  chmod +x "/toolbox"
+  /toolbox --tools-file "$TOOLBOX_YAML" > "$TOOLBOX_LOG" 2>&1 &
+  TOOLBOX_PID=$!
+  
+  # Health Check
+  for i in {1..15}; do
+    if nc -z 127.0.0.1 5000; then
+      echo "Toolbox server is up and running."
+      return
+    fi
+    sleep 1
+  done
+  echo "ERROR: Toolbox server failed to start. Logs:"
+  cat "$TOOLBOX_LOG"
+  exit 1
+}
+
+setup_db_table() {
+  echo "Setting up database table $TABLE_NAME using $SQL_FILE..."
+  export TABLE_NAME
+  envsubst < "$SQL_FILE" | psql -h 127.0.0.1 -p 5432 -U "$DB_USER" -d "$DATABASE_NAME"
+}
+
+run_python_test() {
+  local dir=$1
+  local name=$(basename "$dir")
+  echo "--- Running Python Test: $name ---"
+  (
+    cd "$dir"
+    python3 -m venv .venv
+    source .venv/bin/activate
+    pip install -q -r requirements.txt pytest
+    
+    cd ..
+    local test_file=$(find . -maxdepth 1 -name "*test.py" | head -n 1)
+    if [ -n "$test_file" ]; then
+        echo "Found native test: $test_file. Running pytest..."
+        export ORCH_NAME="$name"
+        export PYTHONPATH="../"
+        pytest "$test_file"
+    else
+        echo "No native test found. running agent directly..."
+        export PYTHONPATH="../"
+        python3 "${name}/${AGENT_FILE_PATTERN}"
+    fi
+    rm -rf "${name}/.venv"
+  )
+}
+
+run_js_test() {
+  local dir=$1
+  local name=$(basename "$dir")
+  echo "--- Running JS Test: $name ---"
+  (
+    cd "$dir"
+    if [ -f "package-lock.json" ]; then npm ci -q; else npm install -q; fi
+    
+    cd ..
+    # Looking for a JS test file in the parent directory
+    local test_file=$(find . -maxdepth 1 -name "*test.js" | head -n 1)
+    if [ -n "$test_file" ]; then
+        echo "Found native test: $test_file. Running node --test..."
+        export ORCH_NAME="$name"
+        node --test "$test_file"
+    else
+        echo "No native test found. running agent directly..."
+        node "${name}/${AGENT_FILE_PATTERN}"
+    fi
+    rm -rf "${name}/node_modules"
+  )
+}
+
+run_go_test() {
+  local dir=$1
+  local name=$(basename "$dir")
+
+  if [ "$name" == "openAI" ]; then
+      echo -e "\nSkipping framework '${name}': Temporarily excluded."
+      return
+  fi
+
+  echo "--- Running Go Test: $name ---"
+  (
+    cd "$dir"
+    if [ -f "go.mod" ]; then
+      go mod tidy
+    fi
+    
+    cd ..
+    local test_file=$(find . -maxdepth 1 -name "*test.go" | head -n 1)
+    if [ -n "$test_file" ]; then
+        echo "Found native test: $test_file. Running go test..."
+        export ORCH_NAME="$name"
+        go test -v ./...
+    else
+        echo "No native test found. running agent directly..."
+        cd "$name"
+        go run "."
+    fi
+  )
+}
+
+cleanup() {
+  echo "Cleaning up background processes..."
+  [ -n "$TOOLBOX_PID" ] && kill "$TOOLBOX_PID" || true
+  [ -n "$PROXY_PID" ] && kill "$PROXY_PID" || true
+}
+trap cleanup EXIT
+
+# --- Execution ---
+install_system_packages
+start_cloud_sql_proxy
+
+export PGHOST=127.0.0.1
+export PGPORT=5432
+export PGPASSWORD="$DB_PASSWORD"
+export GOOGLE_API_KEY="$GOOGLE_API_KEY"
+
+setup_toolbox
+setup_db_table
+
+echo "Scanning $TARGET_ROOT for tests with pattern $AGENT_FILE_PATTERN..."
+
+find "$TARGET_ROOT" -name "$AGENT_FILE_PATTERN" | while read -r agent_file; do
+    sample_dir=$(dirname "$agent_file")
+    if [[ "$TARGET_LANG" == "python" ]]; then
+        run_python_test "$sample_dir"
+    elif [[ "$TARGET_LANG" == "js" ]]; then
+        run_js_test "$sample_dir"
+    elif [[ "$TARGET_LANG" == "go" ]]; then
+        run_go_test "$sample_dir"
+    fi
+done
diff --git a/.ci/quickstart_test/setup_hotels_sample.sql b/.ci/sample_tests/setup_hotels.sql
similarity index 100%
rename from .ci/quickstart_test/setup_hotels_sample.sql
rename to .ci/sample_tests/setup_hotels.sql
diff --git a/.github/workflows/deploy_dev_docs.yaml b/.github/workflows/deploy_dev_docs.yaml
index d51207e1ad..d71f1db273 100644
--- a/.github/workflows/deploy_dev_docs.yaml
+++ b/.github/workflows/deploy_dev_docs.yaml
@@ -40,7 +40,7 @@ jobs:
       group: docs-deployment
       cancel-in-progress: false
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           fetch-depth: 0 # Fetch all history for .GitInfo and .Lastmod
 
@@ -56,7 +56,7 @@ jobs:
           node-version: "22"
 
       - name: Cache dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
diff --git a/.github/workflows/deploy_previous_version_docs.yaml b/.github/workflows/deploy_previous_version_docs.yaml
index 5c238d18b4..1c642262e7 100644
--- a/.github/workflows/deploy_previous_version_docs.yaml
+++ b/.github/workflows/deploy_previous_version_docs.yaml
@@ -30,14 +30,14 @@ jobs:
 
     steps:
       - name: Checkout main branch (for latest templates and theme)
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: 'main'
           submodules: 'recursive'
           fetch-depth: 0
 
       - name: Checkout old content from tag into a temporary directory
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ github.event.inputs.version_tag }}
           path: 'old_version_source' # Checkout into a temp subdir
diff --git a/.github/workflows/deploy_versioned_docs.yaml b/.github/workflows/deploy_versioned_docs.yaml
index 42d0bd1a20..67e809935e 100644
--- a/.github/workflows/deploy_versioned_docs.yaml
+++ b/.github/workflows/deploy_versioned_docs.yaml
@@ -30,7 +30,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: Checkout Code at Tag
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: ${{ github.event.release.tag_name }}
 
diff --git a/.github/workflows/docs_preview_clean.yaml b/.github/workflows/docs_preview_clean.yaml
index ba44bfcc8b..a3a1f07857 100644
--- a/.github/workflows/docs_preview_clean.yaml
+++ b/.github/workflows/docs_preview_clean.yaml
@@ -34,7 +34,7 @@ jobs:
       group: "preview-${{ github.event.number }}"
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           ref: versioned-gh-pages
 
diff --git a/.github/workflows/docs_preview_deploy.yaml b/.github/workflows/docs_preview_deploy.yaml
index 769b4c5dc5..fda0e4895f 100644
--- a/.github/workflows/docs_preview_deploy.yaml
+++ b/.github/workflows/docs_preview_deploy.yaml
@@ -49,7 +49,7 @@ jobs:
       group: "preview-${{ github.event.number }}"
       cancel-in-progress: true
     steps:
-      - uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
         with:
           # Checkout the PR's HEAD commit (supports forks).
           ref: ${{ github.event.pull_request.head.sha }}
@@ -67,7 +67,7 @@ jobs:
           node-version: "22"
 
       - name: Cache dependencies
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
         with:
           path: ~/.npm
           key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
diff --git a/.github/workflows/link_checker_workflow.yaml b/.github/workflows/link_checker_workflow.yaml
index 189016dbc4..591221d16e 100644
--- a/.github/workflows/link_checker_workflow.yaml
+++ b/.github/workflows/link_checker_workflow.yaml
@@ -22,39 +22,47 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Restore lychee cache
-        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5
+        uses: actions/cache@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5
         with:
           path: .lycheecache
           key: cache-lychee-${{ github.sha }}
           restore-keys: cache-lychee-
 
       - name: Link Checker
+        id: lychee-check       
         uses: lycheeverse/lychee-action@a8c4c7cb88f0c7386610c35eb25108e448569cb0 # v2
+        continue-on-error: true 
         with:
           args: >
-            --verbose
+            --quiet
             --no-progress
             --cache
             --max-cache-age 1d
             --exclude '^neo4j\+.*' --exclude '^bolt://.*'
             README.md
             docs/
-          output: /tmp/foo.txt
-          fail: true
-          jobSummary: true
-          debug: true
+          output: lychee-report.md
+          format: markdown
+          fail: true           
+          jobSummary: false    
+          debug: false
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      # This step only runs if the 'lychee_check' step fails, ensuring the 
-      # context note only appears when the developer needs to troubleshoot.
-      - name: Display Link Context Note on Failure
-        if: ${{ failure() }}
+
+      - name: Display Failure Report
+        # Run this ONLY if the link checker failed
+        if: steps.lychee-check.outcome == 'failure'
         run: |
           echo "## Link Resolution Note" >> $GITHUB_STEP_SUMMARY
           echo "Local links and directory changes work differently on GitHub than on the docsite." >> $GITHUB_STEP_SUMMARY
           echo "You must ensure fixes pass the **GitHub check** and also work with **\`hugo server\`**." >> $GITHUB_STEP_SUMMARY
+          echo "See [Link Checking and Fixing with Lychee](https://github.com/googleapis/genai-toolbox/blob/main/DEVELOPER.md#link-checking-and-fixing-with-lychee) for more details." >> $GITHUB_STEP_SUMMARY
           echo "---" >> $GITHUB_STEP_SUMMARY
 
+          echo "### Broken Links Found" >> $GITHUB_STEP_SUMMARY
+          cat ./lychee-report.md >> $GITHUB_STEP_SUMMARY
+
+          exit 1
diff --git a/.github/workflows/publish-mcp.yml b/.github/workflows/publish-mcp.yml
index dc84fbb759..32264b393c 100644
--- a/.github/workflows/publish-mcp.yml
+++ b/.github/workflows/publish-mcp.yml
@@ -29,7 +29,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
 
       - name: Wait for image in Artifact Registry
         shell: bash
diff --git a/.hugo/hugo.toml b/.hugo/hugo.toml
index e3fb75803c..76e253dc0a 100644
--- a/.hugo/hugo.toml
+++ b/.hugo/hugo.toml
@@ -51,6 +51,10 @@ ignoreFiles = ["quickstart/shared", "quickstart/python", "quickstart/js", "quick
 # Add a new version block here before every release
 # The order of versions in this file is mirrored into the dropdown
 
+[[params.versions]]
+  version = "v0.27.0"
+  url = "https://googleapis.github.io/genai-toolbox/v0.27.0/"
+
 [[params.versions]]
   version = "v0.26.0"
   url = "https://googleapis.github.io/genai-toolbox/v0.26.0/"
diff --git a/.lycheeignore b/.lycheeignore
index baec3c4449..236e2c8394 100644
--- a/.lycheeignore
+++ b/.lycheeignore
@@ -23,8 +23,7 @@ https://cloud.dgraph.io/login
 https://dgraph.io/docs
 
 # MySQL Community downloads and main site (often protected by bot mitigation)
-https://dev.mysql.com/downloads/installer/
-https://www.mysql.com/
+^https?://(.*\.)?mysql\.com/.*
 
 # Claude desktop download link
 https://claude.ai/download
@@ -37,9 +36,9 @@ https://dev.mysql.com/doc/refman/8.4/en/sql-prepared-statements.html
 https://dev.mysql.com/doc/refman/8.4/en/user-names.html
 
 # npmjs links can occasionally trigger rate limiting during high-frequency CI builds
-https://www.npmjs.com/package/@toolbox-sdk/core
-https://www.npmjs.com/package/@toolbox-sdk/adk
+^https?://(www\.)?npmjs\.com/.*
+
 https://www.oceanbase.com/
 
 # Ignore social media and blog profiles to reduce external request overhead
-https://medium.com/@mcp_toolbox
+https://medium.com/@mcp_toolbox
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6d18812102..dc9077015d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,31 @@
 # Changelog
 
+## [0.27.0](https://github.com/googleapis/genai-toolbox/compare/v0.26.0...v0.27.0) (2026-02-12)
+
+
+### ⚠ BREAKING CHANGES
+
+* Update configuration file v2 ([#2369](https://github.com/googleapis/genai-toolbox/issues/2369))([293c1d6](https://github.com/googleapis/genai-toolbox/commit/293c1d6889c39807855ba5e01d4c13ba2a4c50ce))
+* Update/add detailed telemetry for mcp endpoint compliant with OTEL semantic convention ([#1987](https://github.com/googleapis/genai-toolbox/issues/1987)) ([478a0bd](https://github.com/googleapis/genai-toolbox/commit/478a0bdb59288c1213f83862f95a698b4c2c0aab))
+
+### Features
+
+* **cli/invoke:** Add support for direct tool invocation from CLI ([#2353](https://github.com/googleapis/genai-toolbox/issues/2353)) ([6e49ba4](https://github.com/googleapis/genai-toolbox/commit/6e49ba436ef2390c13feaf902b29f5907acffb57))
+* **cli/skills:** Add support for generating agent skills from toolset ([#2392](https://github.com/googleapis/genai-toolbox/issues/2392)) ([80ef346](https://github.com/googleapis/genai-toolbox/commit/80ef34621453b77bdf6a6016c354f102a17ada04))
+* **cloud-logging-admin:** Add source, tools, integration test and docs ([#2137](https://github.com/googleapis/genai-toolbox/issues/2137)) ([252fc30](https://github.com/googleapis/genai-toolbox/commit/252fc3091af10d25d8d7af7e047b5ac87a5dd041))
+* **cockroachdb:** Add CockroachDB integration with cockroach-go ([#2006](https://github.com/googleapis/genai-toolbox/issues/2006)) ([1fdd99a](https://github.com/googleapis/genai-toolbox/commit/1fdd99a9b609a5e906acce414226ff44d75d5975))
+* **prebuiltconfigs/alloydb-omni:** Implement Alloydb omni dataplane tools ([#2340](https://github.com/googleapis/genai-toolbox/issues/2340)) ([e995349](https://github.com/googleapis/genai-toolbox/commit/e995349ea0756c700d188b8f04e9459121219f0c))
+* **server:** Add Tool call error categories ([#2387](https://github.com/googleapis/genai-toolbox/issues/2387)) ([32cb4db](https://github.com/googleapis/genai-toolbox/commit/32cb4db712d27579c1bf29e61cbd0bed02286c28))
+* **tools/looker:** support `looker-validate-project` tool ([#2430](https://github.com/googleapis/genai-toolbox/issues/2430)) ([a15a128](https://github.com/googleapis/genai-toolbox/commit/a15a12873f936b0102aeb9500cc3bcd71bb38c34))
+
+
+
+### Bug Fixes
+
+* **dataplex:** Capture GCP HTTP errors in MCP Toolbox ([#2347](https://github.com/googleapis/genai-toolbox/issues/2347)) ([1d7c498](https://github.com/googleapis/genai-toolbox/commit/1d7c4981164c34b4d7bc8edecfd449f57ad11e15))
+* **sources/cockroachdb:** Update kind to type ([#2465](https://github.com/googleapis/genai-toolbox/issues/2465)) ([2d341ac](https://github.com/googleapis/genai-toolbox/commit/2d341acaa61c3c1fe908fceee8afbd90fb646d3a))
+* Surface Dataplex API errors in MCP results ([#2347](https://github.com/googleapis/genai-toolbox/pull/2347))([1d7c498](https://github.com/googleapis/genai-toolbox/commit/1d7c4981164c34b4d7bc8edecfd449f57ad11e15))
+
 ## [0.26.0](https://github.com/googleapis/genai-toolbox/compare/v0.25.0...v0.26.0) (2026-01-22)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 27b829148d..712f7aa71c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -92,11 +92,11 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
   `newdb.go`. Create a `Config` struct to include all the necessary parameters
   for connecting to the database (e.g., host, port, username, password, database
   name) and a `Source` struct to store necessary parameters for tools (e.g.,
-  Name, Kind, connection object, additional config).
+  Name, Type, connection object, additional config).
 * **Implement the
   [`SourceConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L57)
   interface**. This interface requires two methods:
-  * `SourceConfigKind() string`: Returns a unique string identifier for your
+  * `SourceConfigType() string`: Returns a unique string identifier for your
     data source (e.g., `"newdb"`).
   * `Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)`:
     Creates a new instance of your data source and establishes a connection to
@@ -104,7 +104,7 @@ implementation](https://github.com/googleapis/genai-toolbox/blob/main/internal/s
 * **Implement the
   [`Source`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/sources/sources.go#L63)
   interface**. This interface requires one method:
-  * `SourceKind() string`: Returns the same string identifier as `SourceConfigKind()`.
+  * `SourceType() string`: Returns the same string identifier as `SourceConfigType()`.
 * **Implement `init()`** to register the new Source.
 * **Implement Unit Tests** in a file named `newdb_test.go`.
 
@@ -126,7 +126,7 @@ tools.
 * **Implement the
   [`ToolConfig`](https://github.com/googleapis/genai-toolbox/blob/fd300dc606d88bf9f7bba689e2cee4e3565537dd/internal/tools/tools.go#L61)
   interface**. This interface requires one method:
-  * `ToolConfigKind() string`: Returns a unique string identifier for your tool
+  * `ToolConfigType() string`: Returns a unique string identifier for your tool
     (e.g., `"newdb-tool"`).
   * `Initialize(sources map[string]Source) (Tool, error)`: Creates a new
     instance of your tool and validates that it can connect to the specified
@@ -243,7 +243,7 @@ resources.
   | style           | Update src code, with only formatting and whitespace updates (e.g. code formatter or linter changes). |
 
   Pull requests should always add scope whenever possible. The scope is
-  formatted as `<scope-type>/<scope-kind>` (e.g., `sources/postgres`, or
+  formatted as `<scope-resource>/<scope-type>` (e.g., `sources/postgres`, or
   `tools/mssql-sql`).
   
   Ideally, **each PR covers only one scope**, if this is
diff --git a/DEVELOPER.md b/DEVELOPER.md
index ce9f827070..9836d6c9be 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -47,12 +47,13 @@ Before you begin, ensure you have the following:
 ### Tool Naming Conventions
 
 This section details the purpose and conventions for MCP Toolbox's tools naming
-properties, **tool name** and **tool kind**.
+properties, **tool name** and **tool type**.
 
 ```
-cancel_hotel: <- tool name
-    kind: postgres-sql  <- tool kind
-    source: my_pg_source
+kind: tools
+name: cancel_hotel <- tool name
+type: postgres-sql  <- tool type
+source: my_pg_source
 ```
 
 #### Tool Name
@@ -76,17 +77,17 @@ The following guidelines apply to tool names:
   to a function) until they can be validated through extensive testing to ensure
   they do not negatively impact agent's performances.
 
-#### Tool Kind
+#### Tool Type
 
-Tool kind serves as a category or type that a user can assign to a tool.
+Tool type serves as a category or type that a user can assign to a tool.
 
-The following guidelines apply to tool kinds:
+The following guidelines apply to tool types:
 
-* Should user hyphens over underscores (e.g. `firestore-list-collections` or
+* Should use hyphens over underscores (e.g. `firestore-list-collections` or
   `firestore_list_colelctions`).
 * Should use product name in name (e.g. `firestore-list-collections` over
   `list-collections`).
-* Changes to tool kind are breaking changes and should be avoided.
+* Changes to tool type are breaking changes and should be avoided.
 
 ## Testing
 
diff --git a/README.md b/README.md
index 86a186bb8a..160b9456e2 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 
 # MCP Toolbox for Databases
 
+<a href="https://trendshift.io/repositories/13019" target="_blank"><img src="https://trendshift.io/api/badge/repositories/13019" alt="googleapis%2Fgenai-toolbox | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
+
 [![Docs](https://img.shields.io/badge/docs-MCP_Toolbox-blue)](https://googleapis.github.io/genai-toolbox/)
 [![Discord](https://img.shields.io/badge/Discord-%235865F2.svg?style=flat&logo=discord&logoColor=white)](https://discord.gg/Dmm69peqjh)
 [![Medium](https://img.shields.io/badge/Medium-12100E?style=flat&logo=medium&logoColor=white)](https://medium.com/@mcp_toolbox)
@@ -105,7 +107,7 @@ redeploying your application.
 
 ## Getting Started
 
-### (Non-production) Running Toolbox
+### Quickstart: Running Toolbox using NPX
 
 You can run Toolbox directly with a [configuration file](#configuration):
 
@@ -140,7 +142,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.26.0
+> export VERSION=0.27.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -153,7 +155,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.26.0
+> export VERSION=0.27.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 > chmod +x toolbox
 > ```
@@ -166,7 +168,7 @@ To install Toolbox as a binary:
 >
 > ```sh
 > # see releases page for other versions
-> export VERSION=0.26.0
+> export VERSION=0.27.0
 > curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 > chmod +x toolbox
 > ```
@@ -179,7 +181,7 @@ To install Toolbox as a binary:
 >
 > ```cmd
 > :: see releases page for other versions
-> set VERSION=0.26.0
+> set VERSION=0.27.0
 > curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 > ```
 >
@@ -191,7 +193,7 @@ To install Toolbox as a binary:
 >
 > ```powershell
 > # see releases page for other versions
-> $VERSION = "0.26.0"
+> $VERSION = "0.27.0"
 > curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
 > ```
 >
@@ -204,7 +206,7 @@ You can also install Toolbox as a container:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.27.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```
 
@@ -228,7 +230,7 @@ To install from source, ensure you have the latest version of
 [Go installed](https://go.dev/doc/install), and then run the following command:
 
 ```sh
-go install github.com/googleapis/genai-toolbox@v0.26.0
+go install github.com/googleapis/genai-toolbox@v0.27.0
 ```
 <!-- {x-release-please-end} -->
 
@@ -938,14 +940,14 @@ Toolbox should have access to. Most tools will have at least one source to
 execute against.
 
 ```yaml
-sources:
-  my-pg-source:
-    kind: postgres
-    host: 127.0.0.1
-    port: 5432
-    database: toolbox_db
-    user: toolbox_user
-    password: my-password
+kind: sources
+name: my-pg-source
+type: postgres
+host: 127.0.0.1
+port: 5432
+database: toolbox_db
+user: toolbox_user
+password: my-password
 ```
 
 For more details on configuring different types of sources, see the
@@ -954,19 +956,19 @@ For more details on configuring different types of sources, see the
 ### Tools
 
 The `tools` section of a `tools.yaml` define the actions an agent can take: what
-kind of tool it is, which source(s) it affects, what parameters it uses, etc.
+type of tool it is, which source(s) it affects, what parameters it uses, etc.
 
 ```yaml
-tools:
-  search-hotels-by-name:
-    kind: postgres-sql
-    source: my-pg-source
-    description: Search for hotels based on name.
-    parameters:
-      - name: name
-        type: string
-        description: The name of the hotel.
-    statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+kind: tools
+name: search-hotels-by-name
+type: postgres-sql
+source: my-pg-source
+description: Search for hotels based on name.
+parameters:
+  - name: name
+    type: string
+    description: The name of the hotel.
+statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
 ```
 
 For more details on configuring different types of tools, see the
diff --git a/cmd/internal/imports.go b/cmd/internal/imports.go
new file mode 100644
index 0000000000..24c58d7b85
--- /dev/null
+++ b/cmd/internal/imports.go
@@ -0,0 +1,257 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+	// Import prompt packages for side effect of registration
+	_ "github.com/googleapis/genai-toolbox/internal/prompts/custom"
+
+	// Import tool packages for side effect of registration
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreatecluster"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreateinstance"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreateuser"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetcluster"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetinstance"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetuser"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistclusters"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistinstances"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistusers"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbwaitforoperation"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryanalyzecontribution"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryconversationalanalytics"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryforecast"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygetdatasetinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygettableinfo"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylistdatasetids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylisttableids"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysearchcatalog"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cassandra/cassandracql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouseexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselistdatabases"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselisttables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudgda"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdataset"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudmonitoring"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcloneinstance"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatebackup"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatedatabase"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreateusers"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlgetinstances"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqllistdatabases"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqllistinstances"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlrestorebackup"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlwaitforoperation"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cockroachdb/cockroachdbexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cockroachdb/cockroachdblistschemas"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cockroachdb/cockroachdblisttables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/cockroachdb/cockroachdbsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataform/dataformcompilelocal"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexlookupentry"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchaspecttypes"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchentries"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/elasticsearch/elasticsearchesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreadddocuments"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoredeletedocuments"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetdocuments"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetrules"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorelistcollections"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequery"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequerycollection"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreupdatedocument"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorevalidaterules"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardelement"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardfilter"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerconversationalanalytics"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookercreateprojectfile"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdeleteprojectfile"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdevmode"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergenerateembedurl"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiondatabases"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnections"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectionschemas"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiontablecolumns"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiontables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdashboards"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdimensions"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetexplores"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetfilters"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetlooks"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmeasures"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmodels"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetparameters"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojectfile"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojectfiles"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojects"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthanalyze"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthpulse"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthvacuum"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookermakedashboard"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookermakelook"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquery"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquerysql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerqueryurl"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrundashboard"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrunlook"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerupdateprojectfile"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookervalidateproject"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mindsdb/mindsdbexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mindsdb/mindsdbsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbaggregate"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeletemany"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeleteone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfind"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfindone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertmany"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdatemany"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdateone"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqllisttables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlgetqueryplan"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllistactivequeries"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablefragmentation"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablesmissinguniqueindexes"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jcypher"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jexecutecypher"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jschema"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/oceanbase/oceanbaseexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/oceanbase/oceanbasesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/oracle/oracleexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/oracle/oraclesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresdatabaseoverview"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresgetcolumncardinality"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistactivequeries"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistavailableextensions"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistdatabasestats"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistindexes"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistinstalledextensions"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistlocks"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpgsettings"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpublicationtables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistquerystats"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistroles"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistschemas"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistsequences"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresliststoredprocedure"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablespaces"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablestats"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttriggers"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistviews"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslongrunningtransactions"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresreplicationstats"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcancelbatch"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkgetbatch"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparklistbatches"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoreexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoresql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakeexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlistgraphs"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlisttables"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannersql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqliteexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqlitesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbsql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinoexecutesql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinosql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/utility/wait"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/yugabytedbsql"
+
+	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbadmin"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cassandra"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudgda"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudhealthcare"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudloggingadmin"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudmonitoring"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqladmin"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/cockroachdb"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/dataplex"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/elasticsearch"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/firebird"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/firestore"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/looker"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mindsdb"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mongodb"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mssql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/mysql"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/neo4j"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/oceanbase"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/oracle"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/postgres"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/redis"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/serverlessspark"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/singlestore"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/snowflake"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/spanner"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/tidb"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/trino"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/valkey"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/yugabytedb"
+)
diff --git a/cmd/internal/invoke/command.go b/cmd/internal/invoke/command.go
new file mode 100644
index 0000000000..81837402f1
--- /dev/null
+++ b/cmd/internal/invoke/command.go
@@ -0,0 +1,139 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+
+	"github.com/googleapis/genai-toolbox/cmd/internal"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/server/resources"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"github.com/spf13/cobra"
+)
+
+func NewCommand(opts *internal.ToolboxOptions) *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "invoke <tool-name> [params]",
+		Short: "Execute a tool directly",
+		Long: `Execute a tool directly with parameters.
+Params must be a JSON string.
+Example:
+  toolbox invoke my-tool '{"param1": "value1"}'`,
+		Args: cobra.MinimumNArgs(1),
+		RunE: func(c *cobra.Command, args []string) error {
+			return runInvoke(c, args, opts)
+		},
+	}
+	return cmd
+}
+
+func runInvoke(cmd *cobra.Command, args []string, opts *internal.ToolboxOptions) error {
+	ctx, cancel := context.WithCancel(cmd.Context())
+	defer cancel()
+
+	ctx, shutdown, err := opts.Setup(ctx)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = shutdown(ctx)
+	}()
+
+	_, err = opts.LoadConfig(ctx)
+	if err != nil {
+		return err
+	}
+
+	// Initialize Resources
+	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, opts.Cfg)
+	if err != nil {
+		errMsg := fmt.Errorf("failed to initialize resources: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	resourceMgr := resources.NewResourceManager(sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)
+
+	// Execute Tool
+	toolName := args[0]
+	tool, ok := resourceMgr.GetTool(toolName)
+	if !ok {
+		errMsg := fmt.Errorf("tool %q not found", toolName)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	var paramsInput string
+	if len(args) > 1 {
+		paramsInput = args[1]
+	}
+
+	params := make(map[string]any)
+	if paramsInput != "" {
+		if err := json.Unmarshal([]byte(paramsInput), &params); err != nil {
+			errMsg := fmt.Errorf("params must be a valid JSON string: %w", err)
+			opts.Logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+	}
+
+	parsedParams, err := parameters.ParseParams(tool.GetParameters(), params, nil)
+	if err != nil {
+		errMsg := fmt.Errorf("invalid parameters: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	parsedParams, err = tool.EmbedParams(ctx, parsedParams, resourceMgr.GetEmbeddingModelMap())
+	if err != nil {
+		errMsg := fmt.Errorf("error embedding parameters: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	// Client Auth not supported for ephemeral CLI call
+	requiresAuth, err := tool.RequiresClientAuthorization(resourceMgr)
+	if err != nil {
+		errMsg := fmt.Errorf("failed to check auth requirements: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+	if requiresAuth {
+		errMsg := fmt.Errorf("client authorization is not supported")
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	result, err := tool.Invoke(ctx, resourceMgr, parsedParams, "")
+	if err != nil {
+		errMsg := fmt.Errorf("tool execution failed: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	// Print Result
+	output, err := json.MarshalIndent(result, "", "  ")
+	if err != nil {
+		errMsg := fmt.Errorf("failed to marshal result: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+	fmt.Fprintln(opts.IOStreams.Out, string(output))
+
+	return nil
+}
diff --git a/cmd/internal/invoke/command_test.go b/cmd/internal/invoke/command_test.go
new file mode 100644
index 0000000000..3eab850acf
--- /dev/null
+++ b/cmd/internal/invoke/command_test.go
@@ -0,0 +1,153 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package invoke
+
+import (
+	"bytes"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/googleapis/genai-toolbox/cmd/internal"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqlitesql"
+	"github.com/spf13/cobra"
+)
+
+func invokeCommand(args []string) (string, error) {
+	parentCmd := &cobra.Command{Use: "toolbox"}
+
+	buf := new(bytes.Buffer)
+	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+	internal.PersistentFlags(parentCmd, opts)
+
+	cmd := NewCommand(opts)
+	parentCmd.AddCommand(cmd)
+	parentCmd.SetArgs(args)
+
+	err := parentCmd.Execute()
+	return buf.String(), err
+}
+
+func TestInvokeTool(t *testing.T) {
+	// Create a temporary tools file
+	tmpDir := t.TempDir()
+
+	toolsFileContent := `
+sources:
+  my-sqlite:
+    kind: sqlite
+    database: test.db
+tools:
+  hello-sqlite:
+    kind: sqlite-sql
+    source: my-sqlite
+    description: "hello tool"
+    statement: "SELECT 'hello' as greeting"
+  echo-tool:
+    kind: sqlite-sql
+    source: my-sqlite
+    description: "echo tool"
+    statement: "SELECT ? as msg"
+    parameters:
+      - name: message
+        type: string
+        description: message to echo
+`
+
+	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
+	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
+		t.Fatalf("failed to write tools file: %v", err)
+	}
+
+	tcs := []struct {
+		desc    string
+		args    []string
+		want    string
+		wantErr bool
+		errStr  string
+	}{
+		{
+			desc: "success - basic tool call",
+			args: []string{"invoke", "hello-sqlite", "--tools-file", toolsFilePath},
+			want: `"greeting": "hello"`,
+		},
+		{
+			desc: "success - tool call with parameters",
+			args: []string{"invoke", "echo-tool", `{"message": "world"}`, "--tools-file", toolsFilePath},
+			want: `"msg": "world"`,
+		},
+		{
+			desc:    "error - tool not found",
+			args:    []string{"invoke", "non-existent", "--tools-file", toolsFilePath},
+			wantErr: true,
+			errStr:  `tool "non-existent" not found`,
+		},
+		{
+			desc:    "error - invalid JSON params",
+			args:    []string{"invoke", "echo-tool", `invalid-json`, "--tools-file", toolsFilePath},
+			wantErr: true,
+			errStr:  `params must be a valid JSON string`,
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			got, err := invokeCommand(tc.args)
+			if (err != nil) != tc.wantErr {
+				t.Fatalf("got error %v, wantErr %v", err, tc.wantErr)
+			}
+			if tc.wantErr && !strings.Contains(err.Error(), tc.errStr) {
+				t.Fatalf("got error %v, want error containing %q", err, tc.errStr)
+			}
+			if !tc.wantErr && !strings.Contains(got, tc.want) {
+				t.Fatalf("got %q, want it to contain %q", got, tc.want)
+			}
+		})
+	}
+}
+
+func TestInvokeTool_AuthUnsupported(t *testing.T) {
+	tmpDir := t.TempDir()
+	toolsFileContent := `
+sources:
+  my-bq:
+    kind: bigquery
+    project: my-project
+    useClientOAuth: true
+tools:
+  bq-tool:
+    kind: bigquery-sql
+    source: my-bq
+    description: "bq tool"
+    statement: "SELECT 1"
+`
+	toolsFilePath := filepath.Join(tmpDir, "auth_tools.yaml")
+	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
+		t.Fatalf("failed to write tools file: %v", err)
+	}
+
+	args := []string{"invoke", "bq-tool", "--tools-file", toolsFilePath}
+	_, err := invokeCommand(args)
+	if err == nil {
+		t.Fatal("expected error for tool requiring client auth, but got nil")
+	}
+	if !strings.Contains(err.Error(), "client authorization is not supported") {
+		t.Fatalf("unexpected error message: %v", err)
+	}
+}
diff --git a/cmd/internal/options.go b/cmd/internal/options.go
new file mode 100644
index 0000000000..ea07771493
--- /dev/null
+++ b/cmd/internal/options.go
@@ -0,0 +1,251 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"slices"
+	"strings"
+
+	"github.com/googleapis/genai-toolbox/internal/log"
+	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/telemetry"
+	"github.com/googleapis/genai-toolbox/internal/util"
+)
+
+type IOStreams struct {
+	In     io.Reader
+	Out    io.Writer
+	ErrOut io.Writer
+}
+
+// ToolboxOptions holds dependencies shared by all commands.
+type ToolboxOptions struct {
+	IOStreams       IOStreams
+	Logger          log.Logger
+	Cfg             server.ServerConfig
+	ToolsFile       string
+	ToolsFiles      []string
+	ToolsFolder     string
+	PrebuiltConfigs []string
+}
+
+// Option defines a function that modifies the ToolboxOptions struct.
+type Option func(*ToolboxOptions)
+
+// NewToolboxOptions creates a new instance with defaults, then applies any
+// provided options.
+func NewToolboxOptions(opts ...Option) *ToolboxOptions {
+	o := &ToolboxOptions{
+		IOStreams: IOStreams{
+			In:     os.Stdin,
+			Out:    os.Stdout,
+			ErrOut: os.Stderr,
+		},
+	}
+
+	for _, opt := range opts {
+		opt(o)
+	}
+	return o
+}
+
+// Apply allows you to update an EXISTING ToolboxOptions instance.
+// This is useful for "late binding".
+func (o *ToolboxOptions) Apply(opts ...Option) {
+	for _, opt := range opts {
+		opt(o)
+	}
+}
+
+// WithIOStreams updates the IO streams.
+func WithIOStreams(out, err io.Writer) Option {
+	return func(o *ToolboxOptions) {
+		o.IOStreams.Out = out
+		o.IOStreams.ErrOut = err
+	}
+}
+
+// Setup create logger and telemetry instrumentations.
+func (opts *ToolboxOptions) Setup(ctx context.Context) (context.Context, func(context.Context) error, error) {
+	// If stdio, set logger's out stream (usually DEBUG and INFO logs) to
+	// errStream
+	loggerOut := opts.IOStreams.Out
+	if opts.Cfg.Stdio {
+		loggerOut = opts.IOStreams.ErrOut
+	}
+
+	// Handle logger separately from config
+	logger, err := log.NewLogger(opts.Cfg.LoggingFormat.String(), opts.Cfg.LogLevel.String(), loggerOut, opts.IOStreams.ErrOut)
+	if err != nil {
+		return ctx, nil, fmt.Errorf("unable to initialize logger: %w", err)
+	}
+
+	ctx = util.WithLogger(ctx, logger)
+	opts.Logger = logger
+
+	// Set up OpenTelemetry
+	otelShutdown, err := telemetry.SetupOTel(ctx, opts.Cfg.Version, opts.Cfg.TelemetryOTLP, opts.Cfg.TelemetryGCP, opts.Cfg.TelemetryServiceName)
+	if err != nil {
+		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
+		logger.ErrorContext(ctx, errMsg.Error())
+		return ctx, nil, errMsg
+	}
+
+	shutdownFunc := func(ctx context.Context) error {
+		err := otelShutdown(ctx)
+		if err != nil {
+			errMsg := fmt.Errorf("error shutting down OpenTelemetry: %w", err)
+			logger.ErrorContext(ctx, errMsg.Error())
+			return err
+		}
+		return nil
+	}
+
+	instrumentation, err := telemetry.CreateTelemetryInstrumentation(opts.Cfg.Version)
+	if err != nil {
+		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
+		logger.ErrorContext(ctx, errMsg.Error())
+		return ctx, shutdownFunc, errMsg
+	}
+
+	ctx = util.WithInstrumentation(ctx, instrumentation)
+
+	return ctx, shutdownFunc, nil
+}
+
+// LoadConfig checks and merge files that should be loaded into the server
+func (opts *ToolboxOptions) LoadConfig(ctx context.Context) (bool, error) {
+	// Determine if Custom Files should be loaded
+	// Check for explicit custom flags
+	isCustomConfigured := opts.ToolsFile != "" || len(opts.ToolsFiles) > 0 || opts.ToolsFolder != ""
+
+	// Determine if default 'tools.yaml' should be used (No prebuilt AND No custom flags)
+	useDefaultToolsFile := len(opts.PrebuiltConfigs) == 0 && !isCustomConfigured
+
+	if useDefaultToolsFile {
+		opts.ToolsFile = "tools.yaml"
+		isCustomConfigured = true
+	}
+
+	logger, err := util.LoggerFromContext(ctx)
+	if err != nil {
+		return isCustomConfigured, err
+	}
+
+	var allToolsFiles []ToolsFile
+
+	// Load Prebuilt Configuration
+
+	if len(opts.PrebuiltConfigs) > 0 {
+		slices.Sort(opts.PrebuiltConfigs)
+		sourcesList := strings.Join(opts.PrebuiltConfigs, ", ")
+		logMsg := fmt.Sprintf("Using prebuilt tool configurations for: %s", sourcesList)
+		logger.InfoContext(ctx, logMsg)
+
+		for _, configName := range opts.PrebuiltConfigs {
+			buf, err := prebuiltconfigs.Get(configName)
+			if err != nil {
+				logger.ErrorContext(ctx, err.Error())
+				return isCustomConfigured, err
+			}
+
+			// Parse into ToolsFile struct
+			parsed, err := parseToolsFile(ctx, buf)
+			if err != nil {
+				errMsg := fmt.Errorf("unable to parse prebuilt tool configuration for '%s': %w", configName, err)
+				logger.ErrorContext(ctx, errMsg.Error())
+				return isCustomConfigured, errMsg
+			}
+			allToolsFiles = append(allToolsFiles, parsed)
+		}
+	}
+
+	// Load Custom Configurations
+	if isCustomConfigured {
+		// Enforce exclusivity among custom flags (tools-file vs tools-files vs tools-folder)
+		if (opts.ToolsFile != "" && len(opts.ToolsFiles) > 0) ||
+			(opts.ToolsFile != "" && opts.ToolsFolder != "") ||
+			(len(opts.ToolsFiles) > 0 && opts.ToolsFolder != "") {
+			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
+			logger.ErrorContext(ctx, errMsg.Error())
+			return isCustomConfigured, errMsg
+		}
+
+		var customTools ToolsFile
+		var err error
+
+		if len(opts.ToolsFiles) > 0 {
+			// Use tools-files
+			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(opts.ToolsFiles)))
+			customTools, err = LoadAndMergeToolsFiles(ctx, opts.ToolsFiles)
+		} else if opts.ToolsFolder != "" {
+			// Use tools-folder
+			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", opts.ToolsFolder))
+			customTools, err = LoadAndMergeToolsFolder(ctx, opts.ToolsFolder)
+		} else {
+			// Use single file (tools-file or default `tools.yaml`)
+			buf, readFileErr := os.ReadFile(opts.ToolsFile)
+			if readFileErr != nil {
+				errMsg := fmt.Errorf("unable to read tool file at %q: %w", opts.ToolsFile, readFileErr)
+				logger.ErrorContext(ctx, errMsg.Error())
+				return isCustomConfigured, errMsg
+			}
+			customTools, err = parseToolsFile(ctx, buf)
+			if err != nil {
+				err = fmt.Errorf("unable to parse tool file at %q: %w", opts.ToolsFile, err)
+			}
+		}
+
+		if err != nil {
+			logger.ErrorContext(ctx, err.Error())
+			return isCustomConfigured, err
+		}
+		allToolsFiles = append(allToolsFiles, customTools)
+	}
+
+	// Modify version string based on loaded configurations
+	if len(opts.PrebuiltConfigs) > 0 {
+		tag := "prebuilt"
+		if isCustomConfigured {
+			tag = "custom"
+		}
+		// prebuiltConfigs is already sorted above
+		for _, configName := range opts.PrebuiltConfigs {
+			opts.Cfg.Version += fmt.Sprintf("+%s.%s", tag, configName)
+		}
+	}
+
+	// Merge Everything
+	// This will error if custom tools collide with prebuilt tools
+	finalToolsFile, err := mergeToolsFiles(allToolsFiles...)
+	if err != nil {
+		logger.ErrorContext(ctx, err.Error())
+		return isCustomConfigured, err
+	}
+
+	opts.Cfg.SourceConfigs = finalToolsFile.Sources
+	opts.Cfg.AuthServiceConfigs = finalToolsFile.AuthServices
+	opts.Cfg.EmbeddingModelConfigs = finalToolsFile.EmbeddingModels
+	opts.Cfg.ToolConfigs = finalToolsFile.Tools
+	opts.Cfg.ToolsetConfigs = finalToolsFile.Toolsets
+	opts.Cfg.PromptConfigs = finalToolsFile.Prompts
+
+	return isCustomConfigured, nil
+}
diff --git a/cmd/options_test.go b/cmd/internal/options_test.go
similarity index 62%
rename from cmd/options_test.go
rename to cmd/internal/options_test.go
index e0ab779b52..6e7c0a05ed 100644
--- a/cmd/options_test.go
+++ b/cmd/internal/options_test.go
@@ -12,57 +12,38 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package cmd
+package internal
 
 import (
 	"errors"
 	"io"
 	"testing"
-
-	"github.com/spf13/cobra"
 )
 
-func TestCommandOptions(t *testing.T) {
+func TestToolboxOptions(t *testing.T) {
 	w := io.Discard
 	tcs := []struct {
 		desc    string
-		isValid func(*Command) error
+		isValid func(*ToolboxOptions) error
 		option  Option
 	}{
 		{
 			desc: "with logger",
-			isValid: func(c *Command) error {
-				if c.outStream != w || c.errStream != w {
+			isValid: func(o *ToolboxOptions) error {
+				if o.IOStreams.Out != w || o.IOStreams.ErrOut != w {
 					return errors.New("loggers do not match")
 				}
 				return nil
 			},
-			option: WithStreams(w, w),
+			option: WithIOStreams(w, w),
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got, err := invokeProxyWithOption(tc.option)
-			if err != nil {
-				t.Fatal(err)
-			}
+			got := NewToolboxOptions(tc.option)
 			if err := tc.isValid(got); err != nil {
 				t.Errorf("option did not initialize command correctly: %v", err)
 			}
 		})
 	}
 }
-
-func invokeProxyWithOption(o Option) (*Command, error) {
-	c := NewCommand(o)
-	// Keep the test output quiet
-	c.SilenceUsage = true
-	c.SilenceErrors = true
-	// Disable execute behavior
-	c.RunE = func(*cobra.Command, []string) error {
-		return nil
-	}
-
-	err := c.Execute()
-	return c, err
-}
diff --git a/cmd/internal/persistent_flags.go b/cmd/internal/persistent_flags.go
new file mode 100644
index 0000000000..3874521a15
--- /dev/null
+++ b/cmd/internal/persistent_flags.go
@@ -0,0 +1,46 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
+	"github.com/spf13/cobra"
+)
+
+// PersistentFlags sets up flags that are available for all commands and
+// subcommands
+// It is also used to set up persistent flags during subcommand unit tests
+func PersistentFlags(parentCmd *cobra.Command, opts *ToolboxOptions) {
+	persistentFlags := parentCmd.PersistentFlags()
+
+	persistentFlags.StringVar(&opts.ToolsFile, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
+	persistentFlags.StringSliceVar(&opts.ToolsFiles, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, or --tools-folder.")
+	persistentFlags.StringVar(&opts.ToolsFolder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --tools-file, or --tools-files.")
+	persistentFlags.Var(&opts.Cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
+	persistentFlags.Var(&opts.Cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
+	persistentFlags.BoolVar(&opts.Cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
+	persistentFlags.StringVar(&opts.Cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
+	persistentFlags.StringVar(&opts.Cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
+	// Fetch prebuilt tools sources to customize the help description
+	prebuiltHelp := fmt.Sprintf(
+		"Use a prebuilt tool configuration by source type. Allowed: '%s'. Can be specified multiple times.",
+		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
+	)
+	persistentFlags.StringSliceVar(&opts.PrebuiltConfigs, "prebuilt", []string{}, prebuiltHelp)
+	persistentFlags.StringSliceVar(&opts.Cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
+}
diff --git a/cmd/internal/skills/command.go b/cmd/internal/skills/command.go
new file mode 100644
index 0000000000..d06c42c2b7
--- /dev/null
+++ b/cmd/internal/skills/command.go
@@ -0,0 +1,214 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package skills
+
+import (
+	"context"
+	_ "embed"
+	"fmt"
+	"os"
+	"path/filepath"
+	"sort"
+
+	"github.com/googleapis/genai-toolbox/cmd/internal"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/server/resources"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+
+	"github.com/spf13/cobra"
+)
+
+// skillsCmd is the command for generating skills.
+type skillsCmd struct {
+	*cobra.Command
+	name        string
+	description string
+	toolset     string
+	outputDir   string
+}
+
+// NewCommand creates a new Command.
+func NewCommand(opts *internal.ToolboxOptions) *cobra.Command {
+	cmd := &skillsCmd{}
+	cmd.Command = &cobra.Command{
+		Use:   "skills-generate",
+		Short: "Generate skills from tool configurations",
+		RunE: func(c *cobra.Command, args []string) error {
+			return run(cmd, opts)
+		},
+	}
+
+	cmd.Flags().StringVar(&cmd.name, "name", "", "Name of the generated skill.")
+	cmd.Flags().StringVar(&cmd.description, "description", "", "Description of the generated skill")
+	cmd.Flags().StringVar(&cmd.toolset, "toolset", "", "Name of the toolset to convert into a skill. If not provided, all tools will be included.")
+	cmd.Flags().StringVar(&cmd.outputDir, "output-dir", "skills", "Directory to output generated skills")
+
+	_ = cmd.MarkFlagRequired("name")
+	_ = cmd.MarkFlagRequired("description")
+	return cmd.Command
+}
+
+func run(cmd *skillsCmd, opts *internal.ToolboxOptions) error {
+	ctx, cancel := context.WithCancel(cmd.Context())
+	defer cancel()
+
+	ctx, shutdown, err := opts.Setup(ctx)
+	if err != nil {
+		return err
+	}
+	defer func() {
+		_ = shutdown(ctx)
+	}()
+
+	_, err = opts.LoadConfig(ctx)
+	if err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll(cmd.outputDir, 0755); err != nil {
+		errMsg := fmt.Errorf("error creating output directory: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	opts.Logger.InfoContext(ctx, fmt.Sprintf("Generating skill '%s'...", cmd.name))
+
+	// Initialize toolbox and collect tools
+	allTools, err := cmd.collectTools(ctx, opts)
+	if err != nil {
+		errMsg := fmt.Errorf("error collecting tools: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	if len(allTools) == 0 {
+		opts.Logger.InfoContext(ctx, "No tools found to generate.")
+		return nil
+	}
+
+	// Generate the combined skill directory
+	skillPath := filepath.Join(cmd.outputDir, cmd.name)
+	if err := os.MkdirAll(skillPath, 0755); err != nil {
+		errMsg := fmt.Errorf("error creating skill directory: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	// Generate assets directory
+	assetsPath := filepath.Join(skillPath, "assets")
+	if err := os.MkdirAll(assetsPath, 0755); err != nil {
+		errMsg := fmt.Errorf("error creating assets dir: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	// Generate scripts directory
+	scriptsPath := filepath.Join(skillPath, "scripts")
+	if err := os.MkdirAll(scriptsPath, 0755); err != nil {
+		errMsg := fmt.Errorf("error creating scripts dir: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	// Iterate over keys to ensure deterministic order
+	var toolNames []string
+	for name := range allTools {
+		toolNames = append(toolNames, name)
+	}
+	sort.Strings(toolNames)
+
+	for _, toolName := range toolNames {
+		// Generate YAML config in asset directory
+		minimizedContent, err := generateToolConfigYAML(opts.Cfg, toolName)
+		if err != nil {
+			errMsg := fmt.Errorf("error generating filtered config for %s: %w", toolName, err)
+			opts.Logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+
+		specificToolsFileName := fmt.Sprintf("%s.yaml", toolName)
+		if minimizedContent != nil {
+			destPath := filepath.Join(assetsPath, specificToolsFileName)
+			if err := os.WriteFile(destPath, minimizedContent, 0644); err != nil {
+				errMsg := fmt.Errorf("error writing filtered config for %s: %w", toolName, err)
+				opts.Logger.ErrorContext(ctx, errMsg.Error())
+				return errMsg
+			}
+		}
+
+		// Generate wrapper script in scripts directory
+		scriptContent, err := generateScriptContent(toolName, specificToolsFileName)
+		if err != nil {
+			errMsg := fmt.Errorf("error generating script content for %s: %w", toolName, err)
+			opts.Logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+
+		scriptFilename := filepath.Join(scriptsPath, fmt.Sprintf("%s.js", toolName))
+		if err := os.WriteFile(scriptFilename, []byte(scriptContent), 0755); err != nil {
+			errMsg := fmt.Errorf("error writing script %s: %w", scriptFilename, err)
+			opts.Logger.ErrorContext(ctx, errMsg.Error())
+			return errMsg
+		}
+	}
+
+	// Generate SKILL.md
+	skillContent, err := generateSkillMarkdown(cmd.name, cmd.description, allTools)
+	if err != nil {
+		errMsg := fmt.Errorf("error generating SKILL.md content: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+	skillMdPath := filepath.Join(skillPath, "SKILL.md")
+	if err := os.WriteFile(skillMdPath, []byte(skillContent), 0644); err != nil {
+		errMsg := fmt.Errorf("error writing SKILL.md: %w", err)
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+
+	opts.Logger.InfoContext(ctx, fmt.Sprintf("Successfully generated skill '%s' with %d tools.", cmd.name, len(allTools)))
+
+	return nil
+}
+
+func (c *skillsCmd) collectTools(ctx context.Context, opts *internal.ToolboxOptions) (map[string]tools.Tool, error) {
+	// Initialize Resources
+	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, opts.Cfg)
+	if err != nil {
+		return nil, fmt.Errorf("failed to initialize resources: %w", err)
+	}
+
+	resourceMgr := resources.NewResourceManager(sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap)
+
+	result := make(map[string]tools.Tool)
+
+	if c.toolset == "" {
+		return toolsMap, nil
+	}
+
+	ts, ok := resourceMgr.GetToolset(c.toolset)
+	if !ok {
+		return nil, fmt.Errorf("toolset %q not found", c.toolset)
+	}
+
+	for _, t := range ts.Tools {
+		if t != nil {
+			tool := *t
+			result[tool.McpManifest().Name] = tool
+		}
+	}
+
+	return result, nil
+}
diff --git a/cmd/internal/skills/command_test.go b/cmd/internal/skills/command_test.go
new file mode 100644
index 0000000000..e7ddeafd1c
--- /dev/null
+++ b/cmd/internal/skills/command_test.go
@@ -0,0 +1,195 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package skills
+
+import (
+	"bytes"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/googleapis/genai-toolbox/cmd/internal"
+	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
+	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqlitesql"
+	"github.com/spf13/cobra"
+)
+
+func invokeCommand(args []string) (string, error) {
+	parentCmd := &cobra.Command{Use: "toolbox"}
+
+	buf := new(bytes.Buffer)
+	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+	internal.PersistentFlags(parentCmd, opts)
+
+	cmd := NewCommand(opts)
+	parentCmd.AddCommand(cmd)
+	parentCmd.SetArgs(args)
+
+	err := parentCmd.Execute()
+	return buf.String(), err
+}
+
+func TestGenerateSkill(t *testing.T) {
+	// Create a temporary directory for tests
+	tmpDir := t.TempDir()
+	outputDir := filepath.Join(tmpDir, "skills")
+
+	// Create a tools.yaml file with a sqlite tool
+	toolsFileContent := `
+sources:
+  my-sqlite:
+    kind: sqlite
+    database: test.db
+tools:
+  hello-sqlite:
+    kind: sqlite-sql
+    source: my-sqlite
+    description: "hello tool"
+    statement: "SELECT 'hello' as greeting"
+`
+
+	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
+	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
+		t.Fatalf("failed to write tools file: %v", err)
+	}
+
+	args := []string{
+		"skills-generate",
+		"--tools-file", toolsFilePath,
+		"--output-dir", outputDir,
+		"--name", "hello-sqlite",
+		"--description", "hello tool",
+	}
+
+	got, err := invokeCommand(args)
+	if err != nil {
+		t.Fatalf("command failed: %v\nOutput: %s", err, got)
+	}
+
+	// Verify generated directory structure
+	skillPath := filepath.Join(outputDir, "hello-sqlite")
+	if _, err := os.Stat(skillPath); os.IsNotExist(err) {
+		t.Fatalf("skill directory not created: %s", skillPath)
+	}
+
+	// Check SKILL.md
+	skillMarkdown := filepath.Join(skillPath, "SKILL.md")
+	content, err := os.ReadFile(skillMarkdown)
+	if err != nil {
+		t.Fatalf("failed to read SKILL.md: %v", err)
+	}
+
+	expectedFrontmatter := `---
+name: hello-sqlite
+description: hello tool
+---`
+	if !strings.HasPrefix(string(content), expectedFrontmatter) {
+		t.Errorf("SKILL.md does not have expected frontmatter format.\nExpected prefix:\n%s\nGot:\n%s", expectedFrontmatter, string(content))
+	}
+
+	if !strings.Contains(string(content), "## Usage") {
+		t.Errorf("SKILL.md does not contain '## Usage' section")
+	}
+
+	if !strings.Contains(string(content), "## Scripts") {
+		t.Errorf("SKILL.md does not contain '## Scripts' section")
+	}
+
+	if !strings.Contains(string(content), "### hello-sqlite") {
+		t.Errorf("SKILL.md does not contain '### hello-sqlite' tool header")
+	}
+
+	// Check script file
+	scriptFilename := "hello-sqlite.js"
+	scriptPath := filepath.Join(skillPath, "scripts", scriptFilename)
+	if _, err := os.Stat(scriptPath); os.IsNotExist(err) {
+		t.Fatalf("script file not created: %s", scriptPath)
+	}
+
+	scriptContent, err := os.ReadFile(scriptPath)
+	if err != nil {
+		t.Fatalf("failed to read script file: %v", err)
+	}
+	if !strings.Contains(string(scriptContent), "hello-sqlite") {
+		t.Errorf("script file does not contain expected tool name")
+	}
+
+	// Check assets
+	assetPath := filepath.Join(skillPath, "assets", "hello-sqlite.yaml")
+	if _, err := os.Stat(assetPath); os.IsNotExist(err) {
+		t.Fatalf("asset file not created: %s", assetPath)
+	}
+	assetContent, err := os.ReadFile(assetPath)
+	if err != nil {
+		t.Fatalf("failed to read asset file: %v", err)
+	}
+	if !strings.Contains(string(assetContent), "hello-sqlite") {
+		t.Errorf("asset file does not contain expected tool name")
+	}
+}
+
+func TestGenerateSkill_NoConfig(t *testing.T) {
+	tmpDir := t.TempDir()
+	outputDir := filepath.Join(tmpDir, "skills")
+
+	args := []string{
+		"skills-generate",
+		"--output-dir", outputDir,
+		"--name", "test",
+		"--description", "test",
+	}
+
+	_, err := invokeCommand(args)
+	if err == nil {
+		t.Fatal("expected command to fail when no configuration is provided and tools.yaml is missing")
+	}
+
+	// Should not have created the directory if no config was processed
+	if _, err := os.Stat(outputDir); !os.IsNotExist(err) {
+		t.Errorf("output directory should not have been created")
+	}
+}
+
+func TestGenerateSkill_MissingArguments(t *testing.T) {
+	tmpDir := t.TempDir()
+	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
+	if err := os.WriteFile(toolsFilePath, []byte("tools: {}"), 0644); err != nil {
+		t.Fatalf("failed to write tools file: %v", err)
+	}
+
+	tests := []struct {
+		name string
+		args []string
+	}{
+		{
+			name: "missing name",
+			args: []string{"skills-generate", "--tools-file", toolsFilePath, "--description", "test"},
+		},
+		{
+			name: "missing description",
+			args: []string{"skills-generate", "--tools-file", toolsFilePath, "--name", "test"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := invokeCommand(tt.args)
+			if err == nil {
+				t.Fatalf("expected command to fail due to missing arguments, but it succeeded\nOutput: %s", got)
+			}
+		})
+	}
+}
diff --git a/cmd/internal/skills/generator.go b/cmd/internal/skills/generator.go
new file mode 100644
index 0000000000..a9e20fc9e3
--- /dev/null
+++ b/cmd/internal/skills/generator.go
@@ -0,0 +1,296 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package skills
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"sort"
+	"strings"
+	"text/template"
+
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+const skillTemplate = `---
+name: {{.SkillName}}
+description: {{.SkillDescription}}
+---
+
+## Usage
+
+All scripts can be executed using Node.js. Replace ` + "`" + `<param_name>` + "`" + ` and ` + "`" + `<param_value>` + "`" + ` with actual values.
+
+**Bash:**
+` + "`" + `node scripts/<script_name>.js '{"<param_name>": "<param_value>"}'` + "`" + `
+
+**PowerShell:**
+` + "`" + `node scripts/<script_name>.js '{\"<param_name>\": \"<param_value>\"}'` + "`" + `
+
+## Scripts
+
+{{range .Tools}}
+### {{.Name}}
+
+{{.Description}}
+
+{{.ParametersSchema}}
+
+---
+{{end}}
+`
+
+type toolTemplateData struct {
+	Name             string
+	Description      string
+	ParametersSchema string
+}
+
+type skillTemplateData struct {
+	SkillName        string
+	SkillDescription string
+	Tools            []toolTemplateData
+}
+
+// generateSkillMarkdown generates the content of the SKILL.md file.
+// It includes usage instructions and a reference section for each tool in the skill,
+// detailing its description and parameters.
+func generateSkillMarkdown(skillName, skillDescription string, toolsMap map[string]tools.Tool) (string, error) {
+	var toolsData []toolTemplateData
+
+	// Order tools based on name
+	var toolNames []string
+	for name := range toolsMap {
+		toolNames = append(toolNames, name)
+	}
+	sort.Strings(toolNames)
+
+	for _, name := range toolNames {
+		tool := toolsMap[name]
+		manifest := tool.Manifest()
+
+		parametersSchema, err := formatParameters(manifest.Parameters)
+		if err != nil {
+			return "", err
+		}
+
+		toolsData = append(toolsData, toolTemplateData{
+			Name:             name,
+			Description:      manifest.Description,
+			ParametersSchema: parametersSchema,
+		})
+	}
+
+	data := skillTemplateData{
+		SkillName:        skillName,
+		SkillDescription: skillDescription,
+		Tools:            toolsData,
+	}
+
+	tmpl, err := template.New("markdown").Parse(skillTemplate)
+	if err != nil {
+		return "", fmt.Errorf("error parsing markdown template: %w", err)
+	}
+
+	var buf strings.Builder
+	if err := tmpl.Execute(&buf, data); err != nil {
+		return "", fmt.Errorf("error executing markdown template: %w", err)
+	}
+
+	return buf.String(), nil
+}
+
+const nodeScriptTemplate = `#!/usr/bin/env node
+
+const { spawn, execSync } = require('child_process');
+const path = require('path');
+const fs = require('fs');
+
+const toolName = "{{.Name}}";
+const toolsFileName = "{{.ToolsFileName}}";
+
+function getToolboxPath() {
+    try {
+        const checkCommand = process.platform === 'win32' ? 'where toolbox' : 'which toolbox';
+        const globalPath = execSync(checkCommand, { stdio: 'pipe', encoding: 'utf-8' }).trim();
+        if (globalPath) {
+            return globalPath.split('\n')[0].trim();
+        }
+    } catch (e) {
+        // Ignore error;
+    }
+    const localPath = path.resolve(__dirname, '../../../toolbox');
+    if (fs.existsSync(localPath)) {
+        return localPath;
+    }
+    throw new Error("Toolbox binary not found");
+}
+
+let toolboxBinary;
+try {
+    toolboxBinary = getToolboxPath();
+} catch (err) {
+    console.error("Error:", err.message);
+    process.exit(1);
+}
+
+let configArgs = [];
+if (toolsFileName) {
+  configArgs.push("--tools-file", path.join(__dirname, "..", "assets", toolsFileName));
+}
+
+const args = process.argv.slice(2);
+const toolboxArgs = [...configArgs, "invoke", toolName, ...args];
+
+const child = spawn(toolboxBinary, toolboxArgs, { stdio: 'inherit' });
+
+child.on('close', (code) => {
+  process.exit(code);
+});
+
+child.on('error', (err) => {
+  console.error("Error executing toolbox:", err);
+  process.exit(1);
+});
+`
+
+type scriptData struct {
+	Name          string
+	ToolsFileName string
+}
+
+// generateScriptContent creates the content for a Node.js wrapper script.
+// This script invokes the toolbox CLI with the appropriate configuration
+// (using a generated tools file) and arguments to execute the specific tool.
+func generateScriptContent(name string, toolsFileName string) (string, error) {
+	data := scriptData{
+		Name:          name,
+		ToolsFileName: toolsFileName,
+	}
+
+	tmpl, err := template.New("script").Parse(nodeScriptTemplate)
+	if err != nil {
+		return "", fmt.Errorf("error parsing script template: %w", err)
+	}
+
+	var buf strings.Builder
+	if err := tmpl.Execute(&buf, data); err != nil {
+		return "", fmt.Errorf("error executing script template: %w", err)
+	}
+
+	return buf.String(), nil
+}
+
+// formatParameters converts a list of parameter manifests into a formatted JSON schema string.
+// This schema is used in the skill documentation to describe the input parameters for a tool.
+func formatParameters(params []parameters.ParameterManifest) (string, error) {
+	if len(params) == 0 {
+		return "", nil
+	}
+
+	properties := make(map[string]interface{})
+	var required []string
+
+	for _, p := range params {
+		paramMap := map[string]interface{}{
+			"type":        p.Type,
+			"description": p.Description,
+		}
+		if p.Default != nil {
+			paramMap["default"] = p.Default
+		}
+		properties[p.Name] = paramMap
+		if p.Required {
+			required = append(required, p.Name)
+		}
+	}
+
+	schema := map[string]interface{}{
+		"type":       "object",
+		"properties": properties,
+	}
+	if len(required) > 0 {
+		schema["required"] = required
+	}
+
+	schemaJSON, err := json.MarshalIndent(schema, "", "  ")
+	if err != nil {
+		return "", fmt.Errorf("error generating parameters schema: %w", err)
+	}
+
+	return fmt.Sprintf("#### Parameters\n\n```json\n%s\n```", string(schemaJSON)), nil
+}
+
+// generateToolConfigYAML generates the YAML configuration for a single tool and its dependency (source).
+// It extracts the relevant tool and source configurations from the server config and formats them
+// into a YAML document suitable for inclusion in the skill's assets.
+func generateToolConfigYAML(cfg server.ServerConfig, toolName string) ([]byte, error) {
+	toolCfg, ok := cfg.ToolConfigs[toolName]
+	if !ok {
+		return nil, fmt.Errorf("error finding tool config: %s", toolName)
+	}
+
+	var buf bytes.Buffer
+	encoder := yaml.NewEncoder(&buf)
+
+	// Process Tool Config
+	toolWrapper := struct {
+		Kind   string           `yaml:"kind"`
+		Config tools.ToolConfig `yaml:",inline"`
+	}{
+		Kind:   "tools",
+		Config: toolCfg,
+	}
+
+	if err := encoder.Encode(toolWrapper); err != nil {
+		return nil, fmt.Errorf("error encoding tool config: %w", err)
+	}
+
+	// Process Source Config
+	var toolMap map[string]interface{}
+	b, err := yaml.Marshal(toolCfg)
+	if err != nil {
+		return nil, fmt.Errorf("error marshaling tool config: %w", err)
+	}
+	if err := yaml.Unmarshal(b, &toolMap); err != nil {
+		return nil, fmt.Errorf("error unmarshaling tool config map: %w", err)
+	}
+
+	if sourceName, ok := toolMap["source"].(string); ok && sourceName != "" {
+		sourceCfg, ok := cfg.SourceConfigs[sourceName]
+		if !ok {
+			return nil, fmt.Errorf("error finding source config: %s", sourceName)
+		}
+
+		sourceWrapper := struct {
+			Kind   string               `yaml:"kind"`
+			Config sources.SourceConfig `yaml:",inline"`
+		}{
+			Kind:   "sources",
+			Config: sourceCfg,
+		}
+
+		if err := encoder.Encode(sourceWrapper); err != nil {
+			return nil, fmt.Errorf("error encoding source config: %w", err)
+		}
+	}
+
+	return buf.Bytes(), nil
+}
diff --git a/cmd/internal/skills/generator_test.go b/cmd/internal/skills/generator_test.go
new file mode 100644
index 0000000000..bd3a462180
--- /dev/null
+++ b/cmd/internal/skills/generator_test.go
@@ -0,0 +1,347 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package skills
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"go.opentelemetry.io/otel/trace"
+)
+
+type MockToolConfig struct {
+	Name       string                `yaml:"name"`
+	Type       string                `yaml:"type"`
+	Source     string                `yaml:"source"`
+	Other      string                `yaml:"other"`
+	Parameters parameters.Parameters `yaml:"parameters"`
+}
+
+func (m MockToolConfig) ToolConfigType() string {
+	return m.Type
+}
+
+func (m MockToolConfig) Initialize(map[string]sources.Source) (tools.Tool, error) {
+	return nil, nil
+}
+
+type MockSourceConfig struct {
+	Name             string `yaml:"name"`
+	Type             string `yaml:"type"`
+	ConnectionString string `yaml:"connection_string"`
+}
+
+func (m MockSourceConfig) SourceConfigType() string {
+	return m.Type
+}
+
+func (m MockSourceConfig) Initialize(context.Context, trace.Tracer) (sources.Source, error) {
+	return nil, nil
+}
+
+func TestFormatParameters(t *testing.T) {
+	tests := []struct {
+		name         string
+		params       []parameters.ParameterManifest
+		wantContains []string
+		wantErr      bool
+	}{
+		{
+			name:         "empty parameters",
+			params:       []parameters.ParameterManifest{},
+			wantContains: []string{""},
+		},
+		{
+			name: "single required string parameter",
+			params: []parameters.ParameterManifest{
+				{
+					Name:        "param1",
+					Description: "A test parameter",
+					Type:        "string",
+					Required:    true,
+				},
+			},
+			wantContains: []string{
+				"## Parameters",
+				"```json",
+				`"type": "object"`,
+				`"properties": {`,
+				`"param1": {`,
+				`"type": "string"`,
+				`"description": "A test parameter"`,
+				`"required": [`,
+				`"param1"`,
+			},
+		},
+		{
+			name: "mixed parameters with defaults",
+			params: []parameters.ParameterManifest{
+				{
+					Name:        "param1",
+					Description: "Param 1",
+					Type:        "string",
+					Required:    true,
+				},
+				{
+					Name:        "param2",
+					Description: "Param 2",
+					Type:        "integer",
+					Default:     42,
+					Required:    false,
+				},
+			},
+			wantContains: []string{
+				`"param1": {`,
+				`"param2": {`,
+				`"default": 42`,
+				`"required": [`,
+				`"param1"`,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := formatParameters(tt.params)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("formatParameters() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if tt.wantErr {
+				return
+			}
+
+			if len(tt.params) == 0 {
+				if got != "" {
+					t.Errorf("formatParameters() = %v, want empty string", got)
+				}
+				return
+			}
+
+			for _, want := range tt.wantContains {
+				if !strings.Contains(got, want) {
+					t.Errorf("formatParameters() result missing expected string: %s\nGot:\n%s", want, got)
+				}
+			}
+		})
+	}
+}
+
+func TestGenerateSkillMarkdown(t *testing.T) {
+	toolsMap := map[string]tools.Tool{
+		"tool1": server.MockTool{
+			Description: "First tool",
+			Params: []parameters.Parameter{
+				parameters.NewStringParameter("p1", "d1"),
+			},
+		},
+	}
+
+	got, err := generateSkillMarkdown("MySkill", "My Description", toolsMap)
+	if err != nil {
+		t.Fatalf("generateSkillMarkdown() error = %v", err)
+	}
+
+	expectedSubstrings := []string{
+		"name: MySkill",
+		"description: My Description",
+		"## Usage",
+		"All scripts can be executed using Node.js",
+		"**Bash:**",
+		"`node scripts/<script_name>.js '{\"<param_name>\": \"<param_value>\"}'`",
+		"**PowerShell:**",
+		"`node scripts/<script_name>.js '{\"<param_name>\": \"<param_value>\"}'`",
+		"## Scripts",
+		"### tool1",
+		"First tool",
+		"## Parameters",
+	}
+
+	for _, s := range expectedSubstrings {
+		if !strings.Contains(got, s) {
+			t.Errorf("generateSkillMarkdown() missing substring %q", s)
+		}
+	}
+}
+
+func TestGenerateScriptContent(t *testing.T) {
+	tests := []struct {
+		name          string
+		toolName      string
+		toolsFileName string
+		wantContains  []string
+	}{
+		{
+			name:          "basic script",
+			toolName:      "test-tool",
+			toolsFileName: "",
+			wantContains: []string{
+				`const toolName = "test-tool";`,
+				`const toolsFileName = "";`,
+				`const toolboxArgs = [...configArgs, "invoke", toolName, ...args];`,
+			},
+		},
+		{
+			name:          "script with tools file",
+			toolName:      "complex-tool",
+			toolsFileName: "tools.yaml",
+			wantContains: []string{
+				`const toolName = "complex-tool";`,
+				`const toolsFileName = "tools.yaml";`,
+				`configArgs.push("--tools-file", path.join(__dirname, "..", "assets", toolsFileName));`,
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := generateScriptContent(tt.toolName, tt.toolsFileName)
+			if err != nil {
+				t.Fatalf("generateScriptContent() error = %v", err)
+			}
+
+			for _, s := range tt.wantContains {
+				if !strings.Contains(got, s) {
+					t.Errorf("generateScriptContent() missing substring %q\nGot:\n%s", s, got)
+				}
+			}
+		})
+	}
+}
+
+func TestGenerateToolConfigYAML(t *testing.T) {
+	cfg := server.ServerConfig{
+		ToolConfigs: server.ToolConfigs{
+			"tool1": MockToolConfig{
+				Name:   "tool1",
+				Type:   "custom-tool",
+				Source: "src1",
+				Other:  "foo",
+			},
+			"toolNoSource": MockToolConfig{
+				Name: "toolNoSource",
+				Type: "http",
+			},
+			"toolWithParams": MockToolConfig{
+				Name: "toolWithParams",
+				Type: "custom-tool",
+				Parameters: []parameters.Parameter{
+					parameters.NewStringParameter("param1", "desc1"),
+				},
+			},
+			"toolWithMissingSource": MockToolConfig{
+				Name:   "toolWithMissingSource",
+				Type:   "custom-tool",
+				Source: "missing-src",
+			},
+		},
+		SourceConfigs: server.SourceConfigs{
+			"src1": MockSourceConfig{
+				Name:             "src1",
+				Type:             "postgres",
+				ConnectionString: "conn1",
+			},
+		},
+	}
+
+	tests := []struct {
+		name         string
+		toolName     string
+		wantContains []string
+		wantErr      bool
+		wantNil      bool
+	}{
+		{
+			name:     "tool with source",
+			toolName: "tool1",
+			wantContains: []string{
+				"kind: tools",
+				"name: tool1",
+				"type: custom-tool",
+				"source: src1",
+				"other: foo",
+				"---",
+				"kind: sources",
+				"name: src1",
+				"type: postgres",
+				"connection_string: conn1",
+			},
+		},
+		{
+			name:     "tool without source",
+			toolName: "toolNoSource",
+			wantContains: []string{
+				"kind: tools",
+				"name: toolNoSource",
+				"type: http",
+			},
+		},
+		{
+			name:     "tool with parameters",
+			toolName: "toolWithParams",
+			wantContains: []string{
+				"kind: tools",
+				"name: toolWithParams",
+				"type: custom-tool",
+				"parameters:",
+				"- name: param1",
+				"type: string",
+				"description: desc1",
+			},
+		},
+		{
+			name:     "non-existent tool",
+			toolName: "missing-tool",
+			wantErr:  true,
+		},
+		{
+			name:     "tool with missing source config",
+			toolName: "toolWithMissingSource",
+			wantErr:  true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			gotBytes, err := generateToolConfigYAML(cfg, tt.toolName)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("generateToolConfigYAML() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			if tt.wantErr {
+				return
+			}
+
+			if tt.wantNil {
+				if gotBytes != nil {
+					t.Errorf("generateToolConfigYAML() expected nil, got %s", string(gotBytes))
+				}
+				return
+			}
+
+			got := string(gotBytes)
+			for _, want := range tt.wantContains {
+				if !strings.Contains(got, want) {
+					t.Errorf("generateToolConfigYAML() result missing expected string: %q\nGot:\n%s", want, got)
+				}
+			}
+		})
+	}
+}
diff --git a/cmd/internal/tools_file.go b/cmd/internal/tools_file.go
new file mode 100644
index 0000000000..ba91790845
--- /dev/null
+++ b/cmd/internal/tools_file.go
@@ -0,0 +1,349 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strings"
+
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/server"
+)
+
+type ToolsFile struct {
+	Sources         server.SourceConfigs         `yaml:"sources"`
+	AuthServices    server.AuthServiceConfigs    `yaml:"authServices"`
+	EmbeddingModels server.EmbeddingModelConfigs `yaml:"embeddingModels"`
+	Tools           server.ToolConfigs           `yaml:"tools"`
+	Toolsets        server.ToolsetConfigs        `yaml:"toolsets"`
+	Prompts         server.PromptConfigs         `yaml:"prompts"`
+}
+
+// parseEnv replaces environment variables ${ENV_NAME} with their values.
+// also support ${ENV_NAME:default_value}.
+func parseEnv(input string) (string, error) {
+	re := regexp.MustCompile(`\$\{(\w+)(:([^}]*))?\}`)
+
+	var err error
+	output := re.ReplaceAllStringFunc(input, func(match string) string {
+		parts := re.FindStringSubmatch(match)
+
+		// extract the variable name
+		variableName := parts[1]
+		if value, found := os.LookupEnv(variableName); found {
+			return value
+		}
+		if len(parts) >= 4 && parts[2] != "" {
+			return parts[3]
+		}
+		err = fmt.Errorf("environment variable not found: %q", variableName)
+		return ""
+	})
+	return output, err
+}
+
+// parseToolsFile parses the provided yaml into appropriate configs.
+func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
+	var toolsFile ToolsFile
+	// Replace environment variables if found
+	output, err := parseEnv(string(raw))
+	if err != nil {
+		return toolsFile, fmt.Errorf("error parsing environment variables: %s", err)
+	}
+	raw = []byte(output)
+
+	raw, err = convertToolsFile(raw)
+	if err != nil {
+		return toolsFile, fmt.Errorf("error converting tools file: %s", err)
+	}
+
+	// Parse contents
+	toolsFile.Sources, toolsFile.AuthServices, toolsFile.EmbeddingModels, toolsFile.Tools, toolsFile.Toolsets, toolsFile.Prompts, err = server.UnmarshalResourceConfig(ctx, raw)
+	if err != nil {
+		return toolsFile, err
+	}
+	return toolsFile, nil
+}
+
+func convertToolsFile(raw []byte) ([]byte, error) {
+	var input yaml.MapSlice
+	decoder := yaml.NewDecoder(bytes.NewReader(raw), yaml.UseOrderedMap())
+
+	// convert to tools file v2
+	var buf bytes.Buffer
+	encoder := yaml.NewEncoder(&buf)
+
+	v1keys := []string{"sources", "authSources", "authServices", "embeddingModels", "tools", "toolsets", "prompts"}
+	for {
+		if err := decoder.Decode(&input); err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, err
+		}
+		for _, item := range input {
+			key, ok := item.Key.(string)
+			if !ok {
+				return nil, fmt.Errorf("unexpected non-string key in input: %v", item.Key)
+			}
+			// check if the key is config file v1's key
+			if slices.Contains(v1keys, key) {
+				// check if value conversion to yaml.MapSlice successfully
+				// fields such as "tools" in toolsets might pass the first check but
+				// fail to convert to MapSlice
+				if slice, ok := item.Value.(yaml.MapSlice); ok {
+					// Deprecated: convert authSources to authServices
+					if key == "authSources" {
+						key = "authServices"
+					}
+					transformed, err := transformDocs(key, slice)
+					if err != nil {
+						return nil, err
+					}
+					// encode per-doc
+					for _, doc := range transformed {
+						if err := encoder.Encode(doc); err != nil {
+							return nil, err
+						}
+					}
+				} else {
+					// invalid input will be ignored
+					// we don't want to throw error here since the config could
+					// be valid but with a different order such as:
+					// ---
+					// tools:
+					// - tool_a
+					// kind: toolsets
+					// ---
+					continue
+				}
+			} else {
+				// this doc is already v2, encode to buf
+				if err := encoder.Encode(input); err != nil {
+					return nil, err
+				}
+				break
+			}
+		}
+	}
+	return buf.Bytes(), nil
+}
+
+// transformDocs transforms the configuration file from v1 format to v2
+// yaml.MapSlice will preserve the order in a map
+func transformDocs(kind string, input yaml.MapSlice) ([]yaml.MapSlice, error) {
+	var transformed []yaml.MapSlice
+	for _, entry := range input {
+		entryName, ok := entry.Key.(string)
+		if !ok {
+			return nil, fmt.Errorf("unexpected non-string key for entry in '%s': %v", kind, entry.Key)
+		}
+		entryBody := ProcessValue(entry.Value, kind == "toolsets")
+
+		currentTransformed := yaml.MapSlice{
+			{Key: "kind", Value: kind},
+			{Key: "name", Value: entryName},
+		}
+
+		// Merge the transformed body into our result
+		if bodySlice, ok := entryBody.(yaml.MapSlice); ok {
+			currentTransformed = append(currentTransformed, bodySlice...)
+		} else {
+			return nil, fmt.Errorf("unable to convert entryBody to MapSlice")
+		}
+		transformed = append(transformed, currentTransformed)
+	}
+	return transformed, nil
+}
+
+// ProcessValue recursively looks for MapSlices to rename 'kind' -> 'type'
+func ProcessValue(v any, isToolset bool) any {
+	switch val := v.(type) {
+	case yaml.MapSlice:
+		// creating a new MapSlice is safer for recursive transformation
+		newVal := make(yaml.MapSlice, len(val))
+		for i, item := range val {
+			// Perform renaming
+			if item.Key == "kind" {
+				item.Key = "type"
+			}
+			// Recursive call for nested values (e.g., nested objects or lists)
+			item.Value = ProcessValue(item.Value, false)
+			newVal[i] = item
+		}
+		return newVal
+	case []any:
+		// Process lists: If it's a toolset top-level list, wrap it.
+		if isToolset {
+			return yaml.MapSlice{{Key: "tools", Value: val}}
+		}
+		// Otherwise, recurse into list items (to catch nested objects)
+		newVal := make([]any, len(val))
+		for i := range val {
+			newVal[i] = ProcessValue(val[i], false)
+		}
+		return newVal
+	default:
+		return val
+	}
+}
+
+// mergeToolsFiles merges multiple ToolsFile structs into one.
+// Detects and raises errors for resource conflicts in sources, authServices, tools, and toolsets.
+// All resource names (sources, authServices, tools, toolsets) must be unique across all files.
+func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
+	merged := ToolsFile{
+		Sources:         make(server.SourceConfigs),
+		AuthServices:    make(server.AuthServiceConfigs),
+		EmbeddingModels: make(server.EmbeddingModelConfigs),
+		Tools:           make(server.ToolConfigs),
+		Toolsets:        make(server.ToolsetConfigs),
+		Prompts:         make(server.PromptConfigs),
+	}
+
+	var conflicts []string
+
+	for fileIndex, file := range files {
+		// Check for conflicts and merge sources
+		for name, source := range file.Sources {
+			if _, exists := merged.Sources[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("source '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Sources[name] = source
+			}
+		}
+
+		// Check for conflicts and merge authServices
+		for name, authService := range file.AuthServices {
+			if _, exists := merged.AuthServices[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("authService '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.AuthServices[name] = authService
+			}
+		}
+
+		// Check for conflicts and merge embeddingModels
+		for name, em := range file.EmbeddingModels {
+			if _, exists := merged.EmbeddingModels[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("embedding model '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.EmbeddingModels[name] = em
+			}
+		}
+
+		// Check for conflicts and merge tools
+		for name, tool := range file.Tools {
+			if _, exists := merged.Tools[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("tool '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Tools[name] = tool
+			}
+		}
+
+		// Check for conflicts and merge toolsets
+		for name, toolset := range file.Toolsets {
+			if _, exists := merged.Toolsets[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("toolset '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Toolsets[name] = toolset
+			}
+		}
+
+		// Check for conflicts and merge prompts
+		for name, prompt := range file.Prompts {
+			if _, exists := merged.Prompts[name]; exists {
+				conflicts = append(conflicts, fmt.Sprintf("prompt '%s' (file #%d)", name, fileIndex+1))
+			} else {
+				merged.Prompts[name] = prompt
+			}
+		}
+	}
+
+	// If conflicts were detected, return an error
+	if len(conflicts) > 0 {
+		return ToolsFile{}, fmt.Errorf("resource conflicts detected:\n  - %s\n\nPlease ensure each source, authService, tool, toolset and prompt has a unique name across all files", strings.Join(conflicts, "\n  - "))
+	}
+
+	return merged, nil
+}
+
+// LoadAndMergeToolsFiles loads multiple YAML files and merges them
+func LoadAndMergeToolsFiles(ctx context.Context, filePaths []string) (ToolsFile, error) {
+	var toolsFiles []ToolsFile
+
+	for _, filePath := range filePaths {
+		buf, err := os.ReadFile(filePath)
+		if err != nil {
+			return ToolsFile{}, fmt.Errorf("unable to read tool file at %q: %w", filePath, err)
+		}
+
+		toolsFile, err := parseToolsFile(ctx, buf)
+		if err != nil {
+			return ToolsFile{}, fmt.Errorf("unable to parse tool file at %q: %w", filePath, err)
+		}
+
+		toolsFiles = append(toolsFiles, toolsFile)
+	}
+
+	mergedFile, err := mergeToolsFiles(toolsFiles...)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("unable to merge tools files: %w", err)
+	}
+
+	return mergedFile, nil
+}
+
+// LoadAndMergeToolsFolder loads all YAML files from a directory and merges them
+func LoadAndMergeToolsFolder(ctx context.Context, folderPath string) (ToolsFile, error) {
+	// Check if directory exists
+	info, err := os.Stat(folderPath)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("unable to access tools folder at %q: %w", folderPath, err)
+	}
+	if !info.IsDir() {
+		return ToolsFile{}, fmt.Errorf("path %q is not a directory", folderPath)
+	}
+
+	// Find all YAML files in the directory
+	pattern := filepath.Join(folderPath, "*.yaml")
+	yamlFiles, err := filepath.Glob(pattern)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("error finding YAML files in %q: %w", folderPath, err)
+	}
+
+	// Also find .yml files
+	ymlPattern := filepath.Join(folderPath, "*.yml")
+	ymlFiles, err := filepath.Glob(ymlPattern)
+	if err != nil {
+		return ToolsFile{}, fmt.Errorf("error finding YML files in %q: %w", folderPath, err)
+	}
+
+	// Combine both file lists
+	allFiles := append(yamlFiles, ymlFiles...)
+
+	if len(allFiles) == 0 {
+		return ToolsFile{}, fmt.Errorf("no YAML files found in directory %q", folderPath)
+	}
+
+	// Use existing LoadAndMergeToolsFiles function
+	return LoadAndMergeToolsFiles(ctx, allFiles)
+}
diff --git a/cmd/internal/tools_file_test.go b/cmd/internal/tools_file_test.go
new file mode 100644
index 0000000000..3b26baa621
--- /dev/null
+++ b/cmd/internal/tools_file_test.go
@@ -0,0 +1,2141 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package internal
+
+import (
+	"fmt"
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/googleapis/genai-toolbox/internal/auth/google"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels/gemini"
+	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
+	"github.com/googleapis/genai-toolbox/internal/prompts"
+	"github.com/googleapis/genai-toolbox/internal/prompts/custom"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	cloudsqlpgsrc "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
+	httpsrc "github.com/googleapis/genai-toolbox/internal/sources/http"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/tools/http"
+	"github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+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 TestConvertToolsFile(t *testing.T) {
+	tcs := []struct {
+		desc   string
+		in     string
+		want   string
+		isErr  bool
+		errStr string
+	}{
+		{
+			desc: "basic convert",
+			in: `
+            sources:
+                my-pg-instance:
+                    kind: cloud-sql-postgres
+                    project: my-project
+                    region: my-region
+                    instance: my-instance
+                    database: my_db
+                    user: my_user
+                    password: my_pass
+            authServices:
+                my-google-auth:
+                    kind: google
+                    clientId: testing-id
+            tools:
+                example_tool:
+                    kind: postgres-sql
+                    source: my-pg-instance
+                    description: some description
+                    statement: SELECT * FROM SQL_STATEMENT;
+                    parameters:
+                        - name: country
+                          type: string
+                          description: some description
+            toolsets:
+                example_toolset:
+                    - example_tool
+            prompts:
+                code_review:
+                    description: ask llm to analyze code quality
+                    messages:
+                      - content: "please review the following code for quality: {{.code}}"
+                    arguments:
+                        - name: code
+                          description: the code to review
+            embeddingModels:
+                gemini-model:
+                    kind: gemini
+                    model: gemini-embedding-001
+                    apiKey: some-key
+                    dimension: 768`,
+			want: `kind: sources
+name: my-pg-instance
+type: cloud-sql-postgres
+project: my-project
+region: my-region
+instance: my-instance
+database: my_db
+user: my_user
+password: my_pass
+---
+kind: authServices
+name: my-google-auth
+type: google
+clientId: testing-id
+---
+kind: tools
+name: example_tool
+type: postgres-sql
+source: my-pg-instance
+description: some description
+statement: SELECT * FROM SQL_STATEMENT;
+parameters:
+- name: country
+  type: string
+  description: some description
+---
+kind: toolsets
+name: example_toolset
+tools:
+- example_tool
+---
+kind: prompts
+name: code_review
+description: ask llm to analyze code quality
+messages:
+- content: "please review the following code for quality: {{.code}}"
+arguments:
+- name: code
+  description: the code to review
+---
+kind: embeddingModels
+name: gemini-model
+type: gemini
+model: gemini-embedding-001
+apiKey: some-key
+dimension: 768
+`,
+		},
+		{
+			desc: "preserve resource order",
+			in: `
+            tools:
+                example_tool:
+                    kind: postgres-sql
+                    source: my-pg-instance
+                    description: some description
+                    statement: SELECT * FROM SQL_STATEMENT;
+                    parameters:
+                        - name: country
+                          type: string
+                          description: some description
+            sources:
+                my-pg-instance:
+                    kind: cloud-sql-postgres
+                    project: my-project
+                    region: my-region
+                    instance: my-instance
+                    database: my_db
+                    user: my_user
+                    password: my_pass
+            authServices:
+                my-google-auth:
+                    kind: google
+                    clientId: testing-id
+            toolsets:
+                example_toolset:
+                    - example_tool
+            authSources:
+                my-google-auth2:
+                    kind: google
+                    clientId: testing-id`,
+			want: `kind: tools
+name: example_tool
+type: postgres-sql
+source: my-pg-instance
+description: some description
+statement: SELECT * FROM SQL_STATEMENT;
+parameters:
+- name: country
+  type: string
+  description: some description
+---
+kind: sources
+name: my-pg-instance
+type: cloud-sql-postgres
+project: my-project
+region: my-region
+instance: my-instance
+database: my_db
+user: my_user
+password: my_pass
+---
+kind: authServices
+name: my-google-auth
+type: google
+clientId: testing-id
+---
+kind: toolsets
+name: example_toolset
+tools:
+- example_tool
+---
+kind: authServices
+name: my-google-auth2
+type: google
+clientId: testing-id
+`,
+		},
+		{
+			desc: "convert combination of v1 and v2",
+			in: `
+            sources:
+                my-pg-instance:
+                    kind: cloud-sql-postgres
+                    project: my-project
+                    region: my-region
+                    instance: my-instance
+                    database: my_db
+                    user: my_user
+                    password: my_pass
+            authServices:
+                my-google-auth:
+                    kind: google
+                    clientId: testing-id
+            tools:
+                example_tool:
+                    kind: postgres-sql
+                    source: my-pg-instance
+                    description: some description
+                    statement: SELECT * FROM SQL_STATEMENT;
+                    parameters:
+                        - name: country
+                          type: string
+                          description: some description
+            toolsets:
+                example_toolset:
+                    - example_tool
+            prompts:
+                code_review:
+                    description: ask llm to analyze code quality
+                    messages:
+                      - content: "please review the following code for quality: {{.code}}"
+                    arguments:
+                        - name: code
+                          description: the code to review
+            embeddingModels:
+                gemini-model:
+                    kind: gemini
+                    model: gemini-embedding-001
+                    apiKey: some-key
+                    dimension: 768
+---
+            kind: sources
+            name: my-pg-instance2
+            type: cloud-sql-postgres
+            project: my-project
+            region: my-region
+            instance: my-instance
+---
+            kind: authServices
+            name: my-google-auth2
+            type: google
+            clientId: testing-id
+---
+            kind: tools
+            name: example_tool2
+            type: postgres-sql
+            source: my-pg-instance
+            description: some description
+            statement: SELECT * FROM SQL_STATEMENT;
+            parameters:
+            - name: country
+              type: string
+              description: some description
+---
+            kind: toolsets
+            name: example_toolset2
+            tools:
+            - example_tool
+---
+            tools:
+            - example_tool
+            kind: toolsets
+            name: example_toolset3
+---
+            kind: prompts
+            name: code_review2
+            description: ask llm to analyze code quality
+            messages:
+            - content: "please review the following code for quality: {{.code}}"
+            arguments:
+            - name: code
+              description: the code to review
+---
+            kind: embeddingModels
+            name: gemini-model2
+            type: gemini`,
+			want: `kind: sources
+name: my-pg-instance
+type: cloud-sql-postgres
+project: my-project
+region: my-region
+instance: my-instance
+database: my_db
+user: my_user
+password: my_pass
+---
+kind: authServices
+name: my-google-auth
+type: google
+clientId: testing-id
+---
+kind: tools
+name: example_tool
+type: postgres-sql
+source: my-pg-instance
+description: some description
+statement: SELECT * FROM SQL_STATEMENT;
+parameters:
+- name: country
+  type: string
+  description: some description
+---
+kind: toolsets
+name: example_toolset
+tools:
+- example_tool
+---
+kind: prompts
+name: code_review
+description: ask llm to analyze code quality
+messages:
+- content: "please review the following code for quality: {{.code}}"
+arguments:
+- name: code
+  description: the code to review
+---
+kind: embeddingModels
+name: gemini-model
+type: gemini
+model: gemini-embedding-001
+apiKey: some-key
+dimension: 768
+---
+kind: sources
+name: my-pg-instance2
+type: cloud-sql-postgres
+project: my-project
+region: my-region
+instance: my-instance
+---
+kind: authServices
+name: my-google-auth2
+type: google
+clientId: testing-id
+---
+kind: tools
+name: example_tool2
+type: postgres-sql
+source: my-pg-instance
+description: some description
+statement: SELECT * FROM SQL_STATEMENT;
+parameters:
+- name: country
+  type: string
+  description: some description
+---
+kind: toolsets
+name: example_toolset2
+tools:
+- example_tool
+---
+tools:
+- example_tool
+kind: toolsets
+name: example_toolset3
+---
+kind: prompts
+name: code_review2
+description: ask llm to analyze code quality
+messages:
+- content: "please review the following code for quality: {{.code}}"
+arguments:
+- name: code
+  description: the code to review
+---
+kind: embeddingModels
+name: gemini-model2
+type: gemini
+`,
+		},
+		{
+			desc: "no convertion needed",
+			in: `kind: sources
+name: my-pg-instance
+type: cloud-sql-postgres
+project: my-project
+region: my-region
+instance: my-instance
+database: my_db
+user: my_user
+password: my_pass
+---
+kind: tools
+name: example_tool
+type: postgres-sql
+source: my-pg-instance
+description: some description
+statement: SELECT * FROM SQL_STATEMENT;
+parameters:
+- name: country
+  type: string
+  description: some description
+---
+kind: toolsets
+name: example_toolset
+tools:
+- example_tool`,
+			want: `kind: sources
+name: my-pg-instance
+type: cloud-sql-postgres
+project: my-project
+region: my-region
+instance: my-instance
+database: my_db
+user: my_user
+password: my_pass
+---
+kind: tools
+name: example_tool
+type: postgres-sql
+source: my-pg-instance
+description: some description
+statement: SELECT * FROM SQL_STATEMENT;
+parameters:
+- name: country
+  type: string
+  description: some description
+---
+kind: toolsets
+name: example_toolset
+tools:
+- example_tool
+`,
+		},
+		{
+			desc: "invalid source",
+			in:   `sources: invalid`,
+			want: "",
+		},
+		{
+			desc: "invalid toolset",
+			in:   `toolsets: invalid`,
+			want: "",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			output, err := convertToolsFile([]byte(tc.in))
+			if err != nil {
+				t.Fatalf("unexpected error: %s", err)
+			}
+
+			if diff := cmp.Diff(string(output), tc.want); diff != "" {
+				t.Fatalf("incorrect toolsets parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestParseToolFile(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		description   string
+		in            string
+		wantToolsFile ToolsFile
+	}{
+		{
+			description: "basic example tools file v1",
+			in: `
+			sources:
+				my-pg-instance:
+					kind: cloud-sql-postgres
+					project: my-project
+					region: my-region
+					instance: my-instance
+					database: my_db
+					user: my_user
+					password: my_pass
+			tools:
+				example_tool:
+					kind: postgres-sql
+					source: my-pg-instance
+					description: some description
+					statement: |
+						SELECT * FROM SQL_STATEMENT;
+					parameters:
+						- name: country
+							type: string
+							description: some description
+			toolsets:
+				example_toolset:
+					- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Type:     cloudsqlpgsrc.SourceType,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:        "example_tool",
+						Type:        "postgres-sql",
+						Source:      "my-pg-instance",
+						Description: "some description",
+						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
+						Parameters: []parameters.Parameter{
+							parameters.NewStringParameter("country", "some description"),
+						},
+						AuthRequired: []string{},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				AuthServices: nil,
+				Prompts:      nil,
+			},
+		},
+		{
+			description: "basic example tools file v2",
+			in: `
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+---
+			kind: authServices
+			name: my-google-auth
+			type: google
+			clientId: testing-id
+---
+			kind: embeddingModels
+			name: gemini-model
+			type: gemini
+			model: gemini-embedding-001
+			apiKey: some-key
+			dimension: 768
+---
+			kind: tools
+			name: example_tool
+			type: postgres-sql
+			source: my-pg-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			parameters:
+			- name: country
+			  type: string
+			  description: some description
+---
+			kind: toolsets
+			name: example_toolset
+			tools:
+			- example_tool
+---
+			kind: prompts
+			name: code_review
+			description: ask llm to analyze code quality
+			messages:
+			- content: "please review the following code for quality: {{.code}}"
+			arguments:
+			- name: code
+			  description: the code to review
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Type:     cloudsqlpgsrc.SourceType,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-auth": google.Config{
+						Name:     "my-google-auth",
+						Type:     google.AuthServiceType,
+						ClientID: "testing-id",
+					},
+				},
+				EmbeddingModels: server.EmbeddingModelConfigs{
+					"gemini-model": gemini.Config{
+						Name:      "gemini-model",
+						Type:      gemini.EmbeddingModelType,
+						Model:     "gemini-embedding-001",
+						ApiKey:    "some-key",
+						Dimension: 768,
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:        "example_tool",
+						Type:        "postgres-sql",
+						Source:      "my-pg-instance",
+						Description: "some description",
+						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
+						Parameters: []parameters.Parameter{
+							parameters.NewStringParameter("country", "some description"),
+						},
+						AuthRequired: []string{},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				Prompts: server.PromptConfigs{
+					"code_review": &custom.Config{
+						Name:        "code_review",
+						Description: "ask llm to analyze code quality",
+						Arguments: prompts.Arguments{
+							{Parameter: parameters.NewStringParameter("code", "the code to review")},
+						},
+						Messages: []prompts.Message{
+							{Role: "user", Content: "please review the following code for quality: {{.code}}"},
+						},
+					},
+				},
+			},
+		},
+		{
+			description: "only prompts",
+			in: `
+            kind: prompts
+            name: my-prompt
+            description: A prompt template for data analysis.
+            arguments:
+                - name: country
+                  description: The country to analyze.
+            messages:
+                - content: Analyze the data for {{.country}}.
+            `,
+			wantToolsFile: ToolsFile{
+				Sources:      nil,
+				AuthServices: nil,
+				Tools:        nil,
+				Toolsets:     nil,
+				Prompts: server.PromptConfigs{
+					"my-prompt": &custom.Config{
+						Name:        "my-prompt",
+						Description: "A prompt template for data analysis.",
+						Arguments: prompts.Arguments{
+							{Parameter: parameters.NewStringParameter("country", "The country to analyze.")},
+						},
+						Messages: []prompts.Message{
+							{Role: "user", Content: "Analyze the data for {{.country}}."},
+						},
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
+				t.Fatalf("incorrect sources parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
+				t.Fatalf("incorrect authServices parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect toolsets parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Prompts, toolsFile.Prompts); diff != "" {
+				t.Fatalf("incorrect prompts parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestParseToolFileWithAuth(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		description   string
+		in            string
+		wantToolsFile ToolsFile
+	}{
+		{
+			description: "basic example",
+			in: `
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+---
+			kind: authServices
+			name: my-google-service
+			type: google
+			clientId: my-client-id
+---
+			kind: authServices
+			name: other-google-service
+			type: google
+			clientId: other-client-id
+---
+			kind: tools
+			name: example_tool
+			type: postgres-sql
+			source: my-pg-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			parameters:
+				- name: country
+					type: string
+					description: some description
+				- name: id
+					type: integer
+					description: user id
+					authServices:
+					- name: my-google-service
+						field: user_id
+				- name: email
+					type: string
+					description: user email
+					authServices:
+					- name: my-google-service
+						field: email
+					- name: other-google-service
+						field: other_email
+---
+			kind: toolsets
+			name: example_toolset
+			tools:
+				- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Type:     cloudsqlpgsrc.SourceType,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "my-client-id",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "other-client-id",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:         "example_tool",
+						Type:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{},
+						Parameters: []parameters.Parameter{
+							parameters.NewStringParameter("country", "some description"),
+							parameters.NewIntParameterWithAuth("id", "user id", []parameters.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
+							parameters.NewStringParameterWithAuth("email", "user email", []parameters.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
+						},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				Prompts: nil,
+			},
+		},
+		{
+			description: "basic example with authSources",
+			in: `
+			sources:
+				my-pg-instance:
+					kind: cloud-sql-postgres
+					project: my-project
+					region: my-region
+					instance: my-instance
+					database: my_db
+					user: my_user
+					password: my_pass
+			authSources:
+				my-google-service:
+					kind: google
+					clientId: my-client-id
+				other-google-service:
+					kind: google
+					clientId: other-client-id
+
+			tools:
+				example_tool:
+					kind: postgres-sql
+					source: my-pg-instance
+					description: some description
+					statement: |
+						SELECT * FROM SQL_STATEMENT;
+					parameters:
+						- name: country
+						  type: string
+						  description: some description
+						- name: id
+						  type: integer
+						  description: user id
+						  authSources:
+							- name: my-google-service
+								field: user_id
+						- name: email
+							type: string
+							description: user email
+							authSources:
+							- name: my-google-service
+							  field: email
+							- name: other-google-service
+							  field: other_email
+
+			toolsets:
+				example_toolset:
+					- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Type:     cloudsqlpgsrc.SourceType,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "my-client-id",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "other-client-id",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:         "example_tool",
+						Type:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{},
+						Parameters: []parameters.Parameter{
+							parameters.NewStringParameter("country", "some description"),
+							parameters.NewIntParameterWithAuth("id", "user id", []parameters.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
+							parameters.NewStringParameterWithAuth("email", "user email", []parameters.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
+						},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				Prompts: nil,
+			},
+		},
+		{
+			description: "basic example with authRequired",
+			in: `
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+---
+			kind: authServices
+			name: my-google-service
+			type: google
+			clientId: my-client-id
+---
+			kind: authServices
+			name: other-google-service
+			type: google
+			clientId: other-client-id
+---
+			kind: tools
+			name: example_tool
+			type: postgres-sql
+			source: my-pg-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			authRequired:
+				- my-google-service
+			parameters:
+				- name: country
+					type: string
+					description: some description
+				- name: id
+					type: integer
+					description: user id
+					authServices:
+					- name: my-google-service
+						field: user_id
+				- name: email
+					type: string
+					description: user email
+					authServices:
+					- name: my-google-service
+						field: email
+					- name: other-google-service
+						field: other_email
+---
+			kind: toolsets
+			name: example_toolset
+			tools:
+				- example_tool
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-pg-instance": cloudsqlpgsrc.Config{
+						Name:     "my-pg-instance",
+						Type:     cloudsqlpgsrc.SourceType,
+						Project:  "my-project",
+						Region:   "my-region",
+						Instance: "my-instance",
+						IPType:   "public",
+						Database: "my_db",
+						User:     "my_user",
+						Password: "my_pass",
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "my-client-id",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "other-client-id",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": postgressql.Config{
+						Name:         "example_tool",
+						Type:         "postgres-sql",
+						Source:       "my-pg-instance",
+						Description:  "some description",
+						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+						AuthRequired: []string{"my-google-service"},
+						Parameters: []parameters.Parameter{
+							parameters.NewStringParameter("country", "some description"),
+							parameters.NewIntParameterWithAuth("id", "user id", []parameters.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
+							parameters.NewStringParameterWithAuth("email", "user email", []parameters.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
+						},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"example_toolset": tools.ToolsetConfig{
+						Name:      "example_toolset",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				Prompts: nil,
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
+				t.Fatalf("incorrect sources parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
+				t.Fatalf("incorrect authServices parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect toolsets parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Prompts, toolsFile.Prompts); diff != "" {
+				t.Fatalf("incorrect prompts parse: diff %v", diff)
+			}
+		})
+	}
+
+}
+
+func TestEnvVarReplacement(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	t.Setenv("TestHeader", "ACTUAL_HEADER")
+	t.Setenv("API_KEY", "ACTUAL_API_KEY")
+	t.Setenv("clientId", "ACTUAL_CLIENT_ID")
+	t.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
+	t.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
+	t.Setenv("cat_string", "cat")
+	t.Setenv("food_string", "food")
+	t.Setenv("TestHeader", "ACTUAL_HEADER")
+	t.Setenv("prompt_name", "ACTUAL_PROMPT_NAME")
+	t.Setenv("prompt_content", "ACTUAL_CONTENT")
+
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		description   string
+		in            string
+		wantToolsFile ToolsFile
+	}{
+		{
+			description: "file with env var example",
+			in: `
+			sources:
+				my-http-instance:
+					kind: http
+					baseUrl: http://test_server/
+					timeout: 10s
+					headers:
+						Authorization: ${TestHeader}
+					queryParams:
+						api-key: ${API_KEY}
+			authServices:
+				my-google-service:
+					kind: google
+					clientId: ${clientId}
+				other-google-service:
+					kind: google
+					clientId: ${clientId2}
+
+			tools:
+				example_tool:
+					kind: http
+					source: my-instance
+					method: GET
+					path: "search?name=alice&pet=${cat_string}"
+					description: some description
+					authRequired:
+						- my-google-auth-service
+						- other-auth-service
+					queryParams:
+						- name: country
+						  type: string
+						  description: some description
+						  authServices:
+							- name: my-google-auth-service
+							  field: user_id
+							- name: other-auth-service
+							  field: user_id
+					requestBody: |
+							{
+								"age": {{.age}},
+								"city": "{{.city}}",
+								"food": "${food_string}",
+								"other": "$OTHER"
+							}
+					bodyParams:
+						- name: age
+						  type: integer
+						  description: age num
+						- name: city
+						  type: string
+						  description: city string
+					headers:
+						Authorization: API_KEY
+						Content-Type: application/json
+					headerParams:
+						- name: Language
+						  type: string
+						  description: language string
+
+			toolsets:
+				${toolset_name}:
+					- example_tool
+
+
+			prompts:
+				${prompt_name}:
+					description: A test prompt for {{.name}}.
+					messages:
+						- role: user
+						  content: ${prompt_content}
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-http-instance": httpsrc.Config{
+						Name:           "my-http-instance",
+						Type:           httpsrc.SourceType,
+						BaseURL:        "http://test_server/",
+						Timeout:        "10s",
+						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
+						QueryParams:    map[string]string{"api-key": "ACTUAL_API_KEY"},
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "ACTUAL_CLIENT_ID",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "ACTUAL_CLIENT_ID_2",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": http.Config{
+						Name:         "example_tool",
+						Type:         "http",
+						Source:       "my-instance",
+						Method:       "GET",
+						Path:         "search?name=alice&pet=cat",
+						Description:  "some description",
+						AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
+						QueryParams: []parameters.Parameter{
+							parameters.NewStringParameterWithAuth("country", "some description",
+								[]parameters.ParamAuthService{{Name: "my-google-auth-service", Field: "user_id"},
+									{Name: "other-auth-service", Field: "user_id"}}),
+						},
+						RequestBody: `{
+  "age": {{.age}},
+  "city": "{{.city}}",
+  "food": "food",
+  "other": "$OTHER"
+}
+`,
+						BodyParams:   []parameters.Parameter{parameters.NewIntParameter("age", "age num"), parameters.NewStringParameter("city", "city string")},
+						Headers:      map[string]string{"Authorization": "API_KEY", "Content-Type": "application/json"},
+						HeaderParams: []parameters.Parameter{parameters.NewStringParameter("Language", "language string")},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"ACTUAL_TOOLSET_NAME": tools.ToolsetConfig{
+						Name:      "ACTUAL_TOOLSET_NAME",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				Prompts: server.PromptConfigs{
+					"ACTUAL_PROMPT_NAME": &custom.Config{
+						Name:        "ACTUAL_PROMPT_NAME",
+						Description: "A test prompt for {{.name}}.",
+						Messages: []prompts.Message{
+							{
+								Role:    "user",
+								Content: "ACTUAL_CONTENT",
+							},
+						},
+						Arguments: nil,
+					},
+				},
+			},
+		},
+		{
+			description: "file with env var example toolsfile v2",
+			in: `
+			kind: sources
+			name: my-http-instance
+			type: http
+			baseUrl: http://test_server/
+			timeout: 10s
+			headers:
+				Authorization: ${TestHeader}
+			queryParams:
+				api-key: ${API_KEY}
+---
+			kind: authServices
+			name: my-google-service
+			type: google
+			clientId: ${clientId}
+---
+			kind: authServices
+			name: other-google-service
+			type: google
+			clientId: ${clientId2}
+---
+			kind: tools
+			name: example_tool
+			type: http
+			source: my-instance
+			method: GET
+			path: "search?name=alice&pet=${cat_string}"
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			queryParams:
+				- name: country
+					type: string
+					description: some description
+					authServices:
+					- name: my-google-auth-service
+						field: user_id
+					- name: other-auth-service
+						field: user_id
+			requestBody: |
+					{
+						"age": {{.age}},
+						"city": "{{.city}}",
+						"food": "${food_string}",
+						"other": "$OTHER"
+					}
+			bodyParams:
+				- name: age
+					type: integer
+					description: age num
+				- name: city
+					type: string
+					description: city string
+			headers:
+				Authorization: API_KEY
+				Content-Type: application/json
+			headerParams:
+				- name: Language
+					type: string
+					description: language string
+---
+			kind: toolsets
+			name: ${toolset_name}
+			tools:
+				- example_tool
+---
+			kind: prompts
+			name: ${prompt_name}
+			description: A test prompt for {{.name}}.
+			messages:
+				- role: user
+					content: ${prompt_content}
+			`,
+			wantToolsFile: ToolsFile{
+				Sources: server.SourceConfigs{
+					"my-http-instance": httpsrc.Config{
+						Name:           "my-http-instance",
+						Type:           httpsrc.SourceType,
+						BaseURL:        "http://test_server/",
+						Timeout:        "10s",
+						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
+						QueryParams:    map[string]string{"api-key": "ACTUAL_API_KEY"},
+					},
+				},
+				AuthServices: server.AuthServiceConfigs{
+					"my-google-service": google.Config{
+						Name:     "my-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "ACTUAL_CLIENT_ID",
+					},
+					"other-google-service": google.Config{
+						Name:     "other-google-service",
+						Type:     google.AuthServiceType,
+						ClientID: "ACTUAL_CLIENT_ID_2",
+					},
+				},
+				Tools: server.ToolConfigs{
+					"example_tool": http.Config{
+						Name:         "example_tool",
+						Type:         "http",
+						Source:       "my-instance",
+						Method:       "GET",
+						Path:         "search?name=alice&pet=cat",
+						Description:  "some description",
+						AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
+						QueryParams: []parameters.Parameter{
+							parameters.NewStringParameterWithAuth("country", "some description",
+								[]parameters.ParamAuthService{{Name: "my-google-auth-service", Field: "user_id"},
+									{Name: "other-auth-service", Field: "user_id"}}),
+						},
+						RequestBody: `{
+  "age": {{.age}},
+  "city": "{{.city}}",
+  "food": "food",
+  "other": "$OTHER"
+}
+`,
+						BodyParams:   []parameters.Parameter{parameters.NewIntParameter("age", "age num"), parameters.NewStringParameter("city", "city string")},
+						Headers:      map[string]string{"Authorization": "API_KEY", "Content-Type": "application/json"},
+						HeaderParams: []parameters.Parameter{parameters.NewStringParameter("Language", "language string")},
+					},
+				},
+				Toolsets: server.ToolsetConfigs{
+					"ACTUAL_TOOLSET_NAME": tools.ToolsetConfig{
+						Name:      "ACTUAL_TOOLSET_NAME",
+						ToolNames: []string{"example_tool"},
+					},
+				},
+				Prompts: server.PromptConfigs{
+					"ACTUAL_PROMPT_NAME": &custom.Config{
+						Name:        "ACTUAL_PROMPT_NAME",
+						Description: "A test prompt for {{.name}}.",
+						Messages: []prompts.Message{
+							{
+								Role:    "user",
+								Content: "ACTUAL_CONTENT",
+							},
+						},
+						Arguments: nil,
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.description, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
+				t.Fatalf("incorrect sources parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
+				t.Fatalf("incorrect authServices parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect toolsets parse: diff %v", diff)
+			}
+			if diff := cmp.Diff(tc.wantToolsFile.Prompts, toolsFile.Prompts); diff != "" {
+				t.Fatalf("incorrect prompts parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestPrebuiltTools(t *testing.T) {
+	// Get prebuilt configs
+	alloydb_omni_config, _ := prebuiltconfigs.Get("alloydb-omni")
+	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")
+	cloudsqlpg_admin_config, _ := prebuiltconfigs.Get("cloud-sql-postgres-admin")
+	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
+	cloudsqlmysql_admin_config, _ := prebuiltconfigs.Get("cloud-sql-mysql-admin")
+	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
+	cloudsqlmssql_admin_config, _ := prebuiltconfigs.Get("cloud-sql-mssql-admin")
+	dataplex_config, _ := prebuiltconfigs.Get("dataplex")
+	firestoreconfig, _ := prebuiltconfigs.Get("firestore")
+	mysql_config, _ := prebuiltconfigs.Get("mysql")
+	mssql_config, _ := prebuiltconfigs.Get("mssql")
+	looker_config, _ := prebuiltconfigs.Get("looker")
+	lookerca_config, _ := prebuiltconfigs.Get("looker-conversational-analytics")
+	postgresconfig, _ := prebuiltconfigs.Get("postgres")
+	spanner_config, _ := prebuiltconfigs.Get("spanner")
+	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
+	mindsdb_config, _ := prebuiltconfigs.Get("mindsdb")
+	sqlite_config, _ := prebuiltconfigs.Get("sqlite")
+	neo4jconfig, _ := prebuiltconfigs.Get("neo4j")
+	alloydbobsvconfig, _ := prebuiltconfigs.Get("alloydb-postgres-observability")
+	cloudsqlpgobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-postgres-observability")
+	cloudsqlmysqlobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-mysql-observability")
+	cloudsqlmssqlobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-mssql-observability")
+	serverless_spark_config, _ := prebuiltconfigs.Get("serverless-spark")
+	cloudhealthcare_config, _ := prebuiltconfigs.Get("cloud-healthcare")
+	snowflake_config, _ := prebuiltconfigs.Get("snowflake")
+
+	// Set environment variables
+	t.Setenv("API_KEY", "your_api_key")
+
+	t.Setenv("BIGQUERY_PROJECT", "your_gcp_project_id")
+	t.Setenv("DATAPLEX_PROJECT", "your_gcp_project_id")
+	t.Setenv("FIRESTORE_PROJECT", "your_gcp_project_id")
+	t.Setenv("FIRESTORE_DATABASE", "your_firestore_db_name")
+
+	t.Setenv("SPANNER_PROJECT", "your_gcp_project_id")
+	t.Setenv("SPANNER_INSTANCE", "your_spanner_instance")
+	t.Setenv("SPANNER_DATABASE", "your_spanner_db")
+
+	t.Setenv("ALLOYDB_POSTGRES_PROJECT", "your_gcp_project_id")
+	t.Setenv("ALLOYDB_POSTGRES_REGION", "your_gcp_region")
+	t.Setenv("ALLOYDB_POSTGRES_CLUSTER", "your_alloydb_cluster")
+	t.Setenv("ALLOYDB_POSTGRES_INSTANCE", "your_alloydb_instance")
+	t.Setenv("ALLOYDB_POSTGRES_DATABASE", "your_alloydb_db")
+	t.Setenv("ALLOYDB_POSTGRES_USER", "your_alloydb_user")
+	t.Setenv("ALLOYDB_POSTGRES_PASSWORD", "your_alloydb_password")
+
+	t.Setenv("ALLOYDB_OMNI_HOST", "localhost")
+	t.Setenv("ALLOYDB_OMNI_PORT", "5432")
+	t.Setenv("ALLOYDB_OMNI_DATABASE", "your_alloydb_db")
+	t.Setenv("ALLOYDB_OMNI_USER", "your_alloydb_user")
+	t.Setenv("ALLOYDB_OMNI_PASSWORD", "your_alloydb_password")
+
+	t.Setenv("CLICKHOUSE_PROTOCOL", "your_clickhouse_protocol")
+	t.Setenv("CLICKHOUSE_DATABASE", "your_clickhouse_database")
+	t.Setenv("CLICKHOUSE_PASSWORD", "your_clickhouse_password")
+	t.Setenv("CLICKHOUSE_USER", "your_clickhouse_user")
+	t.Setenv("CLICKHOUSE_HOST", "your_clickhosue_host")
+	t.Setenv("CLICKHOUSE_PORT", "8123")
+
+	t.Setenv("CLOUD_SQL_POSTGRES_PROJECT", "your_pg_project")
+	t.Setenv("CLOUD_SQL_POSTGRES_INSTANCE", "your_pg_instance")
+	t.Setenv("CLOUD_SQL_POSTGRES_DATABASE", "your_pg_db")
+	t.Setenv("CLOUD_SQL_POSTGRES_REGION", "your_pg_region")
+	t.Setenv("CLOUD_SQL_POSTGRES_USER", "your_pg_user")
+	t.Setenv("CLOUD_SQL_POSTGRES_PASS", "your_pg_pass")
+
+	t.Setenv("CLOUD_SQL_MYSQL_PROJECT", "your_gcp_project_id")
+	t.Setenv("CLOUD_SQL_MYSQL_REGION", "your_gcp_region")
+	t.Setenv("CLOUD_SQL_MYSQL_INSTANCE", "your_instance")
+	t.Setenv("CLOUD_SQL_MYSQL_DATABASE", "your_cloudsql_mysql_db")
+	t.Setenv("CLOUD_SQL_MYSQL_USER", "your_cloudsql_mysql_user")
+	t.Setenv("CLOUD_SQL_MYSQL_PASSWORD", "your_cloudsql_mysql_password")
+
+	t.Setenv("CLOUD_SQL_MSSQL_PROJECT", "your_gcp_project_id")
+	t.Setenv("CLOUD_SQL_MSSQL_REGION", "your_gcp_region")
+	t.Setenv("CLOUD_SQL_MSSQL_INSTANCE", "your_cloudsql_mssql_instance")
+	t.Setenv("CLOUD_SQL_MSSQL_DATABASE", "your_cloudsql_mssql_db")
+	t.Setenv("CLOUD_SQL_MSSQL_IP_ADDRESS", "127.0.0.1")
+	t.Setenv("CLOUD_SQL_MSSQL_USER", "your_cloudsql_mssql_user")
+	t.Setenv("CLOUD_SQL_MSSQL_PASSWORD", "your_cloudsql_mssql_password")
+	t.Setenv("CLOUD_SQL_POSTGRES_PASSWORD", "your_cloudsql_pg_password")
+
+	t.Setenv("SERVERLESS_SPARK_PROJECT", "your_gcp_project_id")
+	t.Setenv("SERVERLESS_SPARK_LOCATION", "your_gcp_location")
+
+	t.Setenv("POSTGRES_HOST", "localhost")
+	t.Setenv("POSTGRES_PORT", "5432")
+	t.Setenv("POSTGRES_DATABASE", "your_postgres_db")
+	t.Setenv("POSTGRES_USER", "your_postgres_user")
+	t.Setenv("POSTGRES_PASSWORD", "your_postgres_password")
+
+	t.Setenv("MYSQL_HOST", "localhost")
+	t.Setenv("MYSQL_PORT", "3306")
+	t.Setenv("MYSQL_DATABASE", "your_mysql_db")
+	t.Setenv("MYSQL_USER", "your_mysql_user")
+	t.Setenv("MYSQL_PASSWORD", "your_mysql_password")
+
+	t.Setenv("MSSQL_HOST", "localhost")
+	t.Setenv("MSSQL_PORT", "1433")
+	t.Setenv("MSSQL_DATABASE", "your_mssql_db")
+	t.Setenv("MSSQL_USER", "your_mssql_user")
+	t.Setenv("MSSQL_PASSWORD", "your_mssql_password")
+
+	t.Setenv("MINDSDB_HOST", "localhost")
+	t.Setenv("MINDSDB_PORT", "47334")
+	t.Setenv("MINDSDB_DATABASE", "your_mindsdb_db")
+	t.Setenv("MINDSDB_USER", "your_mindsdb_user")
+	t.Setenv("MINDSDB_PASS", "your_mindsdb_password")
+
+	t.Setenv("LOOKER_BASE_URL", "https://your_company.looker.com")
+	t.Setenv("LOOKER_CLIENT_ID", "your_looker_client_id")
+	t.Setenv("LOOKER_CLIENT_SECRET", "your_looker_client_secret")
+	t.Setenv("LOOKER_VERIFY_SSL", "true")
+
+	t.Setenv("LOOKER_PROJECT", "your_project_id")
+	t.Setenv("LOOKER_LOCATION", "us")
+
+	t.Setenv("SQLITE_DATABASE", "test.db")
+
+	t.Setenv("NEO4J_URI", "bolt://localhost:7687")
+	t.Setenv("NEO4J_DATABASE", "neo4j")
+	t.Setenv("NEO4J_USERNAME", "your_neo4j_user")
+	t.Setenv("NEO4J_PASSWORD", "your_neo4j_password")
+
+	t.Setenv("CLOUD_HEALTHCARE_PROJECT", "your_gcp_project_id")
+	t.Setenv("CLOUD_HEALTHCARE_REGION", "your_gcp_region")
+	t.Setenv("CLOUD_HEALTHCARE_DATASET", "your_healthcare_dataset")
+
+	t.Setenv("SNOWFLAKE_ACCOUNT", "your_account")
+	t.Setenv("SNOWFLAKE_USER", "your_username")
+	t.Setenv("SNOWFLAKE_PASSWORD", "your_pass")
+	t.Setenv("SNOWFLAKE_DATABASE", "your_db")
+	t.Setenv("SNOWFLAKE_SCHEMA", "your_schema")
+	t.Setenv("SNOWFLAKE_WAREHOUSE", "your_wh")
+	t.Setenv("SNOWFLAKE_ROLE", "your_role")
+
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		name        string
+		in          []byte
+		wantToolset server.ToolsetConfigs
+	}{
+		{
+			name: "alloydb omni prebuilt tools",
+			in:   alloydb_omni_config,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb_omni_database_tools": tools.ToolsetConfig{
+					Name:      "alloydb_omni_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_columnar_configurations", "list_columnar_recommended_columns", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+				},
+			},
+		},
+		{
+			name: "alloydb postgres admin prebuilt tools",
+			in:   alloydb_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb_postgres_admin_tools": tools.ToolsetConfig{
+					Name:      "alloydb_postgres_admin_tools",
+					ToolNames: []string{"create_cluster", "wait_for_operation", "create_instance", "list_clusters", "list_instances", "list_users", "create_user", "get_cluster", "get_instance", "get_user"},
+				},
+			},
+		},
+		{
+			name: "cloudsql pg admin prebuilt tools",
+			in:   cloudsqlpg_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_postgres_admin_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_postgres_admin_tools",
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "postgres_upgrade_precheck", "clone_instance", "create_backup", "restore_backup"},
+				},
+			},
+		},
+		{
+			name: "cloudsql mysql admin prebuilt tools",
+			in:   cloudsqlmysql_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mysql_admin_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mysql_admin_tools",
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance", "create_backup", "restore_backup"},
+				},
+			},
+		},
+		{
+			name: "cloudsql mssql admin prebuilt tools",
+			in:   cloudsqlmssql_admin_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mssql_admin_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mssql_admin_tools",
+					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance", "create_backup", "restore_backup"},
+				},
+			},
+		},
+		{
+			name: "alloydb prebuilt tools",
+			in:   alloydb_config,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb_postgres_database_tools": tools.ToolsetConfig{
+					Name:      "alloydb_postgres_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+				},
+			},
+		},
+		{
+			name: "bigquery prebuilt tools",
+			in:   bigquery_config,
+			wantToolset: server.ToolsetConfigs{
+				"bigquery_database_tools": tools.ToolsetConfig{
+					Name:      "bigquery_database_tools",
+					ToolNames: []string{"analyze_contribution", "ask_data_insights", "execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids", "search_catalog"},
+				},
+			},
+		},
+		{
+			name: "clickhouse prebuilt tools",
+			in:   clickhouse_config,
+			wantToolset: server.ToolsetConfigs{
+				"clickhouse_database_tools": tools.ToolsetConfig{
+					Name:      "clickhouse_database_tools",
+					ToolNames: []string{"execute_sql", "list_databases", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlpg prebuilt tools",
+			in:   cloudsqlpg_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_postgres_database_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_postgres_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlmysql prebuilt tools",
+			in:   cloudsqlmysql_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mysql_database_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mysql_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables", "get_query_plan", "list_active_queries", "list_tables_missing_unique_indexes", "list_table_fragmentation"},
+				},
+			},
+		},
+		{
+			name: "cloudsqlmssql prebuilt tools",
+			in:   cloudsqlmssql_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mssql_database_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mssql_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "dataplex prebuilt tools",
+			in:   dataplex_config,
+			wantToolset: server.ToolsetConfigs{
+				"dataplex_tools": tools.ToolsetConfig{
+					Name:      "dataplex_tools",
+					ToolNames: []string{"search_entries", "lookup_entry", "search_aspect_types"},
+				},
+			},
+		},
+		{
+			name: "serverless spark prebuilt tools",
+			in:   serverless_spark_config,
+			wantToolset: server.ToolsetConfigs{
+				"serverless_spark_tools": tools.ToolsetConfig{
+					Name:      "serverless_spark_tools",
+					ToolNames: []string{"list_batches", "get_batch", "cancel_batch", "create_pyspark_batch", "create_spark_batch"},
+				},
+			},
+		},
+		{
+			name: "firestore prebuilt tools",
+			in:   firestoreconfig,
+			wantToolset: server.ToolsetConfigs{
+				"firestore_database_tools": tools.ToolsetConfig{
+					Name:      "firestore_database_tools",
+					ToolNames: []string{"get_documents", "add_documents", "update_document", "list_collections", "delete_documents", "query_collection", "get_rules", "validate_rules"},
+				},
+			},
+		},
+		{
+			name: "mysql prebuilt tools",
+			in:   mysql_config,
+			wantToolset: server.ToolsetConfigs{
+				"mysql_database_tools": tools.ToolsetConfig{
+					Name:      "mysql_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables", "get_query_plan", "list_active_queries", "list_tables_missing_unique_indexes", "list_table_fragmentation"},
+				},
+			},
+		},
+		{
+			name: "mssql prebuilt tools",
+			in:   mssql_config,
+			wantToolset: server.ToolsetConfigs{
+				"mssql_database_tools": tools.ToolsetConfig{
+					Name:      "mssql_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "looker prebuilt tools",
+			in:   looker_config,
+			wantToolset: server.ToolsetConfigs{
+				"looker_tools": tools.ToolsetConfig{
+					Name:      "looker_tools",
+					ToolNames: []string{"get_models", "get_explores", "get_dimensions", "get_measures", "get_filters", "get_parameters", "query", "query_sql", "query_url", "get_looks", "run_look", "make_look", "get_dashboards", "run_dashboard", "make_dashboard", "add_dashboard_element", "add_dashboard_filter", "generate_embed_url", "health_pulse", "health_analyze", "health_vacuum", "dev_mode", "get_projects", "get_project_files", "get_project_file", "create_project_file", "update_project_file", "delete_project_file", "validate_project", "get_connections", "get_connection_schemas", "get_connection_databases", "get_connection_tables", "get_connection_table_columns"},
+				},
+			},
+		},
+		{
+			name: "looker-conversational-analytics prebuilt tools",
+			in:   lookerca_config,
+			wantToolset: server.ToolsetConfigs{
+				"looker_conversational_analytics_tools": tools.ToolsetConfig{
+					Name:      "looker_conversational_analytics_tools",
+					ToolNames: []string{"ask_data_insights", "get_models", "get_explores"},
+				},
+			},
+		},
+		{
+			name: "postgres prebuilt tools",
+			in:   postgresconfig,
+			wantToolset: server.ToolsetConfigs{
+				"postgres_database_tools": tools.ToolsetConfig{
+					Name:      "postgres_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
+				},
+			},
+		},
+		{
+			name: "spanner prebuilt tools",
+			in:   spanner_config,
+			wantToolset: server.ToolsetConfigs{
+				"spanner-database-tools": tools.ToolsetConfig{
+					Name:      "spanner-database-tools",
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables", "list_graphs"},
+				},
+			},
+		},
+		{
+			name: "spanner pg prebuilt tools",
+			in:   spannerpg_config,
+			wantToolset: server.ToolsetConfigs{
+				"spanner_postgres_database_tools": tools.ToolsetConfig{
+					Name:      "spanner_postgres_database_tools",
+					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "mindsdb prebuilt tools",
+			in:   mindsdb_config,
+			wantToolset: server.ToolsetConfigs{
+				"mindsdb-tools": tools.ToolsetConfig{
+					Name:      "mindsdb-tools",
+					ToolNames: []string{"mindsdb-execute-sql", "mindsdb-sql"},
+				},
+			},
+		},
+		{
+			name: "sqlite prebuilt tools",
+			in:   sqlite_config,
+			wantToolset: server.ToolsetConfigs{
+				"sqlite_database_tools": tools.ToolsetConfig{
+					Name:      "sqlite_database_tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+		{
+			name: "neo4j prebuilt tools",
+			in:   neo4jconfig,
+			wantToolset: server.ToolsetConfigs{
+				"neo4j_database_tools": tools.ToolsetConfig{
+					Name:      "neo4j_database_tools",
+					ToolNames: []string{"execute_cypher", "get_schema"},
+				},
+			},
+		},
+		{
+			name: "alloydb postgres observability prebuilt tools",
+			in:   alloydbobsvconfig,
+			wantToolset: server.ToolsetConfigs{
+				"alloydb_postgres_cloud_monitoring_tools": tools.ToolsetConfig{
+					Name:      "alloydb_postgres_cloud_monitoring_tools",
+					ToolNames: []string{"get_system_metrics", "get_query_metrics"},
+				},
+			},
+		},
+		{
+			name: "cloudsql postgres observability prebuilt tools",
+			in:   cloudsqlpgobsvconfig,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_postgres_cloud_monitoring_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_postgres_cloud_monitoring_tools",
+					ToolNames: []string{"get_system_metrics", "get_query_metrics"},
+				},
+			},
+		},
+		{
+			name: "cloudsql mysql observability prebuilt tools",
+			in:   cloudsqlmysqlobsvconfig,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mysql_cloud_monitoring_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mysql_cloud_monitoring_tools",
+					ToolNames: []string{"get_system_metrics", "get_query_metrics"},
+				},
+			},
+		},
+		{
+			name: "cloudsql mssql observability prebuilt tools",
+			in:   cloudsqlmssqlobsvconfig,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_sql_mssql_cloud_monitoring_tools": tools.ToolsetConfig{
+					Name:      "cloud_sql_mssql_cloud_monitoring_tools",
+					ToolNames: []string{"get_system_metrics"},
+				},
+			},
+		},
+		{
+			name: "cloud healthcare prebuilt tools",
+			in:   cloudhealthcare_config,
+			wantToolset: server.ToolsetConfigs{
+				"cloud_healthcare_dataset_tools": tools.ToolsetConfig{
+					Name:      "cloud_healthcare_dataset_tools",
+					ToolNames: []string{"get_dataset", "list_dicom_stores", "list_fhir_stores"},
+				},
+				"cloud_healthcare_fhir_tools": tools.ToolsetConfig{
+					Name:      "cloud_healthcare_fhir_tools",
+					ToolNames: []string{"get_fhir_store", "get_fhir_store_metrics", "get_fhir_resource", "fhir_patient_search", "fhir_patient_everything", "fhir_fetch_page"},
+				},
+				"cloud_healthcare_dicom_tools": tools.ToolsetConfig{
+					Name:      "cloud_healthcare_dicom_tools",
+					ToolNames: []string{"get_dicom_store", "get_dicom_store_metrics", "search_dicom_studies", "search_dicom_series", "search_dicom_instances", "retrieve_rendered_dicom_instance"},
+				},
+			},
+		},
+		{
+			name: "Snowflake prebuilt tool",
+			in:   snowflake_config,
+			wantToolset: server.ToolsetConfigs{
+				"snowflake_tools": tools.ToolsetConfig{
+					Name:      "snowflake_tools",
+					ToolNames: []string{"execute_sql", "list_tables"},
+				},
+			},
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.name, func(t *testing.T) {
+			toolsFile, err := parseToolsFile(ctx, tc.in)
+			if err != nil {
+				t.Fatalf("failed to parse input: %v", err)
+			}
+			if diff := cmp.Diff(tc.wantToolset, toolsFile.Toolsets); diff != "" {
+				t.Fatalf("incorrect tools parse: diff %v", diff)
+			}
+			// Prebuilt configs do not have prompts, so assert empty maps.
+			if len(toolsFile.Prompts) != 0 {
+				t.Fatalf("expected empty prompts map for prebuilt config, got: %v", toolsFile.Prompts)
+			}
+		})
+	}
+}
+
+func TestMergeToolsFiles(t *testing.T) {
+	file1 := ToolsFile{
+		Sources:         server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
+		Tools:           server.ToolConfigs{"tool1": http.Config{Name: "tool1"}},
+		Toolsets:        server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}},
+		EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
+	}
+	file2 := ToolsFile{
+		AuthServices: server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
+		Tools:        server.ToolConfigs{"tool2": http.Config{Name: "tool2"}},
+		Toolsets:     server.ToolsetConfigs{"set2": tools.ToolsetConfig{Name: "set2"}},
+	}
+	fileWithConflicts := ToolsFile{
+		Sources: server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
+		Tools:   server.ToolConfigs{"tool2": http.Config{Name: "tool2"}},
+	}
+
+	testCases := []struct {
+		name    string
+		files   []ToolsFile
+		want    ToolsFile
+		wantErr bool
+	}{
+		{
+			name:  "merge two distinct files",
+			files: []ToolsFile{file1, file2},
+			want: ToolsFile{
+				Sources:         server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
+				AuthServices:    server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
+				Tools:           server.ToolConfigs{"tool1": http.Config{Name: "tool1"}, "tool2": http.Config{Name: "tool2"}},
+				Toolsets:        server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}, "set2": tools.ToolsetConfig{Name: "set2"}},
+				Prompts:         server.PromptConfigs{},
+				EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
+			},
+			wantErr: false,
+		},
+		{
+			name:    "merge with conflicts",
+			files:   []ToolsFile{file1, file2, fileWithConflicts},
+			wantErr: true,
+		},
+		{
+			name:  "merge single file",
+			files: []ToolsFile{file1},
+			want: ToolsFile{
+				Sources:         file1.Sources,
+				AuthServices:    make(server.AuthServiceConfigs),
+				EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
+				Tools:           file1.Tools,
+				Toolsets:        file1.Toolsets,
+				Prompts:         server.PromptConfigs{},
+			},
+		},
+		{
+			name:  "merge empty list",
+			files: []ToolsFile{},
+			want: ToolsFile{
+				Sources:         make(server.SourceConfigs),
+				AuthServices:    make(server.AuthServiceConfigs),
+				EmbeddingModels: make(server.EmbeddingModelConfigs),
+				Tools:           make(server.ToolConfigs),
+				Toolsets:        make(server.ToolsetConfigs),
+				Prompts:         server.PromptConfigs{},
+			},
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.name, func(t *testing.T) {
+			got, err := mergeToolsFiles(tc.files...)
+			if (err != nil) != tc.wantErr {
+				t.Fatalf("mergeToolsFiles() error = %v, wantErr %v", err, tc.wantErr)
+			}
+			if !tc.wantErr {
+				if diff := cmp.Diff(tc.want, got); diff != "" {
+					t.Errorf("mergeToolsFiles() mismatch (-want +got):\n%s", diff)
+				}
+			} else {
+				if err == nil {
+					t.Fatal("expected an error for conflicting files but got none")
+				}
+				if !strings.Contains(err.Error(), "resource conflicts detected") {
+					t.Errorf("expected conflict error, but got: %v", err)
+				}
+			}
+		})
+	}
+}
+
+func TestParameterReferenceValidation(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+
+	// Base template
+	baseYaml := `
+sources:
+  dummy-source:
+    kind: http
+    baseUrl: http://example.com
+tools:
+  test-tool:
+    kind: postgres-sql
+    source: dummy-source
+    description: test tool
+    statement: SELECT 1;
+    parameters:
+%s`
+
+	tcs := []struct {
+		desc      string
+		params    string
+		wantErr   bool
+		errSubstr string
+	}{
+		{
+			desc: "valid backward reference",
+			params: `
+      - name: source_param
+        type: string
+        description: source
+      - name: copy_param
+        type: string
+        description: copy
+        valueFromParam: source_param`,
+			wantErr: false,
+		},
+		{
+			desc: "valid forward reference (out of order)",
+			params: `
+      - name: copy_param
+        type: string
+        description: copy
+        valueFromParam: source_param
+      - name: source_param
+        type: string
+        description: source`,
+			wantErr: false,
+		},
+		{
+			desc: "invalid missing reference",
+			params: `
+      - name: copy_param
+        type: string
+        description: copy
+        valueFromParam: non_existent_param`,
+			wantErr:   true,
+			errSubstr: "references '\"non_existent_param\"' in the 'valueFromParam' field",
+		},
+		{
+			desc: "invalid self reference",
+			params: `
+      - name: myself
+        type: string
+        description: self
+        valueFromParam: myself`,
+			wantErr:   true,
+			errSubstr: "parameter \"myself\" cannot copy value from itself",
+		},
+		{
+			desc: "multiple valid references",
+			params: `
+      - name: a
+        type: string
+        description: a
+      - name: b
+        type: string
+        description: b
+        valueFromParam: a
+      - name: c
+        type: string
+        description: c
+        valueFromParam: a`,
+			wantErr: false,
+		},
+	}
+
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Indent parameters to match YAML structure
+			yamlContent := fmt.Sprintf(baseYaml, tc.params)
+
+			_, err := parseToolsFile(ctx, []byte(yamlContent))
+
+			if tc.wantErr {
+				if err == nil {
+					t.Fatal("expected error, got nil")
+				}
+				if !strings.Contains(err.Error(), tc.errSubstr) {
+					t.Errorf("error %q does not contain expected substring %q", err.Error(), tc.errSubstr)
+				}
+			} else {
+				if err != nil {
+					t.Fatalf("unexpected error: %v", err)
+				}
+			}
+		})
+	}
+}
diff --git a/cmd/options.go b/cmd/options.go
deleted file mode 100644
index b87a7e6d55..0000000000
--- a/cmd/options.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2024 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cmd
-
-import (
-	"io"
-)
-
-// Option is a function that configures a Command.
-type Option func(*Command)
-
-// WithStreams overrides the default writer.
-func WithStreams(out, err io.Writer) Option {
-	return func(c *Command) {
-		c.outStream = out
-		c.errStream = err
-	}
-}
diff --git a/cmd/root.go b/cmd/root.go
index dfac1c250f..33383366ea 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -23,7 +23,6 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
-	"regexp"
 	"runtime"
 	"slices"
 	"strings"
@@ -31,249 +30,18 @@ import (
 	"time"
 
 	"github.com/fsnotify/fsnotify"
-	yaml "github.com/goccy/go-yaml"
+	// Importing the cmd/internal package also import packages for side effect of registration
+	"github.com/googleapis/genai-toolbox/cmd/internal"
+	"github.com/googleapis/genai-toolbox/cmd/internal/invoke"
+	"github.com/googleapis/genai-toolbox/cmd/internal/skills"
 	"github.com/googleapis/genai-toolbox/internal/auth"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
-	"github.com/googleapis/genai-toolbox/internal/log"
-	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
 	"github.com/googleapis/genai-toolbox/internal/prompts"
 	"github.com/googleapis/genai-toolbox/internal/server"
 	"github.com/googleapis/genai-toolbox/internal/sources"
-	"github.com/googleapis/genai-toolbox/internal/telemetry"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
-
-	// Import prompt packages for side effect of registration
-	_ "github.com/googleapis/genai-toolbox/internal/prompts/custom"
-
-	// Import tool packages for side effect of registration
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreatecluster"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreateinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbcreateuser"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetcluster"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbgetuser"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistclusters"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydblistusers"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydb/alloydbwaitforoperation"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/alloydbainl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryanalyzecontribution"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryconversationalanalytics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigqueryforecast"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygetdatasetinfo"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerygettableinfo"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylistdatasetids"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerylisttableids"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysearchcatalog"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerysql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cassandra/cassandracql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouseexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselistdatabases"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhouselisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/clickhouse/clickhousesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudgda"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdataset"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudmonitoring"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcloneinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatebackup"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatedatabase"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreateusers"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlgetinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqllistdatabases"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqllistinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlrestorebackup"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlwaitforoperation"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/couchbase"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/dataform/dataformcompilelocal"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexlookupentry"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchaspecttypes"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/dataplex/dataplexsearchentries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/dgraph"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/elasticsearch/elasticsearchesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firebird/firebirdsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreadddocuments"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoredeletedocuments"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetdocuments"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoregetrules"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorelistcollections"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequery"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorequerycollection"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestoreupdatedocument"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/firestore/firestorevalidaterules"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/http"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardelement"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookeradddashboardfilter"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerconversationalanalytics"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookercreateprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdeleteprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerdevmode"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergenerateembedurl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiondatabases"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnections"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectionschemas"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiontablecolumns"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetconnectiontables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdashboards"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetdimensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetexplores"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetfilters"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetlooks"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmeasures"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetmodels"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetparameters"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojectfiles"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookergetprojects"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthanalyze"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthpulse"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerhealthvacuum"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookermakedashboard"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookermakelook"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquery"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerquerysql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerqueryurl"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrundashboard"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerrunlook"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/looker/lookerupdateprojectfile"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mindsdb/mindsdbexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mindsdb/mindsdbsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbaggregate"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeletemany"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeleteone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfind"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfindone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertmany"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdatemany"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdateone"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqllisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mssql/mssqlsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlgetqueryplan"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllistactivequeries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablefragmentation"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqllisttablesmissinguniqueindexes"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/mysql/mysqlsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jcypher"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jexecutecypher"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jschema"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/oceanbase/oceanbaseexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/oceanbase/oceanbasesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/oracle/oracleexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/oracle/oraclesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresdatabaseoverview"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresgetcolumncardinality"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistactivequeries"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistavailableextensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistdatabasestats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistindexes"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistinstalledextensions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistlocks"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpgsettings"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistpublicationtables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistquerystats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistroles"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistschemas"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistsequences"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresliststoredprocedure"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablespaces"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttablestats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslisttriggers"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslistviews"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgreslongrunningtransactions"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgresreplicationstats"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/redis"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcancelbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparkgetbatch"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/serverlessspark/serverlesssparklistbatches"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoreexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/singlestore/singlestoresql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakeexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/snowflake/snowflakesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlistgraphs"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannerlisttables"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/spanner/spannersql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqliteexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/sqlite/sqlitesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/tidb/tidbsql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinoexecutesql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/trino/trinosql"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/utility/wait"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/valkey"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/yugabytedbsql"
-
 	"github.com/spf13/cobra"
-
-	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbadmin"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/alloydbpg"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/bigtable"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cassandra"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudgda"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudhealthcare"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudmonitoring"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqladmin"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/couchbase"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/dataplex"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/dgraph"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/elasticsearch"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/firebird"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/firestore"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/http"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/looker"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/mindsdb"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/mongodb"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/mssql"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/mysql"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/neo4j"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/oceanbase"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/oracle"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/postgres"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/redis"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/serverlessspark"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/singlestore"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/snowflake"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/spanner"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/tidb"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/trino"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/valkey"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/yugabytedb"
 )
 
 var (
@@ -302,303 +70,74 @@ func semanticVersion() string {
 	return v
 }
 
+// GenerateCommand returns a new Command object with the specified IO streams
+// This is used for integration test package
+func GenerateCommand(out, err io.Writer) *cobra.Command {
+	opts := internal.NewToolboxOptions(internal.WithIOStreams(out, err))
+	return NewCommand(opts)
+}
+
 // Execute adds all child commands to the root command and sets flags appropriately.
 // This is called by main.main(). It only needs to happen once to the rootCmd.
 func Execute() {
-	if err := NewCommand().Execute(); err != nil {
+	// Initialize options
+	opts := internal.NewToolboxOptions()
+
+	if err := NewCommand(opts).Execute(); err != nil {
 		exit := 1
 		os.Exit(exit)
 	}
 }
 
-// Command represents an invocation of the CLI.
-type Command struct {
-	*cobra.Command
-
-	cfg             server.ServerConfig
-	logger          log.Logger
-	tools_file      string
-	tools_files     []string
-	tools_folder    string
-	prebuiltConfigs []string
-	inStream        io.Reader
-	outStream       io.Writer
-	errStream       io.Writer
-}
-
 // NewCommand returns a Command object representing an invocation of the CLI.
-func NewCommand(opts ...Option) *Command {
-	in := os.Stdin
-	out := os.Stdout
-	err := os.Stderr
-
-	baseCmd := &cobra.Command{
+func NewCommand(opts *internal.ToolboxOptions) *cobra.Command {
+	cmd := &cobra.Command{
 		Use:           "toolbox",
 		Version:       versionString,
 		SilenceErrors: true,
 	}
-	cmd := &Command{
-		Command:   baseCmd,
-		inStream:  in,
-		outStream: out,
-		errStream: err,
-	}
-
-	for _, o := range opts {
-		o(cmd)
-	}
 
 	// Do not print Usage on runtime error
 	cmd.SilenceUsage = true
 
 	// Set server version
-	cmd.cfg.Version = versionString
+	opts.Cfg.Version = versionString
 
 	// set baseCmd in, out and err the same as cmd.
-	baseCmd.SetIn(cmd.inStream)
-	baseCmd.SetOut(cmd.outStream)
-	baseCmd.SetErr(cmd.errStream)
+	cmd.SetIn(opts.IOStreams.In)
+	cmd.SetOut(opts.IOStreams.Out)
+	cmd.SetErr(opts.IOStreams.ErrOut)
+
+	// setup flags that are common across all commands
+	internal.PersistentFlags(cmd, opts)
 
 	flags := cmd.Flags()
-	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
-	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")
 
-	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
+	flags.StringVarP(&opts.Cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
+	flags.IntVarP(&opts.Cfg.Port, "port", "p", 5000, "Port the server will listen on.")
+
+	flags.StringVar(&opts.ToolsFile, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
 	// deprecate tools_file
 	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
-	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
-	flags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, or --tools-folder.")
-	flags.StringVar(&cmd.tools_folder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --tools-file, or --tools-files.")
-	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
-	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
-	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
-	flags.StringVar(&cmd.cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
-	flags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
-	// Fetch prebuilt tools sources to customize the help description
-	prebuiltHelp := fmt.Sprintf(
-		"Use a prebuilt tool configuration by source type. Allowed: '%s'. Can be specified multiple times.",
-		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
-	)
-	flags.StringSliceVar(&cmd.prebuiltConfigs, "prebuilt", []string{}, prebuiltHelp)
-	flags.BoolVar(&cmd.cfg.Stdio, "stdio", false, "Listens via MCP STDIO instead of acting as a remote HTTP server.")
-	flags.BoolVar(&cmd.cfg.DisableReload, "disable-reload", false, "Disables dynamic reloading of tools file.")
-	flags.BoolVar(&cmd.cfg.UI, "ui", false, "Launches the Toolbox UI web server.")
+	flags.BoolVar(&opts.Cfg.Stdio, "stdio", false, "Listens via MCP STDIO instead of acting as a remote HTTP server.")
+	flags.BoolVar(&opts.Cfg.DisableReload, "disable-reload", false, "Disables dynamic reloading of tools file.")
+	flags.BoolVar(&opts.Cfg.UI, "ui", false, "Launches the Toolbox UI web server.")
 	// TODO: Insecure by default. Might consider updating this for v1.0.0
-	flags.StringSliceVar(&cmd.cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins permitted to access this server. Defaults to '*'.")
-	flags.StringSliceVar(&cmd.cfg.AllowedHosts, "allowed-hosts", []string{"*"}, "Specifies a list of hosts permitted to access this server. Defaults to '*'.")
-	flags.StringSliceVar(&cmd.cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
+	flags.StringSliceVar(&opts.Cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins permitted to access this server. Defaults to '*'.")
+	flags.StringSliceVar(&opts.Cfg.AllowedHosts, "allowed-hosts", []string{"*"}, "Specifies a list of hosts permitted to access this server. Defaults to '*'.")
 
 	// wrap RunE command so that we have access to original Command object
-	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
+	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd, opts) }
+
+	// Register subcommands for tool invocation
+	cmd.AddCommand(invoke.NewCommand(opts))
+	// Register subcommands for skill generation
+	cmd.AddCommand(skills.NewCommand(opts))
 
 	return cmd
 }
 
-type ToolsFile struct {
-	Sources         server.SourceConfigs         `yaml:"sources"`
-	AuthSources     server.AuthServiceConfigs    `yaml:"authSources"` // Deprecated: Kept for compatibility.
-	AuthServices    server.AuthServiceConfigs    `yaml:"authServices"`
-	EmbeddingModels server.EmbeddingModelConfigs `yaml:"embeddingModels"`
-	Tools           server.ToolConfigs           `yaml:"tools"`
-	Toolsets        server.ToolsetConfigs        `yaml:"toolsets"`
-	Prompts         server.PromptConfigs         `yaml:"prompts"`
-}
-
-// parseEnv replaces environment variables ${ENV_NAME} with their values.
-// also support ${ENV_NAME:default_value}.
-func parseEnv(input string) (string, error) {
-	re := regexp.MustCompile(`\$\{(\w+)(:([^}]*))?\}`)
-
-	var err error
-	output := re.ReplaceAllStringFunc(input, func(match string) string {
-		parts := re.FindStringSubmatch(match)
-
-		// extract the variable name
-		variableName := parts[1]
-		if value, found := os.LookupEnv(variableName); found {
-			return value
-		}
-		if len(parts) >= 4 && parts[2] != "" {
-			return parts[3]
-		}
-		err = fmt.Errorf("environment variable not found: %q", variableName)
-		return ""
-	})
-	return output, err
-}
-
-// parseToolsFile parses the provided yaml into appropriate configs.
-func parseToolsFile(ctx context.Context, raw []byte) (ToolsFile, error) {
-	var toolsFile ToolsFile
-	// Replace environment variables if found
-	output, err := parseEnv(string(raw))
-	if err != nil {
-		return toolsFile, fmt.Errorf("error parsing environment variables: %s", err)
-	}
-	raw = []byte(output)
-
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, raw, &toolsFile, yaml.Strict())
-	if err != nil {
-		return toolsFile, err
-	}
-	return toolsFile, nil
-}
-
-// mergeToolsFiles merges multiple ToolsFile structs into one.
-// Detects and raises errors for resource conflicts in sources, authServices, tools, and toolsets.
-// All resource names (sources, authServices, tools, toolsets) must be unique across all files.
-func mergeToolsFiles(files ...ToolsFile) (ToolsFile, error) {
-	merged := ToolsFile{
-		Sources:         make(server.SourceConfigs),
-		AuthServices:    make(server.AuthServiceConfigs),
-		EmbeddingModels: make(server.EmbeddingModelConfigs),
-		Tools:           make(server.ToolConfigs),
-		Toolsets:        make(server.ToolsetConfigs),
-		Prompts:         make(server.PromptConfigs),
-	}
-
-	var conflicts []string
-
-	for fileIndex, file := range files {
-		// Check for conflicts and merge sources
-		for name, source := range file.Sources {
-			if _, exists := merged.Sources[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("source '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.Sources[name] = source
-			}
-		}
-
-		// Check for conflicts and merge authSources (deprecated, but still support)
-		for name, authSource := range file.AuthSources {
-			if _, exists := merged.AuthSources[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("authSource '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				if merged.AuthSources == nil {
-					merged.AuthSources = make(server.AuthServiceConfigs)
-				}
-				merged.AuthSources[name] = authSource
-			}
-		}
-
-		// Check for conflicts and merge authServices
-		for name, authService := range file.AuthServices {
-			if _, exists := merged.AuthServices[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("authService '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.AuthServices[name] = authService
-			}
-		}
-
-		// Check for conflicts and merge embeddingModels
-		for name, em := range file.EmbeddingModels {
-			if _, exists := merged.EmbeddingModels[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("embedding model '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.EmbeddingModels[name] = em
-			}
-		}
-
-		// Check for conflicts and merge tools
-		for name, tool := range file.Tools {
-			if _, exists := merged.Tools[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("tool '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.Tools[name] = tool
-			}
-		}
-
-		// Check for conflicts and merge toolsets
-		for name, toolset := range file.Toolsets {
-			if _, exists := merged.Toolsets[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("toolset '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.Toolsets[name] = toolset
-			}
-		}
-
-		// Check for conflicts and merge prompts
-		for name, prompt := range file.Prompts {
-			if _, exists := merged.Prompts[name]; exists {
-				conflicts = append(conflicts, fmt.Sprintf("prompt '%s' (file #%d)", name, fileIndex+1))
-			} else {
-				merged.Prompts[name] = prompt
-			}
-		}
-	}
-
-	// If conflicts were detected, return an error
-	if len(conflicts) > 0 {
-		return ToolsFile{}, fmt.Errorf("resource conflicts detected:\n  - %s\n\nPlease ensure each source, authService, tool, toolset and prompt has a unique name across all files", strings.Join(conflicts, "\n  - "))
-	}
-
-	return merged, nil
-}
-
-// loadAndMergeToolsFiles loads multiple YAML files and merges them
-func loadAndMergeToolsFiles(ctx context.Context, filePaths []string) (ToolsFile, error) {
-	var toolsFiles []ToolsFile
-
-	for _, filePath := range filePaths {
-		buf, err := os.ReadFile(filePath)
-		if err != nil {
-			return ToolsFile{}, fmt.Errorf("unable to read tool file at %q: %w", filePath, err)
-		}
-
-		toolsFile, err := parseToolsFile(ctx, buf)
-		if err != nil {
-			return ToolsFile{}, fmt.Errorf("unable to parse tool file at %q: %w", filePath, err)
-		}
-
-		toolsFiles = append(toolsFiles, toolsFile)
-	}
-
-	mergedFile, err := mergeToolsFiles(toolsFiles...)
-	if err != nil {
-		return ToolsFile{}, fmt.Errorf("unable to merge tools files: %w", err)
-	}
-
-	return mergedFile, nil
-}
-
-// loadAndMergeToolsFolder loads all YAML files from a directory and merges them
-func loadAndMergeToolsFolder(ctx context.Context, folderPath string) (ToolsFile, error) {
-	// Check if directory exists
-	info, err := os.Stat(folderPath)
-	if err != nil {
-		return ToolsFile{}, fmt.Errorf("unable to access tools folder at %q: %w", folderPath, err)
-	}
-	if !info.IsDir() {
-		return ToolsFile{}, fmt.Errorf("path %q is not a directory", folderPath)
-	}
-
-	// Find all YAML files in the directory
-	pattern := filepath.Join(folderPath, "*.yaml")
-	yamlFiles, err := filepath.Glob(pattern)
-	if err != nil {
-		return ToolsFile{}, fmt.Errorf("error finding YAML files in %q: %w", folderPath, err)
-	}
-
-	// Also find .yml files
-	ymlPattern := filepath.Join(folderPath, "*.yml")
-	ymlFiles, err := filepath.Glob(ymlPattern)
-	if err != nil {
-		return ToolsFile{}, fmt.Errorf("error finding YML files in %q: %w", folderPath, err)
-	}
-
-	// Combine both file lists
-	allFiles := append(yamlFiles, ymlFiles...)
-
-	if len(allFiles) == 0 {
-		return ToolsFile{}, fmt.Errorf("no YAML files found in directory %q", folderPath)
-	}
-
-	// Use existing loadAndMergeToolsFiles function
-	return loadAndMergeToolsFiles(ctx, allFiles)
-}
-
-func handleDynamicReload(ctx context.Context, toolsFile ToolsFile, s *server.Server) error {
+func handleDynamicReload(ctx context.Context, toolsFile internal.ToolsFile, s *server.Server) error {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
 		panic(err)
@@ -618,7 +157,7 @@ func handleDynamicReload(ctx context.Context, toolsFile ToolsFile, s *server.Ser
 
 // validateReloadEdits checks that the reloaded tools file configs can initialized without failing
 func validateReloadEdits(
-	ctx context.Context, toolsFile ToolsFile,
+	ctx context.Context, toolsFile internal.ToolsFile,
 ) (map[string]sources.Source, map[string]auth.AuthService, map[string]embeddingmodels.EmbeddingModel, map[string]tools.Tool, map[string]tools.Toolset, map[string]prompts.Prompt, map[string]prompts.Promptset, error,
 ) {
 	logger, err := util.LoggerFromContext(ctx)
@@ -744,18 +283,18 @@ func watchChanges(ctx context.Context, watchDirs map[string]bool, watchedFiles m
 
 		case <-debounce.C:
 			debounce.Stop()
-			var reloadedToolsFile ToolsFile
+			var reloadedToolsFile internal.ToolsFile
 
 			if watchingFolder {
 				logger.DebugContext(ctx, "Reloading tools folder.")
-				reloadedToolsFile, err = loadAndMergeToolsFolder(ctx, folderToWatch)
+				reloadedToolsFile, err = internal.LoadAndMergeToolsFolder(ctx, folderToWatch)
 				if err != nil {
 					logger.WarnContext(ctx, "error loading tools folder %s", err)
 					continue
 				}
 			} else {
 				logger.DebugContext(ctx, "Reloading tools file(s).")
-				reloadedToolsFile, err = loadAndMergeToolsFiles(ctx, slices.Collect(maps.Keys(watchedFiles)))
+				reloadedToolsFile, err = internal.LoadAndMergeToolsFiles(ctx, slices.Collect(maps.Keys(watchedFiles)))
 				if err != nil {
 					logger.WarnContext(ctx, "error loading tools files %s", err)
 					continue
@@ -799,7 +338,7 @@ func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder str
 	return watchDirs, watchedFiles
 }
 
-func run(cmd *Command) error {
+func run(cmd *cobra.Command, opts *internal.ToolboxOptions) error {
 	ctx, cancel := context.WithCancel(cmd.Context())
 	defer cancel()
 
@@ -816,192 +355,40 @@ func run(cmd *Command) error {
 		}
 		switch s {
 		case syscall.SIGINT:
-			cmd.logger.DebugContext(sCtx, "Received SIGINT signal to shutdown.")
+			opts.Logger.DebugContext(sCtx, "Received SIGINT signal to shutdown.")
 		case syscall.SIGTERM:
-			cmd.logger.DebugContext(sCtx, "Sending SIGTERM signal to shutdown.")
+			opts.Logger.DebugContext(sCtx, "Sending SIGTERM signal to shutdown.")
 		}
 		cancel()
 	}(ctx)
 
-	// If stdio, set logger's out stream (usually DEBUG and INFO logs) to errStream
-	loggerOut := cmd.outStream
-	if cmd.cfg.Stdio {
-		loggerOut = cmd.errStream
-	}
-
-	// Handle logger separately from config
-	switch strings.ToLower(cmd.cfg.LoggingFormat.String()) {
-	case "json":
-		logger, err := log.NewStructuredLogger(loggerOut, cmd.errStream, cmd.cfg.LogLevel.String())
-		if err != nil {
-			return fmt.Errorf("unable to initialize logger: %w", err)
-		}
-		cmd.logger = logger
-	case "standard":
-		logger, err := log.NewStdLogger(loggerOut, cmd.errStream, cmd.cfg.LogLevel.String())
-		if err != nil {
-			return fmt.Errorf("unable to initialize logger: %w", err)
-		}
-		cmd.logger = logger
-	default:
-		return fmt.Errorf("logging format invalid")
-	}
-
-	ctx = util.WithLogger(ctx, cmd.logger)
-
-	// Set up OpenTelemetry
-	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.cfg.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
+	ctx, shutdown, err := opts.Setup(ctx)
 	if err != nil {
-		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
+		return err
 	}
 	defer func() {
-		err := otelShutdown(ctx)
-		if err != nil {
-			errMsg := fmt.Errorf("error shutting down OpenTelemetry: %w", err)
-			cmd.logger.ErrorContext(ctx, errMsg.Error())
-		}
+		_ = shutdown(ctx)
 	}()
 
-	var allToolsFiles []ToolsFile
-
-	// Load Prebuilt Configuration
-
-	if len(cmd.prebuiltConfigs) > 0 {
-		slices.Sort(cmd.prebuiltConfigs)
-		sourcesList := strings.Join(cmd.prebuiltConfigs, ", ")
-		logMsg := fmt.Sprintf("Using prebuilt tool configurations for: %s", sourcesList)
-		cmd.logger.InfoContext(ctx, logMsg)
-
-		for _, configName := range cmd.prebuiltConfigs {
-			buf, err := prebuiltconfigs.Get(configName)
-			if err != nil {
-				cmd.logger.ErrorContext(ctx, err.Error())
-				return err
-			}
-
-			// Update version string
-			cmd.cfg.Version += "+prebuilt." + configName
-
-			// Parse into ToolsFile struct
-			parsed, err := parseToolsFile(ctx, buf)
-			if err != nil {
-				errMsg := fmt.Errorf("unable to parse prebuilt tool configuration for '%s': %w", configName, err)
-				cmd.logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-			allToolsFiles = append(allToolsFiles, parsed)
-		}
-	}
-
-	// Determine if Custom Files should be loaded
-	// Check for explicit custom flags
-	isCustomConfigured := cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != ""
-
-	// Determine if default 'tools.yaml' should be used (No prebuilt AND No custom flags)
-	useDefaultToolsFile := len(cmd.prebuiltConfigs) == 0 && !isCustomConfigured
-
-	if useDefaultToolsFile {
-		cmd.tools_file = "tools.yaml"
-		isCustomConfigured = true
-	}
-
-	// Load Custom Configurations
-	if isCustomConfigured {
-		// Enforce exclusivity among custom flags (tools-file vs tools-files vs tools-folder)
-		if (cmd.tools_file != "" && len(cmd.tools_files) > 0) ||
-			(cmd.tools_file != "" && cmd.tools_folder != "") ||
-			(len(cmd.tools_files) > 0 && cmd.tools_folder != "") {
-			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
-			cmd.logger.ErrorContext(ctx, errMsg.Error())
-			return errMsg
-		}
-
-		var customTools ToolsFile
-		var err error
-
-		if len(cmd.tools_files) > 0 {
-			// Use tools-files
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
-			customTools, err = loadAndMergeToolsFiles(ctx, cmd.tools_files)
-		} else if cmd.tools_folder != "" {
-			// Use tools-folder
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.tools_folder))
-			customTools, err = loadAndMergeToolsFolder(ctx, cmd.tools_folder)
-		} else {
-			// Use single file (tools-file or default `tools.yaml`)
-			buf, readFileErr := os.ReadFile(cmd.tools_file)
-			if readFileErr != nil {
-				errMsg := fmt.Errorf("unable to read tool file at %q: %w", cmd.tools_file, readFileErr)
-				cmd.logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-			customTools, err = parseToolsFile(ctx, buf)
-			if err != nil {
-				err = fmt.Errorf("unable to parse tool file at %q: %w", cmd.tools_file, err)
-			}
-		}
-
-		if err != nil {
-			cmd.logger.ErrorContext(ctx, err.Error())
-			return err
-		}
-		allToolsFiles = append(allToolsFiles, customTools)
-	}
-
-	// Merge Everything
-	// This will error if custom tools collide with prebuilt tools
-	finalToolsFile, err := mergeToolsFiles(allToolsFiles...)
+	isCustomConfigured, err := opts.LoadConfig(ctx)
 	if err != nil {
-		cmd.logger.ErrorContext(ctx, err.Error())
 		return err
 	}
 
-	cmd.cfg.SourceConfigs = finalToolsFile.Sources
-	cmd.cfg.AuthServiceConfigs = finalToolsFile.AuthServices
-	cmd.cfg.EmbeddingModelConfigs = finalToolsFile.EmbeddingModels
-	cmd.cfg.ToolConfigs = finalToolsFile.Tools
-	cmd.cfg.ToolsetConfigs = finalToolsFile.Toolsets
-	cmd.cfg.PromptConfigs = finalToolsFile.Prompts
-
-	authSourceConfigs := finalToolsFile.AuthSources
-	if authSourceConfigs != nil {
-		cmd.logger.WarnContext(ctx, "`authSources` is deprecated, use `authServices` instead")
-
-		for k, v := range authSourceConfigs {
-			if _, exists := cmd.cfg.AuthServiceConfigs[k]; exists {
-				errMsg := fmt.Errorf("resource conflict detected: authSource '%s' has the same name as an existing authService. Please rename your authSource", k)
-				cmd.logger.ErrorContext(ctx, errMsg.Error())
-				return errMsg
-			}
-			cmd.cfg.AuthServiceConfigs[k] = v
-		}
-	}
-
-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
-	if err != nil {
-		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-
-	ctx = util.WithInstrumentation(ctx, instrumentation)
-
 	// start server
-	s, err := server.NewServer(ctx, cmd.cfg)
+	s, err := server.NewServer(ctx, opts.Cfg)
 	if err != nil {
 		errMsg := fmt.Errorf("toolbox failed to initialize: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
+		opts.Logger.ErrorContext(ctx, errMsg.Error())
 		return errMsg
 	}
 
 	// run server in background
 	srvErr := make(chan error)
-	if cmd.cfg.Stdio {
+	if opts.Cfg.Stdio {
 		go func() {
 			defer close(srvErr)
-			err = s.ServeStdio(ctx, cmd.inStream, cmd.outStream)
+			err = s.ServeStdio(ctx, opts.IOStreams.In, opts.IOStreams.Out)
 			if err != nil {
 				srvErr <- err
 			}
@@ -1010,12 +397,12 @@ func run(cmd *Command) error {
 		err = s.Listen(ctx)
 		if err != nil {
 			errMsg := fmt.Errorf("toolbox failed to start listener: %w", err)
-			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			opts.Logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
-		cmd.logger.InfoContext(ctx, "Server ready to serve!")
-		if cmd.cfg.UI {
-			cmd.logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://%s:%d/ui", cmd.cfg.Address, cmd.cfg.Port))
+		opts.Logger.InfoContext(ctx, "Server ready to serve!")
+		if opts.Cfg.UI {
+			opts.Logger.InfoContext(ctx, fmt.Sprintf("Toolbox UI is up and running at: http://%s:%d/ui", opts.Cfg.Address, opts.Cfg.Port))
 		}
 
 		go func() {
@@ -1027,8 +414,8 @@ func run(cmd *Command) error {
 		}()
 	}
 
-	if isCustomConfigured && !cmd.cfg.DisableReload {
-		watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
+	if isCustomConfigured && !opts.Cfg.DisableReload {
+		watchDirs, watchedFiles := resolveWatcherInputs(opts.ToolsFile, opts.ToolsFiles, opts.ToolsFolder)
 		// start watching the file(s) or folder for changes to trigger dynamic reloading
 		go watchChanges(ctx, watchDirs, watchedFiles, s)
 	}
@@ -1038,13 +425,13 @@ func run(cmd *Command) error {
 	case err := <-srvErr:
 		if err != nil {
 			errMsg := fmt.Errorf("toolbox crashed with the following error: %w", err)
-			cmd.logger.ErrorContext(ctx, errMsg.Error())
+			opts.Logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
 	case <-ctx.Done():
 		shutdownContext, cancel := context.WithTimeout(context.Background(), 10*time.Second)
 		defer cancel()
-		cmd.logger.WarnContext(shutdownContext, "Shutting down gracefully...")
+		opts.Logger.WarnContext(shutdownContext, "Shutting down gracefully...")
 		err := s.Shutdown(shutdownContext)
 		if err == context.DeadlineExceeded {
 			return fmt.Errorf("graceful shutdown timed out... forcing exit")
diff --git a/cmd/root_test.go b/cmd/root_test.go
index 17058d18ff..e85aaa3d26 100644
--- a/cmd/root_test.go
+++ b/cmd/root_test.go
@@ -31,22 +31,12 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	"github.com/googleapis/genai-toolbox/internal/auth/google"
-	"github.com/googleapis/genai-toolbox/internal/embeddingmodels/gemini"
+	"github.com/googleapis/genai-toolbox/cmd/internal"
 	"github.com/googleapis/genai-toolbox/internal/log"
-	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
-	"github.com/googleapis/genai-toolbox/internal/prompts"
-	"github.com/googleapis/genai-toolbox/internal/prompts/custom"
 	"github.com/googleapis/genai-toolbox/internal/server"
-	cloudsqlpgsrc "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
-	httpsrc "github.com/googleapis/genai-toolbox/internal/sources/http"
 	"github.com/googleapis/genai-toolbox/internal/telemetry"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
-	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/http"
-	"github.com/googleapis/genai-toolbox/internal/tools/postgres/postgressql"
 	"github.com/googleapis/genai-toolbox/internal/util"
-	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/spf13/cobra"
 )
 
@@ -76,15 +66,16 @@ func withDefaults(c server.ServerConfig) server.ServerConfig {
 	return c
 }
 
-func invokeCommand(args []string) (*Command, string, error) {
-	c := NewCommand()
+func invokeCommand(args []string) (*cobra.Command, *internal.ToolboxOptions, string, error) {
+	buf := new(bytes.Buffer)
+	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+	c := NewCommand(opts)
 
 	// Keep the test output quiet
 	c.SilenceUsage = true
 	c.SilenceErrors = true
 
 	// Capture output
-	buf := new(bytes.Buffer)
 	c.SetOut(buf)
 	c.SetErr(buf)
 	c.SetArgs(args)
@@ -96,22 +87,23 @@ func invokeCommand(args []string) (*Command, string, error) {
 
 	err := c.Execute()
 
-	return c, buf.String(), err
+	return c, opts, buf.String(), err
 }
 
 // invokeCommandWithContext executes the command with a context and returns the captured output.
-func invokeCommandWithContext(ctx context.Context, args []string) (*Command, string, error) {
-	// Capture output using a buffer
+func invokeCommandWithContext(ctx context.Context, args []string) (*cobra.Command, *internal.ToolboxOptions, string, error) {
 	buf := new(bytes.Buffer)
-	c := NewCommand(WithStreams(buf, buf))
+	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+	c := NewCommand(opts)
 
+	// Capture output using a buffer
 	c.SetArgs(args)
 	c.SilenceUsage = true
 	c.SilenceErrors = true
 	c.SetContext(ctx)
 
 	err := c.Execute()
-	return c, buf.String(), err
+	return c, opts, buf.String(), err
 }
 
 func TestVersion(t *testing.T) {
@@ -121,7 +113,7 @@ func TestVersion(t *testing.T) {
 	}
 	want := strings.TrimSpace(string(data))
 
-	_, got, err := invokeCommand([]string{"--version"})
+	_, _, got, err := invokeCommand([]string{"--version"})
 	if err != nil {
 		t.Fatalf("error invoking command: %s", err)
 	}
@@ -243,79 +235,13 @@ func TestServerConfigFlags(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			c, _, err := invokeCommand(tc.args)
+			_, opts, _, err := invokeCommand(tc.args)
 			if err != nil {
 				t.Fatalf("unexpected error invoking command: %s", err)
 			}
 
-			if !cmp.Equal(c.cfg, tc.want) {
-				t.Fatalf("got %v, want %v", c.cfg, tc.want)
-			}
-		})
-	}
-}
-
-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)
+			if !cmp.Equal(opts.Cfg, tc.want) {
+				t.Fatalf("got %v, want %v", opts.Cfg, tc.want)
 			}
 		})
 	}
@@ -350,12 +276,12 @@ func TestToolFileFlag(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			c, _, err := invokeCommand(tc.args)
+			_, opts, _, err := invokeCommand(tc.args)
 			if err != nil {
 				t.Fatalf("unexpected error invoking command: %s", err)
 			}
-			if c.tools_file != tc.want {
-				t.Fatalf("got %v, want %v", c.cfg, tc.want)
+			if opts.ToolsFile != tc.want {
+				t.Fatalf("got %v, want %v", opts.Cfg, tc.want)
 			}
 		})
 	}
@@ -385,12 +311,12 @@ func TestToolsFilesFlag(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			c, _, err := invokeCommand(tc.args)
+			_, opts, _, err := invokeCommand(tc.args)
 			if err != nil {
 				t.Fatalf("unexpected error invoking command: %s", err)
 			}
-			if diff := cmp.Diff(c.tools_files, tc.want); diff != "" {
-				t.Fatalf("got %v, want %v", c.tools_files, tc.want)
+			if diff := cmp.Diff(opts.ToolsFiles, tc.want); diff != "" {
+				t.Fatalf("got %v, want %v", opts.ToolsFiles, tc.want)
 			}
 		})
 	}
@@ -415,12 +341,12 @@ func TestToolsFolderFlag(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			c, _, err := invokeCommand(tc.args)
+			_, opts, _, err := invokeCommand(tc.args)
 			if err != nil {
 				t.Fatalf("unexpected error invoking command: %s", err)
 			}
-			if c.tools_folder != tc.want {
-				t.Fatalf("got %v, want %v", c.tools_folder, tc.want)
+			if opts.ToolsFolder != tc.want {
+				t.Fatalf("got %v, want %v", opts.ToolsFolder, tc.want)
 			}
 		})
 	}
@@ -455,12 +381,12 @@ func TestPrebuiltFlag(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			c, _, err := invokeCommand(tc.args)
+			_, opts, _, err := invokeCommand(tc.args)
 			if err != nil {
 				t.Fatalf("unexpected error invoking command: %s", err)
 			}
-			if diff := cmp.Diff(c.prebuiltConfigs, tc.want); diff != "" {
-				t.Fatalf("got %v, want %v, diff %s", c.prebuiltConfigs, tc.want, diff)
+			if diff := cmp.Diff(opts.PrebuiltConfigs, tc.want); diff != "" {
+				t.Fatalf("got %v, want %v, diff %s", opts.PrebuiltConfigs, tc.want, diff)
 			}
 		})
 	}
@@ -482,7 +408,7 @@ func TestFailServerConfigFlags(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			_, _, err := invokeCommand(tc.args)
+			_, _, _, err := invokeCommand(tc.args)
 			if err == nil {
 				t.Fatalf("expected an error, but got nil")
 			}
@@ -491,11 +417,11 @@ func TestFailServerConfigFlags(t *testing.T) {
 }
 
 func TestDefaultLoggingFormat(t *testing.T) {
-	c, _, err := invokeCommand([]string{})
+	_, opts, _, err := invokeCommand([]string{})
 	if err != nil {
 		t.Fatalf("unexpected error invoking command: %s", err)
 	}
-	got := c.cfg.LoggingFormat.String()
+	got := opts.Cfg.LoggingFormat.String()
 	want := "standard"
 	if got != want {
 		t.Fatalf("unexpected default logging format flag: got %v, want %v", got, want)
@@ -503,677 +429,17 @@ func TestDefaultLoggingFormat(t *testing.T) {
 }
 
 func TestDefaultLogLevel(t *testing.T) {
-	c, _, err := invokeCommand([]string{})
+	_, opts, _, err := invokeCommand([]string{})
 	if err != nil {
 		t.Fatalf("unexpected error invoking command: %s", err)
 	}
-	got := c.cfg.LogLevel.String()
+	got := opts.Cfg.LogLevel.String()
 	want := "info"
 	if got != want {
 		t.Fatalf("unexpected default log level flag: got %v, want %v", got, want)
 	}
 }
 
-func TestParseToolFile(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		description   string
-		in            string
-		wantToolsFile ToolsFile
-	}{
-		{
-			description: "basic example",
-			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-			tools:
-				example_tool:
-					kind: postgres-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-							type: string
-							description: some description
-			toolsets:
-				example_toolset:
-					- example_tool
-			`,
-			wantToolsFile: ToolsFile{
-				Sources: server.SourceConfigs{
-					"my-pg-instance": cloudsqlpgsrc.Config{
-						Name:     "my-pg-instance",
-						Kind:     cloudsqlpgsrc.SourceKind,
-						Project:  "my-project",
-						Region:   "my-region",
-						Instance: "my-instance",
-						IPType:   "public",
-						Database: "my_db",
-						User:     "my_user",
-						Password: "my_pass",
-					},
-				},
-				Tools: server.ToolConfigs{
-					"example_tool": postgressql.Config{
-						Name:        "example_tool",
-						Kind:        "postgres-sql",
-						Source:      "my-pg-instance",
-						Description: "some description",
-						Statement:   "SELECT * FROM SQL_STATEMENT;\n",
-						Parameters: []parameters.Parameter{
-							parameters.NewStringParameter("country", "some description"),
-						},
-						AuthRequired: []string{},
-					},
-				},
-				Toolsets: server.ToolsetConfigs{
-					"example_toolset": tools.ToolsetConfig{
-						Name:      "example_toolset",
-						ToolNames: []string{"example_tool"},
-					},
-				},
-				Prompts: nil,
-			},
-		},
-		{
-			description: "with prompts example",
-			in: `
-            prompts:
-                my-prompt:
-                    description: A prompt template for data analysis.
-                    arguments:
-                        - name: country
-                          description: The country to analyze.
-                    messages:
-                        - content: Analyze the data for {{.country}}.
-            `,
-			wantToolsFile: ToolsFile{
-				Sources:      nil,
-				AuthServices: nil,
-				Tools:        nil,
-				Toolsets:     nil,
-				Prompts: server.PromptConfigs{
-					"my-prompt": &custom.Config{
-						Name:        "my-prompt",
-						Description: "A prompt template for data analysis.",
-						Arguments: prompts.Arguments{
-							{Parameter: parameters.NewStringParameter("country", "The country to analyze.")},
-						},
-						Messages: []prompts.Message{
-							{Role: "user", Content: "Analyze the data for {{.country}}."},
-						},
-					},
-				},
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.description, func(t *testing.T) {
-			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
-			if err != nil {
-				t.Fatalf("failed to parse input: %v", err)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
-				t.Fatalf("incorrect sources parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
-				t.Fatalf("incorrect authServices parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
-				t.Fatalf("incorrect tools parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
-				t.Fatalf("incorrect toolsets parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Prompts, toolsFile.Prompts); diff != "" {
-				t.Fatalf("incorrect prompts parse: diff %v", diff)
-			}
-		})
-	}
-
-}
-
-func TestParseToolFileWithAuth(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		description   string
-		in            string
-		wantToolsFile ToolsFile
-	}{
-		{
-			description: "basic example",
-			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-			authServices:
-				my-google-service:
-					kind: google
-					clientId: my-client-id
-				other-google-service:
-					kind: google
-					clientId: other-client-id
-
-			tools:
-				example_tool:
-					kind: postgres-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						- name: id
-						  type: integer
-						  description: user id
-						  authServices:
-							- name: my-google-service
-								field: user_id
-						- name: email
-							type: string
-							description: user email
-							authServices:
-							- name: my-google-service
-							  field: email
-							- name: other-google-service
-							  field: other_email
-
-			toolsets:
-				example_toolset:
-					- example_tool
-			`,
-			wantToolsFile: ToolsFile{
-				Sources: server.SourceConfigs{
-					"my-pg-instance": cloudsqlpgsrc.Config{
-						Name:     "my-pg-instance",
-						Kind:     cloudsqlpgsrc.SourceKind,
-						Project:  "my-project",
-						Region:   "my-region",
-						Instance: "my-instance",
-						IPType:   "public",
-						Database: "my_db",
-						User:     "my_user",
-						Password: "my_pass",
-					},
-				},
-				AuthServices: server.AuthServiceConfigs{
-					"my-google-service": google.Config{
-						Name:     "my-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "my-client-id",
-					},
-					"other-google-service": google.Config{
-						Name:     "other-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "other-client-id",
-					},
-				},
-				Tools: server.ToolConfigs{
-					"example_tool": postgressql.Config{
-						Name:         "example_tool",
-						Kind:         "postgres-sql",
-						Source:       "my-pg-instance",
-						Description:  "some description",
-						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
-						AuthRequired: []string{},
-						Parameters: []parameters.Parameter{
-							parameters.NewStringParameter("country", "some description"),
-							parameters.NewIntParameterWithAuth("id", "user id", []parameters.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
-							parameters.NewStringParameterWithAuth("email", "user email", []parameters.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
-						},
-					},
-				},
-				Toolsets: server.ToolsetConfigs{
-					"example_toolset": tools.ToolsetConfig{
-						Name:      "example_toolset",
-						ToolNames: []string{"example_tool"},
-					},
-				},
-				Prompts: nil,
-			},
-		},
-		{
-			description: "basic example with authSources",
-			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-			authSources:
-				my-google-service:
-					kind: google
-					clientId: my-client-id
-				other-google-service:
-					kind: google
-					clientId: other-client-id
-
-			tools:
-				example_tool:
-					kind: postgres-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						- name: id
-						  type: integer
-						  description: user id
-						  authSources:
-							- name: my-google-service
-								field: user_id
-						- name: email
-							type: string
-							description: user email
-							authSources:
-							- name: my-google-service
-							  field: email
-							- name: other-google-service
-							  field: other_email
-
-			toolsets:
-				example_toolset:
-					- example_tool
-			`,
-			wantToolsFile: ToolsFile{
-				Sources: server.SourceConfigs{
-					"my-pg-instance": cloudsqlpgsrc.Config{
-						Name:     "my-pg-instance",
-						Kind:     cloudsqlpgsrc.SourceKind,
-						Project:  "my-project",
-						Region:   "my-region",
-						Instance: "my-instance",
-						IPType:   "public",
-						Database: "my_db",
-						User:     "my_user",
-						Password: "my_pass",
-					},
-				},
-				AuthSources: server.AuthServiceConfigs{
-					"my-google-service": google.Config{
-						Name:     "my-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "my-client-id",
-					},
-					"other-google-service": google.Config{
-						Name:     "other-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "other-client-id",
-					},
-				},
-				Tools: server.ToolConfigs{
-					"example_tool": postgressql.Config{
-						Name:         "example_tool",
-						Kind:         "postgres-sql",
-						Source:       "my-pg-instance",
-						Description:  "some description",
-						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
-						AuthRequired: []string{},
-						Parameters: []parameters.Parameter{
-							parameters.NewStringParameter("country", "some description"),
-							parameters.NewIntParameterWithAuth("id", "user id", []parameters.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
-							parameters.NewStringParameterWithAuth("email", "user email", []parameters.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
-						},
-					},
-				},
-				Toolsets: server.ToolsetConfigs{
-					"example_toolset": tools.ToolsetConfig{
-						Name:      "example_toolset",
-						ToolNames: []string{"example_tool"},
-					},
-				},
-				Prompts: nil,
-			},
-		},
-		{
-			description: "basic example with authRequired",
-			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-			authServices:
-				my-google-service:
-					kind: google
-					clientId: my-client-id
-				other-google-service:
-					kind: google
-					clientId: other-client-id
-
-			tools:
-				example_tool:
-					kind: postgres-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						- name: id
-						  type: integer
-						  description: user id
-						  authServices:
-							- name: my-google-service
-								field: user_id
-						- name: email
-							type: string
-							description: user email
-							authServices:
-							- name: my-google-service
-							  field: email
-							- name: other-google-service
-							  field: other_email
-
-			toolsets:
-				example_toolset:
-					- example_tool
-			`,
-			wantToolsFile: ToolsFile{
-				Sources: server.SourceConfigs{
-					"my-pg-instance": cloudsqlpgsrc.Config{
-						Name:     "my-pg-instance",
-						Kind:     cloudsqlpgsrc.SourceKind,
-						Project:  "my-project",
-						Region:   "my-region",
-						Instance: "my-instance",
-						IPType:   "public",
-						Database: "my_db",
-						User:     "my_user",
-						Password: "my_pass",
-					},
-				},
-				AuthServices: server.AuthServiceConfigs{
-					"my-google-service": google.Config{
-						Name:     "my-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "my-client-id",
-					},
-					"other-google-service": google.Config{
-						Name:     "other-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "other-client-id",
-					},
-				},
-				Tools: server.ToolConfigs{
-					"example_tool": postgressql.Config{
-						Name:         "example_tool",
-						Kind:         "postgres-sql",
-						Source:       "my-pg-instance",
-						Description:  "some description",
-						Statement:    "SELECT * FROM SQL_STATEMENT;\n",
-						AuthRequired: []string{"my-google-service"},
-						Parameters: []parameters.Parameter{
-							parameters.NewStringParameter("country", "some description"),
-							parameters.NewIntParameterWithAuth("id", "user id", []parameters.ParamAuthService{{Name: "my-google-service", Field: "user_id"}}),
-							parameters.NewStringParameterWithAuth("email", "user email", []parameters.ParamAuthService{{Name: "my-google-service", Field: "email"}, {Name: "other-google-service", Field: "other_email"}}),
-						},
-					},
-				},
-				Toolsets: server.ToolsetConfigs{
-					"example_toolset": tools.ToolsetConfig{
-						Name:      "example_toolset",
-						ToolNames: []string{"example_tool"},
-					},
-				},
-				Prompts: nil,
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.description, func(t *testing.T) {
-			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
-			if err != nil {
-				t.Fatalf("failed to parse input: %v", err)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
-				t.Fatalf("incorrect sources parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
-				t.Fatalf("incorrect authServices parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
-				t.Fatalf("incorrect tools parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
-				t.Fatalf("incorrect toolsets parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Prompts, toolsFile.Prompts); diff != "" {
-				t.Fatalf("incorrect prompts parse: diff %v", diff)
-			}
-		})
-	}
-
-}
-
-func TestEnvVarReplacement(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	t.Setenv("TestHeader", "ACTUAL_HEADER")
-	t.Setenv("API_KEY", "ACTUAL_API_KEY")
-	t.Setenv("clientId", "ACTUAL_CLIENT_ID")
-	t.Setenv("clientId2", "ACTUAL_CLIENT_ID_2")
-	t.Setenv("toolset_name", "ACTUAL_TOOLSET_NAME")
-	t.Setenv("cat_string", "cat")
-	t.Setenv("food_string", "food")
-	t.Setenv("TestHeader", "ACTUAL_HEADER")
-	t.Setenv("prompt_name", "ACTUAL_PROMPT_NAME")
-	t.Setenv("prompt_content", "ACTUAL_CONTENT")
-
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		description   string
-		in            string
-		wantToolsFile ToolsFile
-	}{
-		{
-			description: "file with env var example",
-			in: `
-			sources:
-				my-http-instance:
-					kind: http
-					baseUrl: http://test_server/
-					timeout: 10s
-					headers:
-						Authorization: ${TestHeader}
-					queryParams:
-						api-key: ${API_KEY}
-			authServices:
-				my-google-service:
-					kind: google
-					clientId: ${clientId}
-				other-google-service:
-					kind: google
-					clientId: ${clientId2}
-
-			tools:
-				example_tool:
-					kind: http
-					source: my-instance
-					method: GET
-					path: "search?name=alice&pet=${cat_string}"
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					queryParams:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					requestBody: |
-							{
-								"age": {{.age}},
-								"city": "{{.city}}",
-								"food": "${food_string}",
-								"other": "$OTHER"
-							}
-					bodyParams:
-						- name: age
-						  type: integer
-						  description: age num
-						- name: city
-						  type: string
-						  description: city string
-					headers:
-						Authorization: API_KEY
-						Content-Type: application/json
-					headerParams:
-						- name: Language
-						  type: string
-						  description: language string
-
-			toolsets:
-				${toolset_name}:
-					- example_tool
-
-						
-			prompts:
-				${prompt_name}:
-					description: A test prompt for {{.name}}.
-					messages:
-						- role: user
-						  content: ${prompt_content}
-			`,
-			wantToolsFile: ToolsFile{
-				Sources: server.SourceConfigs{
-					"my-http-instance": httpsrc.Config{
-						Name:           "my-http-instance",
-						Kind:           httpsrc.SourceKind,
-						BaseURL:        "http://test_server/",
-						Timeout:        "10s",
-						DefaultHeaders: map[string]string{"Authorization": "ACTUAL_HEADER"},
-						QueryParams:    map[string]string{"api-key": "ACTUAL_API_KEY"},
-					},
-				},
-				AuthServices: server.AuthServiceConfigs{
-					"my-google-service": google.Config{
-						Name:     "my-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "ACTUAL_CLIENT_ID",
-					},
-					"other-google-service": google.Config{
-						Name:     "other-google-service",
-						Kind:     google.AuthServiceKind,
-						ClientID: "ACTUAL_CLIENT_ID_2",
-					},
-				},
-				Tools: server.ToolConfigs{
-					"example_tool": http.Config{
-						Name:         "example_tool",
-						Kind:         "http",
-						Source:       "my-instance",
-						Method:       "GET",
-						Path:         "search?name=alice&pet=cat",
-						Description:  "some description",
-						AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
-						QueryParams: []parameters.Parameter{
-							parameters.NewStringParameterWithAuth("country", "some description",
-								[]parameters.ParamAuthService{{Name: "my-google-auth-service", Field: "user_id"},
-									{Name: "other-auth-service", Field: "user_id"}}),
-						},
-						RequestBody: `{
-  "age": {{.age}},
-  "city": "{{.city}}",
-  "food": "food",
-  "other": "$OTHER"
-}
-`,
-						BodyParams:   []parameters.Parameter{parameters.NewIntParameter("age", "age num"), parameters.NewStringParameter("city", "city string")},
-						Headers:      map[string]string{"Authorization": "API_KEY", "Content-Type": "application/json"},
-						HeaderParams: []parameters.Parameter{parameters.NewStringParameter("Language", "language string")},
-					},
-				},
-				Toolsets: server.ToolsetConfigs{
-					"ACTUAL_TOOLSET_NAME": tools.ToolsetConfig{
-						Name:      "ACTUAL_TOOLSET_NAME",
-						ToolNames: []string{"example_tool"},
-					},
-				},
-				Prompts: server.PromptConfigs{
-					"ACTUAL_PROMPT_NAME": &custom.Config{
-						Name:        "ACTUAL_PROMPT_NAME",
-						Description: "A test prompt for {{.name}}.",
-						Messages: []prompts.Message{
-							{
-								Role:    "user",
-								Content: "ACTUAL_CONTENT",
-							},
-						},
-						Arguments: nil,
-					},
-				},
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.description, func(t *testing.T) {
-			toolsFile, err := parseToolsFile(ctx, testutils.FormatYaml(tc.in))
-			if err != nil {
-				t.Fatalf("failed to parse input: %v", err)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Sources, toolsFile.Sources); diff != "" {
-				t.Fatalf("incorrect sources parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.AuthServices, toolsFile.AuthServices); diff != "" {
-				t.Fatalf("incorrect authServices parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Tools, toolsFile.Tools); diff != "" {
-				t.Fatalf("incorrect tools parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Toolsets, toolsFile.Toolsets); diff != "" {
-				t.Fatalf("incorrect toolsets parse: diff %v", diff)
-			}
-			if diff := cmp.Diff(tc.wantToolsFile.Prompts, toolsFile.Prompts); diff != "" {
-				t.Fatalf("incorrect prompts parse: diff %v", diff)
-			}
-		})
-	}
-}
-
 // normalizeFilepaths is a helper function to allow same filepath formats for Mac and Windows.
 // this prevents needing multiple "want" cases for TestResolveWatcherInputs
 func normalizeFilepaths(m map[string]bool) map[string]bool {
@@ -1352,468 +618,6 @@ func TestSingleEdit(t *testing.T) {
 	}
 }
 
-func TestPrebuiltTools(t *testing.T) {
-	// Get prebuilt configs
-	alloydb_admin_config, _ := prebuiltconfigs.Get("alloydb-postgres-admin")
-	alloydb_config, _ := prebuiltconfigs.Get("alloydb-postgres")
-	bigquery_config, _ := prebuiltconfigs.Get("bigquery")
-	clickhouse_config, _ := prebuiltconfigs.Get("clickhouse")
-	cloudsqlpg_config, _ := prebuiltconfigs.Get("cloud-sql-postgres")
-	cloudsqlpg_admin_config, _ := prebuiltconfigs.Get("cloud-sql-postgres-admin")
-	cloudsqlmysql_config, _ := prebuiltconfigs.Get("cloud-sql-mysql")
-	cloudsqlmysql_admin_config, _ := prebuiltconfigs.Get("cloud-sql-mysql-admin")
-	cloudsqlmssql_config, _ := prebuiltconfigs.Get("cloud-sql-mssql")
-	cloudsqlmssql_admin_config, _ := prebuiltconfigs.Get("cloud-sql-mssql-admin")
-	dataplex_config, _ := prebuiltconfigs.Get("dataplex")
-	firestoreconfig, _ := prebuiltconfigs.Get("firestore")
-	mysql_config, _ := prebuiltconfigs.Get("mysql")
-	mssql_config, _ := prebuiltconfigs.Get("mssql")
-	looker_config, _ := prebuiltconfigs.Get("looker")
-	lookerca_config, _ := prebuiltconfigs.Get("looker-conversational-analytics")
-	postgresconfig, _ := prebuiltconfigs.Get("postgres")
-	spanner_config, _ := prebuiltconfigs.Get("spanner")
-	spannerpg_config, _ := prebuiltconfigs.Get("spanner-postgres")
-	mindsdb_config, _ := prebuiltconfigs.Get("mindsdb")
-	sqlite_config, _ := prebuiltconfigs.Get("sqlite")
-	neo4jconfig, _ := prebuiltconfigs.Get("neo4j")
-	alloydbobsvconfig, _ := prebuiltconfigs.Get("alloydb-postgres-observability")
-	cloudsqlpgobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-postgres-observability")
-	cloudsqlmysqlobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-mysql-observability")
-	cloudsqlmssqlobsvconfig, _ := prebuiltconfigs.Get("cloud-sql-mssql-observability")
-	serverless_spark_config, _ := prebuiltconfigs.Get("serverless-spark")
-	cloudhealthcare_config, _ := prebuiltconfigs.Get("cloud-healthcare")
-	snowflake_config, _ := prebuiltconfigs.Get("snowflake")
-
-	// Set environment variables
-	t.Setenv("API_KEY", "your_api_key")
-
-	t.Setenv("BIGQUERY_PROJECT", "your_gcp_project_id")
-	t.Setenv("DATAPLEX_PROJECT", "your_gcp_project_id")
-	t.Setenv("FIRESTORE_PROJECT", "your_gcp_project_id")
-	t.Setenv("FIRESTORE_DATABASE", "your_firestore_db_name")
-
-	t.Setenv("SPANNER_PROJECT", "your_gcp_project_id")
-	t.Setenv("SPANNER_INSTANCE", "your_spanner_instance")
-	t.Setenv("SPANNER_DATABASE", "your_spanner_db")
-
-	t.Setenv("ALLOYDB_POSTGRES_PROJECT", "your_gcp_project_id")
-	t.Setenv("ALLOYDB_POSTGRES_REGION", "your_gcp_region")
-	t.Setenv("ALLOYDB_POSTGRES_CLUSTER", "your_alloydb_cluster")
-	t.Setenv("ALLOYDB_POSTGRES_INSTANCE", "your_alloydb_instance")
-	t.Setenv("ALLOYDB_POSTGRES_DATABASE", "your_alloydb_db")
-	t.Setenv("ALLOYDB_POSTGRES_USER", "your_alloydb_user")
-	t.Setenv("ALLOYDB_POSTGRES_PASSWORD", "your_alloydb_password")
-
-	t.Setenv("CLICKHOUSE_PROTOCOL", "your_clickhouse_protocol")
-	t.Setenv("CLICKHOUSE_DATABASE", "your_clickhouse_database")
-	t.Setenv("CLICKHOUSE_PASSWORD", "your_clickhouse_password")
-	t.Setenv("CLICKHOUSE_USER", "your_clickhouse_user")
-	t.Setenv("CLICKHOUSE_HOST", "your_clickhosue_host")
-	t.Setenv("CLICKHOUSE_PORT", "8123")
-
-	t.Setenv("CLOUD_SQL_POSTGRES_PROJECT", "your_pg_project")
-	t.Setenv("CLOUD_SQL_POSTGRES_INSTANCE", "your_pg_instance")
-	t.Setenv("CLOUD_SQL_POSTGRES_DATABASE", "your_pg_db")
-	t.Setenv("CLOUD_SQL_POSTGRES_REGION", "your_pg_region")
-	t.Setenv("CLOUD_SQL_POSTGRES_USER", "your_pg_user")
-	t.Setenv("CLOUD_SQL_POSTGRES_PASS", "your_pg_pass")
-
-	t.Setenv("CLOUD_SQL_MYSQL_PROJECT", "your_gcp_project_id")
-	t.Setenv("CLOUD_SQL_MYSQL_REGION", "your_gcp_region")
-	t.Setenv("CLOUD_SQL_MYSQL_INSTANCE", "your_instance")
-	t.Setenv("CLOUD_SQL_MYSQL_DATABASE", "your_cloudsql_mysql_db")
-	t.Setenv("CLOUD_SQL_MYSQL_USER", "your_cloudsql_mysql_user")
-	t.Setenv("CLOUD_SQL_MYSQL_PASSWORD", "your_cloudsql_mysql_password")
-
-	t.Setenv("CLOUD_SQL_MSSQL_PROJECT", "your_gcp_project_id")
-	t.Setenv("CLOUD_SQL_MSSQL_REGION", "your_gcp_region")
-	t.Setenv("CLOUD_SQL_MSSQL_INSTANCE", "your_cloudsql_mssql_instance")
-	t.Setenv("CLOUD_SQL_MSSQL_DATABASE", "your_cloudsql_mssql_db")
-	t.Setenv("CLOUD_SQL_MSSQL_IP_ADDRESS", "127.0.0.1")
-	t.Setenv("CLOUD_SQL_MSSQL_USER", "your_cloudsql_mssql_user")
-	t.Setenv("CLOUD_SQL_MSSQL_PASSWORD", "your_cloudsql_mssql_password")
-	t.Setenv("CLOUD_SQL_POSTGRES_PASSWORD", "your_cloudsql_pg_password")
-
-	t.Setenv("SERVERLESS_SPARK_PROJECT", "your_gcp_project_id")
-	t.Setenv("SERVERLESS_SPARK_LOCATION", "your_gcp_location")
-
-	t.Setenv("POSTGRES_HOST", "localhost")
-	t.Setenv("POSTGRES_PORT", "5432")
-	t.Setenv("POSTGRES_DATABASE", "your_postgres_db")
-	t.Setenv("POSTGRES_USER", "your_postgres_user")
-	t.Setenv("POSTGRES_PASSWORD", "your_postgres_password")
-
-	t.Setenv("MYSQL_HOST", "localhost")
-	t.Setenv("MYSQL_PORT", "3306")
-	t.Setenv("MYSQL_DATABASE", "your_mysql_db")
-	t.Setenv("MYSQL_USER", "your_mysql_user")
-	t.Setenv("MYSQL_PASSWORD", "your_mysql_password")
-
-	t.Setenv("MSSQL_HOST", "localhost")
-	t.Setenv("MSSQL_PORT", "1433")
-	t.Setenv("MSSQL_DATABASE", "your_mssql_db")
-	t.Setenv("MSSQL_USER", "your_mssql_user")
-	t.Setenv("MSSQL_PASSWORD", "your_mssql_password")
-
-	t.Setenv("MINDSDB_HOST", "localhost")
-	t.Setenv("MINDSDB_PORT", "47334")
-	t.Setenv("MINDSDB_DATABASE", "your_mindsdb_db")
-	t.Setenv("MINDSDB_USER", "your_mindsdb_user")
-	t.Setenv("MINDSDB_PASS", "your_mindsdb_password")
-
-	t.Setenv("LOOKER_BASE_URL", "https://your_company.looker.com")
-	t.Setenv("LOOKER_CLIENT_ID", "your_looker_client_id")
-	t.Setenv("LOOKER_CLIENT_SECRET", "your_looker_client_secret")
-	t.Setenv("LOOKER_VERIFY_SSL", "true")
-
-	t.Setenv("LOOKER_PROJECT", "your_project_id")
-	t.Setenv("LOOKER_LOCATION", "us")
-
-	t.Setenv("SQLITE_DATABASE", "test.db")
-
-	t.Setenv("NEO4J_URI", "bolt://localhost:7687")
-	t.Setenv("NEO4J_DATABASE", "neo4j")
-	t.Setenv("NEO4J_USERNAME", "your_neo4j_user")
-	t.Setenv("NEO4J_PASSWORD", "your_neo4j_password")
-
-	t.Setenv("CLOUD_HEALTHCARE_PROJECT", "your_gcp_project_id")
-	t.Setenv("CLOUD_HEALTHCARE_REGION", "your_gcp_region")
-	t.Setenv("CLOUD_HEALTHCARE_DATASET", "your_healthcare_dataset")
-
-	t.Setenv("SNOWFLAKE_ACCOUNT", "your_account")
-	t.Setenv("SNOWFLAKE_USER", "your_username")
-	t.Setenv("SNOWFLAKE_PASSWORD", "your_pass")
-	t.Setenv("SNOWFLAKE_DATABASE", "your_db")
-	t.Setenv("SNOWFLAKE_SCHEMA", "your_schema")
-	t.Setenv("SNOWFLAKE_WAREHOUSE", "your_wh")
-	t.Setenv("SNOWFLAKE_ROLE", "your_role")
-
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	tcs := []struct {
-		name        string
-		in          []byte
-		wantToolset server.ToolsetConfigs
-	}{
-		{
-			name: "alloydb postgres admin prebuilt tools",
-			in:   alloydb_admin_config,
-			wantToolset: server.ToolsetConfigs{
-				"alloydb_postgres_admin_tools": tools.ToolsetConfig{
-					Name:      "alloydb_postgres_admin_tools",
-					ToolNames: []string{"create_cluster", "wait_for_operation", "create_instance", "list_clusters", "list_instances", "list_users", "create_user", "get_cluster", "get_instance", "get_user"},
-				},
-			},
-		},
-		{
-			name: "cloudsql pg admin prebuilt tools",
-			in:   cloudsqlpg_admin_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_postgres_admin_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_postgres_admin_tools",
-					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "postgres_upgrade_precheck", "clone_instance", "create_backup", "restore_backup"},
-				},
-			},
-		},
-		{
-			name: "cloudsql mysql admin prebuilt tools",
-			in:   cloudsqlmysql_admin_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_mysql_admin_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_mysql_admin_tools",
-					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance", "create_backup", "restore_backup"},
-				},
-			},
-		},
-		{
-			name: "cloudsql mssql admin prebuilt tools",
-			in:   cloudsqlmssql_admin_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_mssql_admin_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_mssql_admin_tools",
-					ToolNames: []string{"create_instance", "get_instance", "list_instances", "create_database", "list_databases", "create_user", "wait_for_operation", "clone_instance", "create_backup", "restore_backup"},
-				},
-			},
-		},
-		{
-			name: "alloydb prebuilt tools",
-			in:   alloydb_config,
-			wantToolset: server.ToolsetConfigs{
-				"alloydb_postgres_database_tools": tools.ToolsetConfig{
-					Name:      "alloydb_postgres_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
-				},
-			},
-		},
-		{
-			name: "bigquery prebuilt tools",
-			in:   bigquery_config,
-			wantToolset: server.ToolsetConfigs{
-				"bigquery_database_tools": tools.ToolsetConfig{
-					Name:      "bigquery_database_tools",
-					ToolNames: []string{"analyze_contribution", "ask_data_insights", "execute_sql", "forecast", "get_dataset_info", "get_table_info", "list_dataset_ids", "list_table_ids", "search_catalog"},
-				},
-			},
-		},
-		{
-			name: "clickhouse prebuilt tools",
-			in:   clickhouse_config,
-			wantToolset: server.ToolsetConfigs{
-				"clickhouse_database_tools": tools.ToolsetConfig{
-					Name:      "clickhouse_database_tools",
-					ToolNames: []string{"execute_sql", "list_databases", "list_tables"},
-				},
-			},
-		},
-		{
-			name: "cloudsqlpg prebuilt tools",
-			in:   cloudsqlpg_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_postgres_database_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_postgres_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
-				},
-			},
-		},
-		{
-			name: "cloudsqlmysql prebuilt tools",
-			in:   cloudsqlmysql_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_mysql_database_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_mysql_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "get_query_plan", "list_active_queries", "list_tables_missing_unique_indexes", "list_table_fragmentation"},
-				},
-			},
-		},
-		{
-			name: "cloudsqlmssql prebuilt tools",
-			in:   cloudsqlmssql_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_mssql_database_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_mssql_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables"},
-				},
-			},
-		},
-		{
-			name: "dataplex prebuilt tools",
-			in:   dataplex_config,
-			wantToolset: server.ToolsetConfigs{
-				"dataplex_tools": tools.ToolsetConfig{
-					Name:      "dataplex_tools",
-					ToolNames: []string{"search_entries", "lookup_entry", "search_aspect_types"},
-				},
-			},
-		},
-		{
-			name: "serverless spark prebuilt tools",
-			in:   serverless_spark_config,
-			wantToolset: server.ToolsetConfigs{
-				"serverless_spark_tools": tools.ToolsetConfig{
-					Name:      "serverless_spark_tools",
-					ToolNames: []string{"list_batches", "get_batch", "cancel_batch", "create_pyspark_batch", "create_spark_batch"},
-				},
-			},
-		},
-		{
-			name: "firestore prebuilt tools",
-			in:   firestoreconfig,
-			wantToolset: server.ToolsetConfigs{
-				"firestore_database_tools": tools.ToolsetConfig{
-					Name:      "firestore_database_tools",
-					ToolNames: []string{"get_documents", "add_documents", "update_document", "list_collections", "delete_documents", "query_collection", "get_rules", "validate_rules"},
-				},
-			},
-		},
-		{
-			name: "mysql prebuilt tools",
-			in:   mysql_config,
-			wantToolset: server.ToolsetConfigs{
-				"mysql_database_tools": tools.ToolsetConfig{
-					Name:      "mysql_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "get_query_plan", "list_active_queries", "list_tables_missing_unique_indexes", "list_table_fragmentation"},
-				},
-			},
-		},
-		{
-			name: "mssql prebuilt tools",
-			in:   mssql_config,
-			wantToolset: server.ToolsetConfigs{
-				"mssql_database_tools": tools.ToolsetConfig{
-					Name:      "mssql_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables"},
-				},
-			},
-		},
-		{
-			name: "looker prebuilt tools",
-			in:   looker_config,
-			wantToolset: server.ToolsetConfigs{
-				"looker_tools": tools.ToolsetConfig{
-					Name:      "looker_tools",
-					ToolNames: []string{"get_models", "get_explores", "get_dimensions", "get_measures", "get_filters", "get_parameters", "query", "query_sql", "query_url", "get_looks", "run_look", "make_look", "get_dashboards", "run_dashboard", "make_dashboard", "add_dashboard_element", "add_dashboard_filter", "generate_embed_url", "health_pulse", "health_analyze", "health_vacuum", "dev_mode", "get_projects", "get_project_files", "get_project_file", "create_project_file", "update_project_file", "delete_project_file", "get_connections", "get_connection_schemas", "get_connection_databases", "get_connection_tables", "get_connection_table_columns"},
-				},
-			},
-		},
-		{
-			name: "looker-conversational-analytics prebuilt tools",
-			in:   lookerca_config,
-			wantToolset: server.ToolsetConfigs{
-				"looker_conversational_analytics_tools": tools.ToolsetConfig{
-					Name:      "looker_conversational_analytics_tools",
-					ToolNames: []string{"ask_data_insights", "get_models", "get_explores"},
-				},
-			},
-		},
-		{
-			name: "postgres prebuilt tools",
-			in:   postgresconfig,
-			wantToolset: server.ToolsetConfigs{
-				"postgres_database_tools": tools.ToolsetConfig{
-					Name:      "postgres_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables", "list_active_queries", "list_available_extensions", "list_installed_extensions", "list_autovacuum_configurations", "list_memory_configurations", "list_top_bloated_tables", "list_replication_slots", "list_invalid_indexes", "get_query_plan", "list_views", "list_schemas", "database_overview", "list_triggers", "list_indexes", "list_sequences", "long_running_transactions", "list_locks", "replication_stats", "list_query_stats", "get_column_cardinality", "list_publication_tables", "list_tablespaces", "list_pg_settings", "list_database_stats", "list_roles", "list_table_stats", "list_stored_procedure"},
-				},
-			},
-		},
-		{
-			name: "spanner prebuilt tools",
-			in:   spanner_config,
-			wantToolset: server.ToolsetConfigs{
-				"spanner-database-tools": tools.ToolsetConfig{
-					Name:      "spanner-database-tools",
-					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables", "list_graphs"},
-				},
-			},
-		},
-		{
-			name: "spanner pg prebuilt tools",
-			in:   spannerpg_config,
-			wantToolset: server.ToolsetConfigs{
-				"spanner_postgres_database_tools": tools.ToolsetConfig{
-					Name:      "spanner_postgres_database_tools",
-					ToolNames: []string{"execute_sql", "execute_sql_dql", "list_tables"},
-				},
-			},
-		},
-		{
-			name: "mindsdb prebuilt tools",
-			in:   mindsdb_config,
-			wantToolset: server.ToolsetConfigs{
-				"mindsdb-tools": tools.ToolsetConfig{
-					Name:      "mindsdb-tools",
-					ToolNames: []string{"mindsdb-execute-sql", "mindsdb-sql"},
-				},
-			},
-		},
-		{
-			name: "sqlite prebuilt tools",
-			in:   sqlite_config,
-			wantToolset: server.ToolsetConfigs{
-				"sqlite_database_tools": tools.ToolsetConfig{
-					Name:      "sqlite_database_tools",
-					ToolNames: []string{"execute_sql", "list_tables"},
-				},
-			},
-		},
-		{
-			name: "neo4j prebuilt tools",
-			in:   neo4jconfig,
-			wantToolset: server.ToolsetConfigs{
-				"neo4j_database_tools": tools.ToolsetConfig{
-					Name:      "neo4j_database_tools",
-					ToolNames: []string{"execute_cypher", "get_schema"},
-				},
-			},
-		},
-		{
-			name: "alloydb postgres observability prebuilt tools",
-			in:   alloydbobsvconfig,
-			wantToolset: server.ToolsetConfigs{
-				"alloydb_postgres_cloud_monitoring_tools": tools.ToolsetConfig{
-					Name:      "alloydb_postgres_cloud_monitoring_tools",
-					ToolNames: []string{"get_system_metrics", "get_query_metrics"},
-				},
-			},
-		},
-		{
-			name: "cloudsql postgres observability prebuilt tools",
-			in:   cloudsqlpgobsvconfig,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_postgres_cloud_monitoring_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_postgres_cloud_monitoring_tools",
-					ToolNames: []string{"get_system_metrics", "get_query_metrics"},
-				},
-			},
-		},
-		{
-			name: "cloudsql mysql observability prebuilt tools",
-			in:   cloudsqlmysqlobsvconfig,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_mysql_cloud_monitoring_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_mysql_cloud_monitoring_tools",
-					ToolNames: []string{"get_system_metrics", "get_query_metrics"},
-				},
-			},
-		},
-		{
-			name: "cloudsql mssql observability prebuilt tools",
-			in:   cloudsqlmssqlobsvconfig,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_sql_mssql_cloud_monitoring_tools": tools.ToolsetConfig{
-					Name:      "cloud_sql_mssql_cloud_monitoring_tools",
-					ToolNames: []string{"get_system_metrics"},
-				},
-			},
-		},
-		{
-			name: "cloud healthcare prebuilt tools",
-			in:   cloudhealthcare_config,
-			wantToolset: server.ToolsetConfigs{
-				"cloud_healthcare_dataset_tools": tools.ToolsetConfig{
-					Name:      "cloud_healthcare_dataset_tools",
-					ToolNames: []string{"get_dataset", "list_dicom_stores", "list_fhir_stores"},
-				},
-				"cloud_healthcare_fhir_tools": tools.ToolsetConfig{
-					Name:      "cloud_healthcare_fhir_tools",
-					ToolNames: []string{"get_fhir_store", "get_fhir_store_metrics", "get_fhir_resource", "fhir_patient_search", "fhir_patient_everything", "fhir_fetch_page"},
-				},
-				"cloud_healthcare_dicom_tools": tools.ToolsetConfig{
-					Name:      "cloud_healthcare_dicom_tools",
-					ToolNames: []string{"get_dicom_store", "get_dicom_store_metrics", "search_dicom_studies", "search_dicom_series", "search_dicom_instances", "retrieve_rendered_dicom_instance"},
-				},
-			},
-		},
-		{
-			name: "Snowflake prebuilt tool",
-			in:   snowflake_config,
-			wantToolset: server.ToolsetConfigs{
-				"snowflake_tools": tools.ToolsetConfig{
-					Name:      "snowflake_tools",
-					ToolNames: []string{"execute_sql", "list_tables"},
-				},
-			},
-		},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.name, func(t *testing.T) {
-			toolsFile, err := parseToolsFile(ctx, tc.in)
-			if err != nil {
-				t.Fatalf("failed to parse input: %v", err)
-			}
-			if diff := cmp.Diff(tc.wantToolset, toolsFile.Toolsets); diff != "" {
-				t.Fatalf("incorrect tools parse: diff %v", diff)
-			}
-			// Prebuilt configs do not have prompts, so assert empty maps.
-			if len(toolsFile.Prompts) != 0 {
-				t.Fatalf("expected empty prompts map for prebuilt config, got: %v", toolsFile.Prompts)
-			}
-		})
-	}
-}
-
 func TestMutuallyExclusiveFlags(t *testing.T) {
 	testCases := []struct {
 		desc      string
@@ -1834,7 +638,9 @@ func TestMutuallyExclusiveFlags(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.desc, func(t *testing.T) {
-			cmd := NewCommand()
+			buf := new(bytes.Buffer)
+			opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+			cmd := NewCommand(opts)
 			cmd.SetArgs(tc.args)
 			err := cmd.Execute()
 			if err == nil {
@@ -1849,7 +655,9 @@ func TestMutuallyExclusiveFlags(t *testing.T) {
 
 func TestFileLoadingErrors(t *testing.T) {
 	t.Run("non-existent tools-file", func(t *testing.T) {
-		cmd := NewCommand()
+		buf := new(bytes.Buffer)
+		opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+		cmd := NewCommand(opts)
 		// Use a file that is guaranteed not to exist
 		nonExistentFile := filepath.Join(t.TempDir(), "non-existent-tools.yaml")
 		cmd.SetArgs([]string{"--tools-file", nonExistentFile})
@@ -1864,7 +672,9 @@ func TestFileLoadingErrors(t *testing.T) {
 	})
 
 	t.Run("non-existent tools-folder", func(t *testing.T) {
-		cmd := NewCommand()
+		buf := new(bytes.Buffer)
+		opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+		cmd := NewCommand(opts)
 		nonExistentFolder := filepath.Join(t.TempDir(), "non-existent-folder")
 		cmd.SetArgs([]string{"--tools-folder", nonExistentFolder})
 
@@ -1878,109 +688,22 @@ func TestFileLoadingErrors(t *testing.T) {
 	})
 }
 
-func TestMergeToolsFiles(t *testing.T) {
-	file1 := ToolsFile{
-		Sources:         server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
-		Tools:           server.ToolConfigs{"tool1": http.Config{Name: "tool1"}},
-		Toolsets:        server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}},
-		EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
-	}
-	file2 := ToolsFile{
-		AuthServices: server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
-		Tools:        server.ToolConfigs{"tool2": http.Config{Name: "tool2"}},
-		Toolsets:     server.ToolsetConfigs{"set2": tools.ToolsetConfig{Name: "set2"}},
-	}
-	fileWithConflicts := ToolsFile{
-		Sources: server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
-		Tools:   server.ToolConfigs{"tool2": http.Config{Name: "tool2"}},
-	}
-
-	testCases := []struct {
-		name    string
-		files   []ToolsFile
-		want    ToolsFile
-		wantErr bool
-	}{
-		{
-			name:  "merge two distinct files",
-			files: []ToolsFile{file1, file2},
-			want: ToolsFile{
-				Sources:         server.SourceConfigs{"source1": httpsrc.Config{Name: "source1"}},
-				AuthServices:    server.AuthServiceConfigs{"auth1": google.Config{Name: "auth1"}},
-				Tools:           server.ToolConfigs{"tool1": http.Config{Name: "tool1"}, "tool2": http.Config{Name: "tool2"}},
-				Toolsets:        server.ToolsetConfigs{"set1": tools.ToolsetConfig{Name: "set1"}, "set2": tools.ToolsetConfig{Name: "set2"}},
-				Prompts:         server.PromptConfigs{},
-				EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
-			},
-			wantErr: false,
-		},
-		{
-			name:    "merge with conflicts",
-			files:   []ToolsFile{file1, file2, fileWithConflicts},
-			wantErr: true,
-		},
-		{
-			name:  "merge single file",
-			files: []ToolsFile{file1},
-			want: ToolsFile{
-				Sources:         file1.Sources,
-				AuthServices:    make(server.AuthServiceConfigs),
-				EmbeddingModels: server.EmbeddingModelConfigs{"model1": gemini.Config{Name: "gemini-text"}},
-				Tools:           file1.Tools,
-				Toolsets:        file1.Toolsets,
-				Prompts:         server.PromptConfigs{},
-			},
-		},
-		{
-			name:  "merge empty list",
-			files: []ToolsFile{},
-			want: ToolsFile{
-				Sources:         make(server.SourceConfigs),
-				AuthServices:    make(server.AuthServiceConfigs),
-				EmbeddingModels: make(server.EmbeddingModelConfigs),
-				Tools:           make(server.ToolConfigs),
-				Toolsets:        make(server.ToolsetConfigs),
-				Prompts:         server.PromptConfigs{},
-			},
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			got, err := mergeToolsFiles(tc.files...)
-			if (err != nil) != tc.wantErr {
-				t.Fatalf("mergeToolsFiles() error = %v, wantErr %v", err, tc.wantErr)
-			}
-			if !tc.wantErr {
-				if diff := cmp.Diff(tc.want, got); diff != "" {
-					t.Errorf("mergeToolsFiles() mismatch (-want +got):\n%s", diff)
-				}
-			} else {
-				if err == nil {
-					t.Fatal("expected an error for conflicting files but got none")
-				}
-				if !strings.Contains(err.Error(), "resource conflicts detected") {
-					t.Errorf("expected conflict error, but got: %v", err)
-				}
-			}
-		})
-	}
-}
 func TestPrebuiltAndCustomTools(t *testing.T) {
 	t.Setenv("SQLITE_DATABASE", "test.db")
 	// Setup custom tools file
 	customContent := `
-tools:
-  custom_tool:
-    kind: http
-    source: my-http
-    method: GET
-    path: /
-    description: "A custom tool for testing"
-sources:
-  my-http:
-    kind: http
-    baseUrl: http://example.com
+kind: tools
+name: custom_tool
+type: http
+source: my-http
+method: GET
+path: /
+description: "A custom tool for testing"
+---
+kind: sources
+name: my-http
+type: http
+baseUrl: http://example.com
 `
 	customFile := filepath.Join(t.TempDir(), "custom.yaml")
 	if err := os.WriteFile(customFile, []byte(customContent), 0644); err != nil {
@@ -1990,17 +713,18 @@ sources:
 	// Tool Conflict File
 	// SQLite prebuilt has a tool named 'list_tables'
 	toolConflictContent := `
-tools:
-  list_tables:
-    kind: http
-    source: my-http
-    method: GET
-    path: /
-    description: "Conflicting tool"
-sources:
-  my-http:
-    kind: http
-    baseUrl: http://example.com
+kind: tools
+name: list_tables
+type: http
+source: my-http
+method: GET
+path: /
+description: "Conflicting tool"
+---
+kind: sources
+name: my-http
+type: http
+baseUrl: http://example.com
 `
 	toolConflictFile := filepath.Join(t.TempDir(), "tool_conflict.yaml")
 	if err := os.WriteFile(toolConflictFile, []byte(toolConflictContent), 0644); err != nil {
@@ -2010,17 +734,18 @@ sources:
 	// Source Conflict File
 	// SQLite prebuilt has a source named 'sqlite-source'
 	sourceConflictContent := `
-sources:
-  sqlite-source:
-    kind: http
-    baseUrl: http://example.com
-tools:
-  dummy_tool:
-    kind: http
-    source: sqlite-source
-    method: GET
-    path: /
-    description: "Dummy"
+kind: sources
+name: sqlite-source
+type: http
+baseUrl: http://example.com
+---
+kind: tools
+name: dummy_tool
+type: http
+source: sqlite-source
+method: GET
+path: /
+description: "Dummy"
 `
 	sourceConflictFile := filepath.Join(t.TempDir(), "source_conflict.yaml")
 	if err := os.WriteFile(sourceConflictFile, []byte(sourceConflictContent), 0644); err != nil {
@@ -2030,20 +755,23 @@ tools:
 	// Toolset Conflict File
 	// SQLite prebuilt has a toolset named 'sqlite_database_tools'
 	toolsetConflictContent := `
-sources:
-  dummy-src:
-    kind: http
-    baseUrl: http://example.com
+kind: sources
+name: dummy-src
+type: http
+baseUrl: http://example.com
+---
+kind: tools
+name: dummy_tool
+type: http
+source: dummy-src
+method: GET
+path: /
+description: "Dummy"
+---
+kind: toolsets
+name: sqlite_database_tools
 tools:
-  dummy_tool:
-    kind: http
-    source: dummy-src
-    method: GET
-    path: /
-    description: "Dummy"
-toolsets:
-  sqlite_database_tools:
-    - dummy_tool
+- dummy_tool
 `
 	toolsetConflictFile := filepath.Join(t.TempDir(), "toolset_conflict.yaml")
 	if err := os.WriteFile(toolsetConflictFile, []byte(toolsetConflictContent), 0644); err != nil {
@@ -2125,7 +853,7 @@ authSources:
 			ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
 			defer cancel()
 
-			cmd, output, err := invokeCommandWithContext(ctx, tc.args)
+			_, opts, output, err := invokeCommandWithContext(ctx, tc.args)
 
 			if tc.wantErr {
 				if err == nil {
@@ -2142,7 +870,7 @@ authSources:
 					t.Errorf("server did not start successfully (no ready message found). Output:\n%s", output)
 				}
 				if tc.cfgCheck != nil {
-					if err := tc.cfgCheck(cmd.cfg); err != nil {
+					if err := tc.cfgCheck(opts.Cfg); err != nil {
 						t.Errorf("config check failed: %v", err)
 					}
 				}
@@ -2176,7 +904,7 @@ func TestDefaultToolsFileBehavior(t *testing.T) {
 		t.Run(tc.desc, func(t *testing.T) {
 			ctx, cancel := context.WithTimeout(context.Background(), 500*time.Millisecond)
 			defer cancel()
-			_, output, err := invokeCommandWithContext(ctx, tc.args)
+			_, _, output, err := invokeCommandWithContext(ctx, tc.args)
 
 			if tc.expectRun {
 				if err != nil && err != context.DeadlineExceeded && err != context.Canceled {
@@ -2198,114 +926,29 @@ func TestDefaultToolsFileBehavior(t *testing.T) {
 	}
 }
 
-func TestParameterReferenceValidation(t *testing.T) {
-	ctx, err := testutils.ContextWithNewLogger()
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
+func TestSubcommandWiring(t *testing.T) {
+	buf := new(bytes.Buffer)
+	opts := internal.NewToolboxOptions(internal.WithIOStreams(buf, buf))
+	baseCmd := NewCommand(opts)
 
-	// Base template
-	baseYaml := `
-sources:
-  dummy-source:
-    kind: http
-    baseUrl: http://example.com
-tools:
-  test-tool:
-    kind: postgres-sql
-    source: dummy-source
-    description: test tool
-    statement: SELECT 1;
-    parameters:
-%s`
-
-	tcs := []struct {
-		desc      string
-		params    string
-		wantErr   bool
-		errSubstr string
+	tests := []struct {
+		args         []string
+		expectedName string
 	}{
-		{
-			desc: "valid backward reference",
-			params: `
-      - name: source_param
-        type: string
-        description: source
-      - name: copy_param
-        type: string
-        description: copy
-        valueFromParam: source_param`,
-			wantErr: false,
-		},
-		{
-			desc: "valid forward reference (out of order)",
-			params: `
-      - name: copy_param
-        type: string
-        description: copy
-        valueFromParam: source_param
-      - name: source_param
-        type: string
-        description: source`,
-			wantErr: false,
-		},
-		{
-			desc: "invalid missing reference",
-			params: `
-      - name: copy_param
-        type: string
-        description: copy
-        valueFromParam: non_existent_param`,
-			wantErr:   true,
-			errSubstr: "references '\"non_existent_param\"' in the 'valueFromParam' field",
-		},
-		{
-			desc: "invalid self reference",
-			params: `
-      - name: myself
-        type: string
-        description: self
-        valueFromParam: myself`,
-			wantErr:   true,
-			errSubstr: "parameter \"myself\" cannot copy value from itself",
-		},
-		{
-			desc: "multiple valid references",
-			params: `
-      - name: a
-        type: string
-        description: a
-      - name: b
-        type: string
-        description: b
-        valueFromParam: a
-      - name: c
-        type: string
-        description: c
-        valueFromParam: a`,
-			wantErr: false,
-		},
+		{[]string{"invoke"}, "invoke"},
+		{[]string{"skills-generate"}, "skills-generate"},
 	}
 
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			// Indent parameters to match YAML structure
-			yamlContent := fmt.Sprintf(baseYaml, tc.params)
+	for _, tc := range tests {
+		// Find returns the Command struct and the remaining args
+		cmd, _, err := baseCmd.Find(tc.args)
 
-			_, err := parseToolsFile(ctx, []byte(yamlContent))
+		if err != nil {
+			t.Fatalf("Failed to find command %v: %v", tc.args, err)
+		}
 
-			if tc.wantErr {
-				if err == nil {
-					t.Fatal("expected error, got nil")
-				}
-				if !strings.Contains(err.Error(), tc.errSubstr) {
-					t.Errorf("error %q does not contain expected substring %q", err.Error(), tc.errSubstr)
-				}
-			} else {
-				if err != nil {
-					t.Fatalf("unexpected error: %v", err)
-				}
-			}
-		})
+		if cmd.Name() != tc.expectedName {
+			t.Errorf("Expected command name %q, got %q", tc.expectedName, cmd.Name())
+		}
 	}
 }
diff --git a/cmd/version.txt b/cmd/version.txt
index 4e8f395fa5..1b58cc1018 100644
--- a/cmd/version.txt
+++ b/cmd/version.txt
@@ -1 +1 @@
-0.26.0
+0.27.0
diff --git a/docs/ALLOYDBADMIN_README.md b/docs/ALLOYDBADMIN_README.md
index 489dfb0cea..bea3f66ef1 100644
--- a/docs/ALLOYDBADMIN_README.md
+++ b/docs/ALLOYDBADMIN_README.md
@@ -23,6 +23,14 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
+> [!NOTE]
+> On first use, the installation process automatically downloads and uses
+> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+> `>=0.26.0`. To update MCP Toolbox, use:
+> ```npm i -g @toolbox-sdk/server@latest```
+> To always run the latest version, update the MCP server configuration to use:
+> ```npx -y @toolbox-sdk/server@latest --prebuilt alloydb-postgres-admin```.
+
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]
diff --git a/docs/ALLOYDBPG_README.md b/docs/ALLOYDBPG_README.md
index 2e03b785d3..881aa5b354 100644
--- a/docs/ALLOYDBPG_README.md
+++ b/docs/ALLOYDBPG_README.md
@@ -27,6 +27,13 @@ For AlloyDB infrastructure management, search the MCP store for the AlloyDB for
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt alloydb-postgres```.
 
 2. Add the required inputs for your [cluster](https://docs.cloud.google.com/alloydb/docs/cluster-list) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/BIGQUERY_README.md b/docs/BIGQUERY_README.md
index dbc96564df..ad43da9b2f 100644
--- a/docs/BIGQUERY_README.md
+++ b/docs/BIGQUERY_README.md
@@ -21,6 +21,13 @@ An editor configured to use the BigQuery MCP server can use its AI capabilities
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt bigquery```.
 
 2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/CLOUDSQLMSSQLADMIN_README.md b/docs/CLOUDSQLMSSQLADMIN_README.md
index 69130434aa..51829bde22 100644
--- a/docs/CLOUDSQLMSSQLADMIN_README.md
+++ b/docs/CLOUDSQLMSSQLADMIN_README.md
@@ -23,6 +23,14 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
+> [!NOTE]
+> On first use, the installation process automatically downloads and uses
+> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+> `>=0.26.0`. To update MCP Toolbox, use:
+> ```npm i -g @toolbox-sdk/server@latest```
+> To always run the latest version, update the MCP server configuration to use:
+> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mssql-admin```.
+
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]
diff --git a/docs/CLOUDSQLMSSQL_README.md b/docs/CLOUDSQLMSSQL_README.md
index 9b1385f8b8..bcd2b12735 100644
--- a/docs/CLOUDSQLMSSQL_README.md
+++ b/docs/CLOUDSQLMSSQL_README.md
@@ -24,6 +24,13 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mssql```.
 
 2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/sqlserver/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/CLOUDSQLMYSQLADMIN_README.md b/docs/CLOUDSQLMYSQLADMIN_README.md
index 5ab9258a21..83122376b9 100644
--- a/docs/CLOUDSQLMYSQLADMIN_README.md
+++ b/docs/CLOUDSQLMYSQLADMIN_README.md
@@ -23,6 +23,14 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
+> [!NOTE]
+> On first use, the installation process automatically downloads and uses
+> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+> `>=0.26.0`. To update MCP Toolbox, use:
+> ```npm i -g @toolbox-sdk/server@latest```
+> To always run the latest version, update the MCP server configuration to use:
+> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mysql-admin```.
+
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]
diff --git a/docs/CLOUDSQLMYSQL_README.md b/docs/CLOUDSQLMYSQL_README.md
index 4eb5ee1975..f7f4c1d8c1 100644
--- a/docs/CLOUDSQLMYSQL_README.md
+++ b/docs/CLOUDSQLMYSQL_README.md
@@ -26,6 +26,13 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mysql```.
 
 2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/mysql/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/CLOUDSQLPGADMIN_README.md b/docs/CLOUDSQLPGADMIN_README.md
index c1b594ea49..530348c805 100644
--- a/docs/CLOUDSQLPGADMIN_README.md
+++ b/docs/CLOUDSQLPGADMIN_README.md
@@ -23,6 +23,14 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
+> [!NOTE]
+> On first use, the installation process automatically downloads and uses
+> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+> `>=0.26.0`. To update MCP Toolbox, use:
+> ```npm i -g @toolbox-sdk/server@latest```
+> To always run the latest version, update the MCP server configuration to use:
+> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-postgres-admin```.
+
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]
diff --git a/docs/CLOUDSQLPG_README.md b/docs/CLOUDSQLPG_README.md
index a30bd002b8..eaeb5f8e5f 100644
--- a/docs/CLOUDSQLPG_README.md
+++ b/docs/CLOUDSQLPG_README.md
@@ -26,6 +26,13 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-postgres```.
 
 2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/postgres/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/DATAPLEX_README.md b/docs/DATAPLEX_README.md
index f40f4eb909..cd593e4c38 100644
--- a/docs/DATAPLEX_README.md
+++ b/docs/DATAPLEX_README.md
@@ -20,6 +20,13 @@ An editor configured to use the Dataplex MCP server can use its AI capabilities
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt dataplex```.
 
 2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/LOOKER_README.md b/docs/LOOKER_README.md
index e1fc6bab24..5283c3d14d 100644
--- a/docs/LOOKER_README.md
+++ b/docs/LOOKER_README.md
@@ -21,6 +21,13 @@ An editor configured to use the Looker MCP server can use its AI capabilities to
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt looker```.
 
 2. Add the required inputs for your [instance](https://docs.cloud.google.com/looker/docs/set-up-and-administer-looker) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/SPANNER_README.md b/docs/SPANNER_README.md
index f4bf32cd19..646699bf84 100644
--- a/docs/SPANNER_README.md
+++ b/docs/SPANNER_README.md
@@ -21,6 +21,13 @@ An editor configured to use the Cloud Spanner MCP server can use its AI capabili
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest --prebuilt spanner```.
 
 2. Add the required inputs for your [instance](https://docs.cloud.google.com/spanner/docs/instances) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 
diff --git a/docs/TOOLBOX_README.md b/docs/TOOLBOX_README.md
index 170c71e183..3e7c0cd972 100644
--- a/docs/TOOLBOX_README.md
+++ b/docs/TOOLBOX_README.md
@@ -12,10 +12,17 @@ The MCP Toolbox for Databases Server gives AI-powered development tools the abil
 ## Install & Configuration
 
 1.  In the Antigravity MCP Store, click the **Install** button. A configuration window will appear.
+    > [!NOTE]
+    > On first use, the installation process automatically downloads and uses
+    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
+    > `>=0.26.0`. To update MCP Toolbox, use:
+    > ```npm i -g @toolbox-sdk/server@latest```
+    > To always run the latest version, update the MCP server configuration to use:
+    > ```npx -y @toolbox-sdk/server@latest```. 
 
-2.  Create your [`tools.yaml` configuration file](https://googleapis.github.io/genai-toolbox/getting-started/configure/).
+3.  Create your [`tools.yaml` configuration file](https://googleapis.github.io/genai-toolbox/getting-started/configure/).
 
-3.  In the configuration window, enter the full absolute path to your `tools.yaml` file and click **Save**.
+4.  In the configuration window, enter the full absolute path to your `tools.yaml` file and click **Save**.
 
 > [!NOTE]
 > If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
diff --git a/docs/en/about/faq.md b/docs/en/about/faq.md
index 683c49c6b0..5ab557e099 100644
--- a/docs/en/about/faq.md
+++ b/docs/en/about/faq.md
@@ -45,7 +45,7 @@ most popular issues, so make sure to +1 ones you are the most interested in.
 ## Can Toolbox be used for non-database tools?
 
 **Yes!** While Toolbox is primarily focused on databases, it also supports generic 
-**HTTP tools** (`kind: http`). These allow you to connect your agents to REST APIs 
+**HTTP tools** (`type: http`). These allow you to connect your agents to REST APIs 
 and other web services, enabling workflows that extend beyond database interactions.
 
 For configuration details, see the [HTTP Tools documentation](../resources/tools/http/http.md).
diff --git a/docs/en/concepts/telemetry/index.md b/docs/en/concepts/telemetry/index.md
index 49b7c9edca..9bd1598052 100644
--- a/docs/en/concepts/telemetry/index.md
+++ b/docs/en/concepts/telemetry/index.md
@@ -64,7 +64,7 @@ The structured logging outputs log as JSON:
   "timestamp":"2024-11-04T16:45:11.987299-08:00",
   "severity":"ERROR",
   "logging.googleapis.com/sourceLocation":{...},
-  "message":"unable to parse tool file at \"tools.yaml\": \"cloud-sql-postgres1\" is not a valid kind of data source"
+  "message":"unable to parse tool file at \"tools.yaml\": \"cloud-sql-postgres1\" is not a valid type of data source"
 }
 ```
 
diff --git a/docs/en/getting-started/colab_quickstart.ipynb b/docs/en/getting-started/colab_quickstart.ipynb
index 4260b60bb3..a12429180d 100644
--- a/docs/en/getting-started/colab_quickstart.ipynb
+++ b/docs/en/getting-started/colab_quickstart.ipynb
@@ -234,7 +234,7 @@
       },
       "outputs": [],
       "source": [
-        "version = \"0.26.0\" # x-release-please-version\n",
+        "version = \"0.27.0\" # x-release-please-version\n",
         "! curl -O https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
         "\n",
         "# Make the binary executable\n",
@@ -300,78 +300,89 @@
         "# You can also upload a tools file and use that to run toolbox.\n",
         "tools_file_name = \"tools.yml\"\n",
         "file_content = f\"\"\"\n",
-        "sources:\n",
-        "  my-pg-source:\n",
-        "    kind: postgres\n",
-        "    host: 127.0.0.1\n",
-        "    port: 5432\n",
-        "    database: toolbox_db\n",
-        "    user: toolbox_user\n",
-        "    password: my-password\n",
+        "kind: sources\n",
+        "name: my-pg-source\n",
+        "type: postgres\n",
+        "host: 127.0.0.1\n",
+        "port: 5432\n",
+        "database: toolbox_db\n",
+        "user: toolbox_user\n",
+        "password: my-password\n",
+        "---\n",
+        "kind: tools\n",
+        "name: search-hotels-by-name\n",
+        "type: postgres-sql\n",
+        "source: my-pg-source\n",
+        "description: Search for hotels based on name.\n",
+        "parameters:\n",
+        "  - name: name\n",
+        "    type: string\n",
+        "    description: The name of the hotel.\n",
+        "statement: SELECT * FROM hotels WHERE name ILIKE '%' || \\$1 || '%';\n",
+        "---\n",
+        "kind: tools\n",
+        "name: search-hotels-by-location\n",
+        "type: postgres-sql\n",
+        "source: my-pg-source\n",
+        "description: Search for hotels based on location.\n",
+        "parameters:\n",
+        "  - name: location\n",
+        "    type: string\n",
+        "    description: The location of the hotel.\n",
+        "statement: SELECT * FROM hotels WHERE location ILIKE '%' || \\$1 || '%';\n",
+        "---\n",
+        "kind: tools\n",
+        "name: book-hotel\n",
+        "type: postgres-sql\n",
+        "source: my-pg-source\n",
+        "description: >-\n",
+        "   Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.\n",
+        "parameters:\n",
+        "  - name: hotel_id\n",
+        "    type: string\n",
+        "    description: The ID of the hotel to book.\n",
+        "statement: UPDATE hotels SET booked = B'1' WHERE id = \\$1;\n",
+        "---\n",
+        "kind: tools\n",
+        "name: update-hotel\n",
+        "type: postgres-sql\n",
+        "source: my-pg-source\n",
+        "description: >-\n",
+        "  Update a hotel's check-in and check-out dates by its ID. Returns a message\n",
+        "  indicating  whether the hotel was successfully updated or not.\n",
+        "parameters:\n",
+        "  - name: hotel_id\n",
+        "    type: string\n",
+        "    description: The ID of the hotel to update.\n",
+        "  - name: checkin_date\n",
+        "    type: string\n",
+        "    description: The new check-in date of the hotel.\n",
+        "  - name: checkout_date\n",
+        "    type: string\n",
+        "    description: The new check-out date of the hotel.\n",
+        "statement: >-\n",
+        "  UPDATE hotels SET checkin_date = CAST(\\$2 as date), checkout_date = CAST(\\$3\n",
+        "  as date) WHERE id = \\$1;\n",
+        "---\n",
+        "kind: tools\n",
+        "name: cancel-hotel\n",
+        "type: postgres-sql\n",
+        "source: my-pg-source\n",
+        "description: Cancel a hotel by its ID.\n",
+        "parameters:\n",
+        "  - name: hotel_id\n",
+        "    type: string\n",
+        "    description: The ID of the hotel to cancel.\n",
+        "statement: UPDATE hotels SET booked = B'0' WHERE id = \\$1;\n",
+        "---\n",
+        "kind: toolsets\n",
+        "name: my-toolset\n",
         "tools:\n",
-        "  search-hotels-by-name:\n",
-        "    kind: postgres-sql\n",
-        "    source: my-pg-source\n",
-        "    description: Search for hotels based on name.\n",
-        "    parameters:\n",
-        "      - name: name\n",
-        "        type: string\n",
-        "        description: The name of the hotel.\n",
-        "    statement: SELECT * FROM hotels WHERE name ILIKE '%' || \\$1 || '%';\n",
-        "  search-hotels-by-location:\n",
-        "    kind: postgres-sql\n",
-        "    source: my-pg-source\n",
-        "    description: Search for hotels based on location.\n",
-        "    parameters:\n",
-        "      - name: location\n",
-        "        type: string\n",
-        "        description: The location of the hotel.\n",
-        "    statement: SELECT * FROM hotels WHERE location ILIKE '%' || \\$1 || '%';\n",
-        "  book-hotel:\n",
-        "    kind: postgres-sql\n",
-        "    source: my-pg-source\n",
-        "    description: >-\n",
-        "       Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.\n",
-        "    parameters:\n",
-        "      - name: hotel_id\n",
-        "        type: string\n",
-        "        description: The ID of the hotel to book.\n",
-        "    statement: UPDATE hotels SET booked = B'1' WHERE id = \\$1;\n",
-        "  update-hotel:\n",
-        "    kind: postgres-sql\n",
-        "    source: my-pg-source\n",
-        "    description: >-\n",
-        "      Update a hotel's check-in and check-out dates by its ID. Returns a message\n",
-        "      indicating  whether the hotel was successfully updated or not.\n",
-        "    parameters:\n",
-        "      - name: hotel_id\n",
-        "        type: string\n",
-        "        description: The ID of the hotel to update.\n",
-        "      - name: checkin_date\n",
-        "        type: string\n",
-        "        description: The new check-in date of the hotel.\n",
-        "      - name: checkout_date\n",
-        "        type: string\n",
-        "        description: The new check-out date of the hotel.\n",
-        "    statement: >-\n",
-        "      UPDATE hotels SET checkin_date = CAST(\\$2 as date), checkout_date = CAST(\\$3\n",
-        "      as date) WHERE id = \\$1;\n",
-        "  cancel-hotel:\n",
-        "    kind: postgres-sql\n",
-        "    source: my-pg-source\n",
-        "    description: Cancel a hotel by its ID.\n",
-        "    parameters:\n",
-        "      - name: hotel_id\n",
-        "        type: string\n",
-        "        description: The ID of the hotel to cancel.\n",
-        "    statement: UPDATE hotels SET booked = B'0' WHERE id = \\$1;\n",
-        "toolsets:\n",
-        "  my-toolset:\n",
-        "    - search-hotels-by-name\n",
-        "    - search-hotels-by-location\n",
-        "    - book-hotel\n",
-        "    - update-hotel\n",
-        "    - cancel-hotel\n",
+        "  - search-hotels-by-name\n",
+        "  - search-hotels-by-location\n",
+        "  - book-hotel\n",
+        "  - update-hotel\n",
+        "  - cancel-hotel\n",
         "\"\"\""
       ]
     },
@@ -509,8 +520,7 @@
       },
       "outputs": [],
       "source": [
-        "! pip install toolbox-core --quiet\n",
-        "! pip install google-adk --quiet"
+        "! pip install google-adk[toolbox] --quiet"
       ]
     },
     {
@@ -525,14 +535,18 @@
         "from google.adk.runners import Runner\n",
         "from google.adk.sessions import InMemorySessionService\n",
         "from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService\n",
+        "from google.adk.tools.toolbox_toolset import ToolboxToolset\n",
         "from google.genai import types\n",
-        "from toolbox_core import ToolboxSyncClient\n",
         "\n",
         "import os\n",
         "# TODO(developer): replace this with your Google API key\n",
         "os.environ['GOOGLE_API_KEY'] = \"<GOOGLE_API_KEY>\"\n",
         "\n",
-        "toolbox_client = ToolboxSyncClient(\"http://127.0.0.1:5000\")\n",
+        "# Configure toolset\n",
+        "toolset = ToolboxToolset(\n",
+        "    server_url=\"http://127.0.0.1:5000\",\n",
+        "    toolset_name=\"my-toolset\"\n",
+        ")\n",
         "\n",
         "prompt = \"\"\"\n",
         "  You're a helpful hotel assistant. You handle hotel searching, booking and\n",
@@ -549,7 +563,7 @@
         "    name='hotel_agent',\n",
         "    description='A helpful AI assistant.',\n",
         "    instruction=prompt,\n",
-        "    tools=toolbox_client.load_toolset(\"my-toolset\"),\n",
+        "    tools=[toolset],\n",
         ")\n",
         "\n",
         "session_service = InMemorySessionService()\n",
diff --git a/docs/en/getting-started/configure.md b/docs/en/getting-started/configure.md
index 6155eb5608..e578c64dfc 100644
--- a/docs/en/getting-started/configure.md
+++ b/docs/en/getting-started/configure.md
@@ -36,14 +36,14 @@ Toolbox should have access to. Most tools will have at least one source to
 execute against.
 
 ```yaml
-sources:
-  my-pg-source:
-    kind: postgres
-    host: 127.0.0.1
-    port: 5432
-    database: toolbox_db
-    user: ${USER_NAME}
-    password: ${PASSWORD}
+kind: sources
+name: my-pg-source
+type: postgres
+host: 127.0.0.1
+port: 5432
+database: toolbox_db
+user: ${USER_NAME}
+password: ${PASSWORD}
 ```
 
 For more details on configuring different types of sources, see the
@@ -52,20 +52,20 @@ For more details on configuring different types of sources, see the
 ### Tools
 
 The `tools` section of your `tools.yaml` defines the actions your agent can
-take: what kind of tool it is, which source(s) it affects, what parameters it
+take: what type of tool it is, which source(s) it affects, what parameters it
 uses, etc.
 
 ```yaml
-tools:
-  search-hotels-by-name:
-    kind: postgres-sql
-    source: my-pg-source
-    description: Search for hotels based on name.
-    parameters:
-      - name: name
-        type: string
-        description: The name of the hotel.
-    statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+kind: tools
+name: search-hotels-by-name
+type: postgres-sql
+source: my-pg-source
+description: Search for hotels based on name.
+parameters:
+  - name: name
+    type: string
+    description: The name of the hotel.
+statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
 ```
 
 For more details on configuring different types of tools, see the
@@ -78,13 +78,17 @@ that you want to be able to load together. This can be useful for defining
 different sets for different agents or different applications.
 
 ```yaml
-toolsets:
-  my_first_toolset:
-    - my_first_tool
-    - my_second_tool
-  my_second_toolset:
-    - my_second_tool
-    - my_third_tool
+kind: toolsets
+name: my_first_toolset
+tools:
+  - my_first_tool
+  - my_second_tool
+---
+kind: toolsets
+name: my_second_toolset
+tools:
+  - my_second_tool
+  - my_third_tool
 ```
 
 You can load toolsets by name:
@@ -103,14 +107,14 @@ The `prompts` section of your `tools.yaml` defines the templates containing
 structured messages and instructions for interacting with language models.
 
 ```yaml
-prompts:
-  code_review:
-    description: "Asks the LLM to analyze code quality and suggest improvements."
-    messages:
-      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-    arguments:
-      - name: "code"
-        description: "The code to review"
+kind: prompts
+name: code_review
+description: "Asks the LLM to analyze code quality and suggest improvements."
+messages:
+  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
+arguments:
+  - name: "code"
+    description: "The code to review"
 ```
 
 For more details on configuring different types of prompts, see the
diff --git a/docs/en/getting-started/introduction/_index.md b/docs/en/getting-started/introduction/_index.md
index 5fb0b757c8..65453b7030 100644
--- a/docs/en/getting-started/introduction/_index.md
+++ b/docs/en/getting-started/introduction/_index.md
@@ -16,6 +16,12 @@ Databases” as its initial development predated MCP, but was renamed to align
 with recently added MCP compatibility.
 {{< /notice >}}
 
+{{< notice note >}}
+This document has been updated to support the configuration file v2 format. To
+view documentation with configuration file v1 format, please navigate to the
+top-right menu and select versions v0.26.0 or older.
+{{< /notice >}}
+
 ## Why Toolbox?
 
 Toolbox helps you build Gen AI tools that let your agents access data in your
@@ -71,7 +77,7 @@ redeploying your application.
 
 ## Getting Started
 
-### (Non-production) Running Toolbox
+### Quickstart: Running Toolbox using NPX 
 
 You can run Toolbox directly with a [configuration file](../configure.md):
 
@@ -103,7 +109,7 @@ To install Toolbox as a binary on Linux (AMD64):
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.27.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/linux/amd64/toolbox
 chmod +x toolbox
 ```
@@ -114,7 +120,7 @@ To install Toolbox as a binary on macOS (Apple Silicon):
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.27.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/arm64/toolbox
 chmod +x toolbox
 ```
@@ -125,7 +131,7 @@ To install Toolbox as a binary on macOS (Intel):
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.27.0
 curl -L -o toolbox https://storage.googleapis.com/genai-toolbox/v$VERSION/darwin/amd64/toolbox
 chmod +x toolbox
 ```
@@ -136,7 +142,7 @@ To install Toolbox as a binary on Windows (Command Prompt):
 
 ```cmd
 :: see releases page for other versions
-set VERSION=0.26.0
+set VERSION=0.27.0
 curl -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v%VERSION%/windows/amd64/toolbox.exe"
 ```
 
@@ -146,7 +152,7 @@ To install Toolbox as a binary on Windows (PowerShell):
 
 ```powershell
 # see releases page for other versions
-$VERSION = "0.26.0"
+$VERSION = "0.27.0"
 curl.exe -o toolbox.exe "https://storage.googleapis.com/genai-toolbox/v$VERSION/windows/amd64/toolbox.exe"
 ```
 
@@ -158,7 +164,7 @@ You can also install Toolbox as a container:
 
 ```sh
 # see releases page for other versions
-export VERSION=0.26.0
+export VERSION=0.27.0
 docker pull us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:$VERSION
 ```
 
@@ -177,7 +183,7 @@ To install from source, ensure you have the latest version of
 [Go installed](https://go.dev/doc/install), and then run the following command:
 
 ```sh
-go install github.com/googleapis/genai-toolbox@v0.26.0
+go install github.com/googleapis/genai-toolbox@v0.27.0
 ```
 
 {{% /tab %}}
diff --git a/docs/en/getting-started/local_quickstart.md b/docs/en/getting-started/local_quickstart.md
index 684b4b03e9..414156f672 100644
--- a/docs/en/getting-started/local_quickstart.md
+++ b/docs/en/getting-started/local_quickstart.md
@@ -52,7 +52,7 @@ runtime](https://research.google.com/colaboratory/local-runtimes.html).
     {{< tabpane persist=header >}}
 {{< tab header="ADK" lang="bash" >}}
 
-pip install toolbox-core
+pip install google-adk[toolbox]
 {{< /tab >}}
 {{< tab header="Langchain" lang="bash" >}}
 
@@ -73,7 +73,7 @@ pip install toolbox-core
     {{< tabpane persist=header >}}
 {{< tab header="ADK" lang="bash" >}}
 
-pip install google-adk
+# No other dependencies required for ADK
 {{< /tab >}}
 {{< tab header="Langchain" lang="bash" >}}
 
@@ -115,7 +115,7 @@ pip install google-genai
 
 1. Update `my_agent/agent.py` with the following content to connect to Toolbox:
     ```py
-    {{< include "quickstart/python/adk/quickstart.py" >}}
+    {{< regionInclude "quickstart/python/adk/quickstart.py" "quickstart" >}}
     ```
     <br/>
 
diff --git a/docs/en/getting-started/mcp_quickstart/_index.md b/docs/en/getting-started/mcp_quickstart/_index.md
index 7967d574a5..b005643a10 100644
--- a/docs/en/getting-started/mcp_quickstart/_index.md
+++ b/docs/en/getting-started/mcp_quickstart/_index.md
@@ -105,7 +105,7 @@ In this section, we will download Toolbox, configure our tools in a
     <!-- {x-release-please-start-version} -->
     ```bash
     export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
@@ -125,78 +125,89 @@ In this section, we will download Toolbox, configure our tools in a
     {{< /notice >}}
 
     ```yaml
-    sources:
-      my-pg-source:
-        kind: postgres
-        host: 127.0.0.1
-        port: 5432
-        database: toolbox_db
-        user: toolbox_user
-        password: my-password
+    kind: sources
+    name: my-pg-source
+    type: postgres
+    host: 127.0.0.1
+    port: 5432
+    database: toolbox_db
+    user: toolbox_user
+    password: my-password
+    ---
+    kind: tools
+    name: search-hotels-by-name
+    type: postgres-sql
+    source: my-pg-source
+    description: Search for hotels based on name.
+    parameters:
+      - name: name
+        type: string
+        description: The name of the hotel.
+    statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+    ---
+    kind: tools
+    name: search-hotels-by-location
+    type: postgres-sql
+    source: my-pg-source
+    description: Search for hotels based on location.
+    parameters:
+      - name: location
+        type: string
+        description: The location of the hotel.
+    statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
+    ---
+    kind: tools
+    name: book-hotel
+    type: postgres-sql
+    source: my-pg-source
+    description: >-
+       Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+    parameters:
+      - name: hotel_id
+        type: string
+        description: The ID of the hotel to book.
+    statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
+    ---
+    kind: tools
+    name: update-hotel
+    type: postgres-sql
+    source: my-pg-source
+    description: >-
+      Update a hotel's check-in and check-out dates by its ID. Returns a message
+      indicating  whether the hotel was successfully updated or not.
+    parameters:
+      - name: hotel_id
+        type: string
+        description: The ID of the hotel to update.
+      - name: checkin_date
+        type: string
+        description: The new check-in date of the hotel.
+      - name: checkout_date
+        type: string
+        description: The new check-out date of the hotel.
+    statement: >-
+      UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
+      as date) WHERE id = $1;
+    ---
+    kind: tools
+    name: cancel-hotel
+    type: postgres-sql
+    source: my-pg-source
+    description: Cancel a hotel by its ID.
+    parameters:
+      - name: hotel_id
+        type: string
+        description: The ID of the hotel to cancel.
+    statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+    ---
+    kind: toolsets
+    name: my-toolset
     tools:
-      search-hotels-by-name:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Search for hotels based on name.
-        parameters:
-          - name: name
-            type: string
-            description: The name of the hotel.
-        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
-      search-hotels-by-location:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Search for hotels based on location.
-        parameters:
-          - name: location
-            type: string
-            description: The location of the hotel.
-        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
-      book-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: >-
-           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to book.
-        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
-      update-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: >-
-          Update a hotel's check-in and check-out dates by its ID. Returns a message
-          indicating  whether the hotel was successfully updated or not.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to update.
-          - name: checkin_date
-            type: string
-            description: The new check-in date of the hotel.
-          - name: checkout_date
-            type: string
-            description: The new check-out date of the hotel.
-        statement: >-
-          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
-          as date) WHERE id = $1;
-      cancel-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Cancel a hotel by its ID.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to cancel.
-        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
-   toolsets:
-      my-toolset:
-        - search-hotels-by-name
-        - search-hotels-by-location
-        - book-hotel
-        - update-hotel
-        - cancel-hotel
+      - search-hotels-by-name
+      - search-hotels-by-location
+      - book-hotel
+      - update-hotel
+      - cancel-hotel
     ```
 
     For more info on tools, check out the
diff --git a/docs/en/getting-started/prompts_quickstart_gemini_cli.md b/docs/en/getting-started/prompts_quickstart_gemini_cli.md
index 2061acd7fa..47140ed2e7 100644
--- a/docs/en/getting-started/prompts_quickstart_gemini_cli.md
+++ b/docs/en/getting-started/prompts_quickstart_gemini_cli.md
@@ -157,61 +157,67 @@ Create a file named `tools.yaml`. This file defines the database connection, the
 SQL tools available, and the prompts the agents will use.
 
 ```yaml
-sources:
-  my-foodiefind-db:
-    kind: postgres
-    host: 127.0.0.1
-    port: 5432
-    database: toolbox_db
-    user: toolbox_user
-    password: my-password
-tools:
-  find_user_by_email:
-    kind: postgres-sql
-    source: my-foodiefind-db
-    description: Find a user's ID by their email address.
-    parameters:
-      - name: email
-        type: string
-        description: The email address of the user to find.
-    statement: SELECT id FROM users WHERE email = $1;
-  find_restaurant_by_name:
-    kind: postgres-sql
-    source: my-foodiefind-db
-    description: Find a restaurant's ID by its exact name.
-    parameters:
-      - name: name
-        type: string
-        description: The name of the restaurant to find.
-    statement: SELECT id FROM restaurants WHERE name = $1;
-  find_review_by_user_and_restaurant:
-    kind: postgres-sql
-    source: my-foodiefind-db
-    description: Find the full record for a specific review using the user's ID and the restaurant's ID.
-    parameters:
-      - name: user_id
-        type: integer
-        description: The numerical ID of the user.
-      - name: restaurant_id
-        type: integer
-        description: The numerical ID of the restaurant.
-    statement: SELECT * FROM reviews WHERE user_id = $1 AND restaurant_id = $2;
-prompts:
-  investigate_missing_review:
-    description: "Investigates a user's missing review by finding the user, restaurant, and the review itself, then analyzing its status."
-    arguments:
-      - name: "user_email"
-        description: "The email of the user who wrote the review."
-      - name: "restaurant_name"
-        description: "The name of the restaurant being reviewed."
-    messages:
-      - content: >-
-          **Goal:** Find the review written by the user with email '{{.user_email}}' for the restaurant named '{{.restaurant_name}}' and understand its status.
-          **Workflow:**
-          1. Use the `find_user_by_email` tool with the email '{{.user_email}}' to get the `user_id`.
-          2. Use the `find_restaurant_by_name` tool with the name '{{.restaurant_name}}' to get the `restaurant_id`.
-          3. Use the `find_review_by_user_and_restaurant` tool with the `user_id` and `restaurant_id` you just found.
-          4. Analyze the results from the final tool call. Examine the `is_published` and `moderation_status` fields and explain the review's status to the user in a clear, human-readable sentence.
+kind: sources
+name: my-foodiefind-db
+type: postgres
+host: 127.0.0.1
+port: 5432
+database: toolbox_db
+user: toolbox_user
+password: my-password
+---
+kind: tools
+name: find_user_by_email
+type: postgres-sql
+source: my-foodiefind-db
+description: Find a user's ID by their email address.
+parameters:
+  - name: email
+    type: string
+    description: The email address of the user to find.
+statement: SELECT id FROM users WHERE email = $1;
+---
+kind: tools
+name: find_restaurant_by_name
+type: postgres-sql
+source: my-foodiefind-db
+description: Find a restaurant's ID by its exact name.
+parameters:
+  - name: name
+    type: string
+    description: The name of the restaurant to find.
+statement: SELECT id FROM restaurants WHERE name = $1;
+---
+kind: tools
+name: find_review_by_user_and_restaurant
+type: postgres-sql
+source: my-foodiefind-db
+description: Find the full record for a specific review using the user's ID and the restaurant's ID.
+parameters:
+  - name: user_id
+    type: integer
+    description: The numerical ID of the user.
+  - name: restaurant_id
+    type: integer
+    description: The numerical ID of the restaurant.
+statement: SELECT * FROM reviews WHERE user_id = $1 AND restaurant_id = $2;
+---
+kind: prompts
+name: investigate_missing_review
+description: "Investigates a user's missing review by finding the user, restaurant, and the review itself, then analyzing its status."
+arguments:
+  - name: "user_email"
+    description: "The email of the user who wrote the review."
+  - name: "restaurant_name"
+    description: "The name of the restaurant being reviewed."
+messages:
+  - content: >-
+      **Goal:** Find the review written by the user with email '{{.user_email}}' for the restaurant named '{{.restaurant_name}}' and understand its status.
+      **Workflow:**
+      1. Use the `find_user_by_email` tool with the email '{{.user_email}}' to get the `user_id`.
+      2. Use the `find_restaurant_by_name` tool with the name '{{.restaurant_name}}' to get the `restaurant_id`.
+      3. Use the `find_review_by_user_and_restaurant` tool with the `user_id` and `restaurant_id` you just found.
+      4. Analyze the results from the final tool call. Examine the `is_published` and `moderation_status` fields and explain the review's status to the user in a clear, human-readable sentence.
 ```
 
 ## Step 3: Connect to Gemini CLI
diff --git a/docs/en/getting-started/quickstart/js/adk/package-lock.json b/docs/en/getting-started/quickstart/js/adk/package-lock.json
index 84bc88e40a..9bcbc4080d 100644
--- a/docs/en/getting-started/quickstart/js/adk/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/adk/package-lock.json
@@ -18,6 +18,7 @@
       "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz",
       "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "arrify": "^2.0.0",
         "extend": "^3.0.2"
@@ -31,6 +32,7 @@
       "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz",
       "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=14.0.0"
       }
@@ -40,15 +42,17 @@
       "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz",
       "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==",
       "license": "Apache-2.0",
+      "peer": true,
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@google-cloud/storage": {
-      "version": "7.18.0",
-      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.18.0.tgz",
-      "integrity": "sha512-r3ZwDMiz4nwW6R922Z1pwpePxyRwE5GdevYX63hRmAQUkUQJcBH/79EnQPDv5cOv1mFBgevdNWQfi3tie3dHrQ==",
+      "version": "7.19.0",
+      "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.19.0.tgz",
+      "integrity": "sha512-n2FjE7NAOYyshogdc7KQOl/VZb4sneqPjWouSyia9CMDdMhRX5+RIbqalNmC7LOLzuLAN89VlF2HvG8na9G+zQ==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "@google-cloud/paginator": "^5.0.0",
         "@google-cloud/projectify": "^4.0.0",
@@ -56,7 +60,7 @@
         "abort-controller": "^3.0.0",
         "async-retry": "^1.3.3",
         "duplexify": "^4.1.3",
-        "fast-xml-parser": "^4.4.1",
+        "fast-xml-parser": "^5.3.4",
         "gaxios": "^6.0.2",
         "google-auth-library": "^9.6.3",
         "html-entities": "^2.5.2",
@@ -75,6 +79,7 @@
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
       "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "uuid": "dist/bin/uuid"
       }
@@ -97,7 +102,6 @@
       "resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.14.0.tgz",
       "integrity": "sha512-jirYprAAJU1svjwSDVCzyVq+FrJpJd5CSxR/g2Ga/gZ0ZYZpcWjMS75KJl9y71K1mDN+tcx6s21CzCbB2R840g==",
       "license": "Apache-2.0",
-      "peer": true,
       "dependencies": {
         "google-auth-library": "^9.14.2",
         "ws": "^8.18.0"
@@ -136,7 +140,6 @@
       "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.17.5.tgz",
       "integrity": "sha512-QakrKIGniGuRVfWBdMsDea/dx1PNE739QJ7gCM41s9q+qaCYTHCdsIBXQVVXry3mfWAiaM9kT22Hyz53Uw8mfg==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "ajv": "^6.12.6",
         "content-type": "^1.0.5",
@@ -299,6 +302,7 @@
       "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
       "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 10"
       }
@@ -307,13 +311,15 @@
       "version": "0.12.5",
       "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz",
       "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/@types/node": {
       "version": "24.10.1",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz",
       "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "undici-types": "~7.16.0"
       }
@@ -323,6 +329,7 @@
       "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.13.tgz",
       "integrity": "sha512-FGJ6udDNUCjd19pp0Q3iTiDkwhYup7J8hpMW9c4k53NrccQFFWKRho6hvtPPEhnXWKvukfwAlB6DbDz4yhH5Gg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/caseless": "*",
         "@types/node": "*",
@@ -335,6 +342,7 @@
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz",
       "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -352,6 +360,7 @@
       "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
       "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 0.6"
       }
@@ -361,6 +370,7 @@
       "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
       "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -372,13 +382,15 @@
       "version": "4.0.5",
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
       "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/abort-controller": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz",
       "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "event-target-shim": "^5.0.0"
       },
@@ -453,6 +465,7 @@
       "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz",
       "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=8"
       }
@@ -462,6 +475,7 @@
       "resolved": "https://registry.npmjs.org/async-retry/-/async-retry-1.3.3.tgz",
       "integrity": "sha512-wfr/jstw9xNi/0teMHrRW7dsz3Lt5ARhYNZ2ewpadnhaIp5mbALhOAP+EAdsC7t4Z6wqsDVv9+W6gm1Dk9mEyw==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "retry": "0.13.1"
       }
@@ -754,6 +768,7 @@
       "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-4.1.3.tgz",
       "integrity": "sha512-M3BmBhwJRZsSx38lZyhE53Csddgzl5R7xGJNk7CVddZD6CcmwMCH8J+7AprIrQKH7TonKxaCjcv27Qmf+sQ+oA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "end-of-stream": "^1.4.1",
         "inherits": "^2.0.3",
@@ -802,6 +817,7 @@
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.5.tgz",
       "integrity": "sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "once": "^1.4.0"
       }
@@ -871,6 +887,7 @@
       "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
       "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=6"
       }
@@ -901,7 +918,6 @@
       "resolved": "https://registry.npmjs.org/express/-/express-5.1.0.tgz",
       "integrity": "sha512-DT9ck5YIRU+8GYzzU5kT3eHGA5iL+1Zd0EutOmTE9Dtk+Tvuzd23VBU+ec7HPNSTxXYO55gPV/hq4pSBJDjFpA==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "accepts": "^2.0.0",
         "body-parser": "^2.2.0",
@@ -973,9 +989,9 @@
       "license": "MIT"
     },
     "node_modules/fast-xml-parser": {
-      "version": "4.5.3",
-      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-4.5.3.tgz",
-      "integrity": "sha512-RKihhV+SHsIUGXObeVy9AXiBbFwkVk7Syp8XgwN5U3JV416+Gwp/GO9i0JYKmikykgz/UHRrrV4ROuZEo/T0ig==",
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.3.5.tgz",
+      "integrity": "sha512-JeaA2Vm9ffQKp9VjvfzObuMCjUYAp5WDYhRYL5LrBPY/jUDlUtOvDfot0vKSkB9tuX885BDHjtw4fZadD95wnA==",
       "funding": [
         {
           "type": "github",
@@ -983,8 +999,9 @@
         }
       ],
       "license": "MIT",
+      "peer": true,
       "dependencies": {
-        "strnum": "^1.1.1"
+        "strnum": "^2.1.2"
       },
       "bin": {
         "fxparser": "src/cli/cli.js"
@@ -1333,7 +1350,8 @@
           "url": "https://patreon.com/mdevils"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/http-errors": {
       "version": "2.0.0",
@@ -1365,6 +1383,7 @@
       "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
       "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -1379,6 +1398,7 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "4"
       },
@@ -1555,6 +1575,7 @@
       "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
       "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
       "license": "MIT",
+      "peer": true,
       "bin": {
         "mime": "cli.js"
       },
@@ -1715,6 +1736,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -1856,6 +1878,7 @@
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
       "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "inherits": "^2.0.3",
         "string_decoder": "^1.1.1",
@@ -1870,6 +1893,7 @@
       "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
       "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">= 4"
       }
@@ -1879,6 +1903,7 @@
       "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz",
       "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "@types/request": "^2.48.8",
         "extend": "^3.0.2",
@@ -2107,6 +2132,7 @@
       "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz",
       "integrity": "sha512-E1GUzBSgvct8Jsb3v2X15pjzN1tYebtbLaMg+eBOUOAxgbLoSbT2NS91ckc5lJD1KfLjId+jXJRgo0qnV5Nerg==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "stubs": "^3.0.0"
       }
@@ -2115,13 +2141,15 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.3.tgz",
       "integrity": "sha512-76ORR0DO1o1hlKwTbi/DM3EXWGf3ZJYO8cXX5RJwnul2DEg2oyoZyjLNoQM8WsvZiFKCRfC1O0J7iCvie3RZmQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/string_decoder": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
       "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "~5.2.0"
       }
@@ -2223,28 +2251,31 @@
       }
     },
     "node_modules/strnum": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/strnum/-/strnum-1.1.2.tgz",
-      "integrity": "sha512-vrN+B7DBIoTTZjnPNewwhx6cBA/H+IS7rfW68n7XxC1y7uoiGQBxaKzqucGUgavX15dJgiGztLJ8vxuEzwqBdA==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.1.2.tgz",
+      "integrity": "sha512-l63NF9y/cLROq/yqKXSLtcMeeyOfnSQlfMSlzFt/K73oIaD8DGaQWd7Z34X9GPiKqP5rbSh84Hl4bOlLcjiSrQ==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/NaturalIntelligence"
         }
       ],
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/stubs": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/stubs/-/stubs-3.0.0.tgz",
       "integrity": "sha512-PdHt7hHUJKxvTCgbKX9C1V/ftOcjJQgz8BZwNfV5c4B6dcGqlpelTbJ999jBGZ2jYiPAwcX5dP6oBwVlBlUbxw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/teeny-request": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz",
       "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==",
       "license": "Apache-2.0",
+      "peer": true,
       "dependencies": {
         "http-proxy-agent": "^5.0.0",
         "https-proxy-agent": "^5.0.0",
@@ -2261,6 +2292,7 @@
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
       "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "debug": "4"
       },
@@ -2273,6 +2305,7 @@
       "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
       "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "license": "MIT",
+      "peer": true,
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -2314,7 +2347,8 @@
       "version": "7.16.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
       "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/unpipe": {
       "version": "1.0.0",
@@ -2338,7 +2372,8 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-      "license": "MIT"
+      "license": "MIT",
+      "peer": true
     },
     "node_modules/uuid": {
       "version": "9.0.1",
@@ -2525,6 +2560,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "license": "MIT",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -2537,7 +2573,6 @@
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/docs/en/getting-started/quickstart/js/genkit/package-lock.json b/docs/en/getting-started/quickstart/js/genkit/package-lock.json
index 22324c05f3..cdb5744245 100644
--- a/docs/en/getting-started/quickstart/js/genkit/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/genkit/package-lock.json
@@ -24,12 +24,13 @@
       }
     },
     "node_modules/@dabh/diagnostics": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz",
-      "integrity": "sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==",
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz",
+      "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "colorspace": "1.1.x",
+        "@so-ric/colorspace": "^1.1.6",
         "enabled": "2.0.x",
         "kuler": "^2.0.0"
       }
@@ -578,9 +579,10 @@
       }
     },
     "node_modules/@google-cloud/firestore": {
-      "version": "7.11.3",
-      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.3.tgz",
-      "integrity": "sha512-qsM3/WHpawF07SRVvEJJVRwhYzM7o9qtuksyuqnrMig6fxIrwWnsezECWsG/D5TyYru51Fv5c/RTqNDQ2yU+4w==",
+      "version": "7.11.6",
+      "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz",
+      "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==",
+      "license": "Apache-2.0",
       "optional": true,
       "peer": true,
       "dependencies": {
@@ -2887,6 +2889,17 @@
       "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
       "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
     },
+    "node_modules/@so-ric/colorspace": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@so-ric/colorspace/-/colorspace-1.1.6.tgz",
+      "integrity": "sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==",
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "color": "^5.0.2",
+        "text-hex": "1.0.x"
+      }
+    },
     "node_modules/@toolbox-sdk/core": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@toolbox-sdk/core/-/core-0.1.2.tgz",
@@ -3338,13 +3351,13 @@
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/axios": {
-      "version": "1.12.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
-      "integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
+      "version": "1.13.5",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.5.tgz",
+      "integrity": "sha512-cz4ur7Vb0xS4/KUN0tPWe44eqxrIu31me+fbang3ijiNscE129POzipJJA6zniq2C/Z6sJCjMimjS8Lc/GAs8Q==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.6",
-        "form-data": "^4.0.4",
+        "follow-redirects": "^1.15.11",
+        "form-data": "^4.0.5",
         "proxy-from-env": "^1.1.0"
       }
     },
@@ -3515,38 +3528,53 @@
       }
     },
     "node_modules/color": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/color/-/color-3.2.1.tgz",
-      "integrity": "sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==",
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-5.0.3.tgz",
+      "integrity": "sha512-ezmVcLR3xAVp8kYOm4GS45ZLLgIE6SPAFoduLr6hTDajwb3KZ2F46gulK3XpcwRFb5KKGCSezCBAY4Dw4HsyXA==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "color-convert": "^1.9.3",
-        "color-string": "^1.6.0"
+        "color-convert": "^3.1.3",
+        "color-string": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-3.1.3.tgz",
+      "integrity": "sha512-fasDH2ont2GqF5HpyO4w0+BcewlhHEZOFn9c1ckZdHpJ56Qb7MHhH/IcJZbBGgvdtwdwNbLvxiBEdg336iA9Sg==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "color-name": "1.1.3"
+        "color-name": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=14.6"
       }
     },
     "node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==",
-      "optional": true
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-2.1.0.tgz",
+      "integrity": "sha512-1bPaDNFm0axzE4MEAzKPuqKWeRaT43U/hyxKPBdqTfmPF+d6n7FSoTFxLVULUJOmiLp01KjhIPPH+HrXZJN4Rg==",
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=12.20"
+      }
     },
     "node_modules/color-string": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-2.1.4.tgz",
+      "integrity": "sha512-Bb6Cq8oq0IjDOe8wJmi4JeNn763Xs9cfrBcaylK1tPypWzyoy2G3l90v9k64kjphl/ZJjPIShFztenRomi8WTg==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
+        "color-name": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=18"
       }
     },
     "node_modules/colorette": {
@@ -3554,16 +3582,6 @@
       "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
       "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
-    "node_modules/colorspace": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz",
-      "integrity": "sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==",
-      "optional": true,
-      "dependencies": {
-        "color": "^3.1.3",
-        "text-hex": "1.0.x"
-      }
-    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -4230,9 +4248,10 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
-      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz",
+      "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -4968,12 +4987,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
-      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==",
-      "optional": true
-    },
     "node_modules/is-core-module": {
       "version": "2.16.1",
       "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
@@ -5114,13 +5127,14 @@
       }
     },
     "node_modules/jsonwebtoken/node_modules/jws": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.2.tgz",
-      "integrity": "sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==",
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-3.2.3.tgz",
+      "integrity": "sha512-byiJ0FLRdLdSVSReO/U4E7RoEyOCKnEnEPMjq3HxWtvzLsV08/i5RQKsFVNkCldrCaPr2vDNAOMsfs8T/Hze7g==",
+      "license": "MIT",
       "optional": true,
       "peer": true,
       "dependencies": {
-        "jwa": "^1.4.1",
+        "jwa": "^1.4.2",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -5153,11 +5167,12 @@
       }
     },
     "node_modules/jws": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
-      "integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jws/-/jws-4.0.1.tgz",
+      "integrity": "sha512-EKI/M/yqPncGUUh44xz0PxSidXFr/+r0pA70+gIYhjv+et7yxM+s29Y+VGDkovRofQem0fs7Uvf4+YmAdyRduA==",
+      "license": "MIT",
       "dependencies": {
-        "jwa": "^2.0.0",
+        "jwa": "^2.0.1",
         "safe-buffer": "^5.0.1"
       }
     },
@@ -5424,9 +5439,10 @@
       }
     },
     "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.3.tgz",
+      "integrity": "sha512-rLvcdSyRCyouf6jcOIPe/BgwG/d7hKjzMKOas33/pHEr6gbq18IK9zV7DiPvzsz0oBJPme6qr6H6kGZuI9/DZg==",
+      "license": "(BSD-3-Clause OR GPL-2.0)",
       "optional": true,
       "peer": true,
       "engines": {
@@ -6038,15 +6054,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/simple-swizzle": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
-      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
-      "optional": true,
-      "dependencies": {
-        "is-arrayish": "^0.3.1"
-      }
-    },
     "node_modules/source-map": {
       "version": "0.6.1",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -6233,6 +6240,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz",
       "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==",
+      "license": "MIT",
       "optional": true
     },
     "node_modules/thriftrw": {
@@ -6416,13 +6424,14 @@
       }
     },
     "node_modules/winston": {
-      "version": "3.17.0",
-      "resolved": "https://registry.npmjs.org/winston/-/winston-3.17.0.tgz",
-      "integrity": "sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==",
+      "version": "3.19.0",
+      "resolved": "https://registry.npmjs.org/winston/-/winston-3.19.0.tgz",
+      "integrity": "sha512-LZNJgPzfKR+/J3cHkxcpHKpKKvGfDZVPS4hfJCc4cCG0CgYzvlD6yE/S3CIL/Yt91ak327YCpiF/0MyeZHEHKA==",
+      "license": "MIT",
       "optional": true,
       "dependencies": {
         "@colors/colors": "^1.6.0",
-        "@dabh/diagnostics": "^2.0.2",
+        "@dabh/diagnostics": "^2.0.8",
         "async": "^3.2.3",
         "is-stream": "^2.0.0",
         "logform": "^2.7.0",
diff --git a/docs/en/getting-started/quickstart/js/genkit/quickstart.js b/docs/en/getting-started/quickstart/js/genkit/quickstart.js
index 2ec16cb843..1c1f203539 100644
--- a/docs/en/getting-started/quickstart/js/genkit/quickstart.js
+++ b/docs/en/getting-started/quickstart/js/genkit/quickstart.js
@@ -53,7 +53,7 @@ export async function main() {
 
   for (const query of queries) {
     conversationHistory.push({ role: "user", content: [{ text: query }] });
-    const response = await ai.generate({
+    let response = await ai.generate({
       messages: conversationHistory,
       tools: tools,
     });
diff --git a/docs/en/getting-started/quickstart/js/langchain/package-lock.json b/docs/en/getting-started/quickstart/js/langchain/package-lock.json
index a52001ef13..c71fb84620 100644
--- a/docs/en/getting-started/quickstart/js/langchain/package-lock.json
+++ b/docs/en/getting-started/quickstart/js/langchain/package-lock.json
@@ -18,7 +18,8 @@
     "node_modules/@cfworker/json-schema": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/@cfworker/json-schema/-/json-schema-4.1.1.tgz",
-      "integrity": "sha512-gAmrUZSGtKc3AiBL71iNWxDsyUC5uMaKKGdvzYsBoTW/xi42JQHl7eKV2OYzCUqvc+D2RCcf7EXY2iCyFIk6og=="
+      "integrity": "sha512-gAmrUZSGtKc3AiBL71iNWxDsyUC5uMaKKGdvzYsBoTW/xi42JQHl7eKV2OYzCUqvc+D2RCcf7EXY2iCyFIk6og==",
+      "peer": true
     },
     "node_modules/@google/generative-ai": {
       "version": "0.24.1",
@@ -225,6 +226,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
       "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -308,6 +310,7 @@
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "peer": true,
       "engines": {
         "node": ">=10"
       },
@@ -420,6 +423,7 @@
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
       "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -821,6 +825,7 @@
       "version": "1.0.21",
       "resolved": "https://registry.npmjs.org/js-tiktoken/-/js-tiktoken-1.0.21.tgz",
       "integrity": "sha512-biOj/6M5qdgx5TKjDnFT1ymSpM5tbd3ylwDtrQvFQSu0Z7bBYko2dF+W/aUkXUPuk6IVpRxk/3Q2sHOzGlS36g==",
+      "peer": true,
       "dependencies": {
         "base64-js": "^1.5.1"
       }
@@ -873,9 +878,9 @@
       }
     },
     "node_modules/langsmith": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.4.3.tgz",
-      "integrity": "sha512-vuBAagBZulXj0rpZhUTxmHhrYIBk53z8e2Q8ty4OHVkahN4ul7Im3OZxD9jsXZB0EuncK1xRYtY8J3BW4vj1zw==",
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/langsmith/-/langsmith-0.5.2.tgz",
+      "integrity": "sha512-CfkcQsiajtTWknAcyItvJsKEQdY2VgDpm6U8pRI9wnM07mevnOv5EF+RcqWGwx37SEUxtyi2RXMwnKW8b06JtA==",
       "license": "MIT",
       "dependencies": {
         "@types/uuid": "^10.0.0",
@@ -969,6 +974,7 @@
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz",
       "integrity": "sha512-71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==",
+      "peer": true,
       "bin": {
         "mustache": "bin/mustache"
       }
@@ -1407,7 +1413,6 @@
       "version": "3.25.76",
       "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
       "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/docs/en/getting-started/quickstart/python/adk/quickstart.py b/docs/en/getting-started/quickstart/python/adk/quickstart.py
index d341e89842..42a72fa38e 100644
--- a/docs/en/getting-started/quickstart/python/adk/quickstart.py
+++ b/docs/en/getting-started/quickstart/python/adk/quickstart.py
@@ -1,15 +1,57 @@
+# [START quickstart]
+import asyncio
+
 from google.adk import Agent
 from google.adk.apps import App
-from toolbox_core import ToolboxSyncClient
+from google.adk.runners import InMemoryRunner
+from google.adk.tools.toolbox_toolset import ToolboxToolset
+from google.genai.types import Content, Part
+
+prompt = """
+You're a helpful hotel assistant. You handle hotel searching, booking and
+cancellations. When the user searches for a hotel, mention it's name, id,
+location and price tier. Always mention hotel ids while performing any
+searches. This is very important for any operations. For any bookings or
+cancellations, please provide the appropriate confirmation. Be sure to
+update checkin or checkout dates if mentioned by the user.
+Don't ask for confirmations from the user.
+"""
 
 # TODO(developer): update the TOOLBOX_URL to your toolbox endpoint
-client = ToolboxSyncClient("http://127.0.0.1:5000")
+toolset = ToolboxToolset(
+    server_url="http://127.0.0.1:5000",
+)
 
 root_agent = Agent(
-    name='root_agent',
+    name='hotel_assistant',
     model='gemini-2.5-flash',
-    instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-    tools=client.load_toolset(),
+    instruction=prompt,
+    tools=[toolset],
 )
 
 app = App(root_agent=root_agent, name="my_agent")
+# [END quickstart]
+
+queries = [
+    "Find hotels in Basel with Basel in its name.",
+    "Can you book the Hilton Basel for me?",
+    "Oh wait, this is too expensive. Please cancel it and book the Hyatt Regency instead.",
+    "My check in dates would be from April 10, 2024 to April 19, 2024.",
+]
+
+async def main():
+    runner = InMemoryRunner(app=app)
+    session = await runner.session_service.create_session(
+        app_name=app.name, user_id="test_user"
+    )
+
+    for query in queries:
+        print(f"\nUser: {query}")
+        user_message = Content(parts=[Part.from_text(text=query)])
+
+        async for event in runner.run_async(user_id="test_user", session_id=session.id, new_message=user_message):
+            if event.is_final_response() and event.content and event.content.parts:
+                print(f"Agent: {event.content.parts[0].text}")
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/docs/en/getting-started/quickstart/python/adk/requirements.txt b/docs/en/getting-started/quickstart/python/adk/requirements.txt
index 7fb84e8d67..b67361ecfd 100644
--- a/docs/en/getting-started/quickstart/python/adk/requirements.txt
+++ b/docs/en/getting-started/quickstart/python/adk/requirements.txt
@@ -1,3 +1,2 @@
-google-adk==1.21.0
-toolbox-core==0.5.4
+google-adk[toolbox]==1.23.0
 pytest==9.0.2
\ No newline at end of file
diff --git a/docs/en/getting-started/quickstart/python/quickstart_test.py b/docs/en/getting-started/quickstart/python/quickstart_test.py
index eb46bee1f8..b6c6e3a8a8 100755
--- a/docs/en/getting-started/quickstart/python/quickstart_test.py
+++ b/docs/en/getting-started/quickstart/python/quickstart_test.py
@@ -41,31 +41,29 @@ def golden_keywords():
 class TestExecution:
     """Test framework execution and output validation."""
 
+    _cached_output = None
+
     @pytest.fixture(scope="function")
     def script_output(self, capsys):
         """Run the quickstart function and return its output."""
-
-        # TODO: Add better validation for ADK once we have a way to capture its
-        # output.
-        if ORCH_NAME == "adk":
-            return quickstart.app.root_agent.name
-        else:
+        if TestExecution._cached_output is None:
             asyncio.run(quickstart.main())
-
-        return capsys.readouterr()
+            out, err = capsys.readouterr()
+            TestExecution._cached_output = (out, err)
+            
+        class Output:
+            def __init__(self, out, err):
+                self.out = out
+                self.err = err
+                
+        return Output(*TestExecution._cached_output)
 
     def test_script_runs_without_errors(self, script_output):
         """Test that the script runs and produces no stderr."""
-        if ORCH_NAME == "adk":
-            return
         assert script_output.err == "", f"Script produced stderr: {script_output.err}"
 
     def test_keywords_in_output(self, script_output, golden_keywords):
         """Test that expected keywords are present in the script's output."""
-        
-        if ORCH_NAME == "adk":
-            assert script_output == "root_agent"
-            return
         output = script_output.out
         missing_keywords = [kw for kw in golden_keywords if kw not in output]
         assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"
diff --git a/docs/en/getting-started/quickstart/shared/configure_toolbox.md b/docs/en/getting-started/quickstart/shared/configure_toolbox.md
index 12436ee7d6..3a20508982 100644
--- a/docs/en/getting-started/quickstart/shared/configure_toolbox.md
+++ b/docs/en/getting-started/quickstart/shared/configure_toolbox.md
@@ -13,7 +13,7 @@ In this section, we will download Toolbox, configure our tools in a
     <!-- {x-release-please-start-version} -->
     ```bash
     export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
@@ -33,78 +33,89 @@ In this section, we will download Toolbox, configure our tools in a
     {{< /notice >}}
 
     ```yaml
-    sources:
-      my-pg-source:
-        kind: postgres
-        host: 127.0.0.1
-        port: 5432
-        database: toolbox_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
+    kind: sources
+    name: my-pg-source
+    type: postgres
+    host: 127.0.0.1
+    port: 5432
+    database: toolbox_db
+    user: toolbox_user
+    password: my-password
+    ---
+    kind: tools
+    name: search-hotels-by-name
+    type: postgres-sql
+    source: my-pg-source
+    description: Search for hotels based on name.
+    parameters:
+      - name: name
+        type: string
+        description: The name of the hotel.
+    statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
+    ---
+    kind: tools
+    name: search-hotels-by-location
+    type: postgres-sql
+    source: my-pg-source
+    description: Search for hotels based on location.
+    parameters:
+      - name: location
+        type: string
+        description: The location of the hotel.
+    statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
+    ---
+    kind: tools
+    name: book-hotel
+    type: postgres-sql
+    source: my-pg-source
+    description: >-
+       Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+    parameters:
+      - name: hotel_id
+        type: string
+        description: The ID of the hotel to book.
+    statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
+    ---
+    kind: tools
+    name: update-hotel
+    type: postgres-sql
+    source: my-pg-source
+    description: >-
+      Update a hotel's check-in and check-out dates by its ID. Returns a message
+      indicating  whether the hotel was successfully updated or not.
+    parameters:
+      - name: hotel_id
+        type: string
+        description: The ID of the hotel to update.
+      - name: checkin_date
+        type: string
+        description: The new check-in date of the hotel.
+      - name: checkout_date
+        type: string
+        description: The new check-out date of the hotel.
+    statement: >-
+      UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
+      as date) WHERE id = $1;
+    ---
+    kind: tools
+    name: cancel-hotel
+    type: postgres-sql
+    source: my-pg-source
+    description: Cancel a hotel by its ID.
+    parameters:
+      - name: hotel_id
+        type: string
+        description: The ID of the hotel to cancel.
+    statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
+    ---
+    kind: toolsets
+    name: my-toolset
     tools:
-      search-hotels-by-name:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Search for hotels based on name.
-        parameters:
-          - name: name
-            type: string
-            description: The name of the hotel.
-        statement: SELECT * FROM hotels WHERE name ILIKE '%' || $1 || '%';
-      search-hotels-by-location:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Search for hotels based on location.
-        parameters:
-          - name: location
-            type: string
-            description: The location of the hotel.
-        statement: SELECT * FROM hotels WHERE location ILIKE '%' || $1 || '%';
-      book-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: >-
-           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to book.
-        statement: UPDATE hotels SET booked = B'1' WHERE id = $1;
-      update-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: >-
-          Update a hotel's check-in and check-out dates by its ID. Returns a message
-          indicating  whether the hotel was successfully updated or not.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to update.
-          - name: checkin_date
-            type: string
-            description: The new check-in date of the hotel.
-          - name: checkout_date
-            type: string
-            description: The new check-out date of the hotel.
-        statement: >-
-          UPDATE hotels SET checkin_date = CAST($2 as date), checkout_date = CAST($3
-          as date) WHERE id = $1;
-      cancel-hotel:
-        kind: postgres-sql
-        source: my-pg-source
-        description: Cancel a hotel by its ID.
-        parameters:
-          - name: hotel_id
-            type: string
-            description: The ID of the hotel to cancel.
-        statement: UPDATE hotels SET booked = B'0' WHERE id = $1;
-   toolsets:
-      my-toolset:
-        - search-hotels-by-name
-        - search-hotels-by-location
-        - book-hotel
-        - update-hotel
-        - cancel-hotel
+      - search-hotels-by-name
+      - search-hotels-by-location
+      - book-hotel
+      - update-hotel
+      - cancel-hotel
     ```
 
     For more info on tools, check out the `Resources` section of the docs.
diff --git a/docs/en/how-to/connect-ide/looker_mcp.md b/docs/en/how-to/connect-ide/looker_mcp.md
index 2972ddb341..ed8ea16a34 100644
--- a/docs/en/how-to/connect-ide/looker_mcp.md
+++ b/docs/en/how-to/connect-ide/looker_mcp.md
@@ -100,19 +100,19 @@ After you install Looker in the MCP Store, resources and tools from the server a
 
 {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->
diff --git a/docs/en/how-to/connect-ide/mssql_mcp.md b/docs/en/how-to/connect-ide/mssql_mcp.md
index 722feeaebe..5a11f9c2e4 100644
--- a/docs/en/how-to/connect-ide/mssql_mcp.md
+++ b/docs/en/how-to/connect-ide/mssql_mcp.md
@@ -45,19 +45,19 @@ instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->
diff --git a/docs/en/how-to/connect-ide/mysql_mcp.md b/docs/en/how-to/connect-ide/mysql_mcp.md
index de1c15d839..c101a597ee 100644
--- a/docs/en/how-to/connect-ide/mysql_mcp.md
+++ b/docs/en/how-to/connect-ide/mysql_mcp.md
@@ -43,19 +43,19 @@ expose your developer assistant tools to a MySQL instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->
diff --git a/docs/en/how-to/connect-ide/neo4j_mcp.md b/docs/en/how-to/connect-ide/neo4j_mcp.md
index 624d7540aa..2f68c1d2de 100644
--- a/docs/en/how-to/connect-ide/neo4j_mcp.md
+++ b/docs/en/how-to/connect-ide/neo4j_mcp.md
@@ -44,19 +44,19 @@ expose your developer assistant tools to a Neo4j instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->
diff --git a/docs/en/how-to/connect-ide/postgres_mcp.md b/docs/en/how-to/connect-ide/postgres_mcp.md
index 44e3e09ade..e93e37492c 100644
--- a/docs/en/how-to/connect-ide/postgres_mcp.md
+++ b/docs/en/how-to/connect-ide/postgres_mcp.md
@@ -32,7 +32,7 @@ to expose your developer assistant tools to a Postgres instance:
 
 {{< notice tip >}}
 This guide can be used with [AlloyDB
-Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
+Omni](https://cloud.google.com/alloydb/omni/docs/overview).
 {{< /notice >}}
 
 ## Set up the database
@@ -40,10 +40,10 @@ Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
 1. Create or select a PostgreSQL instance.
 
     * [Install PostgreSQL locally](https://www.postgresql.org/download/)
-    * [Install AlloyDB Omni](https://cloud.google.com/alloydb/omni/current/docs/quickstart)
+    * [Install AlloyDB Omni](https://cloud.google.com/alloydb/omni/docs/quickstart)
 
 1. Create or reuse [a database
-   user](https://cloud.google.com/alloydb/omni/current/docs/database-users/manage-users)
+   user](https://docs.cloud.google.com/alloydb/omni/containers/current/docs/database-users/manage-users)
    and have the username and password ready.
 
 ## Install MCP Toolbox
@@ -56,19 +56,19 @@ Omni](https://cloud.google.com/alloydb/omni/current/docs/overview).
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->
diff --git a/docs/en/how-to/connect-ide/sqlite_mcp.md b/docs/en/how-to/connect-ide/sqlite_mcp.md
index 8f0bdf4dac..65d0c39ef0 100644
--- a/docs/en/how-to/connect-ide/sqlite_mcp.md
+++ b/docs/en/how-to/connect-ide/sqlite_mcp.md
@@ -43,19 +43,19 @@ to expose your developer assistant tools to a SQLite instance:
    <!-- {x-release-please-start-version} -->
    {{< tabpane persist=header >}}
 {{< tab header="linux/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/linux/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/linux/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/arm64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/arm64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/arm64/toolbox
 {{< /tab >}}
 
 {{< tab header="darwin/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/darwin/amd64/toolbox
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/darwin/amd64/toolbox
 {{< /tab >}}
 
 {{< tab header="windows/amd64" lang="bash" >}}
-curl -O https://storage.googleapis.com/genai-toolbox/v0.26.0/windows/amd64/toolbox.exe
+curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/windows/amd64/toolbox.exe
 {{< /tab >}}
 {{< /tabpane >}}
     <!-- {x-release-please-end} -->
diff --git a/docs/en/how-to/deploy_adk_agent.md b/docs/en/how-to/deploy_adk_agent.md
index adb390352a..cc247d4831 100644
--- a/docs/en/how-to/deploy_adk_agent.md
+++ b/docs/en/how-to/deploy_adk_agent.md
@@ -46,10 +46,10 @@ with the necessary configuration for deployment to Vertex AI Agent Engine.
     process will generate deployment configuration files (like a `Makefile` and
     `Dockerfile`) in your project directory.
 
-4.  Add `toolbox-core` as a dependency to the new project:
+4.  Add `google-adk[toolbox]` as a dependency to the new project:
 
     ```bash
-    uv add toolbox-core
+    uv add google-adk[toolbox]
     ```
 
 ## Step 3: Configure Google Cloud Authentication
@@ -83,34 +83,32 @@ Toolbox instead of the local address.
 
 2.  Open your agent file (`my_agent/agent.py`).
 
-3.  Update the `ToolboxSyncClient` initialization to use your Cloud Run URL.
+3.  Update the `ToolboxToolset` initialization to point to your Cloud Run service URL. Replace the existing initialization code with the following:
 
-    {{% alert color="info" %}}
-Since Cloud Run services are secured by default, you also need to provide an
-authentication token.
+    {{% alert color="info" title="Note" %}}
+Since Cloud Run services are secured by default, you also need to provide a workload identity.
     {{% /alert %}}
 
-    Replace your existing client initialization code with the following:
-
     ```python
     from google.adk import Agent
     from google.adk.apps import App
-    from toolbox_core import ToolboxSyncClient, auth_methods
+    from google.adk.tools.toolbox_toolset import ToolboxToolset
+    from toolbox_adk import CredentialStrategy
 
     # TODO(developer): Replace with your Toolbox Cloud Run Service URL
     TOOLBOX_URL = "https://your-toolbox-service-xyz.a.run.app"
 
-    # Initialize the client with the Cloud Run URL and Auth headers
-    client = ToolboxSyncClient(
-        TOOLBOX_URL, 
-        client_headers={"Authorization": auth_methods.get_google_id_token(TOOLBOX_URL)}
+    # Initialize the toolset with Workload Identity (generates ID token for the URL)
+    toolset = ToolboxToolset(
+        server_url=TOOLBOX_URL,
+        credentials=CredentialStrategy.workload_identity(target_audience=TOOLBOX_URL)
     )
 
     root_agent = Agent(
         name='root_agent',
         model='gemini-2.5-flash',
         instruction="You are a helpful AI assistant designed to provide accurate and useful information.",
-        tools=client.load_toolset(),
+        tools=[toolset],
     )
 
     app = App(root_agent=root_agent, name="my_agent")
@@ -131,14 +129,14 @@ app = App(root_agent=root_agent, name="my_agent")
 Run the deployment command:
 
 ```bash
-make backend
+make deploy
 ```
 
 This command will build your agent's container image and deploy it to Vertex AI.
 
 ## Step 6: Test your Deployment
 
-Once the deployment command (`make backend`) completes, it will output the URL
+Once the deployment command (`make deploy`) completes, it will output the URL
 for the Agent Engine Playground. You can click on this URL to open the
 Playground in your browser and start chatting with your agent to test the tools.
 
diff --git a/docs/en/how-to/generate_skill.md b/docs/en/how-to/generate_skill.md
new file mode 100644
index 0000000000..7fa731e85b
--- /dev/null
+++ b/docs/en/how-to/generate_skill.md
@@ -0,0 +1,112 @@
+---
+title: "Generate Agent Skills"
+type: docs
+weight: 10
+description: >
+  How to generate agent skills from a toolset.
+---
+
+The `skills-generate` command allows you to convert a **toolset** into an **Agent Skill**. A toolset is a collection of tools, and the generated skill will contain metadata and execution scripts for all tools within that toolset, complying with the [Agent Skill specification](https://agentskills.io/specification).
+
+## Before you begin
+
+1. Make sure you have the `toolbox` executable in your PATH.
+2. Make sure you have [Node.js](https://nodejs.org/) installed on your system.
+
+## Generating a Skill from a Toolset
+
+A skill package consists of a `SKILL.md` file (with required YAML frontmatter) and a set of Node.js scripts. Each tool defined in your toolset maps to a corresponding script in the generated Node.js scripts (`.js`) that work across different platforms (Linux, macOS, Windows).
+
+
+### Command Usage
+
+The basic syntax for the command is:
+
+```bash
+toolbox <tool-source> skills-generate \
+  --name <skill-name> \
+  --toolset <toolset-name> \
+  --description <description> \
+  --output-dir <output-directory>
+```
+
+- `<tool-source>`: Can be `--tools-file`, `--tools-files`, `--tools-folder`, and `--prebuilt`. See the [CLI Reference](../reference/cli.md) for details.
+- `--name`: Name of the generated skill.
+- `--description`: Description of the generated skill.
+- `--toolset`: (Optional) Name of the toolset to convert into a skill. If not provided, all tools will be included.
+- `--output-dir`: (Optional) Directory to output generated skills (default: "skills").
+
+{{< notice note >}}
+**Note:** The `<skill-name>` must follow the Agent Skill [naming convention](https://agentskills.io/specification): it must contain only lowercase alphanumeric characters and hyphens, cannot start or end with a hyphen, and cannot contain consecutive hyphens (e.g., `my-skill`, `data-processing`).
+{{< /notice >}}
+
+### Example: Custom Tools File
+
+1. Create a `tools.yaml` file with a toolset and some tools:
+
+   ```yaml
+   tools:
+     tool_a:
+       description: "First tool"
+       run:
+         command: "echo 'Tool A'"
+     tool_b:
+       description: "Second tool"
+       run:
+         command: "echo 'Tool B'"
+   toolsets:
+     my_toolset:
+       tools:
+         - tool_a
+         - tool_b
+   ```
+
+2. Generate the skill:
+
+   ```bash
+   toolbox --tools-file tools.yaml skills-generate \
+     --name "my-skill" \
+     --toolset "my_toolset" \
+     --description "A skill containing multiple tools" \
+     --output-dir "generated-skills"
+   ```
+
+3. The generated skill directory structure:
+
+   ```text
+   generated-skills/
+   └── my-skill/
+       ├── SKILL.md
+       ├── assets/
+       │   ├── tool_a.yaml
+       │   └── tool_b.yaml
+       └── scripts/
+           ├── tool_a.js
+           └── tool_b.js
+   ```
+
+   In this example, the skill contains two Node.js scripts (`tool_a.js` and `tool_b.js`), each mapping to a tool in the original toolset.
+
+### Example: Prebuilt Configuration
+
+You can also generate skills from prebuilt toolsets:
+
+```bash
+toolbox --prebuilt alloydb-postgres-admin skills-generate \
+  --name "alloydb-postgres-admin" \
+  --description "skill for performing administrative operations on alloydb"
+```
+
+## Installing the Generated Skill in Gemini CLI
+
+Once you have generated a skill, you can install it into the Gemini CLI using the `gemini skills install` command.
+
+### Installation Command
+
+Provide the path to the directory containing the generated skill:
+
+```bash
+gemini skills install /path/to/generated-skills/my-skill
+```
+
+Alternatively, use ~/.gemini/skills as the `--output-dir` to generate the skill straight to the Gemini CLI.
diff --git a/docs/en/how-to/invoke_tool.md b/docs/en/how-to/invoke_tool.md
new file mode 100644
index 0000000000..4fc23d3a2c
--- /dev/null
+++ b/docs/en/how-to/invoke_tool.md
@@ -0,0 +1,75 @@
+---
+title: "Invoke Tools via CLI"
+type: docs
+weight: 10
+description: >
+  Learn how to invoke your tools directly from the command line using the `invoke` command.
+---
+
+The `invoke` command allows you to invoke tools defined in your configuration directly from the CLI. This is useful for:
+
+- **Ephemeral Invocation:** Executing a tool without spinning up a full MCP server/client.
+- **Debugging:** Isolating tool execution logic and testing with various parameter combinations.
+
+{{< notice tip >}}
+**Keep configurations minimal:** The `invoke` command initializes *all* resources (sources, tools, etc.) defined in your configuration files during execution. To ensure fast response times, consider using a minimal configuration file containing only the tools you need for the specific invocation.
+{{< /notice >}}
+
+## Before you begin
+
+1. Make sure you have the `toolbox` binary installed or built.
+2. Make sure you have a valid tool configuration file (e.g., `tools.yaml`).
+
+### Command Usage
+
+The basic syntax for the command is:
+
+```bash
+toolbox <tool-source> invoke <tool-name> [params]
+```
+
+- `<tool-source>`: Can be `--tools-file`, `--tools-files`, `--tools-folder`, and `--prebuilt`. See the [CLI Reference](../reference/cli.md) for details.
+- `<tool-name>`: The name of the tool you want to call. This must match the name defined in your `tools.yaml`.
+- `[params]`: (Optional) A JSON string representing the arguments for the tool.
+
+## Examples
+
+### 1. Calling a Tool without Parameters
+
+If your tool takes no parameters, simply provide the tool name:
+
+```bash
+toolbox  --tools-file tools.yaml invoke my-simple-tool
+```
+
+### 2. Calling a Tool with Parameters
+
+For tools that require arguments, pass them as a JSON string. Ensure you escape quotes correctly for your shell.
+
+**Example: A tool that takes parameters**
+
+Assuming a tool named `mytool` taking `a` and `b`:
+
+```bash
+toolbox --tools-file tools.yaml invoke mytool '{"a": 10, "b": 20}' 
+```
+
+**Example: A tool that queries a database**
+
+```bash
+toolbox  --tools-file tools.yaml invoke db-query '{"sql": "SELECT * FROM users LIMIT 5"}'
+```
+
+### 3. Using Prebuilt Configurations
+
+You can also use the `--prebuilt` flag to load prebuilt toolsets.
+
+```bash
+toolbox --prebuilt cloudsql-postgres invoke cloudsql-postgres-list-instances
+```
+
+## Troubleshooting
+
+- **Tool not found:** Ensure the `<tool-name>` matches exactly what is in your YAML file and that the file is correctly loaded via `--tools-file`.
+- **Invalid parameters:** Double-check your JSON syntax. The error message will usually indicate if the JSON parsing failed or if the parameters didn't match the tool's schema.
+- **Auth errors:** The `invoke` command currently does not support flows requiring client-side authorization (like OAuth flow initiation via the CLI). It works best for tools using service-side authentication (e.g., Application Default Credentials).
diff --git a/docs/en/reference/cli.md b/docs/en/reference/cli.md
index 686dbc0c73..11549c2830 100644
--- a/docs/en/reference/cli.md
+++ b/docs/en/reference/cli.md
@@ -27,9 +27,53 @@ description: >
 |              | `--ui`                     | Launches the Toolbox UI web server.                                                                                                                                              |             |
 |              | `--allowed-origins`        | Specifies a list of origins permitted to access this server for CORs access.                                                                                                     | `*`         |
 |              | `--allowed-hosts`          | Specifies a list of hosts permitted to access this server to prevent DNS rebinding attacks.                                                                                      | `*`         |
-|              | `--user-agent-extra`       | Appends additional metadata to the User-Agent.                                                                                                                                   |             |
+|              | `--user-agent-metadata`    | Appends additional metadata to the User-Agent.                                                                                                                                   |             |
 | `-v`         | `--version`                | version for toolbox                                                                                                                                                              |             |
 
+## Sub Commands
+
+<details>
+<summary><code>invoke</code></summary>
+
+Executes a tool directly with the provided parameters. This is useful for testing tool configurations and parameters without needing a full client setup.
+
+**Syntax:**
+
+```bash
+toolbox invoke <tool-name> [params]
+```
+
+**Arguments:**
+
+- `tool-name`: The name of the tool to execute (as defined in your configuration).
+- `params`: (Optional) A JSON string containing the parameters for the tool.
+
+For more detailed instructions, see [Invoke Tools via CLI](../how-to/invoke_tool.md).
+
+</details>
+
+<details>
+<summary><code>skills-generate</code></summary>
+
+Generates a skill package from a specified toolset. Each tool in the toolset will have a corresponding Node.js execution script in the generated skill.
+
+**Syntax:**
+
+```bash
+toolbox skills-generate --name <name> --description <description> --toolset <toolset> --output-dir <output>
+```
+
+**Flags:**
+
+- `--name`: Name of the generated skill.
+- `--description`: Description of the generated skill.
+- `--toolset`: (Optional) Name of the toolset to convert into a skill. If not provided, all tools will be included.
+- `--output-dir`: (Optional) Directory to output generated skills (default: "skills").
+
+For more detailed instructions, see [Generate Agent Skills](../how-to/generate_skill.md).
+
+</details>
+
 ## Examples
 
 ### Transport Configuration
diff --git a/docs/en/reference/prebuilt-tools.md b/docs/en/reference/prebuilt-tools.md
index a539af9fb2..7a52236dfa 100644
--- a/docs/en/reference/prebuilt-tools.md
+++ b/docs/en/reference/prebuilt-tools.md
@@ -54,9 +54,9 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `get_query_plan`: Generate the execution plan of a statement.
     *   `list_views`: Lists views in the database from pg_views with a default
         limit of 50 rows. Returns schemaname, viewname and the ownername.
-    *   `list_schemas`: Lists schemas in the database. 
-    *   `database_overview`: Fetches the current state of the PostgreSQL server. 
-    *   `list_triggers`: Lists triggers in the database. 
+    *   `list_schemas`: Lists schemas in the database.
+    *   `database_overview`: Fetches the current state of the PostgreSQL server.
+    *   `list_triggers`: Lists triggers in the database.
     *   `list_indexes`: List available user indexes in a PostgreSQL database.
     *   `list_sequences`: List sequences in a PostgreSQL database.
     *   `list_publication_tables`: List publication tables in a PostgreSQL database.
@@ -64,7 +64,7 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
     *   `list_database_stats`: Lists the key performance and activity statistics for
         each database in the AlloyDB instance.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.  
+    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.
 
 ## AlloyDB Postgres Admin
 
@@ -100,6 +100,43 @@ See [Usage Examples](../reference/cli.md#examples).
         (timeseries metrics) for queries running in an AlloyDB instance using a
         PromQL query.
 
+## AlloyDB Omni
+
+*   `--prebuilt` value: `alloydb-omni`
+*   **Environment Variables:**
+    *   `ALLOYDB_OMNI_HOST`: (Optional) The hostname or IP address (Default: localhost).
+    *   `ALLOYDB_OMNI_PORT`: (Optional) The port number (Default: 5432).
+    *   `ALLOYDB_OMNI_DATABASE`: The name of the database to connect to.
+    *   `ALLOYDB_OMNI_USER`: The database username.
+    *   `ALLOYDB_OMNI_PASSWORD`: (Optional) The password for the database user.
+    *   `ALLOYDB_OMNI_QUERY_PARAMS`: (Optional) Connection query parameters.
+*   **Tools:**
+    *   `execute_sql`: Executes a SQL query.
+    *   `list_tables`: Lists tables in the database.
+    *   `list_autovacuum_configurations`: Lists autovacuum configurations in the
+        database.
+    *   `list_columnar_configurations`: List AlloyDB Omni columnar-related configurations.
+    *   `list_columnar_recommended_columns`: Lists columns that AlloyDB Omni recommends adding to the columnar engine.
+    *   `list_memory_configurations`: Lists memory-related configurations in the
+        database.
+    *   `list_top_bloated_tables`: List top bloated tables in the database.
+    *   `list_replication_slots`: Lists replication slots in the database.
+    *   `list_invalid_indexes`: Lists invalid indexes in the database.
+    *   `get_query_plan`: Generate the execution plan of a statement.
+    *   `list_views`: Lists views in the database from pg_views with a default
+        limit of 50 rows. Returns schemaname, viewname and the ownername.
+    *   `list_schemas`: Lists schemas in the database.
+    *   `database_overview`: Fetches the current state of the PostgreSQL server.
+    *   `list_triggers`: Lists triggers in the database.
+    *   `list_indexes`: List available user indexes in a PostgreSQL database.
+    *   `list_sequences`: List sequences in a PostgreSQL database.
+    *   `list_publication_tables`: List publication tables in a PostgreSQL database.
+    *   `list_tablespaces`: Lists tablespaces in the database.
+    *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
+    *   `list_database_stats`: Lists the key performance and activity statistics for
+        each database in the AlloyDB instance.
+    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.
+
 ## BigQuery
 
 *   `--prebuilt` value: `bigquery`
@@ -243,9 +280,9 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `get_query_plan`: Generate the execution plan of a statement.
     *   `list_views`: Lists views in the database from pg_views with a default
         limit of 50 rows. Returns schemaname, viewname and the ownername.
-    *   `list_schemas`: Lists schemas in the database. 
-    *   `database_overview`: Fetches the current state of the PostgreSQL server. 
-    *   `list_triggers`: Lists triggers in the database. 
+    *   `list_schemas`: Lists schemas in the database.
+    *   `database_overview`: Fetches the current state of the PostgreSQL server.
+    *   `list_triggers`: Lists triggers in the database.
     *   `list_indexes`: List available user indexes in a PostgreSQL database.
     *   `list_sequences`: List sequences in a PostgreSQL database.
     *   `list_publication_tables`: List publication tables in a PostgreSQL database.
@@ -253,7 +290,7 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
     *   `list_database_stats`: Lists the key performance and activity statistics for
         each database in the postgreSQL instance.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.  
+    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.
 
 ## Cloud SQL for PostgreSQL Observability
 
@@ -377,10 +414,10 @@ See [Usage Examples](../reference/cli.md#examples).
         entries.
     *   **Dataplex Editor** (`roles/dataplex.editor`) to modify entries.
 *   **Tools:**
-    *   `dataplex_search_entries`: Searches for entries in Dataplex Catalog.
-    *   `dataplex_lookup_entry`: Retrieves a specific entry from Dataplex
+    *   `search_entries`: Searches for entries in Dataplex Catalog.
+    *   `lookup_entry`: Retrieves a specific entry from Dataplex
         Catalog.
-    *   `dataplex_search_aspect_types`: Finds aspect types relevant to the
+    *   `search_aspect_types`: Finds aspect types relevant to the
         query.
 
 ## Firestore
@@ -451,6 +488,7 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `create_project_file`: Create a new LookML file.
     *   `update_project_file`: Update an existing LookML file.
     *   `delete_project_file`: Delete a LookML file.
+    *   `validate_project`: Check the syntax of a LookML project.
     *   `get_connections`: Get the available connections in a Looker instance.
     *   `get_connection_schemas`: Get the available schemas in a connection.
     *   `get_connection_databases`: Get the available databases in a connection.
@@ -564,9 +602,9 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `get_query_plan`: Generate the execution plan of a statement.
     *   `list_views`: Lists views in the database from pg_views with a default
         limit of 50 rows. Returns schemaname, viewname and the ownername.
-    *   `list_schemas`: Lists schemas in the database. 
-    *   `database_overview`: Fetches the current state of the PostgreSQL server. 
-    *   `list_triggers`: Lists triggers in the database. 
+    *   `list_schemas`: Lists schemas in the database.
+    *   `database_overview`: Fetches the current state of the PostgreSQL server.
+    *   `list_triggers`: Lists triggers in the database.
     *   `list_indexes`: List available user indexes in a PostgreSQL database.
     *   `list_sequences`: List sequences in a PostgreSQL database.
     *   `list_publication_tables`: List publication tables in a PostgreSQL database.
@@ -574,7 +612,7 @@ See [Usage Examples](../reference/cli.md#examples).
     *   `list_pg_settings`: List configuration parameters for the PostgreSQL server.
     *   `list_database_stats`: Lists the key performance and activity statistics for
         each database in the PostgreSQL server.
-    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.  
+    *   `list_roles`: Lists all the user-created roles in PostgreSQL database.
 
 ## Google Cloud Serverless for Apache Spark
 
diff --git a/docs/en/resources/authServices/_index.md b/docs/en/resources/authServices/_index.md
index 757b58a1a3..a40ce182d1 100644
--- a/docs/en/resources/authServices/_index.md
+++ b/docs/en/resources/authServices/_index.md
@@ -28,17 +28,19 @@ The following configurations are placed at the top level of a `tools.yaml` file.
 {{< notice tip >}}
 If you are accessing Toolbox with multiple applications, each
  application should register their own Client ID even if they use the same
- "kind" of auth provider.
+ "type" of auth provider.
 {{< /notice >}}
 
 ```yaml
-authServices:
-  my_auth_app_1:
-    kind: google
-    clientId: ${YOUR_CLIENT_ID_1}
-  my_auth_app_2:
-    kind: google
-    clientId: ${YOUR_CLIENT_ID_2}
+kind: authServices
+name: my_auth_app_1
+type: google
+clientId: ${YOUR_CLIENT_ID_1}
+---
+kind: authServices
+name: my_auth_app_2
+type: google
+clientId: ${YOUR_CLIENT_ID_2}
 ```
 
 {{< notice tip >}}
diff --git a/docs/en/resources/authServices/google.md b/docs/en/resources/authServices/google.md
index b0950040d3..f44284731e 100644
--- a/docs/en/resources/authServices/google.md
+++ b/docs/en/resources/authServices/google.md
@@ -40,10 +40,10 @@ id-token][provided-claims] can be used for the parameter.
 ## Example
 
 ```yaml
-authServices:
-  my-google-auth:
-    kind: google
-    clientId: ${YOUR_GOOGLE_CLIENT_ID}
+kind: authServices
+name: my-google-auth
+type: google
+clientId: ${YOUR_GOOGLE_CLIENT_ID}
 ```
 
 {{< notice tip >}}
@@ -55,5 +55,5 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                  |
 |-----------|:--------:|:------------:|------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "google".                                                |
+| type      |  string  |     true     | Must be "google".                                                |
 | clientId  |  string  |     true     | Client ID of your application from registering your application. |
diff --git a/docs/en/resources/embeddingModels/_index.md b/docs/en/resources/embeddingModels/_index.md
index d9da2b71c3..8fb867306f 100644
--- a/docs/en/resources/embeddingModels/_index.md
+++ b/docs/en/resources/embeddingModels/_index.md
@@ -54,12 +54,12 @@ ${ENV_NAME} instead of hardcoding your API keys into the configuration file.
 Define an embedding model in the `embeddingModels` section:
 
 ```yaml
-embeddingModels:
-  gemini-model: # Name of the embedding model
-    kind: gemini
-    model: gemini-embedding-001
-    apiKey: ${GOOGLE_API_KEY}
-    dimension: 768
+kind: embeddingModels
+name: gemini-model # Name of the embedding model
+type: gemini
+model: gemini-embedding-001
+apiKey: ${GOOGLE_API_KEY}
+dimension: 768
 ```
 
 ### Step 2 - Embed Tool Parameters
@@ -68,38 +68,39 @@ Use the defined embedding model, embed your query parameters using the
 `embeddedBy` field. Only string-typed parameters can be embedded:
 
 ```yaml
-tools:
-  # Vector ingestion tool
-  insert_embedding:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      INSERT INTO documents (content, embedding) 
-      VALUES ($1, $2);
-    parameters:
-      - name: content
-        type: string
-        description: The raw text content to be stored in the database.
-      - name: vector_string
-        type: string
-        # This parameter is hidden from the LLM.
-        # It automatically copies the value from 'content' and embeds it.
-        valueFromParam: content
-        embeddedBy: gemini-model
-
-  # Semantic search tool
-  search_embedding:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      SELECT id, content, embedding <-> $1 AS distance 
-      FROM documents
-      ORDER BY distance LIMIT 1
-    parameters:
-      - name: semantic_search_string
-        type: string
-        description: The search query that will be converted to a vector.
-        embeddedBy: gemini-model # refers to the name of a defined embedding model
+# Vector ingestion tool
+kind: tools
+name: insert_embedding
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  INSERT INTO documents (content, embedding) 
+  VALUES ($1, $2);
+parameters:
+  - name: content
+    type: string
+    description: The raw text content to be stored in the database.
+  - name: vector_string
+    type: string
+    # This parameter is hidden from the LLM.
+    # It automatically copies the value from 'content' and embeds it.
+    valueFromParam: content
+    embeddedBy: gemini-model
+---
+# Semantic search tool
+kind: tools
+name: search_embedding
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT id, content, embedding <-> $1 AS distance 
+  FROM documents
+  ORDER BY distance LIMIT 1
+parameters:
+  - name: semantic_search_string
+    type: string
+    description: The search query that will be converted to a vector.
+    embeddedBy: gemini-model # refers to the name of a defined embedding model
 ```
 
 ## Kinds of Embedding Models
diff --git a/docs/en/resources/embeddingModels/gemini.md b/docs/en/resources/embeddingModels/gemini.md
index 8fcf8cf358..7555c91f85 100644
--- a/docs/en/resources/embeddingModels/gemini.md
+++ b/docs/en/resources/embeddingModels/gemini.md
@@ -50,12 +50,12 @@ information.
 ## Example
 
 ```yaml
-embeddingModels:
-  gemini-model:
-    kind: gemini
-    model: gemini-embedding-001
-    apiKey: ${GOOGLE_API_KEY}
-    dimension: 768
+kind: embeddingModels
+name: gemini-model
+type: gemini
+model: gemini-embedding-001
+apiKey: ${GOOGLE_API_KEY}
+dimension: 768
 ```
 
 {{< notice tip >}}
@@ -67,7 +67,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                              |
 |-----------|:--------:|:------------:|--------------------------------------------------------------|
-| kind      |  string  |     true     | Must be `gemini`.                                            |
+| type      |  string  |     true     | Must be `gemini`.                                            |
 | model     |  string  |     true     | The Gemini model ID to use (e.g., `gemini-embedding-001`).   |
 | apiKey    |  string  |    false     | Your API Key from Google AI Studio.                          |
 | dimension | integer  |    false     | The number of dimensions in the output vector (e.g., `768`). |
diff --git a/docs/en/resources/prompts/_index.md b/docs/en/resources/prompts/_index.md
index 5227ba8470..b62f8d17ae 100644
--- a/docs/en/resources/prompts/_index.md
+++ b/docs/en/resources/prompts/_index.md
@@ -16,14 +16,14 @@ can be sent to a Large Language Model (LLM). The Toolbox server implements the
 specification, allowing clients to discover and retrieve these prompts.
 
 ```yaml
-prompts:
-  code_review:
-    description: "Asks the LLM to analyze code quality and suggest improvements."
-    messages:
-      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-    arguments:
-      - name: "code"
-        description: "The code to review"
+kind: prompts
+name: code_review
+description: "Asks the LLM to analyze code quality and suggest improvements."
+messages:
+  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
+arguments:
+  - name: "code"
+    description: "The code to review"
 ```
 
 ## Prompt Schema
@@ -31,7 +31,7 @@ prompts:
 | **field**   | **type**                       | **required** | **description**                                                          |
 |-------------|--------------------------------|--------------|--------------------------------------------------------------------------|
 | description | string                         | No           | A brief explanation of what the prompt does.                             |
-| kind        | string                         | No           | The kind of prompt. Defaults to `"custom"`.                              |
+| type        | string                         | No           | The type of prompt. Defaults to `"custom"`.                              |
 | messages    | [][Message](#message-schema)   | Yes          | A list of one or more message objects that make up the prompt's content. |
 | arguments   | [][Argument](#argument-schema) | No           | A list of arguments that can be interpolated into the prompt's content.  |
 
diff --git a/docs/en/resources/prompts/custom/_index.md b/docs/en/resources/prompts/custom/_index.md
index 01eedafdbf..01a8db4ca9 100644
--- a/docs/en/resources/prompts/custom/_index.md
+++ b/docs/en/resources/prompts/custom/_index.md
@@ -17,14 +17,14 @@ Here is an example of a simple prompt that takes a single argument, code, and
 asks an LLM to review it.
 
 ```yaml
-prompts:
-  code_review:
-    description: "Asks the LLM to analyze code quality and suggest improvements."
-    messages:
-      - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
-    arguments:
-      - name: "code"
-        description: "The code to review"
+kind: prompts
+name: code_review
+description: "Asks the LLM to analyze code quality and suggest improvements."
+messages:
+  - content: "Please review the following code for quality, correctness, and potential improvements: \n\n{{.code}}"
+arguments:
+  - name: "code"
+    description: "The code to review"
 ```
 
 ### Multi-message prompt
@@ -33,19 +33,19 @@ You can define prompts with multiple messages to set up more complex
 conversational contexts, like a role-playing scenario.
 
 ```yaml
-prompts:
-  roleplay_scenario:
-    description: "Sets up a roleplaying scenario with initial messages."
-    arguments:
-      - name: "character"
-        description: "The character the AI should embody."
-      - name: "situation"
-        description: "The initial situation for the roleplay."
-    messages:
-      - role: "user"
-        content: "Let's roleplay. You are {{.character}}. The situation is: {{.situation}}"
-      - role: "assistant"
-        content: "Okay, I understand. I am ready. What happens next?"
+kind: prompts
+name: roleplay_scenario
+description: "Sets up a roleplaying scenario with initial messages."
+arguments:
+  - name: "character"
+    description: "The character the AI should embody."
+  - name: "situation"
+    description: "The initial situation for the roleplay."
+messages:
+  - role: "user"
+    content: "Let's roleplay. You are {{.character}}. The situation is: {{.situation}}"
+  - role: "assistant"
+    content: "Okay, I understand. I am ready. What happens next?"
 ```
 
 ## Reference
@@ -54,7 +54,7 @@ prompts:
 
 | **field**   | **type**                       | **required** | **description**                                                          |
 |-------------|--------------------------------|--------------|--------------------------------------------------------------------------|
-| kind        | string                         | No           | The kind of prompt. Must be `"custom"`.                                  |
+| type        | string                         | No           | The type of prompt. Must be `"custom"`.                                  |
 | description | string                         | No           | A brief explanation of what the prompt does.                             |
 | messages    | [][Message](#message-schema)   | Yes          | A list of one or more message objects that make up the prompt's content. |
 | arguments   | [][Argument](#argument-schema) | No           | A list of arguments that can be interpolated into the prompt's content.  |
diff --git a/docs/en/resources/sources/_index.md b/docs/en/resources/sources/_index.md
index a5f916726f..21d281f6a3 100644
--- a/docs/en/resources/sources/_index.md
+++ b/docs/en/resources/sources/_index.md
@@ -17,15 +17,15 @@ instead of hardcoding your secrets into the configuration file.
 {{< /notice >}}
 
 ```yaml
-sources:
-    my-cloud-sql-source:
-        kind: cloud-sql-postgres
-        project: my-project-id
-        region: us-central1
-        instance: my-instance-name
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
+kind: sources
+name: my-cloud-sql-source
+type: cloud-sql-postgres
+project: my-project-id
+region: us-central1
+instance: my-instance-name
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
 ```
 
 In implementation, each source is a different connection pool or client that used
diff --git a/docs/en/resources/sources/alloydb-admin.md b/docs/en/resources/sources/alloydb-admin.md
index cddff47533..0584994ab1 100644
--- a/docs/en/resources/sources/alloydb-admin.md
+++ b/docs/en/resources/sources/alloydb-admin.md
@@ -25,19 +25,20 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-sources:
-    my-alloydb-admin:
-        kind: alloy-admin
-
-    my-oauth-alloydb-admin:
-        kind: alloydb-admin
-        useClientOAuth: true
+kind: sources
+name: my-alloydb-admin
+type: alloydb-admin
+---
+kind: sources
+name: my-oauth-alloydb-admin
+type: alloydb-admin
+useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                |
 | -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| kind           |  string  |     true     | Must be "alloydb-admin".                                                                                                                       |
+| type           |  string  |     true     | Must be "alloydb-admin".                                                                                                                       |
 | defaultProject |  string  |     false    | The Google Cloud project ID to use for AlloyDB infrastructure tools.                                                                           |
 | useClientOAuth |  boolean |     false    | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |
diff --git a/docs/en/resources/sources/alloydb-pg.md b/docs/en/resources/sources/alloydb-pg.md
index 2fa502aaec..b7fe99c759 100644
--- a/docs/en/resources/sources/alloydb-pg.md
+++ b/docs/en/resources/sources/alloydb-pg.md
@@ -176,17 +176,17 @@ To connect using IAM authentication:
 ## Example
 
 ```yaml
-sources:
-    my-alloydb-pg-source:
-        kind: alloydb-postgres
-        project: my-project-id
-        region: us-central1
-        cluster: my-cluster
-        instance: my-instance
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # ipType: "public"
+kind: sources
+name: my-alloydb-pg-source
+type: alloydb-postgres
+project: my-project-id
+region: us-central1
+cluster: my-cluster
+instance: my-instance
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+# ipType: "public"
 ```
 
 {{< notice tip >}}
@@ -194,11 +194,20 @@ Use environment variable replacement with the format ${ENV_NAME}
 instead of hardcoding your secrets into the configuration file.
 {{< /notice >}}
 
+### Managed Connection Pooling
+
+Toolbox automatically supports [Managed Connection Pooling][alloydb-mcp]. If your AlloyDB instance has Managed Connection Pooling enabled, the connection will immediately benefit from increased throughput and reduced latency.
+
+The interface is identical, so there's no additional configuration required on the client. For more information on configuring your instance, see the [AlloyDB Managed Connection Pooling documentation][alloydb-mcp-docs].
+
+[alloydb-mcp]: https://cloud.google.com/blog/products/databases/alloydb-managed-connection-pooling
+[alloydb-mcp-docs]: https://cloud.google.com/alloydb/docs/configure-managed-connection-pooling
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
+| type      |  string  |     true     | Must be "alloydb-postgres".                                                                                              |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
 | cluster   |  string  |     true     | Name of the AlloyDB cluster (e.g. "my-cluster").                                                                         |
diff --git a/docs/en/resources/sources/bigquery.md b/docs/en/resources/sources/bigquery.md
index 8cb05ccbb8..b898f9f383 100644
--- a/docs/en/resources/sources/bigquery.md
+++ b/docs/en/resources/sources/bigquery.md
@@ -121,47 +121,47 @@ identity used has been granted the correct IAM permissions.
 Initialize a BigQuery source that uses ADC:
 
 ```yaml
-sources:
-  my-bigquery-source:
-    kind: "bigquery"
-    project: "my-project-id"
-    # location: "US" # Optional: Specifies the location for query jobs.
-    # writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
-    # allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
-    #   - "my_dataset_1"
-    #   - "other_project.my_dataset_2"
-    # impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
-    # scopes: # Optional: List of OAuth scopes to request.
-    #   - "https://www.googleapis.com/auth/bigquery"
-    #   - "https://www.googleapis.com/auth/drive.readonly"
-    # maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
+kind: sources
+name: my-bigquery-source
+type: "bigquery"
+project: "my-project-id"
+# location: "US" # Optional: Specifies the location for query jobs.
+# writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
+# allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
+#   - "my_dataset_1"
+#   - "other_project.my_dataset_2"
+# impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
+# scopes: # Optional: List of OAuth scopes to request.
+#   - "https://www.googleapis.com/auth/bigquery"
+#   - "https://www.googleapis.com/auth/drive.readonly"
+# maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
 ```
 
 Initialize a BigQuery source that uses the client's access token:
 
 ```yaml
-sources:
-  my-bigquery-client-auth-source:
-    kind: "bigquery"
-    project: "my-project-id"
-    useClientOAuth: true
-    # location: "US" # Optional: Specifies the location for query jobs.
-    # writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
-    # allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
-    #   - "my_dataset_1"
-    #   - "other_project.my_dataset_2"
-    # impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
-    # scopes: # Optional: List of OAuth scopes to request.
-    #   - "https://www.googleapis.com/auth/bigquery"
-    #   - "https://www.googleapis.com/auth/drive.readonly"
-    # maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
+kind: sources
+name: my-bigquery-client-auth-source
+type: "bigquery"
+project: "my-project-id"
+useClientOAuth: true
+# location: "US" # Optional: Specifies the location for query jobs.
+# writeMode: "allowed" # One of: allowed, blocked, protected. Defaults to "allowed".
+# allowedDatasets: # Optional: Restricts tool access to a specific list of datasets.
+#   - "my_dataset_1"
+#   - "other_project.my_dataset_2"
+# impersonateServiceAccount: "service-account@project-id.iam.gserviceaccount.com" # Optional: Service account to impersonate
+# scopes: # Optional: List of OAuth scopes to request.
+#   - "https://www.googleapis.com/auth/bigquery"
+#   - "https://www.googleapis.com/auth/drive.readonly"
+# maxQueryResultRows: 50 # Optional: Limits the number of rows returned by queries. Defaults to 50.
 ```
 
 ## Reference
 
 | **field**                 | **type** | **required** | **description**                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     |
 |---------------------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind                      |  string  |     true     | Must be "bigquery".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+| type                      |  string  |     true     | Must be "bigquery".                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
 | project                   |  string  |     true     | Id of the Google Cloud project to use for billing and as the default project for BigQuery resources.                                                                                                                                                                                                                                                                                                                                                                                                                |
 | location                  |  string  |    false     | Specifies the location (e.g., 'us', 'asia-northeast1') in which to run the query job. This location must match the location of any tables referenced in the query. Defaults to the table's location or 'US' if the location cannot be determined. [Learn More](https://cloud.google.com/bigquery/docs/locations)                                                                                                                                                                                                    |
 | writeMode                 |  string  |    false     | Controls the write behavior for tools. `allowed` (default): All queries are permitted. `blocked`: Only `SELECT` statements are allowed for the `bigquery-execute-sql` tool. `protected`: Enables session-based execution where all tools associated with this source instance share the same [BigQuery session](https://cloud.google.com/bigquery/docs/sessions-intro). This allows for stateful operations using temporary tables (e.g., `CREATE TEMP TABLE`). For `bigquery-execute-sql`, `SELECT` statements can be used on all tables, but write operations are restricted to the session's temporary dataset. For tools like `bigquery-sql`, `bigquery-forecast`, and `bigquery-analyze-contribution`, the `writeMode` restrictions do not apply, but they will operate within the shared session. **Note:** The `protected` mode cannot be used with `useClientOAuth: true`. It is also not recommended for multi-user server environments, as all users would share the same session. A session is terminated automatically after 24 hours of inactivity or after 7 days, whichever comes first. A new session is created on the next request, and any temporary data from the previous session will be lost. |
diff --git a/docs/en/resources/sources/bigtable.md b/docs/en/resources/sources/bigtable.md
index e05653ac05..7e4207e9c5 100644
--- a/docs/en/resources/sources/bigtable.md
+++ b/docs/en/resources/sources/bigtable.md
@@ -59,17 +59,17 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-sources:
-  my-bigtable-source:
-    kind: "bigtable"
-    project: "my-project-id"
-    instance: "test-instance"
+kind: sources
+name: my-bigtable-source
+type: "bigtable"
+project: "my-project-id"
+instance: "test-instance"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                               |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "bigtable".                                                           |
+| type      |  string  |     true     | Must be "bigtable".                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id"). |
 | instance  |  string  |     true     | Name of the Bigtable instance.                                                |
diff --git a/docs/en/resources/sources/cassandra.md b/docs/en/resources/sources/cassandra.md
index 6a149718b4..1009a2bce0 100644
--- a/docs/en/resources/sources/cassandra.md
+++ b/docs/en/resources/sources/cassandra.md
@@ -23,19 +23,19 @@ distributed architectures, and a flexible approach to schema definition.
 ## Example
 
 ```yaml
-sources:
-    my-cassandra-source:
-        kind: cassandra
-        hosts:
-            - 127.0.0.1
-        keyspace: my_keyspace
-        protoVersion: 4
-        username: ${USER_NAME}
-        password: ${PASSWORD}
-        caPath: /path/to/ca.crt # Optional: path to CA certificate
-        certPath: /path/to/client.crt # Optional: path to client certificate
-        keyPath: /path/to/client.key # Optional: path to client key
-        enableHostVerification: true # Optional: enable host verification
+kind: sources
+name: my-cassandra-source
+type: cassandra
+hosts:
+    - 127.0.0.1
+keyspace: my_keyspace
+protoVersion: 4
+username: ${USER_NAME}
+password: ${PASSWORD}
+caPath: /path/to/ca.crt # Optional: path to CA certificate
+certPath: /path/to/client.crt # Optional: path to client certificate
+keyPath: /path/to/client.key # Optional: path to client key
+enableHostVerification: true # Optional: enable host verification
 ```
 
 {{< notice tip >}}
@@ -47,7 +47,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**              | **type** | **required** | **description**                                                                                                                                    |
 |------------------------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind                   |  string  |     true     | Must be "cassandra".                                                                                                                               |
+| type                   |  string  |     true     | Must be "cassandra".                                                                                                                               |
 | hosts                  | string[] |     true     | List of IP addresses to connect to (e.g., ["192.168.1.1:9042", "192.168.1.2:9042","192.168.1.3:9042"]). The default port is 9042 if not specified. |
 | keyspace               |  string  |     true     | Name of the Cassandra keyspace to connect to (e.g., "my_keyspace").                                                                                |
 | protoVersion           | integer  |    false     | Protocol version for the Cassandra connection (e.g., 4).                                                                                           |
diff --git a/docs/en/resources/sources/clickhouse.md b/docs/en/resources/sources/clickhouse.md
index 2442899ce5..378e52b22c 100644
--- a/docs/en/resources/sources/clickhouse.md
+++ b/docs/en/resources/sources/clickhouse.md
@@ -46,31 +46,31 @@ ClickHouse supports multiple protocols:
 ### 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
+kind: sources
+name: secure-clickhouse-source
+type: 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
+kind: sources
+name: http-clickhouse-source
+type: clickhouse
+host: localhost
+port: "8123"
+database: logs
+user: ${CLICKHOUSE_USER}
+password: ${CLICKHOUSE_PASSWORD}
+protocol: http
+secure: false
 ```
 
 {{< notice tip >}}
@@ -82,7 +82,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                     |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "clickhouse".                                                               |
+| type      |  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").                 |
diff --git a/docs/en/resources/sources/cloud-gda.md b/docs/en/resources/sources/cloud-gda.md
index dc400f17e8..5d65df3cb7 100644
--- a/docs/en/resources/sources/cloud-gda.md
+++ b/docs/en/resources/sources/cloud-gda.md
@@ -20,21 +20,22 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-sources:
-  my-gda-source:
-    kind: cloud-gemini-data-analytics
-    projectId: my-project-id
-
-  my-oauth-gda-source:
-    kind: cloud-gemini-data-analytics
-    projectId: my-project-id
-    useClientOAuth: true
+kind: sources
+name: my-gda-source
+type: cloud-gemini-data-analytics
+projectId: my-project-id
+---
+kind: sources
+name: my-oauth-gda-source
+type: cloud-gemini-data-analytics
+projectId: my-project-id
+useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                                              |
 | -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| kind           |  string  |     true     | Must be "cloud-gemini-data-analytics".                                                                                                                                       |
+| type           |  string  |     true     | Must be "cloud-gemini-data-analytics".                                                                                                                                       |
 | projectId      |  string  |     true     | The Google Cloud Project ID where the API is enabled.                                                                                                                        |
 | useClientOAuth | boolean  |    false     | If true, the source uses the token provided by the caller (forwarded to the API). Otherwise, it uses server-side Application Default Credentials (ADC). Defaults to `false`. |
diff --git a/docs/en/resources/sources/cloud-healthcare.md b/docs/en/resources/sources/cloud-healthcare.md
index 117079688a..b1bf3d6c35 100644
--- a/docs/en/resources/sources/cloud-healthcare.md
+++ b/docs/en/resources/sources/cloud-healthcare.md
@@ -123,41 +123,41 @@ identity used has been granted the correct IAM permissions.
 Initialize a Cloud Healthcare API source that uses ADC:
 
 ```yaml
-sources:
-  my-healthcare-source:
-    kind: "cloud-healthcare"
-    project: "my-project-id"
-    region: "us-central1"
-    dataset: "my-healthcare-dataset-id"
-    # allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
-    #   - "my_fhir_store_1"
-    # allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
-    #   - "my_dicom_store_1"
-    #   - "my_dicom_store_2"
+kind: sources
+name: my-healthcare-source
+type: "cloud-healthcare"
+project: "my-project-id"
+region: "us-central1"
+dataset: "my-healthcare-dataset-id"
+# allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
+#   - "my_fhir_store_1"
+# allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
+#   - "my_dicom_store_1"
+#   - "my_dicom_store_2"
 ```
 
 Initialize a Cloud Healthcare API source that uses the client's access token:
 
 ```yaml
-sources:
-  my-healthcare-client-auth-source:
-    kind: "cloud-healthcare"
-    project: "my-project-id"
-    region: "us-central1"
-    dataset: "my-healthcare-dataset-id"
-    useClientOAuth: true
-    # allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
-    #   - "my_fhir_store_1"
-    # allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
-    #   - "my_dicom_store_1"
-    #   - "my_dicom_store_2"
+kind: sources
+name: my-healthcare-client-auth-source
+type: "cloud-healthcare"
+project: "my-project-id"
+region: "us-central1"
+dataset: "my-healthcare-dataset-id"
+useClientOAuth: true
+# allowedFhirStores: # Optional: Restricts tool access to a specific list of FHIR store IDs.
+#   - "my_fhir_store_1"
+# allowedDicomStores: # Optional: Restricts tool access to a specific list of DICOM store IDs.
+#   - "my_dicom_store_1"
+#   - "my_dicom_store_2"
 ```
 
 ## Reference
 
 | **field**          | **type** | **required** | **description**                                                                                                                                                                                                                                                              |
 |--------------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |  string  |     true     | Must be "cloud-healthcare".                                                                                                                                                                                                                                                  |
+| type               |  string  |     true     | Must be "cloud-healthcare".                                                                                                                                                                                                                                                  |
 | project            |  string  |     true     | ID of the GCP project that the dataset lives in.                                                                                                                                                                                                                             |
 | region             |  string  |     true     | Specifies the region (e.g., 'us', 'asia-northeast1') of the healthcare dataset. [Learn More](https://cloud.google.com/healthcare-api/docs/regions)                                                                                                                           |
 | dataset            |  string  |     true     | ID of the healthcare dataset.                                                                                                                                                                                                                                                |
diff --git a/docs/en/resources/sources/cloud-logging-admin.md b/docs/en/resources/sources/cloud-logging-admin.md
new file mode 100644
index 0000000000..199352ef6e
--- /dev/null
+++ b/docs/en/resources/sources/cloud-logging-admin.md
@@ -0,0 +1,71 @@
+---
+title: "Cloud Logging Admin"
+type: docs
+weight: 1
+description: >
+  The Cloud Logging Admin source enables tools to interact with the Cloud Logging API, allowing for the retrieval of log names, monitored resource types, and the querying of log data.
+---
+
+## About
+
+The Cloud Logging Admin source provides a client to interact with the [Google
+Cloud Logging API](https://cloud.google.com/logging/docs). This allows tools to list log names, monitored resource types, and query log entries.
+
+Authentication can be handled in two ways:
+
+1.  **Application Default Credentials (ADC):** By default, the source uses ADC
+    to authenticate with the API.
+2.  **Client-side OAuth:** If `useClientOAuth` is set to `true`, the source will
+    expect an OAuth 2.0 access token to be provided by the client (e.g., a web
+    browser) for each request.
+
+## Available Tools
+
+- [`cloud-logging-admin-list-log-names`](../tools/cloudloggingadmin/cloud-logging-admin-list-log-names.md)
+  Lists the log names in the project.
+
+- [`cloud-logging-admin-list-resource-types`](../tools/cloudloggingadmin/cloud-logging-admin-list-resource-types.md)
+  Lists the monitored resource types.
+
+- [`cloud-logging-admin-query-logs`](../tools/cloudloggingadmin/cloud-logging-admin-query-logs.md)
+  Queries log entries.
+
+## Example
+
+Initialize a Cloud Logging Admin source that uses ADC:
+
+```yaml
+kind: sources
+name: my-cloud-logging
+type: cloud-logging-admin
+project: my-project-id
+```
+
+Initialize a Cloud Logging Admin source that uses client-side OAuth:
+
+```yaml
+kind: sources
+name: my-oauth-cloud-logging
+type: cloud-logging-admin
+project: my-project-id
+useClientOAuth: true
+```
+
+Initialize a Cloud Logging Admin source that uses service account impersonation:
+
+```yaml
+kind: sources
+name: my-impersonated-cloud-logging
+type: cloud-logging-admin
+project: my-project-id
+impersonateServiceAccount: "my-service-account@my-project.iam.gserviceaccount.com"
+```
+
+## Reference
+
+| **field**                   | **type** | **required** | **description**                                                                                                                                                                                 |
+|-----------------------------|:--------:|:------------:|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| type                        |  string  |     true     | Must be "cloud-logging-admin".                                                                                                                                                                  |
+| project                     |  string  |     true     | ID of the GCP project.                                                                                                                                                                          |
+| useClientOAuth              | boolean  |    false     | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. Cannot be used with `impersonateServiceAccount`. |
+| impersonateServiceAccount   |  string  |    false     | The service account to impersonate for API calls. Cannot be used with `useClientOAuth`.                                                                                                         |
diff --git a/docs/en/resources/sources/cloud-monitoring.md b/docs/en/resources/sources/cloud-monitoring.md
index 84b700721f..dc4847549a 100644
--- a/docs/en/resources/sources/cloud-monitoring.md
+++ b/docs/en/resources/sources/cloud-monitoring.md
@@ -25,18 +25,19 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-sources:
-    my-cloud-monitoring:
-        kind: cloud-monitoring
-
-    my-oauth-cloud-monitoring:
-        kind: cloud-monitoring
-        useClientOAuth: true
+kind: sources
+name: my-cloud-monitoring
+type: cloud-monitoring
+---
+kind: sources
+name: my-oauth-cloud-monitoring
+type: cloud-monitoring
+useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                |
 |----------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind           |  string  |     true     | Must be "cloud-monitoring".                                                                                                                    |
+| type           |  string  |     true     | Must be "cloud-monitoring".                                                                                                                    |
 | useClientOAuth | boolean  |    false     | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |
diff --git a/docs/en/resources/sources/cloud-sql-admin.md b/docs/en/resources/sources/cloud-sql-admin.md
index e66448725e..51462e982d 100644
--- a/docs/en/resources/sources/cloud-sql-admin.md
+++ b/docs/en/resources/sources/cloud-sql-admin.md
@@ -24,19 +24,20 @@ Authentication can be handled in two ways:
 ## Example
 
 ```yaml
-sources:
-    my-cloud-sql-admin:
-        kind: cloud-sql-admin
-
-    my-oauth-cloud-sql-admin:
-        kind: cloud-sql-admin
-        useClientOAuth: true
+kind: sources
+name: my-cloud-sql-admin
+type: cloud-sql-admin
+---
+kind: sources
+name: my-oauth-cloud-sql-admin
+type: cloud-sql-admin
+useClientOAuth: true
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                                |
 | -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------- |
-| kind           |  string  |     true     | Must be "cloud-sql-admin".                                                                                                                     |
+| type           |  string  |     true     | Must be "cloud-sql-admin".                                                                                                                     |
 | defaultProject |  string  |     false    | The Google Cloud project ID to use for Cloud SQL infrastructure tools.                                                                         |
 | useClientOAuth |  boolean |     false    | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |
diff --git a/docs/en/resources/sources/cloud-sql-mssql.md b/docs/en/resources/sources/cloud-sql-mssql.md
index 9477e44c93..ef3ce3cebe 100644
--- a/docs/en/resources/sources/cloud-sql-mssql.md
+++ b/docs/en/resources/sources/cloud-sql-mssql.md
@@ -87,16 +87,16 @@ Currently, this source only uses standard authentication. You will need to
 ## Example
 
 ```yaml
-sources:
-    my-cloud-sql-mssql-instance:
-     kind: cloud-sql-mssql
-     project: my-project
-     region: my-region
-     instance: my-instance
-     database: my_db
-     user: ${USER_NAME}
-     password: ${PASSWORD}
-     # ipType: private
+kind: sources
+name: my-cloud-sql-mssql-instance
+type: cloud-sql-mssql
+project: my-project
+region: my-region
+instance: my-instance
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+# ipType: private
 ```
 
 {{< notice tip >}}
@@ -108,7 +108,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                      |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "cloud-sql-mssql".                                                                           |
+| type      |  string  |     true     | Must be "cloud-sql-mssql".                                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                        |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                         |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                              |
diff --git a/docs/en/resources/sources/cloud-sql-mysql.md b/docs/en/resources/sources/cloud-sql-mysql.md
index e9f89f22a9..ba0c1b1f26 100644
--- a/docs/en/resources/sources/cloud-sql-mysql.md
+++ b/docs/en/resources/sources/cloud-sql-mysql.md
@@ -128,16 +128,16 @@ To connect using IAM authentication:
 ## Example
 
 ```yaml
-sources:
-    my-cloud-sql-mysql-source:
-        kind: cloud-sql-mysql
-        project: my-project-id
-        region: us-central1
-        instance: my-instance
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # ipType: "private"
+kind: sources
+name: my-cloud-sql-mysql-source
+type: cloud-sql-mysql
+project: my-project-id
+region: us-central1
+instance: my-instance
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+# ipType: "private"
 ```
 
 {{< notice tip >}}
@@ -149,7 +149,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                      |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "cloud-sql-mysql".                                                                           |
+| type      |  string  |     true     | Must be "cloud-sql-mysql".                                                                           |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                        |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                         |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                              |
diff --git a/docs/en/resources/sources/cloud-sql-pg.md b/docs/en/resources/sources/cloud-sql-pg.md
index 2ecdcee6ac..182b54e914 100644
--- a/docs/en/resources/sources/cloud-sql-pg.md
+++ b/docs/en/resources/sources/cloud-sql-pg.md
@@ -178,16 +178,16 @@ To connect using IAM authentication:
 ## Example
 
 ```yaml
-sources:
-    my-cloud-sql-pg-source:
-        kind: cloud-sql-postgres
-        project: my-project-id
-        region: us-central1
-        instance: my-instance
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # ipType: "private"
+kind: sources
+name: my-cloud-sql-pg-source
+type: cloud-sql-postgres
+project: my-project-id
+region: us-central1
+instance: my-instance
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+# ipType: "private"
 ```
 
 {{< notice tip >}}
@@ -195,11 +195,20 @@ Use environment variable replacement with the format ${ENV_NAME}
 instead of hardcoding your secrets into the configuration file.
 {{< /notice >}}
 
+### Managed Connection Pooling
+
+Toolbox automatically supports [Managed Connection Pooling][csql-mcp]. If your Cloud SQL for PostgreSQL instance has Managed Connection Pooling enabled, the connection will immediately benefit from increased throughput and reduced latency.
+
+The interface is identical, so there's no additional configuration required on the client. For more information on configuring your instance, see the [Cloud SQL Managed Connection Pooling documentation][csql-mcp-docs].
+
+[csql-mcp]: https://docs.cloud.google.com/sql/docs/postgres/managed-connection-pooling
+[csql-mcp-docs]: https://docs.cloud.google.com/sql/docs/postgres/configure-mcp
+
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
+| type      |  string  |     true     | Must be "cloud-sql-postgres".                                                                                            |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                            |
 | region    |  string  |     true     | Name of the GCP region that the cluster was created in (e.g. "us-central1").                                             |
 | instance  |  string  |     true     | Name of the Cloud SQL instance within the cluster (e.g. "my-instance").                                                  |
diff --git a/docs/en/resources/sources/cockroachdb.md b/docs/en/resources/sources/cockroachdb.md
new file mode 100644
index 0000000000..9ecf884ce5
--- /dev/null
+++ b/docs/en/resources/sources/cockroachdb.md
@@ -0,0 +1,242 @@
+---
+title: "CockroachDB"
+type: docs
+weight: 1
+description: >
+  CockroachDB is a distributed SQL database built for cloud applications.
+
+---
+
+## About
+
+[CockroachDB][crdb-docs] is a distributed SQL database designed for cloud-native applications. It provides strong consistency, horizontal scalability, and built-in resilience with automatic failover and recovery. CockroachDB uses the PostgreSQL wire protocol, making it compatible with many PostgreSQL tools and drivers while providing unique features like multi-region deployments and distributed transactions.
+
+**Minimum Version:** CockroachDB v25.1 or later is recommended for full tool compatibility.
+
+[crdb-docs]: https://www.cockroachlabs.com/docs/
+
+## Available Tools
+
+- [`cockroachdb-sql`](../tools/cockroachdb/cockroachdb-sql.md)
+  Execute SQL queries as prepared statements in CockroachDB (alias for execute-sql).
+
+- [`cockroachdb-execute-sql`](../tools/cockroachdb/cockroachdb-execute-sql.md)
+  Run parameterized SQL statements in CockroachDB.
+
+- [`cockroachdb-list-schemas`](../tools/cockroachdb/cockroachdb-list-schemas.md)
+  List schemas in a CockroachDB database.
+
+- [`cockroachdb-list-tables`](../tools/cockroachdb/cockroachdb-list-tables.md)
+  List tables in a CockroachDB database.
+
+## Requirements
+
+### Database User
+
+This source uses standard authentication. You will need to [create a CockroachDB user][crdb-users] to login to the database with. For CockroachDB Cloud deployments, SSL/TLS is required.
+
+[crdb-users]: https://www.cockroachlabs.com/docs/stable/create-user.html
+
+### SSL/TLS Configuration
+
+CockroachDB Cloud clusters require SSL/TLS connections. Use the `queryParams` section to configure SSL settings:
+
+- **For CockroachDB Cloud**: Use `sslmode: require` at minimum
+- **For self-hosted with certificates**: Use `sslmode: verify-full` with certificate paths
+- **For local development only**: Use `sslmode: disable` (not recommended for production)
+
+## Example
+
+```yaml
+sources:
+  my_cockroachdb:
+    type: cockroachdb
+    host: your-cluster.cockroachlabs.cloud
+    port: "26257"
+    user: myuser
+    password: mypassword
+    database: defaultdb
+    maxRetries: 5
+    retryBaseDelay: 500ms
+    queryParams:
+      sslmode: require
+      application_name: my-app
+    
+    # MCP Security Settings (recommended for production)
+    readOnlyMode: true          # Read-only by default (MCP best practice)
+    enableWriteMode: false      # Set to true to allow write operations
+    maxRowLimit: 1000           # Limit query results
+    queryTimeoutSec: 30         # Prevent long-running queries
+    enableTelemetry: true       # Enable observability
+    telemetryVerbose: false     # Set true for detailed logs
+    clusterID: "my-cluster"     # Optional identifier
+
+tools:
+  list_expenses:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: List all expenses
+    statement: SELECT id, description, amount, category FROM expenses WHERE user_id = $1
+    parameters:
+      - name: user_id
+        type: string
+        description: The user's ID
+  
+  describe_expenses:
+    type: cockroachdb-describe-table
+    source: my_cockroachdb
+    description: Describe the expenses table schema
+  
+  list_expenses_indexes:
+    type: cockroachdb-list-indexes
+    source: my_cockroachdb
+    description: List indexes on the expenses table
+```
+
+## Configuration Parameters
+
+### Required Parameters
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `type` | string | Must be `cockroachdb` |
+| `host` | string | The hostname or IP address of the CockroachDB cluster |
+| `port` | string | The port number (typically "26257") |
+| `user` | string | The database user name |
+| `database` | string | The database name to connect to |
+
+### Optional Parameters
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `password` | string | "" | The database password (can be empty for certificate-based auth) |
+| `maxRetries` | integer | 5 | Maximum number of connection retry attempts |
+| `retryBaseDelay` | string | "500ms" | Base delay between retry attempts (exponential backoff) |
+| `queryParams` | map | {} | Additional connection parameters (e.g., SSL configuration) |
+
+### MCP Security Parameters
+
+CockroachDB integration includes security features following the [Model Context Protocol (MCP)](https://modelcontextprotocol.io/) specification:
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `readOnlyMode` | boolean | true | Enables read-only mode by default (MCP requirement) |
+| `enableWriteMode` | boolean | false | Explicitly enable write operations (INSERT/UPDATE/DELETE/CREATE/DROP) |
+| `maxRowLimit` | integer | 1000 | Maximum rows returned per SELECT query (auto-adds LIMIT clause) |
+| `queryTimeoutSec` | integer | 30 | Query timeout in seconds to prevent long-running queries |
+| `enableTelemetry` | boolean | true | Enable structured logging of tool invocations |
+| `telemetryVerbose` | boolean | false | Enable detailed JSON telemetry output |
+| `clusterID` | string | "" | Optional cluster identifier for telemetry |
+
+### Query Parameters
+
+Common query parameters for CockroachDB connections:
+
+| Parameter | Values | Description |
+|-----------|--------|-------------|
+| `sslmode` | `disable`, `require`, `verify-ca`, `verify-full` | SSL/TLS mode (CockroachDB Cloud requires `require` or higher) |
+| `sslrootcert` | file path | Path to root certificate for SSL verification |
+| `sslcert` | file path | Path to client certificate |
+| `sslkey` | file path | Path to client key |
+| `application_name` | string | Application name for connection tracking |
+
+## Best Practices
+
+### Security and MCP Compliance
+
+**Read-Only by Default**: The integration follows MCP best practices by defaulting to read-only mode. This prevents accidental data modifications:
+
+```yaml
+sources:
+  my_cockroachdb:
+    readOnlyMode: true        # Default behavior
+    enableWriteMode: false    # Explicit write opt-in required
+```
+
+To enable write operations:
+
+```yaml
+sources:
+  my_cockroachdb:
+    readOnlyMode: false       # Disable read-only protection
+    enableWriteMode: true     # Explicitly allow writes
+```
+
+**Query Limits**: Automatic row limits prevent excessive data retrieval:
+- SELECT queries automatically get `LIMIT 1000` appended (configurable via `maxRowLimit`)
+- Queries are terminated after 30 seconds (configurable via `queryTimeoutSec`)
+
+**Observability**: Structured telemetry provides visibility into tool usage:
+- Tool invocations are logged with status, latency, and row counts
+- SQL queries are redacted to protect sensitive values
+- Set `telemetryVerbose: true` for detailed JSON logs
+
+### Use UUID Primary Keys
+
+CockroachDB performs best with UUID primary keys rather than sequential integers to avoid transaction hotspots:
+
+```sql
+CREATE TABLE expenses (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  description TEXT,
+  amount DECIMAL(10,2)
+);
+```
+
+### Automatic Transaction Retry
+
+This source uses the official `cockroach-go/v2` library which provides automatic transaction retry for serialization conflicts. For write operations requiring explicit transaction control, tools can use the `ExecuteTxWithRetry` method.
+
+### Multi-Region Deployments
+
+CockroachDB supports multi-region deployments with automatic data distribution. Configure your cluster's regions and survival goals separately from the Toolbox configuration. The source will connect to any node in the cluster.
+
+### Connection Pooling
+
+The source maintains a connection pool to the CockroachDB cluster. The pool automatically handles:
+- Load balancing across cluster nodes
+- Connection retry with exponential backoff
+- Health checking of connections
+
+## Troubleshooting
+
+### SSL/TLS Errors
+
+If you encounter "server requires encryption" errors:
+
+1. For CockroachDB Cloud, ensure `sslmode` is set to `require` or higher:
+   ```yaml
+   queryParams:
+     sslmode: require
+   ```
+
+2. For certificate verification, download your cluster's root certificate and configure:
+   ```yaml
+   queryParams:
+     sslmode: verify-full
+     sslrootcert: /path/to/ca.crt
+   ```
+
+### Connection Timeouts
+
+If experiencing connection timeouts:
+
+1. Check network connectivity to the CockroachDB cluster
+2. Verify firewall rules allow connections on port 26257
+3. For CockroachDB Cloud, ensure IP allowlisting is configured
+4. Increase `maxRetries` or `retryBaseDelay` if needed
+
+### Transaction Retry Errors
+
+CockroachDB may encounter serializable transaction conflicts. The integration automatically handles these retries using the cockroach-go library. If you see retry-related errors, check:
+
+1. Database load and contention
+2. Query patterns that might cause conflicts
+3. Consider using `SELECT FOR UPDATE` for explicit locking
+
+## Additional Resources
+
+- [CockroachDB Documentation](https://www.cockroachlabs.com/docs/)
+- [CockroachDB Best Practices](https://www.cockroachlabs.com/docs/stable/performance-best-practices-overview.html)
+- [Multi-Region Capabilities](https://www.cockroachlabs.com/docs/stable/multiregion-overview.html)
+- [Connection Parameters](https://www.cockroachlabs.com/docs/stable/connection-parameters.html)
diff --git a/docs/en/resources/sources/couchbase.md b/docs/en/resources/sources/couchbase.md
index b571d11cfe..18703f68b8 100644
--- a/docs/en/resources/sources/couchbase.md
+++ b/docs/en/resources/sources/couchbase.md
@@ -19,14 +19,14 @@ allowing tools to execute SQL queries against it.
 ## Example
 
 ```yaml
-sources:
-    my-couchbase-instance:
-        kind: couchbase
-        connectionString: couchbase://localhost
-        bucket: travel-sample
-        scope: inventory
-        username: Administrator
-        password: password
+kind: sources
+name: my-couchbase-instance
+type: couchbase
+connectionString: couchbase://localhost
+bucket: travel-sample
+scope: inventory
+username: Administrator
+password: password
 ```
 
 {{< notice note >}}
@@ -38,7 +38,7 @@ Connections](https://docs.couchbase.com/java-sdk/current/howtos/managing-connect
 
 | **field**            | **type** | **required** | **description**                                                                                                                                                                                                                                                                                                                                                                          |
 |----------------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind                 |  string  |     true     | Must be "couchbase".                                                                                                                                                                                                                                                                                                                                                                     |
+| type                 |  string  |     true     | Must be "couchbase".                                                                                                                                                                                                                                                                                                                                                                     |
 | connectionString     |  string  |     true     | Connection string for the Couchbase cluster.                                                                                                                                                                                                                                                                                                                                             |
 | bucket               |  string  |     true     | Name of the bucket to connect to.                                                                                                                                                                                                                                                                                                                                                        |
 | scope                |  string  |     true     | Name of the scope within the bucket.                                                                                                                                                                                                                                                                                                                                                     |
diff --git a/docs/en/resources/sources/dataplex.md b/docs/en/resources/sources/dataplex.md
index 828ee5b698..52c44166f5 100644
--- a/docs/en/resources/sources/dataplex.md
+++ b/docs/en/resources/sources/dataplex.md
@@ -23,10 +23,10 @@ applying artificial intelligence and machine learning.
 ## Example
 
 ```yaml
-sources:
-  my-dataplex-source:
-    kind: "dataplex"
-    project: "my-project-id"
+kind: sources
+name: my-dataplex-source
+type: "dataplex"
+project: "my-project-id"
 ```
 
 ## Sample System Prompt
@@ -355,5 +355,5 @@ This abbreviated syntax works for the qualified predicates except for `label` in
 
 | **field** | **type** | **required** | **description**                                                                  |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "dataplex".                                                              |
+| type      |  string  |     true     | Must be "dataplex".                                                              |
 | project   |  string  |     true     | ID of the GCP project used for quota and billing purposes (e.g. "my-project-id").|
diff --git a/docs/en/resources/sources/dgraph.md b/docs/en/resources/sources/dgraph.md
index 8ac82e03c4..e99721b73c 100644
--- a/docs/en/resources/sources/dgraph.md
+++ b/docs/en/resources/sources/dgraph.md
@@ -51,14 +51,14 @@ and user credentials for that namespace.
 ## Example
 
 ```yaml
-sources:
-    my-dgraph-source:
-        kind: dgraph
-        dgraphUrl: https://xxxx.cloud.dgraph.io
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        apiKey: ${API_KEY}
-        namespace : 0
+kind: sources
+name: my-dgraph-source
+type: dgraph
+dgraphUrl: https://xxxx.cloud.dgraph.io
+user: ${USER_NAME}
+password: ${PASSWORD}
+apiKey: ${API_KEY}
+namespace : 0
 ```
 
 {{< notice tip >}}
@@ -70,7 +70,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **Field**   | **Type** | **Required** | **Description**                                                                                  |
 |-------------|:--------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |  string  |     true     | Must be "dgraph".                                                                                |
+| type        |  string  |     true     | Must be "dgraph".                                                                                |
 | dgraphUrl   |  string  |     true     | Connection URI (e.g. "<https://xxx.cloud.dgraph.io>", "<https://localhost:8080>").               |
 | user        |  string  |     false    | Name of the Dgraph user to connect as (e.g., "groot").                                           |
 | password    |  string  |     false    | Password of the Dgraph user (e.g., "password").                                                  |
diff --git a/docs/en/resources/sources/elasticsearch.md b/docs/en/resources/sources/elasticsearch.md
index d0451c16b1..57527e6800 100644
--- a/docs/en/resources/sources/elasticsearch.md
+++ b/docs/en/resources/sources/elasticsearch.md
@@ -59,18 +59,18 @@ applying permissions to an API key.
 ## Example
 
 ```yaml
-sources:
-  my-elasticsearch-source:
-    kind: "elasticsearch"
-    addresses:
-      - "http://localhost:9200"
-    apikey: "my-api-key"
+kind: sources
+name: my-elasticsearch-source
+type: "elasticsearch"
+addresses:
+  - "http://localhost:9200"
+apikey: "my-api-key"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                            |
 |-----------|:--------:|:------------:|--------------------------------------------|
-| kind      |  string  |     true     | Must be "elasticsearch".                   |
+| type      |  string  |     true     | Must be "elasticsearch".                   |
 | addresses | []string |     true     | List of Elasticsearch hosts to connect to. |
 | apikey    |  string  |     true     | The API key to use for authentication.     |
diff --git a/docs/en/resources/sources/firebird.md b/docs/en/resources/sources/firebird.md
index 1c3a8a7696..fe7a1003a1 100644
--- a/docs/en/resources/sources/firebird.md
+++ b/docs/en/resources/sources/firebird.md
@@ -36,14 +36,14 @@ user][fb-users] to login to the database with.
 ## Example
 
 ```yaml
-sources:
-    my_firebird_db:
-        kind: firebird
-        host: "localhost"
-        port: 3050
-        database: "/path/to/your/database.fdb"
-        user: ${FIREBIRD_USER}
-        password: ${FIREBIRD_PASS}
+kind: sources
+name: my_firebird_db
+type: firebird
+host: "localhost"
+port: 3050
+database: "/path/to/your/database.fdb"
+user: ${FIREBIRD_USER}
+password: ${FIREBIRD_PASS}
 ```
 
 {{< notice tip >}}
@@ -55,7 +55,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                              |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "firebird".                                                          |
+| type      |  string  |     true     | Must be "firebird".                                                          |
 | host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1")                                  |
 | port      |  string  |     true     | Port to connect to (e.g. "3050")                                             |
 | database  |  string  |     true     | Path to the Firebird database file (e.g. "/var/lib/firebird/data/test.fdb"). |
diff --git a/docs/en/resources/sources/firestore.md b/docs/en/resources/sources/firestore.md
index 5fe3c875d1..d15a44507d 100644
--- a/docs/en/resources/sources/firestore.md
+++ b/docs/en/resources/sources/firestore.md
@@ -61,17 +61,17 @@ database named `(default)` will be used.
 ## Example
 
 ```yaml
-sources:
-  my-firestore-source:
-    kind: "firestore"
-    project: "my-project-id"
-    # database: "my-database"  # Optional, defaults to "(default)"
+kind: sources
+name: my-firestore-source
+type: "firestore"
+project: "my-project-id"
+# database: "my-database"  # Optional, defaults to "(default)"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                                          |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "firestore".                                                                                     |
+| type      |  string  |     true     | Must be "firestore".                                                                                     |
 | project   |  string  |     true     | Id of the GCP project that contains the Firestore database (e.g. "my-project-id").                       |
 | database  |  string  |     false    | Name of the Firestore database to connect to. Defaults to "(default)" if not specified.                  |
diff --git a/docs/en/resources/sources/http.md b/docs/en/resources/sources/http.md
index edb25002f8..cd840318b8 100644
--- a/docs/en/resources/sources/http.md
+++ b/docs/en/resources/sources/http.md
@@ -21,18 +21,18 @@ and other HTTP-accessible resources.
 ## Example
 
 ```yaml
-sources:
-  my-http-source:
-    kind: http
-    baseUrl: https://api.example.com/data
-    timeout: 10s # default to 30s
-    headers:
-      Authorization: Bearer ${API_KEY}
-      Content-Type: application/json
-    queryParams:
-      param1: value1
-      param2: value2
-    # disableSslVerification: false
+kind: sources
+name: my-http-source
+type: http
+baseUrl: https://api.example.com/data
+timeout: 10s # default to 30s
+headers:
+  Authorization: Bearer ${API_KEY}
+  Content-Type: application/json
+queryParams:
+  param1: value1
+  param2: value2
+# disableSslVerification: false
 ```
 
 {{< notice tip >}}
@@ -44,7 +44,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**              |     **type**      | **required** | **description**                                                                                                                    |
 |------------------------|:-----------------:|:------------:|------------------------------------------------------------------------------------------------------------------------------------|
-| kind                   |      string       |     true     | Must be "http".                                                                                                                    |
+| type                   |      string       |     true     | Must be "http".                                                                                                                    |
 | baseUrl                |      string       |     true     | The base URL for the HTTP requests (e.g., `https://api.example.com`).                                                              |
 | timeout                |      string       |    false     | The timeout for HTTP requests (e.g., "5s", "1m", refer to [ParseDuration][parse-duration-doc] for more examples). Defaults to 30s. |
 | headers                | map[string]string |    false     | Default headers to include in the HTTP requests.                                                                                   |
diff --git a/docs/en/resources/sources/looker.md b/docs/en/resources/sources/looker.md
index 75bebf37ea..d731f05138 100644
--- a/docs/en/resources/sources/looker.md
+++ b/docs/en/resources/sources/looker.md
@@ -56,16 +56,16 @@ To initialize the application default credential run `gcloud auth login
 ## Example
 
 ```yaml
-sources:
-    my-looker-source:
-        kind: looker
-        base_url: http://looker.example.com
-        client_id: ${LOOKER_CLIENT_ID}
-        client_secret: ${LOOKER_CLIENT_SECRET}
-        project: ${LOOKER_PROJECT}
-        location: ${LOOKER_LOCATION}
-        verify_ssl: true
-        timeout: 600s
+kind: sources
+name: my-looker-source
+type: looker
+base_url: http://looker.example.com
+client_id: ${LOOKER_CLIENT_ID}
+client_secret: ${LOOKER_CLIENT_SECRET}
+project: ${LOOKER_PROJECT}
+location: ${LOOKER_LOCATION}
+verify_ssl: true
+timeout: 600s
 ```
 
 The Looker base url will look like "https://looker.example.com", don't include
@@ -93,7 +93,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**            | **type** | **required** | **description**                                                                                                                                     |
 |----------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind                 |  string  |     true     | Must be "looker".                                                                                                                                   |
+| type                 |  string  |     true     | Must be "looker".                                                                                                                                   |
 | base_url             |  string  |     true     | The URL of your Looker server with no trailing /.                                                                                                   |
 | client_id            |  string  |    false     | The client id assigned by Looker.                                                                                                                   |
 | client_secret        |  string  |    false     | The client secret assigned by Looker.                                                                                                               |
diff --git a/docs/en/resources/sources/mariadb.md b/docs/en/resources/sources/mariadb.md
index c956274fde..67854f4a3d 100644
--- a/docs/en/resources/sources/mariadb.md
+++ b/docs/en/resources/sources/mariadb.md
@@ -45,18 +45,18 @@ MariaDB user][mariadb-users] to log in to the database.
 ## Example
 
 ```yaml
-sources:
-    my_mariadb_db:
-        kind: mysql
-        host: 127.0.0.1
-        port: 3306
-        database: my_db
-        user: ${MARIADB_USER}
-        password: ${MARIADB_PASS}
-        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-        # queryParams:
-        #     tls: preferred
-        queryTimeout: 30s # Optional: query timeout duration
+kind: sources
+name: my_mariadb_db
+type: mysql
+host: 127.0.0.1
+port: 3306
+database: my_db
+user: ${MARIADB_USER}
+password: ${MARIADB_PASS}
+# Optional TLS and other driver parameters. For example, enable preferred TLS:
+# queryParams:
+#     tls: preferred
+queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -68,7 +68,7 @@ Use environment variables instead of committing credentials to source files.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| kind         |  string  |     true     | Must be `mysql`.                                                                                |
+| type         |  string  |     true     | Must be `mysql`.                                                                                |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "3307").                                                               |
 | database     |  string  |     true     | Name of the MariaDB database to connect to (e.g. "my_db").                                        |
diff --git a/docs/en/resources/sources/mindsdb.md b/docs/en/resources/sources/mindsdb.md
index 5ea8f4a147..6ec7e57021 100644
--- a/docs/en/resources/sources/mindsdb.md
+++ b/docs/en/resources/sources/mindsdb.md
@@ -125,15 +125,15 @@ can omit the password field.
 ## Example
 
 ```yaml
-sources:
-    my-mindsdb-source:
-        kind: mindsdb
-        host: 127.0.0.1
-        port: 3306
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD} # Optional: omit if MindsDB is configured without authentication
-        queryTimeout: 30s # Optional: query timeout duration
+kind: sources
+name: my-mindsdb-source
+type: mindsdb
+host: 127.0.0.1
+port: 3306
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD} # Optional: omit if MindsDB is configured without authentication
+queryTimeout: 30s # Optional: query timeout duration
 ```
 
 ### Working Configuration Example
@@ -141,13 +141,13 @@ sources:
 Here's a working configuration that has been tested:
 
 ```yaml
-sources:
-  my-pg-source:
-    kind: mindsdb
-    host: 127.0.0.1
-    port: 47335
-    database: files
-    user: mindsdb
+kind: sources
+name: my-pg-source
+type: mindsdb
+host: 127.0.0.1
+port: 47335
+database: files
+user: mindsdb
 ```
 
 {{< notice tip >}}
@@ -176,7 +176,7 @@ With MindsDB integration, you can:
 
 | **field**    | **type** | **required** | **description**                                                                                              |
 |--------------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------|
-| kind         |  string  |     true     | Must be "mindsdb".                                                                                           |
+| type         |  string  |     true     | Must be "mindsdb".                                                                                           |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                                 |
 | port         |  string  |     true     | Port to connect to (e.g. "3306").                                                                            |
 | database     |  string  |     true     | Name of the MindsDB database to connect to (e.g. "my_db").                                                   |
diff --git a/docs/en/resources/sources/mongodb.md b/docs/en/resources/sources/mongodb.md
index 91fbe23957..50e3a63dce 100644
--- a/docs/en/resources/sources/mongodb.md
+++ b/docs/en/resources/sources/mongodb.md
@@ -17,10 +17,10 @@ flexible, JSON-like documents, making it easy to develop and scale applications.
 ## Example
 
 ```yaml
-sources:
-    my-mongodb:
-        kind: mongodb
-        uri: "mongodb+srv://username:password@host.mongodb.net"       
+kind: sources
+name: my-mongodb
+type: mongodb
+uri: "mongodb+srv://username:password@host.mongodb.net"       
 
 ```
 
@@ -28,5 +28,5 @@ sources:
 
 | **field** | **type** | **required** | **description**                                                   |
 |-----------|:--------:|:------------:|-------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "mongodb".                                                |
+| type      |  string  |     true     | Must be "mongodb".                                                |
 | uri       |  string  |     true     | connection string to connect to MongoDB                           |
diff --git a/docs/en/resources/sources/mssql.md b/docs/en/resources/sources/mssql.md
index 424d781c33..e1b36228ad 100644
--- a/docs/en/resources/sources/mssql.md
+++ b/docs/en/resources/sources/mssql.md
@@ -39,15 +39,15 @@ SQL Server user][mssql-users] to login to the database with.
 ## Example
 
 ```yaml
-sources:
-    my-mssql-source:
-        kind: mssql
-        host: 127.0.0.1
-        port: 1433
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # encrypt: strict
+kind: sources
+name: my-mssql-source
+type: mssql
+host: 127.0.0.1
+port: 1433
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+# encrypt: strict
 ```
 
 {{< notice tip >}}
@@ -59,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                                                                                                                                                                                                          |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "mssql".                                                                                                                                                                                                                                                         |
+| type      |  string  |     true     | Must be "mssql".                                                                                                                                                                                                                                                         |
 | host      |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                                                                                                                                                                                             |
 | port      |  string  |     true     | Port to connect to (e.g. "1433").                                                                                                                                                                                                                                        |
 | database  |  string  |     true     | Name of the SQL Server database to connect to (e.g. "my_db").                                                                                                                                                                                                            |
diff --git a/docs/en/resources/sources/mysql.md b/docs/en/resources/sources/mysql.md
index 95f2b96d7c..ee294bc8ff 100644
--- a/docs/en/resources/sources/mysql.md
+++ b/docs/en/resources/sources/mysql.md
@@ -49,18 +49,18 @@ MySQL user][mysql-users] to login to the database with.
 ## Example
 
 ```yaml
-sources:
-    my-mysql-source:
-        kind: mysql
-        host: 127.0.0.1
-        port: 3306
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # Optional TLS and other driver parameters. For example, enable preferred TLS:
-        # queryParams:
-        #     tls: preferred
-        queryTimeout: 30s # Optional: query timeout duration
+kind: sources
+name: my-mysql-source
+type: mysql
+host: 127.0.0.1
+port: 3306
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+# Optional TLS and other driver parameters. For example, enable preferred TLS:
+# queryParams:
+#     tls: preferred
+queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -72,7 +72,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: | ----------------------------------------------------------------------------------------------- |
-| kind         |  string  |     true     | Must be "mysql".                                                                                |
+| type         |  string  |     true     | Must be "mysql".                                                                                |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "3306").                                                               |
 | database     |  string  |     true     | Name of the MySQL database to connect to (e.g. "my_db").                                        |
diff --git a/docs/en/resources/sources/neo4j.md b/docs/en/resources/sources/neo4j.md
index 223915c337..0400ea25d5 100644
--- a/docs/en/resources/sources/neo4j.md
+++ b/docs/en/resources/sources/neo4j.md
@@ -33,13 +33,13 @@ user if available.
 ## Example
 
 ```yaml
-sources:
-    my-neo4j-source:
-        kind: neo4j
-        uri: neo4j+s://xxxx.databases.neo4j.io:7687
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        database: "neo4j"
+kind: sources
+name: my-neo4j-source
+type: neo4j
+uri: neo4j+s://xxxx.databases.neo4j.io:7687
+user: ${USER_NAME}
+password: ${PASSWORD}
+database: "neo4j"
 ```
 
 {{< notice tip >}}
@@ -51,7 +51,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                      |
 |-----------|:--------:|:------------:|----------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "neo4j".                                                     |
+| type      |  string  |     true     | Must be "neo4j".                                                     |
 | uri       |  string  |     true     | Connect URI ("bolt://localhost", "neo4j+s://xxx.databases.neo4j.io") |
 | user      |  string  |     true     | Name of the Neo4j user to connect as (e.g. "neo4j").                 |
 | password  |  string  |     true     | Password of the Neo4j user (e.g. "my-password").                     |
diff --git a/docs/en/resources/sources/oceanbase.md b/docs/en/resources/sources/oceanbase.md
index b26b46b8be..24e24f5bfe 100644
--- a/docs/en/resources/sources/oceanbase.md
+++ b/docs/en/resources/sources/oceanbase.md
@@ -33,15 +33,15 @@ with SSL).
 ## Example
 
 ```yaml
-sources:
-    my-oceanbase-source:
-        kind: oceanbase
-        host: 127.0.0.1
-        port: 2881
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        queryTimeout: 30s # Optional: query timeout duration
+kind: sources
+name: my-oceanbase-source
+type: oceanbase
+host: 127.0.0.1
+port: 2881
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -53,7 +53,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 | ------------ | :------: | :----------: |-------------------------------------------------------------------------------------------------|
-| kind         |  string  |     true     | Must be "oceanbase".                                                                            |
+| type         |  string  |     true     | Must be "oceanbase".                                                                            |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "2881").                                                               |
 | database     |  string  |     true     | Name of the OceanBase database to connect to (e.g. "my_db").                                    |
diff --git a/docs/en/resources/sources/oracle.md b/docs/en/resources/sources/oracle.md
index 51fa18fe13..8778838cf6 100644
--- a/docs/en/resources/sources/oracle.md
+++ b/docs/en/resources/sources/oracle.md
@@ -90,27 +90,27 @@ using a TNS (Transparent Network Substrate) alias.
 This example demonstrates the four connection methods you could choose from:
 
 ```yaml
-sources:
-    my-oracle-source:
-        kind: oracle
-        
-        # --- Choose one connection method ---
-        # 1. Host, Port, and Service Name
-        host: 127.0.0.1
-        port: 1521
-        serviceName: XEPDB1
+kind: sources
+name: my-oracle-source
+type: oracle
 
-        # 2. Direct Connection String
-        connectionString: "127.0.0.1:1521/XEPDB1"
+# --- Choose one connection method ---
+# 1. Host, Port, and Service Name
+host: 127.0.0.1
+port: 1521
+serviceName: XEPDB1
 
-        # 3. TNS Alias (requires tnsnames.ora)
-        tnsAlias: "MY_DB_ALIAS"
-        tnsAdmin: "/opt/oracle/network/admin" # Optional: overrides TNS_ADMIN env var
+# 2. Direct Connection String
+connectionString: "127.0.0.1:1521/XEPDB1"
 
-        user: ${USER_NAME}
-        password: ${PASSWORD}
+# 3. TNS Alias (requires tnsnames.ora)
+tnsAlias: "MY_DB_ALIAS"
+tnsAdmin: "/opt/oracle/network/admin" # Optional: overrides TNS_ADMIN env var
 
-        # Optional: Set to true to use the OCI-based driver for advanced features (Requires Oracle Instant Client)
+user: ${USER_NAME}
+password: ${PASSWORD}
+
+# Optional: Set to true to use the OCI-based driver for advanced features (Requires Oracle Instant Client)
 ```
 
 ### Using an Oracle Wallet
@@ -122,15 +122,15 @@ Oracle Wallet allows you to store credentails used for database connection. Depe
 The `go-ora` driver uses the `walletLocation` field to connect to a database secured with an Oracle Wallet without standard username and password.
 
 ```yaml
-sources:
-    pure-go-wallet:
-        kind: oracle
-        connectionString: "127.0.0.1:1521/XEPDB1"
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        # The TNS Alias is often required to connect to a service registered in tnsnames.ora
-        tnsAlias: "SECURE_DB_ALIAS"
-        walletLocation: "/path/to/my/wallet/directory"
+kind: sources
+name: pure-go-wallet
+type: oracle
+connectionString: "127.0.0.1:1521/XEPDB1"
+user: ${USER_NAME}
+password: ${PASSWORD}
+# The TNS Alias is often required to connect to a service registered in tnsnames.ora
+tnsAlias: "SECURE_DB_ALIAS"
+walletLocation: "/path/to/my/wallet/directory"
 ```
 
 #### OCI-Based Driver (`useOCI: true`) - Oracle Wallet
@@ -138,15 +138,15 @@ sources:
 For the OCI-based driver, wallet authentication is triggered by setting tnsAdmin to the wallet directory and connecting via a tnsAlias. 
 
 ```yaml
-sources:
-    oci-wallet:
-        kind: oracle
-        connectionString: "127.0.0.1:1521/XEPDB1"
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        tnsAlias: "WALLET_DB_ALIAS"
-        tnsAdmin: "/opt/oracle/wallet" # Directory containing tnsnames.ora, sqlnet.ora, and wallet files
-        useOCI: true
+kind: sources
+name: oci-wallet
+type: oracle
+connectionString: "127.0.0.1:1521/XEPDB1"
+user: ${USER_NAME}
+password: ${PASSWORD}
+tnsAlias: "WALLET_DB_ALIAS"
+tnsAdmin: "/opt/oracle/wallet" # Directory containing tnsnames.ora, sqlnet.ora, and wallet files
+useOCI: true
 ```
 
 {{< notice tip >}}
@@ -158,7 +158,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**        | **type** | **required** | **description**                                                                                                                                                                         |
 |------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind             |  string  |     true     | Must be "oracle".                                                                                                                                                                       |
+| type             |  string  |     true     | Must be "oracle".                                                                                                                                                                       |
 | user             |  string  |     true     | Name of the Oracle user to connect as (e.g. "my-oracle-user").                                                                                                                          |
 | password         |  string  |     true     | Password of the Oracle user (e.g. "my-password").                                                                                                                                       |
 | host             |  string  |    false     | IP address or hostname to connect to (e.g. "127.0.0.1"). Required if not using `connectionString` or `tnsAlias`.                                                                        |
diff --git a/docs/en/resources/sources/postgres.md b/docs/en/resources/sources/postgres.md
index 8668b46190..ed7c77aeee 100644
--- a/docs/en/resources/sources/postgres.md
+++ b/docs/en/resources/sources/postgres.md
@@ -107,14 +107,14 @@ PostgreSQL user][pg-users] to login to the database with.
 ## Example
 
 ```yaml
-sources:
-    my-pg-source:
-        kind: postgres
-        host: 127.0.0.1
-        port: 5432
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
+kind: sources
+name: my-pg-source
+type: postgres
+host: 127.0.0.1
+port: 5432
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
 ```
 
 {{< notice tip >}}
@@ -126,7 +126,7 @@ instead of hardcoding your secrets into the configuration file.
 
 |  **field**  |      **type**      | **required** | **description**                                                        |
 |-------------|:------------------:|:------------:|------------------------------------------------------------------------|
-| kind        |       string       |     true     | Must be "postgres".                                                    |
+| type        |       string       |     true     | Must be "postgres".                                                    |
 | host        |       string       |     true     | IP address to connect to (e.g. "127.0.0.1")                            |
 | port        |       string       |     true     | Port to connect to (e.g. "5432")                                       |
 | database    |       string       |     true     | Name of the Postgres database to connect to (e.g. "my_db").            |
diff --git a/docs/en/resources/sources/redis.md b/docs/en/resources/sources/redis.md
index c0dee699e0..51c8cfde00 100644
--- a/docs/en/resources/sources/redis.md
+++ b/docs/en/resources/sources/redis.md
@@ -34,16 +34,16 @@ connections must authenticate in order to connect.
 Specify your AUTH string in the password field:
 
 ```yaml
-sources:
-    my-redis-instance:
-     kind: redis
-     address:
-       - 127.0.0.1:6379
-     username: ${MY_USER_NAME}
-     password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
-     # database: 0
-     # clusterEnabled: false
-     # useGCPIAM: false
+kind: sources
+name: my-redis-instance
+type: redis
+address:
+  - 127.0.0.1:6379
+username: ${MY_USER_NAME}
+password: ${MY_AUTH_STRING} # Omit this field if you don't have a password.
+# database: 0
+# clusterEnabled: false
+# useGCPIAM: false
 ```
 
 {{< notice tip >}}
@@ -59,14 +59,14 @@ string.
 Here is an example tools.yaml config with [AUTH][auth] enabled:
 
 ```yaml
-sources:
-    my-redis-cluster-instance:
-     kind: memorystore-redis
-     address:
-       - 127.0.0.1:6379
-     password: ${MY_AUTH_STRING}
-     # useGCPIAM: false
-     # clusterEnabled: false
+kind: sources
+name: my-redis-cluster-instance
+type: memorystore-redis
+address:
+  - 127.0.0.1:6379
+password: ${MY_AUTH_STRING}
+# useGCPIAM: false
+# clusterEnabled: false
 ```
 
 Memorystore Redis Cluster supports IAM authentication instead. Grant your
@@ -76,13 +76,13 @@ Here is an example tools.yaml config for Memorystore Redis Cluster instances
 using IAM authentication:
 
 ```yaml
-sources:
-    my-redis-cluster-instance:
-     kind: memorystore-redis
-     address:
-       - 127.0.0.1:6379
-     useGCPIAM: true
-     clusterEnabled: true
+kind: sources
+name: my-redis-cluster-instance
+type: memorystore-redis
+address:
+  - 127.0.0.1:6379
+useGCPIAM: true
+clusterEnabled: true
 ```
 
 [iam]: https://cloud.google.com/memorystore/docs/cluster/about-iam-auth
@@ -91,7 +91,7 @@ sources:
 
 | **field**      | **type** | **required** | **description**                                                                                                                 |
 |----------------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------------------|
-| kind           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
+| type           |  string  |     true     | Must be "memorystore-redis".                                                                                                    |
 | address        |  string  |     true     | Primary endpoint for the Memorystore Redis instance to connect to.                                                              |
 | username       |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Redis, leave this field blank |
 | password       |  string  |    false     | If you have [Redis AUTH][auth] enabled, specify the AUTH string here                                                            |
diff --git a/docs/en/resources/sources/serverless-spark.md b/docs/en/resources/sources/serverless-spark.md
index 1f2afc3cec..f08c6c5e79 100644
--- a/docs/en/resources/sources/serverless-spark.md
+++ b/docs/en/resources/sources/serverless-spark.md
@@ -49,17 +49,17 @@ set up your ADC.
 ## Example
 
 ```yaml
-sources:
-  my-serverless-spark-source:
-    kind: serverless-spark
-    project: my-project-id
-    location: us-central1
+kind: sources
+name: my-serverless-spark-source
+type: serverless-spark
+project: my-project-id
+location: us-central1
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                   |
 | --------- | :------: | :----------: | ----------------------------------------------------------------- |
-| kind      |  string  |     true     | Must be "serverless-spark".                                       |
+| type      |  string  |     true     | Must be "serverless-spark".                                       |
 | project   |  string  |     true     | ID of the GCP project with Serverless for Apache Spark resources. |
 | location  |  string  |     true     | Location containing Serverless for Apache Spark resources.        |
diff --git a/docs/en/resources/sources/singlestore.md b/docs/en/resources/sources/singlestore.md
index fef332a7d8..9acde19ff0 100644
--- a/docs/en/resources/sources/singlestore.md
+++ b/docs/en/resources/sources/singlestore.md
@@ -39,15 +39,15 @@ database user][singlestore-user] to login to the database with.
 ## Example
 
 ```yaml
-sources:
-    my-singlestore-source:
-        kind: singlestore
-        host: 127.0.0.1
-        port: 3306
-        database: my_db
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        queryTimeout: 30s # Optional: query timeout duration
+kind: sources
+name: my-singlestore-source
+type: singlestore
+host: 127.0.0.1
+port: 3306
+database: my_db
+user: ${USER_NAME}
+password: ${PASSWORD}
+queryTimeout: 30s # Optional: query timeout duration
 ```
 
 {{< notice tip >}}
@@ -59,7 +59,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**    | **type** | **required** | **description**                                                                                 |
 |--------------|:--------:|:------------:|-------------------------------------------------------------------------------------------------|
-| kind         |  string  |     true     | Must be "singlestore".                                                                          |
+| type         |  string  |     true     | Must be "singlestore".                                                                          |
 | host         |  string  |     true     | IP address to connect to (e.g. "127.0.0.1").                                                    |
 | port         |  string  |     true     | Port to connect to (e.g. "3306").                                                               |
 | database     |  string  |     true     | Name of the SingleStore database to connect to (e.g. "my_db").                                  |
diff --git a/docs/en/resources/sources/snowflake.md b/docs/en/resources/sources/snowflake.md
index 5981538ec5..3a048470e7 100644
--- a/docs/en/resources/sources/snowflake.md
+++ b/docs/en/resources/sources/snowflake.md
@@ -31,16 +31,16 @@ Snowflake user to login to the database with.
 ## Example
 
 ```yaml
-sources:
-    my-sf-source:
-        kind: snowflake
-        account: ${SNOWFLAKE_ACCOUNT}
-        user: ${SNOWFLAKE_USER}
-        password: ${SNOWFLAKE_PASSWORD}
-        database: ${SNOWFLAKE_DATABASE}
-        schema: ${SNOWFLAKE_SCHEMA}
-        warehouse: ${SNOWFLAKE_WAREHOUSE}
-        role: ${SNOWFLAKE_ROLE}
+kind: sources
+name: my-sf-source
+type: snowflake
+account: ${SNOWFLAKE_ACCOUNT}
+user: ${SNOWFLAKE_USER}
+password: ${SNOWFLAKE_PASSWORD}
+database: ${SNOWFLAKE_DATABASE}
+schema: ${SNOWFLAKE_SCHEMA}
+warehouse: ${SNOWFLAKE_WAREHOUSE}
+role: ${SNOWFLAKE_ROLE}
 ```
 
 {{< notice tip >}}
@@ -52,7 +52,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                        |
 |-----------|:--------:|:------------:|------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "snowflake".                                                   |
+| type      |  string  |     true     | Must be "snowflake".                                                   |
 | account   |  string  |     true     | Your Snowflake account identifier.                                     |
 | user      |  string  |     true     | Name of the Snowflake user to connect as (e.g. "my-sf-user").          |
 | password  |  string  |     true     | Password of the Snowflake user (e.g. "my-password").                   |
diff --git a/docs/en/resources/sources/spanner.md b/docs/en/resources/sources/spanner.md
index 373ba75446..c8039583ac 100644
--- a/docs/en/resources/sources/spanner.md
+++ b/docs/en/resources/sources/spanner.md
@@ -64,20 +64,20 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-sources:
-    my-spanner-source:
-        kind: "spanner"
-        project: "my-project-id"
-        instance: "my-instance"
-        database: "my_db"
-        # dialect: "googlesql"
+kind: sources
+name: my-spanner-source
+type: "spanner"
+project: "my-project-id"
+instance: "my-instance"
+database: "my_db"
+# dialect: "googlesql"
 ```
 
 ## Reference
 
 | **field** | **type** | **required** | **description**                                                                                                     |
 |-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "spanner".                                                                                                  |
+| type      |  string  |     true     | Must be "spanner".                                                                                                  |
 | project   |  string  |     true     | Id of the GCP project that the cluster was created in (e.g. "my-project-id").                                       |
 | instance  |  string  |     true     | Name of the Spanner instance.                                                                                       |
 | database  |  string  |     true     | Name of the database on the Spanner instance                                                                        |
diff --git a/docs/en/resources/sources/sqlite.md b/docs/en/resources/sources/sqlite.md
index 5a3c6df918..aae3030347 100644
--- a/docs/en/resources/sources/sqlite.md
+++ b/docs/en/resources/sources/sqlite.md
@@ -48,19 +48,19 @@ You need a SQLite database file. This can be:
 ## Example
 
 ```yaml
-sources:
-    my-sqlite-db:
-        kind: "sqlite"
-        database: "/path/to/database.db"
+kind: sources
+name: my-sqlite-db
+type: "sqlite"
+database: "/path/to/database.db"
 ```
 
 For an in-memory database:
 
 ```yaml
-sources:
-    my-sqlite-memory-db:
-        kind: "sqlite"
-        database: ":memory:"
+kind: sources
+name: my-sqlite-memory-db
+type: "sqlite"
+database: ":memory:"
 ```
 
 ## Reference
@@ -69,7 +69,7 @@ sources:
 
 | **field** | **type** | **required** | **description**                                                                                                     |
 |-----------|:--------:|:------------:|---------------------------------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "sqlite".                                                                                                   |
+| type      |  string  |     true     | Must be "sqlite".                                                                                                   |
 | database  |  string  |     true     | Path to SQLite database file, or ":memory:" for an in-memory database.                                              |
 
 ### Connection Properties
diff --git a/docs/en/resources/sources/tidb.md b/docs/en/resources/sources/tidb.md
index 3b22db0bdb..2bb4b62c66 100644
--- a/docs/en/resources/sources/tidb.md
+++ b/docs/en/resources/sources/tidb.md
@@ -46,29 +46,29 @@ console.
 - TiDB Cloud
 
     ```yaml
-    sources:
-        my-tidb-cloud-source:
-            kind: tidb
-            host: gateway01.us-west-2.prod.aws.tidbcloud.com
-            port: 4000
-            database: my_db
-            user: ${TIDB_USERNAME}
-            password: ${TIDB_PASSWORD}
-            # SSL is automatically enabled for TiDB Cloud
+    kind: sources
+    name: my-tidb-cloud-source
+    type: tidb
+    host: gateway01.us-west-2.prod.aws.tidbcloud.com
+    port: 4000
+    database: my_db
+    user: ${TIDB_USERNAME}
+    password: ${TIDB_PASSWORD}
+    # SSL is automatically enabled for TiDB Cloud    
     ```
 
 - Self-Hosted TiDB
 
     ```yaml
-    sources:
-        my-tidb-source:
-            kind: tidb
-            host: 127.0.0.1
-            port: 4000
-            database: my_db
-            user: ${TIDB_USERNAME}
-            password: ${TIDB_PASSWORD}
-            # ssl: true  # Optional: enable SSL for secure connections
+    kind: sources
+    name: my-tidb-source
+    type: tidb
+    host: 127.0.0.1
+    port: 4000
+    database: my_db
+    user: ${TIDB_USERNAME}
+    password: ${TIDB_PASSWORD}
+    # ssl: true  # Optional: enable SSL for secure connections    
     ```
 
 {{< notice tip >}}
@@ -80,7 +80,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field** | **type** | **required** | **description**                                                                            |
 |-----------|:--------:|:------------:|--------------------------------------------------------------------------------------------|
-| kind      |  string  |     true     | Must be "tidb".                                                                            |
+| type      |  string  |     true     | Must be "tidb".                                                                            |
 | host      |  string  |     true     | IP address or hostname to connect to (e.g. "127.0.0.1" or "gateway01.*.tidbcloud.com").    |
 | port      |  string  |     true     | Port to connect to (typically "4000" for TiDB).                                            |
 | database  |  string  |     true     | Name of the TiDB database to connect to (e.g. "my_db").                                    |
diff --git a/docs/en/resources/sources/trino.md b/docs/en/resources/sources/trino.md
index e6a9122681..d3ae1e6fcf 100644
--- a/docs/en/resources/sources/trino.md
+++ b/docs/en/resources/sources/trino.md
@@ -32,15 +32,15 @@ the catalogs and schemas you want to query.
 ## Example
 
 ```yaml
-sources:
-    my-trino-source:
-    kind: trino
-    host: trino.example.com
-    port: "8080"
-    user: ${TRINO_USER}  # Optional for anonymous access
-    password: ${TRINO_PASSWORD}  # Optional
-    catalog: hive
-    schema: default
+kind: sources
+name: my-trino-source
+type: trino
+host: trino.example.com
+port: "8080"
+user: ${TRINO_USER}  # Optional for anonymous access
+password: ${TRINO_PASSWORD}  # Optional
+catalog: hive
+schema: default
 ```
 
 {{< notice tip >}}
@@ -52,7 +52,7 @@ instead of hardcoding your secrets into the configuration file.
 
 | **field**              | **type** | **required** | **description**                                                              |
 | ---------------------- | :------: | :----------: | ---------------------------------------------------------------------------- |
-| kind                   |  string  |     true     | Must be "trino".                                                             |
+| type                   |  string  |     true     | Must be "trino".                                                             |
 | host                   |  string  |     true     | Trino coordinator hostname (e.g. "trino.example.com")                        |
 | port                   |  string  |     true     | Trino coordinator port (e.g. "8080", "8443")                                 |
 | user                   |  string  |    false     | Username for authentication (e.g. "analyst"). Optional for anonymous access. |
diff --git a/docs/en/resources/sources/valkey.md b/docs/en/resources/sources/valkey.md
index 8b1e68e947..aedb8759aa 100644
--- a/docs/en/resources/sources/valkey.md
+++ b/docs/en/resources/sources/valkey.md
@@ -27,16 +27,16 @@ the [official Valkey website](https://valkey.io/topics/quickstart/).
 ## Example
 
 ```yaml
-sources:
-    my-valkey-instance:
-     kind: valkey
-     address:
-       - 127.0.0.1:6379
-     username: ${YOUR_USERNAME}
-     password: ${YOUR_PASSWORD}
-     # database: 0
-     # useGCPIAM: false
-     # disableCache: false
+kind: sources
+name: my-valkey-instance
+type: valkey
+address:
+  - 127.0.0.1:6379
+username: ${YOUR_USERNAME}
+password: ${YOUR_PASSWORD}
+# database: 0
+# useGCPIAM: false
+# disableCache: false
 ```
 
 {{< notice tip >}}
@@ -51,12 +51,12 @@ authentication. Grant your account the required [IAM role][iam] and set
 `useGCPIAM` to `true`:
 
 ```yaml
-sources:
-    my-valkey-instance:
-     kind: valkey
-     address:
-       - 127.0.0.1:6379
-     useGCPIAM: true
+kind: sources
+name: my-valkey-instance
+type: valkey
+address:
+  - 127.0.0.1:6379
+useGCPIAM: true
 ```
 
 [iam]: https://cloud.google.com/memorystore/docs/valkey/about-iam-auth
@@ -65,7 +65,7 @@ sources:
 
 | **field**    | **type** | **required** | **description**                                                                                                                  |
 |--------------|:--------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------|
-| kind         |  string  |     true     | Must be "valkey".                                                                                                                |
+| type         |  string  |     true     | Must be "valkey".                                                                                                                |
 | address      | []string |     true     | Endpoints for the Valkey instance to connect to.                                                                                 |
 | username     |  string  |    false     | If you are using a non-default user, specify the user name here. If you are using Memorystore for Valkey, leave this field blank |
 | password     |  string  |    false     | Password for the Valkey instance                                                                                                 |
diff --git a/docs/en/resources/sources/yugabytedb.md b/docs/en/resources/sources/yugabytedb.md
index cdd1362197..b923327cdc 100644
--- a/docs/en/resources/sources/yugabytedb.md
+++ b/docs/en/resources/sources/yugabytedb.md
@@ -17,23 +17,23 @@ compatibility.
 ## Example
 
 ```yaml
-sources:
-    my-yb-source:
-        kind: yugabytedb
-        host: 127.0.0.1
-        port: 5433
-        database: yugabyte
-        user: ${USER_NAME}
-        password: ${PASSWORD}
-        loadBalance: true
-        topologyKeys: cloud.region.zone1:1,cloud.region.zone2:2
+kind: sources
+name: my-yb-source
+type: yugabytedb
+host: 127.0.0.1
+port: 5433
+database: yugabyte
+user: ${USER_NAME}
+password: ${PASSWORD}
+loadBalance: true
+topologyKeys: cloud.region.zone1:1,cloud.region.zone2:2
 ```
 
 ## Reference
 
 | **field**                    | **type** | **required** | **description**                                                                                                                                                       |
 |------------------------------|:--------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind                         |  string  |     true     | Must be "yugabytedb".                                                                                                                                                 |
+| type                         |  string  |     true     | Must be "yugabytedb".                                                                                                                                                 |
 | host                         |  string  |     true     | IP address to connect to.                                                                                                                                             |
 | port                         | integer  |     true     | Port to connect to. The default port is 5433.                                                                                                                         |
 | database                     |  string  |     true     | Name of the YugabyteDB database to connect to. The default database name is yugabyte.                                                                                 |
diff --git a/docs/en/resources/tools/_index.md b/docs/en/resources/tools/_index.md
index 43a72427f7..aaf8f73f74 100644
--- a/docs/en/resources/tools/_index.md
+++ b/docs/en/resources/tools/_index.md
@@ -12,41 +12,41 @@ statement. You can define Tools as a map in the `tools` section of your
 `tools.yaml` file. Typically, a tool will require a source to act on:
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = $1
-      AND flight_number = $2
-      LIMIT 10
-    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.
-      An airline code is a code for an airline service consisting of a two-character
-      airline designator and followed by a flight number, which is a 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 today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = $1
+  AND flight_number = $2
+  LIMIT 10
+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.
+  An airline code is a code for an airline service consisting of a two-character
+  airline designator and followed by a flight number, which is a 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 today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ## Specifying Parameters
@@ -55,13 +55,13 @@ Parameters for each Tool will define what inputs the agent will need to provide
 to invoke them. Parameters should be pass as a list of Parameter objects:
 
 ```yaml
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Basic Parameters
@@ -71,10 +71,10 @@ most cases, the description will be provided to the LLM as context on specifying
 the parameter.
 
 ```yaml
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
 ```
 
 | **field**      |    **type**    | **required** | **description**                                                                                                                                                                                                                        |
@@ -97,16 +97,16 @@ To use the `array` type, you must also specify what kind of items are
 in the list using the items field:
 
 ```yaml
-    parameters:
-      - name: preferred_airlines
-        type: array
-        description: A list of airline, ordered by preference.
-        items:
-          name: name
-          type: string
-          description: Name of the airline.
-    statement: |
-      SELECT * FROM airlines WHERE preferred_airlines = ANY($1);
+parameters:
+  - name: preferred_airlines
+    type: array
+    description: A list of airline, ordered by preference.
+    items:
+      name: name
+      type: string
+      description: Name of the airline.
+statement: |
+  SELECT * FROM airlines WHERE preferred_airlines = ANY($1);
 ```
 
 | **field**      |     **type**     | **required** | **description**                                                            |
@@ -141,10 +141,10 @@ This is the default behavior when valueType is omitted. It's useful for passing
 a flexible group of settings.
 
 ```yaml
-    parameters:
-          - name: execution_context
-            type: map
-            description: A flexible set of key-value pairs for the execution environment.
+parameters:
+  - name: execution_context
+    type: map
+    description: A flexible set of key-value pairs for the execution environment.
 ```
 
 #### Typed Map
@@ -153,11 +153,11 @@ Specify valueType to ensure all values in the map are of the same type. An error
 will be thrown in case of value type mismatch.
 
 ```yaml
- parameters:
-      - name: user_scores
-        type: map
-        description: A map of user IDs to their scores. All scores must be integers.
-        valueType: integer # This enforces the value type for all entries.
+parameters:
+  - name: user_scores
+    type: map
+    description: A map of user IDs to their scores. All scores must be integers.
+    valueType: integer # This enforces the value type for all entries.
 ```
 
 ### Authenticated Parameters
@@ -171,21 +171,21 @@ the required [authServices](../authServices/) to specific claims within the
 user's ID token.
 
 ```yaml
-  tools:
-    search_flights_by_user_id:
-        kind: postgres-sql
-        source: my-pg-instance
-        statement: |
-          SELECT * FROM flights WHERE user_id = $1
-        parameters:
-          - name: user_id
-            type: string
-            description: Auto-populated from Google login
-            authServices:
-              # Refer to one of the `authServices` defined
-              - name: my-google-auth
-              # `sub` is the OIDC claim field for user ID
-                field: sub
+kind: tools
+name: search_flights_by_user_id
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT * FROM flights WHERE user_id = $1
+parameters:
+  - name: user_id
+    type: string
+    description: Auto-populated from Google login
+    authServices:
+      # Refer to one of the `authServices` defined
+      - name: my-google-auth
+        # `sub` is the OIDC claim field for user ID
+        field: sub
 ```
 
 | **field** | **type** | **required** | **description**                                                                  |
@@ -222,31 +222,31 @@ can use `minValue` and `maxValue` to define the allowable range.
 {{< /notice >}}
 
 ```yaml
-tools:
- select_columns_from_table:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      SELECT {{array .columnNames}} FROM {{.tableName}}
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-          "columnNames": ["id", "name"]
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
-      - name: columnNames
-        type: array
-        description: The columns to select
-        items:
-          name: column
-          type: string
-          description: Name of a column to select
-          escape: double-quotes # with this, the statement will resolve to `SELECT "id", "name" FROM flights`
+kind: tools
+name: select_columns_from_table
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT {{array .columnNames}} FROM {{.tableName}}
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+      "columnNames": ["id", "name"]
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
+  - name: columnNames
+    type: array
+    description: The columns to select
+    items:
+      name: column
+      type: string
+      description: Name of a column to select
+      escape: double-quotes # with this, the statement will resolve to `SELECT "id", "name" FROM flights`
 ```
 
 | **field**      |     **type**     |  **required**   | **description**                                                                     |
@@ -267,16 +267,16 @@ specifying an `authRequired` field. Specify a list of
 [authServices](../authServices/) defined in the previous section.
 
 ```yaml
-tools:
-  search_all_flight:
-      kind: postgres-sql
-      source: my-pg-instance
-      statement: |
-        SELECT * FROM flights
-      # A list of `authServices` defined previously
-      authRequired:
-        - my-google-auth
-        - other-auth-service
+kind: tools
+name: search_all_flight
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT * FROM flights
+# A list of `authServices` defined previously
+authRequired:
+  - my-google-auth
+  - other-auth-service
 ```
 
 ## Kinds of tools
diff --git a/docs/en/resources/tools/alloydb/alloydb-create-cluster.md b/docs/en/resources/tools/alloydb/alloydb-create-cluster.md
index b70d320213..621feb1852 100644
--- a/docs/en/resources/tools/alloydb/alloydb-create-cluster.md
+++ b/docs/en/resources/tools/alloydb/alloydb-create-cluster.md
@@ -40,17 +40,17 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  create_cluster:
-    kind: alloydb-create-cluster
-    source: alloydb-admin-source
-    description: Use this tool to create a new AlloyDB cluster in a given project and location.
+kind: tools
+name: create_cluster
+type: alloydb-create-cluster
+source: alloydb-admin-source
+description: Use this tool to create a new AlloyDB cluster in a given project and location.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be alloydb-create-cluster.                      |
+| type        |  string  |     true     | Must be alloydb-create-cluster.                      |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/alloydb/alloydb-create-instance.md b/docs/en/resources/tools/alloydb/alloydb-create-instance.md
index 6a8680af94..19f6aaa95c 100644
--- a/docs/en/resources/tools/alloydb/alloydb-create-instance.md
+++ b/docs/en/resources/tools/alloydb/alloydb-create-instance.md
@@ -45,17 +45,17 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  create_instance:
-    kind: alloydb-create-instance
-    source: alloydb-admin-source
-    description: Use this tool to create a new AlloyDB instance within a specified cluster.
+kind: tools
+name: create_instance
+type: alloydb-create-instance
+source: alloydb-admin-source
+description: Use this tool to create a new AlloyDB instance within a specified cluster.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-create-instance.                     |
+| type        |  string  |     true     | Must be alloydb-create-instance.                     |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
-| description |  string  |     false    | Description of the tool that is passed to the agent. |
+| description |  string  |     false    | Description of the tool that is passed to the agent. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/alloydb/alloydb-create-user.md b/docs/en/resources/tools/alloydb/alloydb-create-user.md
index b4ca9bcbb3..3c7e450781 100644
--- a/docs/en/resources/tools/alloydb/alloydb-create-user.md
+++ b/docs/en/resources/tools/alloydb/alloydb-create-user.md
@@ -39,17 +39,17 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  create_user:
-    kind: alloydb-create-user
-    source: alloydb-admin-source
-    description: Use this tool to create a new database user for an AlloyDB cluster.
+kind: tools
+name: create_user
+type: alloydb-create-user
+source: alloydb-admin-source
+description: Use this tool to create a new database user for an AlloyDB cluster.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-create-user.                         |
+| type        |  string  |     true     | Must be alloydb-create-user.                         |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
-| description |  string  |     false    | Description of the tool that is passed to the agent. |
+| description |  string  |     false    | Description of the tool that is passed to the agent. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/alloydb/alloydb-get-cluster.md b/docs/en/resources/tools/alloydb/alloydb-get-cluster.md
index 29f5af0cf5..fcd5049393 100644
--- a/docs/en/resources/tools/alloydb/alloydb-get-cluster.md
+++ b/docs/en/resources/tools/alloydb/alloydb-get-cluster.md
@@ -3,7 +3,7 @@ title: alloydb-get-cluster
 type: docs
 weight: 1
 description: "The \"alloydb-get-cluster\" tool retrieves details for a specific AlloyDB cluster.\n"
-aliases: [/resources/tools/alloydb-get-cluster]
+alias: [/resources/tools/alloydb-get-cluster]
 ---
 
 ## About
@@ -21,17 +21,17 @@ specified AlloyDB cluster. It is compatible with
 ## Example
 
 ```yaml
-tools:
-  get_specific_cluster:
-    kind: alloydb-get-cluster
-    source: my-alloydb-admin-source
-    description: Use this tool to retrieve details for a specific AlloyDB cluster.
+kind: tools
+name: get_specific_cluster
+type: alloydb-get-cluster
+source: my-alloydb-admin-source
+description: Use this tool to retrieve details for a specific AlloyDB cluster.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-get-cluster.                         |
+| type        |  string  |     true     | Must be alloydb-get-cluster.                         |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
-| description |  string  |     false    | Description of the tool that is passed to the agent. |
+| description |  string  |     false    | Description of the tool that is passed to the agent. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/alloydb/alloydb-get-instance.md b/docs/en/resources/tools/alloydb/alloydb-get-instance.md
index 0305c4bcc0..65a9a7ec81 100644
--- a/docs/en/resources/tools/alloydb/alloydb-get-instance.md
+++ b/docs/en/resources/tools/alloydb/alloydb-get-instance.md
@@ -22,17 +22,17 @@ specified AlloyDB instance. It is compatible with
 ## Example
 
 ```yaml
-tools:
-  get_specific_instance:
-    kind: alloydb-get-instance
-    source: my-alloydb-admin-source
-    description: Use this tool to retrieve details for a specific AlloyDB instance.
+kind: tools
+name: get_specific_instance
+type: alloydb-get-instance
+source: my-alloydb-admin-source
+description: Use this tool to retrieve details for a specific AlloyDB instance.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be alloydb-get-instance.                        |
+| type        |  string  |     true     | Must be alloydb-get-instance.                        |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
-| description |  string  |    false     | Description of the tool that is passed to the agent. |
+| description |  string  |    false     | Description of the tool that is passed to the agent. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/alloydb/alloydb-get-user.md b/docs/en/resources/tools/alloydb/alloydb-get-user.md
index afee54aab5..a223afe8f7 100644
--- a/docs/en/resources/tools/alloydb/alloydb-get-user.md
+++ b/docs/en/resources/tools/alloydb/alloydb-get-user.md
@@ -22,17 +22,17 @@ specified AlloyDB user. It is compatible with
 ## Example
 
 ```yaml
-tools:
-  get_specific_user:
-    kind: alloydb-get-user
-    source: my-alloydb-admin-source
-    description: Use this tool to retrieve details for a specific AlloyDB user.
+kind: tools
+name: get_specific_user
+type: alloydb-get-user
+source: my-alloydb-admin-source
+description: Use this tool to retrieve details for a specific AlloyDB user.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-get-user.                            |
+| type        |  string  |     true     | Must be alloydb-get-user.                            |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
-| description |  string  |     false    | Description of the tool that is passed to the agent. |
+| description |  string  |     false    | Description of the tool that is passed to the agent. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/alloydb/alloydb-list-clusters.md b/docs/en/resources/tools/alloydb/alloydb-list-clusters.md
index 6f0beb3a67..644f98729b 100644
--- a/docs/en/resources/tools/alloydb/alloydb-list-clusters.md
+++ b/docs/en/resources/tools/alloydb/alloydb-list-clusters.md
@@ -24,17 +24,17 @@ location. The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_clusters:
-    kind: alloydb-list-clusters
-    source: alloydb-admin-source
-    description: Use this tool to list all AlloyDB clusters in a given project and location.
+kind: tools
+name: list_clusters
+type: alloydb-list-clusters
+source: alloydb-admin-source
+description: Use this tool to list all AlloyDB clusters in a given project and location.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-list-clusters.                       |
+| type        |  string  |     true     | Must be alloydb-list-clusters.                       |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
-| description |  string  |     false    | Description of the tool that is passed to the agent. |
+| description |  string  |     false    | Description of the tool that is passed to the agent. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/alloydb/alloydb-list-instances.md b/docs/en/resources/tools/alloydb/alloydb-list-instances.md
index ecf1f9a8dd..fdf0c35c9d 100644
--- a/docs/en/resources/tools/alloydb/alloydb-list-instances.md
+++ b/docs/en/resources/tools/alloydb/alloydb-list-instances.md
@@ -26,17 +26,17 @@ parameters:
 ## Example
 
 ```yaml
-tools:
-  list_instances:
-    kind: alloydb-list-instances
-    source: alloydb-admin-source
-    description: Use this tool to list all AlloyDB instances for a given project, cluster and location.
+kind: tools
+name: list_instances
+type: alloydb-list-instances
+source: alloydb-admin-source
+description: Use this tool to list all AlloyDB instances for a given project, cluster and location.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-list-instances.                      |
+| type        |  string  |     true     | Must be alloydb-list-instances.                      |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
 | description |  string  |     false    | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/alloydb/alloydb-list-users.md b/docs/en/resources/tools/alloydb/alloydb-list-users.md
index 73d3015b88..b735cd0607 100644
--- a/docs/en/resources/tools/alloydb/alloydb-list-users.md
+++ b/docs/en/resources/tools/alloydb/alloydb-list-users.md
@@ -22,17 +22,17 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_users:
-    kind: alloydb-list-users
-    source: alloydb-admin-source
-    description: Use this tool to list all database users within an AlloyDB cluster
+kind: tools
+name: list_users
+type: alloydb-list-users
+source: alloydb-admin-source
+description: Use this tool to list all database users within an AlloyDB cluster
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 | ----------- | :------: | :----------: | ---------------------------------------------------- |
-| kind        |  string  |     true     | Must be alloydb-list-users.                          |
+| type        |  string  |     true     | Must be alloydb-list-users.                          |
 | source      |  string  |     true     | The name of an `alloydb-admin` source.               |
 | description |  string  |     false    | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/alloydb/alloydb-wait-for-operation.md b/docs/en/resources/tools/alloydb/alloydb-wait-for-operation.md
index f5e84e5b97..98d67e9084 100644
--- a/docs/en/resources/tools/alloydb/alloydb-wait-for-operation.md
+++ b/docs/en/resources/tools/alloydb/alloydb-wait-for-operation.md
@@ -25,22 +25,22 @@ and shouldn't be used for production agents.
 ## Example
 
 ```yaml
-tools:
-  wait_for_operation:
-    kind: alloydb-wait-for-operation
-    source: my-alloydb-admin-source
-    description: "This will poll on operations API until the operation is done. For checking operation status we need projectId, locationID and operationId. Once instance is created give follow up steps on how to use the variables to bring data plane MCP server up in local and remote setup."
-    delay: 1s
-    maxDelay: 4m
-    multiplier: 2
-    maxRetries: 10
+kind: tools
+name: wait_for_operation
+type: alloydb-wait-for-operation
+source: my-alloydb-admin-source
+description: "This will poll on operations API until the operation is done. For checking operation status we need projectId, locationID and operationId. Once instance is created give follow up steps on how to use the variables to bring data plane MCP server up in local and remote setup."
+delay: 1s
+maxDelay: 4m
+multiplier: 2
+maxRetries: 10
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                                                                                  |
 | ----------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------- |
-| kind        |  string  |     true     | Must be "alloydb-wait-for-operation".                                                                            |
+| type        |  string  |     true     | Must be "alloydb-wait-for-operation".                                                                            |
 | source      |  string  |     true     | The name of a `alloydb-admin` source to use for authentication.                                                  |
 | description |  string  |     false    | A description of the tool.                                                                                       |
 | delay       | duration |     false    | The initial delay between polling requests (e.g., `3s`). Defaults to 3 seconds.                                  |
diff --git a/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md b/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
index aa6d377f2c..97364c5dd8 100644
--- a/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
+++ b/docs/en/resources/tools/alloydbainl/alloydb-ai-nl.md
@@ -103,29 +103,29 @@ CREATE EXTENSION IF NOT EXISTS parameterized_views;
 ## Example
 
 ```yaml
-tools:
-  ask_questions:
-    kind: alloydb-ai-nl
-    source: my-alloydb-source
-    description: "Ask questions to check information about flights"
-    nlConfig: "cymbal_air_nl_config"
-    nlConfigParameters:
-      - name: user_email
-        type: string
-        description: User ID of the logged in user.
-        # note: we strongly recommend using features like Authenticated or
-        # Bound parameters to prevent the LLM from seeing these params and
-        # specifying values it shouldn't in the tool input
-        authServices:
-          - name: my_google_service
-            field: email
+kind: tools
+name: ask_questions
+type: alloydb-ai-nl
+source: my-alloydb-source
+description: "Ask questions to check information about flights"
+nlConfig: "cymbal_air_nl_config"
+nlConfigParameters:
+  - name: user_email
+    type: string
+    description: User ID of the logged in user.
+    # note: we strongly recommend using features like Authenticated or
+    # Bound parameters to prevent the LLM from seeing these params and
+    # specifying values it shouldn't in the tool input
+    authServices:
+      - name: my_google_service
+        field: email
 ```
 
 ## Reference
 
 | **field**          |                **type**                 | **required** | **description**                                                          |
 |--------------------|:---------------------------------------:|:------------:|--------------------------------------------------------------------------|
-| kind               |                 string                  |     true     | Must be "alloydb-ai-nl".                                                 |
+| type               |                 string                  |     true     | Must be "alloydb-ai-nl".                                                 |
 | source             |                 string                  |     true     | Name of the AlloyDB source the natural language query should execute on. |
 | description        |                 string                  |     true     | Description of the tool that is passed to the LLM.                       |
 | nlConfig           |                 string                  |     true     | The name of the  `nl_config` in AlloyDB                                  |
diff --git a/docs/en/resources/tools/bigquery/bigquery-analyze-contribution.md b/docs/en/resources/tools/bigquery/bigquery-analyze-contribution.md
index 3561af3dd3..ed126246a4 100644
--- a/docs/en/resources/tools/bigquery/bigquery-analyze-contribution.md
+++ b/docs/en/resources/tools/bigquery/bigquery-analyze-contribution.md
@@ -64,11 +64,11 @@ the `bigquery` source:
 ## Example
 
 ```yaml
-tools:
-  contribution_analyzer:
-    kind: bigquery-analyze-contribution
-    source: my-bigquery-source
-    description: Use this tool to run contribution analysis on a dataset in BigQuery.
+kind: tools
+name: contribution_analyzer
+type: bigquery-analyze-contribution
+source: my-bigquery-source
+description: Use this tool to run contribution analysis on a dataset in BigQuery.
 ```
 
 ## Sample Prompt
@@ -88,6 +88,6 @@ And use the following sample prompts to call this tool:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "bigquery-analyze-contribution".           |
+| type        |  string  |     true     | Must be "bigquery-analyze-contribution".           |
 | source      |  string  |     true     | Name of the source the tool should execute on.     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md b/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
index 2c8ef29083..486db6083e 100644
--- a/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
+++ b/docs/en/resources/tools/bigquery/bigquery-conversational-analytics.md
@@ -53,19 +53,19 @@ dataset specified in the `table_references` parameter.
 ## 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.
+kind: tools
+name: ask_data_insights
+type: 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".       |
+| type        |  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. |
diff --git a/docs/en/resources/tools/bigquery/bigquery-execute-sql.md b/docs/en/resources/tools/bigquery/bigquery-execute-sql.md
index b59ae58249..783ba5c742 100644
--- a/docs/en/resources/tools/bigquery/bigquery-execute-sql.md
+++ b/docs/en/resources/tools/bigquery/bigquery-execute-sql.md
@@ -54,17 +54,17 @@ layer of security by controlling which datasets can be accessed:
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: bigquery-execute-sql
-    source: my-bigquery-source
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: bigquery-execute-sql
+source: my-bigquery-source
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "bigquery-execute-sql".                    |
+| type        |  string  |     true     | Must be "bigquery-execute-sql".                    |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/bigquery/bigquery-forecast.md b/docs/en/resources/tools/bigquery/bigquery-forecast.md
index 823eb487e1..188a7d11c7 100644
--- a/docs/en/resources/tools/bigquery/bigquery-forecast.md
+++ b/docs/en/resources/tools/bigquery/bigquery-forecast.md
@@ -58,11 +58,11 @@ the `bigquery` source:
 ## Example
 
 ```yaml
-tools:
- forecast_tool:
-    kind: bigquery-forecast
-    source: my-bigquery-source
-    description: Use this tool to forecast time series data in BigQuery.
+kind: tools
+name: forecast_tool
+type: bigquery-forecast
+source: my-bigquery-source
+description: Use this tool to forecast time series data in BigQuery.
 ```
 
 ## Sample Prompt
@@ -78,6 +78,6 @@ You can use the following sample prompts to call this tool:
 
 | **field**   | **type** | **required** | **description**                                         |
 |-------------|:--------:|:------------:|---------------------------------------------------------|
-| kind        |  string  |     true     | Must be "bigquery-forecast".                            |
+| type        |  string  |     true     | Must be "bigquery-forecast".                            |
 | source      |  string  |     true     | Name of the source the forecast tool should execute on. |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.      |
diff --git a/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md b/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
index 460816d290..e68fe83574 100644
--- a/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
+++ b/docs/en/resources/tools/bigquery/bigquery-get-dataset-info.md
@@ -34,17 +34,17 @@ The tool's behavior regarding these parameters is influenced by the
 ## Example
 
 ```yaml
-tools:
-  bigquery_get_dataset_info:
-    kind: bigquery-get-dataset-info
-    source: my-bigquery-source
-    description: Use this tool to get dataset metadata.
+kind: tools
+name: bigquery_get_dataset_info
+type: bigquery-get-dataset-info
+source: my-bigquery-source
+description: Use this tool to get dataset metadata.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "bigquery-get-dataset-info".                                                             |
+| type        |                   string                   |     true     | Must be "bigquery-get-dataset-info".                                                             |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/bigquery/bigquery-get-table-info.md b/docs/en/resources/tools/bigquery/bigquery-get-table-info.md
index e05f74c131..807e9a8f04 100644
--- a/docs/en/resources/tools/bigquery/bigquery-get-table-info.md
+++ b/docs/en/resources/tools/bigquery/bigquery-get-table-info.md
@@ -35,17 +35,17 @@ The tool's behavior regarding these parameters is influenced by the
 ## Example
 
 ```yaml
-tools:
-  bigquery_get_table_info:
-    kind: bigquery-get-table-info
-    source: my-bigquery-source
-    description: Use this tool to get table metadata.
+kind: tools
+name: bigquery_get_table_info
+type: bigquery-get-table-info
+source: my-bigquery-source
+description: Use this tool to get table metadata.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "bigquery-get-table-info".                                                               |
+| type        |                   string                   |     true     | Must be "bigquery-get-table-info".                                                               |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md b/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md
index 176ad78dfe..c2cd8b7609 100644
--- a/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md
+++ b/docs/en/resources/tools/bigquery/bigquery-list-dataset-ids.md
@@ -32,17 +32,17 @@ The tool's behavior regarding this parameter is influenced by the
 ## Example
 
 ```yaml
-tools:
-  bigquery_list_dataset_ids:
-    kind: bigquery-list-dataset-ids
-    source: my-bigquery-source
-    description: Use this tool to get dataset metadata.
+kind: tools
+name: bigquery_list_dataset_ids
+type: bigquery-list-dataset-ids
+source: my-bigquery-source
+description: Use this tool to get dataset metadata.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "bigquery-list-dataset-ids".                                                             |
+| type        |                   string                   |     true     | Must be "bigquery-list-dataset-ids".                                                             |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md b/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md
index 5e72d0b22a..828e84cb8f 100644
--- a/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md
+++ b/docs/en/resources/tools/bigquery/bigquery-list-table-ids.md
@@ -34,17 +34,17 @@ will be used as the default value for the `dataset` parameter.
 ## Example
 
 ```yaml
-tools:
-  bigquery_list_table_ids:
-    kind: bigquery-list-table-ids
-    source: my-bigquery-source
-    description: Use this tool to get table metadata.
+kind: tools
+name: bigquery_list_table_ids
+type: bigquery-list-table-ids
+source: my-bigquery-source
+description: Use this tool to get table metadata.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "bigquery-list-table-ids".                                                               |
+| type        |                   string                   |     true     | Must be "bigquery-list-table-ids".                                                               |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/bigquery/bigquery-search-catalog.md b/docs/en/resources/tools/bigquery/bigquery-search-catalog.md
index 32a107983e..3994e4744a 100644
--- a/docs/en/resources/tools/bigquery/bigquery-search-catalog.md
+++ b/docs/en/resources/tools/bigquery/bigquery-search-catalog.md
@@ -48,17 +48,17 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-tools:
-  search_catalog:
-    kind: bigquery-search-catalog
-    source: bigquery-source
-    description: Use this tool to find tables, views, models, routines or connections.
+kind: tools
+name: search_catalog
+type: bigquery-search-catalog
+source: bigquery-source
+description: Use this tool to find tables, views, models, routines or connections.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "bigquery-search-catalog".                                                               |
+| type        |                   string                   |     true     | Must be "bigquery-search-catalog".                                                               |
 | source      |                   string                   |     true     | Name of the source the tool should execute on.                                                   |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/bigquery/bigquery-sql.md b/docs/en/resources/tools/bigquery/bigquery-sql.md
index c07192f710..39d5c750ff 100644
--- a/docs/en/resources/tools/bigquery/bigquery-sql.md
+++ b/docs/en/resources/tools/bigquery/bigquery-sql.md
@@ -46,36 +46,36 @@ same query.
 > identifiers, column names, table names, or other parts of the query.
 
 ```yaml
-tools:
-  # Example: Querying a user table in BigQuery
-  search_users_bq:
-    kind: bigquery-sql
-    source: my-bigquery-source
-    statement: |
-      SELECT
-        id,
-        name,
-        email
-      FROM
-        `my-project.my-dataset.users`
-      WHERE
-        id = @id OR email = @email;
-    description: |
-      Use this tool to get information for a specific user.
-      Takes an id number or a name and returns info on the user.
+# Example: Querying a user table in BigQuery
+kind: tools
+name: search_users_bq
+type: bigquery-sql
+source: my-bigquery-source
+statement: |
+  SELECT
+    id,
+    name,
+    email
+  FROM
+    `my-project.my-dataset.users`
+  WHERE
+    id = @id OR email = @email;
+description: |
+  Use this tool to get information for a specific user.
+  Takes an id number or a name and returns info on the user.
 
-      Example:
-      {{
-          "id": 123,
-          "name": "Alice",
-      }}
-    parameters:
-      - name: id
-        type: integer
-        description: User ID
-      - name: email
-        type: string
-        description: Email address of the user
+  Example:
+  {{
+      "id": 123,
+      "name": "Alice",
+  }}
+parameters:
+  - name: id
+    type: integer
+    description: User ID
+  - name: email
+    type: string
+    description: Email address of the user
 ```
 
 ### Example with Template Parameters
@@ -87,31 +87,31 @@ tools:
 > [templateParameters](../#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: bigquery-sql
-    source: my-bigquery-source
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: bigquery-sql
+source: my-bigquery-source
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                    | **required** | **description**                                                                                                                         |
 |--------------------|:---------------------------------------------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                     |     true     | Must be "bigquery-sql".                                                                                                                 |
+| type               |                    string                     |     true     | Must be "bigquery-sql".                                                                                                                 |
 | source             |                    string                     |     true     | Name of the source the GoogleSQL should execute on.                                                                                     |
 | description        |                    string                     |     true     | Description of the tool that is passed to the LLM.                                                                                      |
 | statement          |                    string                     |     true     | The GoogleSQL statement to execute.                                                                                                     |
 | parameters         |    [parameters](../#specifying-parameters)    |    false     | List of [parameters](../#specifying-parameters) that will be inserted into the SQL statement.                                           |
-| templateParameters | [templateParameters](../#template-parameters) |    false     | List of [templateParameters](../#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
+| templateParameters | [templateParameters](../#template-parameters) |    false     | List of [templateParameters](../#template-parameters) that will be inserted into the SQL statement before executing prepared statement. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/bigtable/bigtable-sql.md b/docs/en/resources/tools/bigtable/bigtable-sql.md
index cce122f94d..7d56be05b5 100644
--- a/docs/en/resources/tools/bigtable/bigtable-sql.md
+++ b/docs/en/resources/tools/bigtable/bigtable-sql.md
@@ -40,35 +40,35 @@ inserted according to their name: e.g. `@name`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_user_by_id_or_name:
-    kind: bigtable-sql
-    source: my-bigtable-instance
-    statement: |
-      SELECT
-        TO_INT64(cf[ 'id' ]) as id,
-        CAST(cf[ 'name' ] AS string) as name,
-      FROM
-        mytable
-      WHERE
-        TO_INT64(cf[ 'id' ]) = @id
-        OR CAST(cf[ 'name' ] AS string) = @name;
-    description: |
-      Use this tool to get information for a specific user.
-      Takes an id number or a name and returns info on the user.
+kind: tools
+name: search_user_by_id_or_name
+type: bigtable-sql
+source: my-bigtable-instance
+statement: |
+  SELECT
+    TO_INT64(cf[ 'id' ]) as id,
+    CAST(cf[ 'name' ] AS string) as name,
+  FROM
+    mytable
+  WHERE
+    TO_INT64(cf[ 'id' ]) = @id
+    OR CAST(cf[ 'name' ] AS string) = @name;
+description: |
+  Use this tool to get information for a specific user.
+  Takes an id number or a name and returns info on the user.
 
-      Example:
-      {{
-          "id": 123,
-          "name": "Alice",
-      }}
-    parameters:
-      - name: id
-        type: integer
-        description: User ID
-      - name: name
-        type: string
-        description: Name of the user
+  Example:
+  {{
+      "id": 123,
+      "name": "Alice",
+  }}
+parameters:
+  - name: id
+    type: integer
+    description: User ID
+  - name: name
+    type: string
+    description: Name of the user
 ```
 
 ### Example with Template Parameters
@@ -80,29 +80,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: bigtable-sql
-    source: my-bigtable-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: bigtable-sql
+source: my-bigtable-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "bigtable-sql".                                                                                                                |
+| type               |                    string                    |     true     | Must be "bigtable-sql".                                                                                                                |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/cassandra/cassandra-cql.md b/docs/en/resources/tools/cassandra/cassandra-cql.md
index feb092ee21..14f1eb8e01 100644
--- a/docs/en/resources/tools/cassandra/cassandra-cql.md
+++ b/docs/en/resources/tools/cassandra/cassandra-cql.md
@@ -31,27 +31,27 @@ the form of placeholders `?`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
-  search_users_by_email:
-    kind: cassandra-cql
-    source: my-cassandra-cluster
-    statement: |
-      SELECT user_id, email, first_name, last_name, created_at 
-      FROM users 
-      WHERE email = ?
-    description: |
-      Use this tool to retrieve specific user information by their email address.
-      Takes an email address and returns user details including user ID, email, 
-      first name, last name, and account creation timestamp.
-      Do NOT use this tool with a user ID or other identifiers.
-      Example:
-      {{
-          "email": "user@example.com",
-      }}
-    parameters:
-      - name: email
-        type: string
-        description: User's email address
+kind: tools
+name: search_users_by_email
+type: cassandra-cql
+source: my-cassandra-cluster
+statement: |
+  SELECT user_id, email, first_name, last_name, created_at 
+  FROM users 
+  WHERE email = ?
+description: |
+  Use this tool to retrieve specific user information by their email address.
+  Takes an email address and returns user details including user ID, email, 
+  first name, last name, and account creation timestamp.
+  Do NOT use this tool with a user ID or other identifiers.
+  Example:
+  {{
+      "email": "user@example.com",
+  }}
+parameters:
+  - name: email
+    type: string
+    description: User's email address
 ```
 
 ### Example with Template Parameters
@@ -63,33 +63,33 @@ tools:
 > [templateParameters](../#template-parameters).
 
 ```yaml
-tools:
-  list_keyspace_table:
-    kind: cassandra-cql
-    source: my-cassandra-cluster
-    statement: |
-      SELECT * FROM {{.keyspace}}.{{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table in a keyspace.
-      Example:
-      {{
-          "keyspace": "my_keyspace",
-          "tableName": "users",
-      }}
-    templateParameters:
-      - name: keyspace
-        type: string
-        description: Keyspace containing the table
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_keyspace_table
+type: cassandra-cql
+source: my-cassandra-cluster
+statement: |
+  SELECT * FROM {{.keyspace}}.{{.tableName}};
+description: |
+  Use this tool to list all information from a specific table in a keyspace.
+  Example:
+  {{
+      "keyspace": "my_keyspace",
+      "tableName": "users",
+  }}
+templateParameters:
+  - name: keyspace
+    type: string
+    description: Keyspace containing the table
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                    | **required** | **description**                                                                                                                         |
 |--------------------|:---------------------------------------------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                     |     true     | Must be "cassandra-cql".                                                                                                                |
+| type               |                    string                     |     true     | Must be "cassandra-cql".                                                                                                                |
 | source             |                    string                     |     true     | Name of the source the CQL should execute on.                                                                                           |
 | description        |                    string                     |     true     | Description of the tool that is passed to the LLM.                                                                                      |
 | statement          |                    string                     |     true     | CQL statement to execute.                                                                                                               |
diff --git a/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md b/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
index e197c1f05b..5e28b54386 100644
--- a/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-execute-sql.md
@@ -25,11 +25,11 @@ capabilities for monitoring and debugging purposes.
 ## Example
 
 ```yaml
-tools:
-  execute_sql_tool:
-    kind: clickhouse-execute-sql
-    source: my-clickhouse-instance
-    description: Use this tool to execute SQL statements against ClickHouse.
+kind: tools
+name: execute_sql_tool
+type: clickhouse-execute-sql
+source: my-clickhouse-instance
+description: Use this tool to execute SQL statements against ClickHouse.
 ```
 
 ## Parameters
@@ -42,6 +42,6 @@ tools:
 
 | **field**   | **type** | **required** | **description**                                       |
 |-------------|:--------:|:------------:|-------------------------------------------------------|
-| kind        |  string  |     true     | Must be "clickhouse-execute-sql".                     |
+| type        |  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.    |
diff --git a/docs/en/resources/tools/clickhouse/clickhouse-list-databases.md b/docs/en/resources/tools/clickhouse/clickhouse-list-databases.md
index 43e5f0e982..eedf197b41 100644
--- a/docs/en/resources/tools/clickhouse/clickhouse-list-databases.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-list-databases.md
@@ -21,11 +21,11 @@ discovery and exploration tasks.
 ## Example
 
 ```yaml
-tools:
-  list_clickhouse_databases:
-    kind: clickhouse-list-databases
-    source: my-clickhouse-instance
-    description: List all available databases in the ClickHouse instance
+kind: tools
+name: list_clickhouse_databases
+type: clickhouse-list-databases
+source: my-clickhouse-instance
+description: List all available databases in the ClickHouse instance
 ```
 
 ## Return Value
@@ -49,7 +49,7 @@ Example response:
 
 | **field**    |      **type**      | **required** | **description**                                       |
 |--------------|:------------------:|:------------:|-------------------------------------------------------|
-| kind         |       string       |     true     | Must be "clickhouse-list-databases".                  |
+| type         |       string       |     true     | Must be "clickhouse-list-databases".                  |
 | source       |       string       |     true     | Name of the ClickHouse source to list databases from. |
 | description  |       string       |     true     | Description of the tool that is passed to the LLM.    |
 | authRequired |  array of string   |    false     | Authentication services required to use this tool.    |
diff --git a/docs/en/resources/tools/clickhouse/clickhouse-list-tables.md b/docs/en/resources/tools/clickhouse/clickhouse-list-tables.md
index a886813e17..dbeb49c79c 100644
--- a/docs/en/resources/tools/clickhouse/clickhouse-list-tables.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-list-tables.md
@@ -21,11 +21,11 @@ user, making it useful for schema exploration and table discovery tasks.
 ## Example
 
 ```yaml
-tools:
-  list_clickhouse_tables:
-    kind: clickhouse-list-tables
-    source: my-clickhouse-instance
-    description: List all tables in a specific ClickHouse database
+kind: tools
+name: list_clickhouse_tables
+type: clickhouse-list-tables
+source: my-clickhouse-instance
+description: List all tables in a specific ClickHouse database
 ```
 
 ## Parameters
@@ -56,7 +56,7 @@ Example response:
 
 | **field**    |      **type**      | **required** | **description**                                         |
 |--------------|:------------------:|:------------:|---------------------------------------------------------|
-| kind         |       string       |     true     | Must be "clickhouse-list-tables".                       |
+| type         |       string       |     true     | Must be "clickhouse-list-tables".                       |
 | source       |       string       |     true     | Name of the ClickHouse source to list tables from.      |
 | description  |       string       |     true     | Description of the tool that is passed to the LLM.      |
 | authRequired |  array of string   |    false     | Authentication services required to use this tool.      |
diff --git a/docs/en/resources/tools/clickhouse/clickhouse-sql.md b/docs/en/resources/tools/clickhouse/clickhouse-sql.md
index 5d66d6826f..b26bb6eade 100644
--- a/docs/en/resources/tools/clickhouse/clickhouse-sql.md
+++ b/docs/en/resources/tools/clickhouse/clickhouse-sql.md
@@ -21,60 +21,60 @@ 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
+kind: tools
+name: my_analytics_query
+type: 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
+kind: tools
+name: flexible_table_query
+type: 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".                             |
+| type               |       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.                |
diff --git a/docs/en/resources/tools/cloudgda/cloud-gda-query.md b/docs/en/resources/tools/cloudgda/cloud-gda-query.md
index 39e5bf64ae..d416321424 100644
--- a/docs/en/resources/tools/cloudgda/cloud-gda-query.md
+++ b/docs/en/resources/tools/cloudgda/cloud-gda-query.md
@@ -18,28 +18,28 @@ The `cloud-gemini-data-analytics-query` tool allows you to send natural language
 ## Example
 
 ```yaml
-tools:
-  my-gda-query-tool:
-    kind: cloud-gemini-data-analytics-query
-    source: my-gda-source
-    description: "Use this tool to send natural language queries to the Gemini Data Analytics API and receive SQL, natural language answers, and explanations."
-    location: ${your_database_location}
-    context:
-      datasourceReferences:
-        cloudSqlReference:
-          databaseReference:
-            projectId: "${your_project_id}"
-            region: "${your_database_instance_region}"
-            instanceId: "${your_database_instance_id}"
-            databaseId: "${your_database_name}"
-            engine: "POSTGRESQL"
-          agentContextReference:
-            contextSetId: "${your_context_set_id}" # E.g. projects/${project_id}/locations/${context_set_location}/contextSets/${context_set_id}
-    generationOptions:
-      generateQueryResult: true
-      generateNaturalLanguageAnswer: true
-      generateExplanation: true
-      generateDisambiguationQuestion: true
+kind: tools
+name: my-gda-query-tool
+type: cloud-gemini-data-analytics-query
+source: my-gda-source
+description: "Use this tool to send natural language queries to the Gemini Data Analytics API and receive SQL, natural language answers, and explanations."
+location: ${your_database_location}
+context:
+  datasourceReferences:
+    cloudSqlReference:
+      databaseReference:
+        projectId: "${your_project_id}"
+        region: "${your_database_instance_region}"
+        instanceId: "${your_database_instance_id}"
+        databaseId: "${your_database_name}"
+        engine: "POSTGRESQL"
+      agentContextReference:
+        contextSetId: "${your_context_set_id}" # E.g. projects/${project_id}/locations/${context_set_location}/contextSets/${context_set_id}
+generationOptions:
+  generateQueryResult: true
+  generateNaturalLanguageAnswer: true
+  generateExplanation: true
+  generateDisambiguationQuestion: true
 ```
 
 ### Usage Flow
@@ -87,7 +87,7 @@ How many accounts who have region in Prague are eligible for loans? A3 contains
 
 | **field**         | **type** | **required** | **description**                                                                                                                                                                                                                                              |
 | ----------------- | :------: | :----------: | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| kind              |  string  |     true     | Must be "cloud-gemini-data-analytics-query".                                                                                                                                                                                                                 |
+| type              |  string  |     true     | Must be "cloud-gemini-data-analytics-query".                                                                                                                                                                                                                 |
 | source            |  string  |     true     | The name of the `cloud-gemini-data-analytics` source to use.                                                                                                                                                                                                 |
 | description       |  string  |     true     | A description of the tool's purpose.                                                                                                                                                                                                                         |
 | location          |  string  |     true     | The Google Cloud location of the target database resource (e.g., "us-central1"). This is used to construct the parent resource name in the API call.                                                                                                         |
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-fetch-page.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-fetch-page.md
index 0e990c9fee..f8cd93cef8 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-fetch-page.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-fetch-page.md
@@ -23,18 +23,18 @@ response bundle.
 ## Example
 
 ```yaml
-tools:
-  get_fhir_store:
-    kind: cloud-healthcare-fhir-fetch-page
-    source: my-healthcare-source
-    description: Use this tool to fetch a page of FHIR resources from a FHIR Bundle's entry.link.url
+kind: tools
+name: get_fhir_store
+type: cloud-healthcare-fhir-fetch-page
+source: my-healthcare-source
+description: Use this tool to fetch a page of FHIR resources from a FHIR Bundle's entry.link.url
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-fhir-fetch-page".        |
+| type        |  string  |     true     | Must be "cloud-healthcare-fhir-fetch-page".        |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-everything.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-everything.md
index b66f65f4bc..8f74aa1392 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-everything.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-everything.md
@@ -22,18 +22,18 @@ types, or only resources that have been updated after a given time.
 ## Example
 
 ```yaml
-tools:
-  fhir_patient_everything:
-    kind: cloud-healthcare-fhir-patient-everything
-    source: my-healthcare-source
-    description: Use this tool to retrieve all the information about a given patient.
+kind: tools
+name: fhir_patient_everything
+type: cloud-healthcare-fhir-patient-everything
+source: my-healthcare-source
+description: Use this tool to retrieve all the information about a given patient.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                     |
 |-------------|:--------:|:------------:|-----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-fhir-patient-everything". |
+| type        |  string  |     true     | Must be "cloud-healthcare-fhir-patient-everything". |
 | source      |  string  |     true     | Name of the healthcare source.                      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.  |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-search.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-search.md
index 73155c90e1..f3cdab733b 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-search.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-fhir-patient-search.md
@@ -21,18 +21,18 @@ given criteria.
 ## Example
 
 ```yaml
-tools:
-  fhir_patient_search:
-    kind: cloud-healthcare-fhir-patient-search
-    source: my-healthcare-source
-    description: Use this tool to search for patients in the FHIR store.
+kind: tools
+name: fhir_patient_search
+type: cloud-healthcare-fhir-patient-search
+source: my-healthcare-source
+description: Use this tool to search for patients in the FHIR store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-fhir-patient-search".    |
+| type        |  string  |     true     | Must be "cloud-healthcare-fhir-patient-search".    |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dataset.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dataset.md
index 0bcdb6896d..856e327251 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dataset.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dataset.md
@@ -21,17 +21,17 @@ configured in the source. It takes no extra parameters.
 ## Example
 
 ```yaml
-tools:
-  get_dataset:
-    kind: cloud-healthcare-get-dataset
-    source: my-healthcare-source
-    description: Use this tool to get healthcare dataset metadata.
+kind: tools
+name: get_dataset
+type: cloud-healthcare-get-dataset
+source: my-healthcare-source
+description: Use this tool to get healthcare dataset metadata.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                    |
 |-------------|:------------------------------------------:|:------------:|----------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "cloud-healthcare-get-dataset".            |
+| type        |                   string                   |     true     | Must be "cloud-healthcare-get-dataset".            |
 | source      |                   string                   |     true     | Name of the healthcare source.                     |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store-metrics.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store-metrics.md
index 8bd5d38b1f..8f0b4f152b 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store-metrics.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store-metrics.md
@@ -20,18 +20,18 @@ store. It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  get_dicom_store_metrics:
-    kind: cloud-healthcare-get-dicom-store-metrics
-    source: my-healthcare-source
-    description: Use this tool to get metrics for a DICOM store.
+kind: tools
+name: get_dicom_store_metrics
+type: cloud-healthcare-get-dicom-store-metrics
+source: my-healthcare-source
+description: Use this tool to get metrics for a DICOM store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                     |
 |-------------|:--------:|:------------:|-----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-get-dicom-store-metrics". |
+| type        |  string  |     true     | Must be "cloud-healthcare-get-dicom-store-metrics". |
 | source      |  string  |     true     | Name of the healthcare source.                      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.  |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store.md
index 9828b06aea..ba44d9b2cc 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-dicom-store.md
@@ -20,18 +20,18 @@ compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  get_dicom_store:
-    kind: cloud-healthcare-get-dicom-store
-    source: my-healthcare-source
-    description: Use this tool to get information about a DICOM store.
+kind: tools
+name: get_dicom_store
+type: cloud-healthcare-get-dicom-store
+source: my-healthcare-source
+description: Use this tool to get information about a DICOM store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-get-dicom-store".        |
+| type        |  string  |     true     | Must be "cloud-healthcare-get-dicom-store".        |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-resource.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-resource.md
index ef093ec1a3..ab36abd08d 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-resource.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-resource.md
@@ -23,18 +23,18 @@ by its type and ID.
 ## Example
 
 ```yaml
-tools:
-  get_fhir_resource:
-    kind: cloud-healthcare-get-fhir-resource
-    source: my-healthcare-source
-    description: Use this tool to retrieve a specific FHIR resource.
+kind: tools
+name: get_fhir_resource
+type: cloud-healthcare-get-fhir-resource
+source: my-healthcare-source
+description: Use this tool to retrieve a specific FHIR resource.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-get-fhir-resource".      |
+| type        |  string  |     true     | Must be "cloud-healthcare-get-fhir-resource".      |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store-metrics.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store-metrics.md
index e5209e6118..f53aafac4e 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store-metrics.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store-metrics.md
@@ -20,18 +20,18 @@ compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  get_fhir_store_metrics:
-    kind: cloud-healthcare-get-fhir-store-metrics
-    source: my-healthcare-source
-    description: Use this tool to get metrics for a FHIR store.
+kind: tools
+name: get_fhir_store_metrics
+type: cloud-healthcare-get-fhir-store-metrics
+source: my-healthcare-source
+description: Use this tool to get metrics for a FHIR store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-get-fhir-store-metrics". |
+| type        |  string  |     true     | Must be "cloud-healthcare-get-fhir-store-metrics". |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store.md
index a9ce8d4aee..ff08bf3b31 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-get-fhir-store.md
@@ -20,18 +20,18 @@ compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  get_fhir_store:
-    kind: cloud-healthcare-get-fhir-store
-    source: my-healthcare-source
-    description: Use this tool to get information about a FHIR store.
+kind: tools
+name: get_fhir_store
+type: cloud-healthcare-get-fhir-store
+source: my-healthcare-source
+description: Use this tool to get information about a FHIR store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-get-fhir-store".         |
+| type        |  string  |     true     | Must be "cloud-healthcare-get-fhir-store".         |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-dicom-stores.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-dicom-stores.md
index 7a6b493aca..ce1238d632 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-dicom-stores.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-dicom-stores.md
@@ -22,17 +22,17 @@ stores in the dataset of the healthcare source. It takes no extra parameters.
 ## Example
 
 ```yaml
-tools:
-  list_dicom_stores:
-    kind: cloud-healthcare-list-dicom-stores
-    source: my-healthcare-source
-    description: Use this tool to list DICOM stores in the healthcare dataset.
+kind: tools
+name: list_dicom_stores
+type: cloud-healthcare-list-dicom-stores
+source: my-healthcare-source
+description: Use this tool to list DICOM stores in the healthcare dataset.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-list-dicom-stores".      |
+| type        |  string  |     true     | Must be "cloud-healthcare-list-dicom-stores".      |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-fhir-stores.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-fhir-stores.md
index ff10278203..12986af45d 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-fhir-stores.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-list-fhir-stores.md
@@ -22,17 +22,17 @@ stores in the dataset of the healthcare source. It takes no extra parameters.
 ## Example
 
 ```yaml
-tools:
-  list_fhir_stores:
-    kind: cloud-healthcare-list-fhir-stores
-    source: my-healthcare-source
-    description: Use this tool to list FHIR stores in the healthcare dataset.
+kind: tools
+name: list_fhir_stores
+type: cloud-healthcare-list-fhir-stores
+source: my-healthcare-source
+description: Use this tool to list FHIR stores in the healthcare dataset.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-list-fhir-stores".       |
+| type        |  string  |     true     | Must be "cloud-healthcare-list-fhir-stores".       |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-retrieve-rendered-dicom-instance.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-retrieve-rendered-dicom-instance.md
index c1b99818ef..1d8eea9f29 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-retrieve-rendered-dicom-instance.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-retrieve-rendered-dicom-instance.md
@@ -22,18 +22,18 @@ string of the image in JPEG format.
 ## Example
 
 ```yaml
-tools:
-  retrieve_rendered_dicom_instance:
-    kind: cloud-healthcare-retrieve-rendered-dicom-instance
-    source: my-healthcare-source
-    description: Use this tool to retrieve a rendered DICOM instance from the DICOM store.
+kind: tools
+name: retrieve_rendered_dicom_instance
+type: cloud-healthcare-retrieve-rendered-dicom-instance
+source: my-healthcare-source
+description: Use this tool to retrieve a rendered DICOM instance from the DICOM store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                              |
 |-------------|:--------:|:------------:|--------------------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-retrieve-rendered-dicom-instance". |
+| type        |  string  |     true     | Must be "cloud-healthcare-retrieve-rendered-dicom-instance". |
 | source      |  string  |     true     | Name of the healthcare source.                               |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.           |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-instances.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-instances.md
index 042253d91d..554290fe37 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-instances.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-instances.md
@@ -22,18 +22,18 @@ criteria.
 ## Example
 
 ```yaml
-tools:
-  search_dicom_instances:
-    kind: cloud-healthcare-search-dicom-instances
-    source: my-healthcare-source
-    description: Use this tool to search for DICOM instances in the DICOM store.
+kind: tools
+name: search_dicom_instances
+type: cloud-healthcare-search-dicom-instances
+source: my-healthcare-source
+description: Use this tool to search for DICOM instances in the DICOM store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-search-dicom-instances". |
+| type        |  string  |     true     | Must be "cloud-healthcare-search-dicom-instances". |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-series.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-series.md
index 1a8e76a183..2dba31f3cf 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-series.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-series.md
@@ -20,18 +20,18 @@ set of criteria. It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  search_dicom_series:
-    kind: cloud-healthcare-search-dicom-series
-    source: my-healthcare-source
-    description: Use this tool to search for DICOM series in the DICOM store.
+kind: tools
+name: search_dicom_series
+type: cloud-healthcare-search-dicom-series
+source: my-healthcare-source
+description: Use this tool to search for DICOM series in the DICOM store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-search-dicom-series".    |
+| type        |  string  |     true     | Must be "cloud-healthcare-search-dicom-series".    |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-studies.md b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-studies.md
index 11d9036292..a3c8504444 100644
--- a/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-studies.md
+++ b/docs/en/resources/tools/cloudhealthcare/cloud-healthcare-search-dicom-studies.md
@@ -20,18 +20,18 @@ set of criteria. It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  search_dicom_studies:
-    kind: cloud-healthcare-search-dicom-studies
-    source: my-healthcare-source
-    description: Use this tool to search for DICOM studies in the DICOM store.
+kind: tools
+name: search_dicom_studies
+type: cloud-healthcare-search-dicom-studies
+source: my-healthcare-source
+description: Use this tool to search for DICOM studies in the DICOM store.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-healthcare-search-dicom-studies".   |
+| type        |  string  |     true     | Must be "cloud-healthcare-search-dicom-studies".   |
 | source      |  string  |     true     | Name of the healthcare source.                     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
 
diff --git a/docs/en/resources/tools/cloudloggingadmin/_index.md b/docs/en/resources/tools/cloudloggingadmin/_index.md
new file mode 100644
index 0000000000..a5b34e9a76
--- /dev/null
+++ b/docs/en/resources/tools/cloudloggingadmin/_index.md
@@ -0,0 +1,8 @@
+---
+title: "Cloud Logging Admin"
+linkTitle: "Cloud Logging Admin"
+type: docs
+weight: 1
+description: > 
+  Tools that work with Cloud Logging Admin Sources.
+---
diff --git a/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-log-names.md b/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-log-names.md
new file mode 100644
index 0000000000..17e30d050d
--- /dev/null
+++ b/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-log-names.md
@@ -0,0 +1,39 @@
+---
+title: "cloud-logging-admin-list-log-names"
+type: docs
+description: >
+  A "cloud-logging-admin-list-log-names" tool lists the log names in the project.
+aliases:
+- /resources/tools/cloud-logging-admin-list-log-names
+---
+
+## About
+
+The `cloud-logging-admin-list-log-names` tool lists the log names available in the Google Cloud project.
+It's compatible with the following sources:
+
+- [cloud-logging-admin](../../sources/cloud-logging-admin.md)
+
+## Example
+
+```yaml
+kind: tools
+name: list_log_names
+type: cloud-logging-admin-list-log-names
+source: my-cloud-logging
+description: Lists all log names in the project.
+```
+
+## Reference
+
+| **field**   | **type** | **required** | **description**                                    |
+|-------------|:--------:|:------------:|----------------------------------------------------|
+| type        |  string  |     true     | Must be "cloud-logging-admin-list-log-names".      |
+| source      |  string  |     true     | Name of the cloud-logging-admin source.            |
+| description |  string  |     true     | Description of the tool that is passed to the LLM. |
+
+### Parameters
+
+| **parameter** | **type** | **required** | **description** |
+|:--------------|:--------:|:------------:|:----------------|
+| limit | integer | false | Maximum number of log entries to return (default: 200). |
diff --git a/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-resource-types.md b/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-resource-types.md
new file mode 100644
index 0000000000..1bbac35c4b
--- /dev/null
+++ b/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-resource-types.md
@@ -0,0 +1,34 @@
+---
+title: "cloud-logging-admin-list-resource-types"
+type: docs
+description: >
+  A "cloud-logging-admin-list-resource-types" tool lists the monitored resource types.
+aliases:
+- /resources/tools/cloud-logging-admin-list-resource-types
+---
+
+## About
+
+The `cloud-logging-admin-list-resource-types` tool lists the monitored resource types available in Google Cloud Logging.
+It's compatible with the following sources:
+
+- [cloud-logging-admin](../../sources/cloud-logging-admin.md)
+
+## Example
+
+```yaml
+kind: tools
+name: list_resource_types
+type: cloud-logging-admin-list-resource-types
+source: my-cloud-logging
+description: Lists monitored resource types.
+```
+
+## Reference
+
+| **field**   | **type** | **required** | **description**                                    |
+|-------------|:--------:|:------------:|----------------------------------------------------|
+| type        |  string  |     true     | Must be "cloud-logging-admin-list-resource-types".|
+| source      |  string  |     true     | Name of the cloud-logging-admin source.            |
+| description |  string  |     true     | Description of the tool that is passed to the LLM. |
+
diff --git a/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-query-logs.md b/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-query-logs.md
new file mode 100644
index 0000000000..7a9b8f97d5
--- /dev/null
+++ b/docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-query-logs.md
@@ -0,0 +1,44 @@
+---
+title: "cloud-logging-admin-query-logs"
+type: docs
+description: >
+  A "cloud-logging-admin-query-logs" tool queries log entries.
+aliases:
+- /resources/tools/cloud-logging-admin-query-logs
+---
+
+## About
+
+The `cloud-logging-admin-query-logs` tool allows you to query log entries from Google Cloud Logging using the advanced logs filter syntax.
+It's compatible with the following sources:
+
+- [cloud-logging-admin](../../sources/cloud-logging-admin.md)
+
+## Example
+
+```yaml
+kind: tools
+name: query_logs
+type: cloud-logging-admin-query-logs
+source: my-cloud-logging
+description: Queries log entries from Cloud Logging.
+```
+
+## Reference
+
+| **field**   | **type** | **required** | **description**                                    |
+|-------------|:--------:|:------------:|----------------------------------------------------|
+| type        |  string  |     true     | Must be "cloud-logging-admin-query-logs".          |
+| source      |  string  |     true     | Name of the cloud-logging-admin source.            |
+| description |  string  |     true     | Description of the tool that is passed to the LLM. |
+
+### Parameters
+
+| **parameter** | **type** | **required** | **description** |
+|:--------------|:--------:|:------------:|:----------------|
+| filter | string | false | Cloud Logging filter query. Common fields: resource.type, resource.labels.*, logName, severity, textPayload, jsonPayload.*, protoPayload.*, labels.*, httpRequest.*. Operators: =, !=, <, <=, >, >=, :, =~, AND, OR, NOT. |
+| newestFirst | boolean | false | Set to true for newest logs first. Defaults to oldest first. |
+| startTime | string | false | Start time in RFC3339 format (e.g., 2025-12-09T00:00:00Z). Defaults to 30 days ago. |
+| endTime | string | false | End time in RFC3339 format (e.g., 2025-12-09T23:59:59Z). Defaults to now. |
+| verbose | boolean | false | Include additional fields (insertId, trace, spanId, httpRequest, labels, operation, sourceLocation). Defaults to false. |
+| limit | integer | false | Maximum number of log entries to return. Default: `200`. |
diff --git a/docs/en/resources/tools/cloudmonitoring/cloud-monitoring-query-prometheus.md b/docs/en/resources/tools/cloudmonitoring/cloud-monitoring-query-prometheus.md
index 53ade0eb33..8597c1dc1a 100644
--- a/docs/en/resources/tools/cloudmonitoring/cloud-monitoring-query-prometheus.md
+++ b/docs/en/resources/tools/cloudmonitoring/cloud-monitoring-query-prometheus.md
@@ -55,21 +55,21 @@ Here are some examples of how to use the `cloud-monitoring-query-prometheus`
 tool.
 
 ```yaml
-tools:
- get_wait_time_metrics:
-    kind: cloud-monitoring-query-prometheus
-    source: cloud-monitoring-source
-    description: |
-      This tool fetches system wait time information for AlloyDB cluster, instance. Get the `projectID`, `clusterID` and `instanceID` from the user intent. To use this tool, you must provide the Google Cloud `projectId` and a PromQL `query`.
-      Generate `query` using these metric details:
-      metric: `alloydb.googleapis.com/instance/postgresql/wait_time`,  monitored_resource: `alloydb.googleapis.com/Instance`. labels: `cluster_id`, `instance_id`, `wait_event_type`, `wait_event_name`.
-      Basic time series example promql query: `avg_over_time({"__name__"="alloydb.googleapis.com/instance/postgresql/wait_time","monitored_resource"="alloydb.googleapis.com/Instance","instance_id"="alloydb-instance"}[5m])`
+kind: tools
+name: get_wait_time_metrics
+type: cloud-monitoring-query-prometheus
+source: cloud-monitoring-source
+description: |
+  This tool fetches system wait time information for AlloyDB cluster, instance. Get the `projectID`, `clusterID` and `instanceID` from the user intent. To use this tool, you must provide the Google Cloud `projectId` and a PromQL `query`.
+  Generate `query` using these metric details:
+  metric: `alloydb.googleapis.com/instance/postgresql/wait_time`,  monitored_resource: `alloydb.googleapis.com/Instance`. labels: `cluster_id`, `instance_id`, `wait_event_type`, `wait_event_name`.
+  Basic time series example promql query: `avg_over_time({"__name__"="alloydb.googleapis.com/instance/postgresql/wait_time","monitored_resource"="alloydb.googleapis.com/Instance","instance_id"="alloydb-instance"}[5m])`
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be cloud-monitoring-query-prometheus.           |
+| type        |  string  |     true     | Must be cloud-monitoring-query-prometheus.           |
 | source      |  string  |     true     | The name of an `cloud-monitoring` source.            |
 | description |  string  |     true     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlcloneinstance.md b/docs/en/resources/tools/cloudsql/cloudsqlcloneinstance.md
index 89fdb8d986..455381173d 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlcloneinstance.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlcloneinstance.md
@@ -8,7 +8,7 @@ description: "Clone a Cloud SQL instance."
 The `cloud-sql-clone-instance` tool clones a Cloud SQL instance using the Cloud SQL Admin API.
 
 {{< notice info dd>}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Examples
@@ -16,21 +16,21 @@ This tool uses a `source` of kind `cloud-sql-admin`.
 Basic clone (current state)
 
 ```yaml
-tools:
-  clone-instance-basic:
-    kind: cloud-sql-clone-instance
-    source: cloud-sql-admin-source
-    description: "Creates an exact copy of a Cloud SQL instance. Supports configuring instance zones and high-availability setup through zone preferences."
+kind: tools
+name: clone-instance-basic
+type: cloud-sql-clone-instance
+source: cloud-sql-admin-source
+description: "Creates an exact copy of a Cloud SQL instance. Supports configuring instance zones and high-availability setup through zone preferences."
 ```
 
 Point-in-time recovery (PITR) clone
 
 ```yaml
-tools:
-  clone-instance-pitr:
-    kind: cloud-sql-clone-instance
-    source: cloud-sql-admin-source
-    description: "Creates an exact copy of a Cloud SQL instance at a specific point in time (PITR). Supports configuring instance zones and high-availability setup through zone preferences"
+kind: tools
+name: clone-instance-pitr
+type: cloud-sql-clone-instance
+source: cloud-sql-admin-source
+description: "Creates an exact copy of a Cloud SQL instance at a specific point in time (PITR). Supports configuring instance zones and high-availability setup through zone preferences"
 ```
 
 ## Reference
@@ -39,7 +39,7 @@ tools:
 
 | **field**      | **type** | **required** | **description**                                               |
 | -------------- | :------: | :----------: | ------------------------------------------------------------- |
-| kind           | string   | true         | Must be "cloud-sql-clone-instance".                           |
+| type           | string   | true         | Must be "cloud-sql-clone-instance".                           |
 | source         | string   | true         | The name of the `cloud-sql-admin` source to use.              |
 | description    | string   | false        | A description of the tool.                                    |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlcreatebackup.md b/docs/en/resources/tools/cloudsql/cloudsqlcreatebackup.md
index 751534a0ba..b767389644 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlcreatebackup.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlcreatebackup.md
@@ -8,7 +8,7 @@ description: "Creates a backup on a Cloud SQL instance."
 The `cloud-sql-create-backup` tool creates an on-demand backup on a Cloud SQL instance using the Cloud SQL Admin API.
 
 {{< notice info dd>}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Examples
@@ -16,17 +16,17 @@ This tool uses a `source` of kind `cloud-sql-admin`.
 Basic backup creation (current state)
 
 ```yaml
-tools:
-  backup-creation-basic:
-    kind: cloud-sql-create-backup
-    source: cloud-sql-admin-source
-    description: "Creates a backup on the given Cloud SQL instance."
+kind: tools
+name: backup-creation-basic
+type: cloud-sql-create-backup
+source: cloud-sql-admin-source
+description: "Creates a backup on the given Cloud SQL instance."
 ```
 ## Reference
 ### Tool Configuration
 | **field**      | **type** | **required** | **description**                                               |
 | -------------- | :------: | :----------: | ------------------------------------------------------------- |
-| kind           | string   | true         | Must be "cloud-sql-create-backup".                            |
+| type           | string   | true         | Must be "cloud-sql-create-backup".                            |
 | source         | string   | true         | The name of the `cloud-sql-admin` source to use.              |
 | description    | string   | false        | A description of the tool.                                    |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlcreatedatabase.md b/docs/en/resources/tools/cloudsql/cloudsqlcreatedatabase.md
index dbad4f3376..96c41047d8 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlcreatedatabase.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlcreatedatabase.md
@@ -10,24 +10,24 @@ The `cloud-sql-create-database` tool creates a new database in a specified Cloud
 SQL instance.
 
 {{< notice info >}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Example
 
 ```yaml
-tools:
-  create-cloud-sql-database:
-    kind: cloud-sql-create-database
-    source: my-cloud-sql-admin-source
-    description: "Creates a new database in a Cloud SQL instance."
+kind: tools
+name: create-cloud-sql-database
+type: cloud-sql-create-database
+source: my-cloud-sql-admin-source
+description: "Creates a new database in a Cloud SQL instance."
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                  |
 | ----------- | :------: | :----------: | ------------------------------------------------ |
-| kind        |  string  |     true     | Must be "cloud-sql-create-database".             |
+| type        |  string  |     true     | Must be "cloud-sql-create-database".             |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use. |
 | description |  string  |     false    | A description of the tool.                       |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlcreateusers.md b/docs/en/resources/tools/cloudsql/cloudsqlcreateusers.md
index affee91cfc..243e812100 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlcreateusers.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlcreateusers.md
@@ -10,23 +10,23 @@ The `cloud-sql-create-users` tool creates a new user in a specified Cloud SQL
 instance. It can create both built-in and IAM users.
 
 {{< notice info >}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Example
 
 ```yaml
-tools:
-  create-cloud-sql-user:
-    kind: cloud-sql-create-users
-    source: my-cloud-sql-admin-source
-    description: "Creates a new user in a Cloud SQL instance. Both built-in and IAM users are supported. IAM users require an email account as the user name. IAM is the more secure and recommended way to manage users. The agent should always ask the user what type of user they want to create. For more information, see https://cloud.google.com/sql/docs/postgres/add-manage-iam-users"
+kind: tools
+name: create-cloud-sql-user
+type: cloud-sql-create-users
+source: my-cloud-sql-admin-source
+description: "Creates a new user in a Cloud SQL instance. Both built-in and IAM users are supported. IAM users require an email account as the user name. IAM is the more secure and recommended way to manage users. The agent should always ask the user what type of user they want to create. For more information, see https://cloud.google.com/sql/docs/postgres/add-manage-iam-users"
 ```
 
 ## Reference
 
 | **field**    |  **type** | **required** | **description**                                  |
 | ------------ | :-------: | :----------: | ------------------------------------------------ |
-| kind         |   string  |     true     | Must be "cloud-sql-create-users".                |
+| type         |   string  |     true     | Must be "cloud-sql-create-users".                |
 | description  |   string  |     false    | A description of the tool.                       |
 | source       |   string  |     true     | The name of the `cloud-sql-admin` source to use. |
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlgetinstances.md b/docs/en/resources/tools/cloudsql/cloudsqlgetinstances.md
index 711fc3b333..d6ab497995 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlgetinstances.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlgetinstances.md
@@ -10,23 +10,23 @@ The `cloud-sql-get-instance` tool retrieves a Cloud SQL instance resource using
 the Cloud SQL Admin API.
 
 {{< notice info >}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Example
 
 ```yaml
-tools:
-  get-sql-instance:
-    kind: cloud-sql-get-instance
-    source: my-cloud-sql-admin-source
-    description: "Gets a particular cloud sql instance."
+kind: tools
+name: get-sql-instance
+type: cloud-sql-get-instance
+source: my-cloud-sql-admin-source
+description: "Gets a particular cloud sql instance."
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                  |
 | ----------- | :------: | :----------: | ------------------------------------------------ |
-| kind        |  string  |     true     | Must be "cloud-sql-get-instance".                |
+| type        |  string  |     true     | Must be "cloud-sql-get-instance".                |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use. |
 | description |  string  |     false    | A description of the tool.                       |
diff --git a/docs/en/resources/tools/cloudsql/cloudsqllistdatabases.md b/docs/en/resources/tools/cloudsql/cloudsqllistdatabases.md
index 54f8f3401d..2d86f5b23e 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqllistdatabases.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqllistdatabases.md
@@ -18,15 +18,15 @@ Here is an example of how to configure the `cloud-sql-list-databases` tool in yo
 `tools.yaml` file:
 
 ```yaml
-sources:
-  my-cloud-sql-admin-source:
-    kind: cloud-sql-admin
-
-tools:
-  list_my_databases:
-    kind: cloud-sql-list-databases
-    source: my-cloud-sql-admin-source
-    description: Use this tool to list all Cloud SQL databases in an instance.
+kind: sources
+name: my-cloud-sql-admin-source
+type: cloud-sql-admin
+---
+kind: tools
+name: list_my_databases
+type: cloud-sql-list-databases
+source: my-cloud-sql-admin-source
+description: Use this tool to list all Cloud SQL databases in an instance.
 ```
 
 ## Parameters
@@ -42,6 +42,6 @@ The `cloud-sql-list-databases` tool has two required parameters:
 
 | **field**   | **type** | **required** | **description**                                                |
 | ----------- | :------: | :----------: | -------------------------------------------------------------- |
-| kind        |  string  |     true     | Must be "cloud-sql-list-databases".                            |
+| type        |  string  |     true     | Must be "cloud-sql-list-databases".                            |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use for this tool. |
 | description |  string  |     false    | Description of the tool that is passed to the agent.           |
diff --git a/docs/en/resources/tools/cloudsql/cloudsqllistinstances.md b/docs/en/resources/tools/cloudsql/cloudsqllistinstances.md
index 45e3c542e6..c078aa43bd 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqllistinstances.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqllistinstances.md
@@ -19,15 +19,15 @@ Here is an example of how to configure the `cloud-sql-list-instances` tool in
 your `tools.yaml` file:
 
 ```yaml
-sources:
-  my-cloud-sql-admin-source:
-    kind: cloud-sql-admin
-
-tools:
-  list_my_instances:
-    kind: cloud-sql-list-instances
-    source: my-cloud-sql-admin-source
-    description: Use this tool to list all Cloud SQL instances in a project.
+kind: sources
+name: my-cloud-sql-admin-source
+type: cloud-sql-admin
+---
+kind: tools
+name: list_my_instances
+type: cloud-sql-list-instances
+source: my-cloud-sql-admin-source
+description: Use this tool to list all Cloud SQL instances in a project.
 ```
 
 ## Parameters
@@ -42,6 +42,6 @@ The `cloud-sql-list-instances` tool has one required parameter:
 
 | **field**   | **type** | **required** | **description**                                                |
 |-------------|:--------:|:------------:|----------------------------------------------------------------|
-| kind        |  string  |     true     | Must be "cloud-sql-list-instances".                            |
+| type        |  string  |     true     | Must be "cloud-sql-list-instances".                            |
 | description |  string  |    false     | Description of the tool that is passed to the agent.           |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use for this tool. |
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlmssqlcreateinstance.md b/docs/en/resources/tools/cloudsql/cloudsqlmssqlcreateinstance.md
index 6b7cd9beb9..2053724237 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlmssqlcreateinstance.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlmssqlcreateinstance.md
@@ -9,17 +9,17 @@ The `cloud-sql-mssql-create-instance` tool creates a Cloud SQL for SQL Server
 instance using the Cloud SQL Admin API.
 
 {{< notice info dd>}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Example
 
 ```yaml
-tools:
-  create-sql-instance:
-    kind: cloud-sql-mssql-create-instance
-    source: cloud-sql-admin-source
-    description: "Creates a SQL Server instance using `Production` and `Development` presets. For the `Development` template, it chooses a 2 vCPU, 8 GiB RAM (`db-custom-2-8192`) configuration with Non-HA/zonal availability. For the `Production` template, it chooses a 4 vCPU, 26 GiB RAM (`db-custom-4-26624`) configuration with HA/regional availability. The Enterprise edition is used in both cases. The default database version is `SQLSERVER_2022_STANDARD`. The agent should ask the user if they want to use a different version."
+kind: tools
+name: create-sql-instance
+type: cloud-sql-mssql-create-instance
+source: cloud-sql-admin-source
+description: "Creates a SQL Server instance using `Production` and `Development` presets. For the `Development` template, it chooses a 2 vCPU, 8 GiB RAM (`db-custom-2-8192`) configuration with Non-HA/zonal availability. For the `Production` template, it chooses a 4 vCPU, 26 GiB RAM (`db-custom-4-26624`) configuration with HA/regional availability. The Enterprise edition is used in both cases. The default database version is `SQLSERVER_2022_STANDARD`. The agent should ask the user if they want to use a different version."
 ```
 
 ## Reference
@@ -28,7 +28,7 @@ tools:
 
 | **field**   | **type** | **required** | **description**                                  |
 | ----------- | :------: | :----------: | ------------------------------------------------ |
-| kind        |  string  |     true     | Must be "cloud-sql-mssql-create-instance".       |
+| type        |  string  |     true     | Must be "cloud-sql-mssql-create-instance".       |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use. |
 | description |  string  |    false     | A description of the tool.                       |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlmysqlcreateinstance.md b/docs/en/resources/tools/cloudsql/cloudsqlmysqlcreateinstance.md
index 8707b8fea2..d9e5a7dcee 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlmysqlcreateinstance.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlmysqlcreateinstance.md
@@ -18,15 +18,15 @@ Here is an example of how to configure the `cloud-sql-mysql-create-instance`
 tool in your `tools.yaml` file:
 
 ```yaml
-sources:
-  my-cloud-sql-admin-source:
-    kind: cloud-sql-admin
-
-tools:
-  create_my_mysql_instance:
-    kind: cloud-sql-mysql-create-instance
-    source: my-cloud-sql-admin-source
-    description: "Creates a MySQL instance using `Production` and `Development` presets. For the `Development` template, it chooses a 2 vCPU, 16 GiB RAM, 100 GiB SSD configuration with Non-HA/zonal availability. For the `Production` template, it chooses an 8 vCPU, 64 GiB RAM, 250 GiB SSD configuration with HA/regional availability. The Enterprise Plus edition is used in both cases. The default database version is `MYSQL_8_4`. The agent should ask the user if they want to use a different version."
+kind: sources
+name: my-cloud-sql-admin-source
+type: cloud-sql-admin
+---
+kind: tools
+name: create_my_mysql_instance
+type: cloud-sql-mysql-create-instance
+source: my-cloud-sql-admin-source
+description: "Creates a MySQL instance using `Production` and `Development` presets. For the `Development` template, it chooses a 2 vCPU, 16 GiB RAM, 100 GiB SSD configuration with Non-HA/zonal availability. For the `Production` template, it chooses an 8 vCPU, 64 GiB RAM, 250 GiB SSD configuration with HA/regional availability. The Enterprise Plus edition is used in both cases. The default database version is `MYSQL_8_4`. The agent should ask the user if they want to use a different version."
 ```
 
 ## Parameters
@@ -45,6 +45,6 @@ The `cloud-sql-mysql-create-instance` tool has the following parameters:
 
 | **field**   | **type** | **required** | **description**                                                |
 | ----------- | :------: | :----------: | -------------------------------------------------------------- |
-| kind        |  string  |     true     | Must be `cloud-sql-mysql-create-instance`.                     |
+| type        |  string  |     true     | Must be `cloud-sql-mysql-create-instance`.                     |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use for this tool. |
 | description |  string  |     false    | A description of the tool that is passed to the agent.         |
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlpgcreateinstances.md b/docs/en/resources/tools/cloudsql/cloudsqlpgcreateinstances.md
index b567537592..0d41a89e03 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlpgcreateinstances.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlpgcreateinstances.md
@@ -9,17 +9,17 @@ The `cloud-sql-postgres-create-instance` tool creates a Cloud SQL for PostgreSQL
 instance using the Cloud SQL Admin API.
 
 {{< notice info >}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Example
 
 ```yaml
-tools:
-  create-sql-instance:
-    kind: cloud-sql-postgres-create-instance
-    source: cloud-sql-admin-source
-    description: "Creates a Postgres instance using `Production` and `Development` presets. For the `Development` template, it chooses a 2 vCPU, 16 GiB RAM, 100 GiB SSD configuration with Non-HA/zonal availability. For the `Production` template, it chooses an 8 vCPU, 64 GiB RAM, 250 GiB SSD configuration with HA/regional availability. The Enterprise Plus edition is used in both cases. The default database version is `POSTGRES_17`. The agent should ask the user if they want to use a different version."
+kind: tools
+name: create-sql-instance
+type: cloud-sql-postgres-create-instance
+source: cloud-sql-admin-source
+description: "Creates a Postgres instance using `Production` and `Development` presets. For the `Development` template, it chooses a 2 vCPU, 16 GiB RAM, 100 GiB SSD configuration with Non-HA/zonal availability. For the `Production` template, it chooses an 8 vCPU, 64 GiB RAM, 250 GiB SSD configuration with HA/regional availability. The Enterprise Plus edition is used in both cases. The default database version is `POSTGRES_17`. The agent should ask the user if they want to use a different version."
 ```
 
 ## Reference
@@ -28,7 +28,7 @@ tools:
 
 | **field**   | **type** | **required** | **description**                                  |
 | ----------- | :------: | :----------: | ------------------------------------------------ |
-| kind        |  string  |     true     | Must be "cloud-sql-postgres-create-instance".    |
+| type        |  string  |     true     | Must be "cloud-sql-postgres-create-instance".    |
 | source      |  string  |     true     | The name of the `cloud-sql-admin` source to use. |
 | description |  string  |     false    | A description of the tool.                       |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlpgupgradeprecheck.md b/docs/en/resources/tools/cloudsql/cloudsqlpgupgradeprecheck.md
index 4b5933a176..820bf44031 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlpgupgradeprecheck.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlpgupgradeprecheck.md
@@ -10,7 +10,7 @@ instance to assess its readiness for a major version upgrade using the Cloud SQL
 It helps identify potential incompatibilities or issues before starting the actual upgrade process.
 
 {{< notice info >}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Tool Inputs
@@ -18,18 +18,18 @@ This tool uses a `source` of kind `cloud-sql-admin`.
 ### Example
 
 ```yaml
-tools:
-  postgres-upgrade-precheck:
-    kind: postgres-upgrade-precheck
-    source: cloud-sql-admin-source
-    description: "Checks if a Cloud SQL PostgreSQL instance is ready for a major version upgrade to the specified target version."
+kind: tools
+name: postgres-upgrade-precheck
+type: postgres-upgrade-precheck
+source: cloud-sql-admin-source
+description: "Checks if a Cloud SQL PostgreSQL instance is ready for a major version upgrade to the specified target version."
 ```
 
 ### Reference
 
 | **field**    | **type** | **required** | **description**                                           |
 | ------------ | :------: | :----------: | --------------------------------------------------------- |
-| kind         |  string  |     true     | Must be "postgres-upgrade-precheck". |
+| type         |  string  |     true     | Must be "postgres-upgrade-precheck". |
 | source       |  string  |     true     | The name of the `cloud-sql-admin` source to use.          |
 | description  |  string  |     false    | A description of the tool.                                |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlrestorebackup.md b/docs/en/resources/tools/cloudsql/cloudsqlrestorebackup.md
index 3eabdac865..12e45a2c66 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlrestorebackup.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlrestorebackup.md
@@ -8,7 +8,7 @@ description: "Restores a backup of a Cloud SQL instance."
 The `cloud-sql-restore-backup` tool restores a backup on a Cloud SQL instance using the Cloud SQL Admin API.
 
 {{< notice info dd>}}
-This tool uses a `source` of kind `cloud-sql-admin`.
+This tool uses a `source` of type `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Examples
@@ -16,11 +16,11 @@ This tool uses a `source` of kind `cloud-sql-admin`.
 Basic backup restore
 
 ```yaml
-tools:
-  backup-restore-basic:
-    kind: cloud-sql-restore-backup
-    source: cloud-sql-admin-source
-    description: "Restores a backup onto the given Cloud SQL instance."
+kind: tools
+name: backup-restore-basic
+type: cloud-sql-restore-backup
+source: cloud-sql-admin-source
+description: "Restores a backup onto the given Cloud SQL instance."
 ```
 
 ## Reference
@@ -28,7 +28,7 @@ tools:
 ### Tool Configuration
 | **field**      | **type** | **required** | **description**                                  |
 | -------------- | :------: | :----------: | ------------------------------------------------ |
-| kind           | string   | true         | Must be "cloud-sql-restore-backup".              |
+| type           | string   | true         | Must be "cloud-sql-restore-backup".              |
 | source         | string   | true         | The name of the `cloud-sql-admin` source to use. |
 | description    | string   | false        | A description of the tool.                       |
 
diff --git a/docs/en/resources/tools/cloudsql/cloudsqlwaitforoperation.md b/docs/en/resources/tools/cloudsql/cloudsqlwaitforoperation.md
index 3816d12bf3..728d0e2bc8 100644
--- a/docs/en/resources/tools/cloudsql/cloudsqlwaitforoperation.md
+++ b/docs/en/resources/tools/cloudsql/cloudsqlwaitforoperation.md
@@ -14,22 +14,22 @@ exponential backoff.
 ## Example
 
 ```yaml
-tools:
-  cloudsql-operations-get:
-    kind: cloud-sql-wait-for-operation
-    source: my-cloud-sql-source
-    description: "This will poll on operations API until the operation is done. For checking operation status we need projectId and operationId. Once instance is created give follow up steps on how to use the variables to bring data plane MCP server up in local and remote setup."
-    delay: 1s
-    maxDelay: 4m
-    multiplier: 2
-    maxRetries: 10
+kind: tools
+name: cloudsql-operations-get
+type: cloud-sql-wait-for-operation
+source: my-cloud-sql-source
+description: "This will poll on operations API until the operation is done. For checking operation status we need projectId and operationId. Once instance is created give follow up steps on how to use the variables to bring data plane MCP server up in local and remote setup."
+delay: 1s
+maxDelay: 4m
+multiplier: 2
+maxRetries: 10
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                                                                                  |
 | ----------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------- |
-| kind        |  string  |     true     | Must be "cloud-sql-wait-for-operation".                                                                          |
+| type        |  string  |     true     | Must be "cloud-sql-wait-for-operation".                                                                          |
 | source      |  string  |     true     | The name of a `cloud-sql-admin` source to use for authentication.                                                |
 | description |  string  |     false    | A description of the tool.                                                                                       |
 | delay       | duration |     false    | The initial delay between polling requests (e.g., `3s`). Defaults to 3 seconds.                                  |
diff --git a/docs/en/resources/tools/cockroachdb/cockroachdb-execute-sql.md b/docs/en/resources/tools/cockroachdb/cockroachdb-execute-sql.md
new file mode 100644
index 0000000000..10a78926f4
--- /dev/null
+++ b/docs/en/resources/tools/cockroachdb/cockroachdb-execute-sql.md
@@ -0,0 +1,273 @@
+---
+title: "cockroachdb-execute-sql"
+type: docs
+weight: 1
+description: >
+  Execute ad-hoc SQL statements against a CockroachDB database.
+
+---
+
+## About
+
+A `cockroachdb-execute-sql` tool executes ad-hoc SQL statements against a CockroachDB database. This tool is designed for interactive workflows where the SQL query is provided dynamically at runtime, making it ideal for developer assistance and exploratory data analysis.
+
+The tool takes a single `sql` parameter containing the SQL statement to execute and returns the query results.
+
+> **Note:** This tool is intended for developer assistant workflows with human-in-the-loop and shouldn't be used for production agents. For production use cases with predefined queries, use [cockroachdb-sql](./cockroachdb-sql.md) instead.
+
+## Example
+
+```yaml
+sources:
+  my_cockroachdb:
+    type: cockroachdb
+    host: your-cluster.cockroachlabs.cloud
+    port: "26257"
+    user: myuser
+    password: mypassword
+    database: defaultdb
+    queryParams:
+      sslmode: require
+
+tools:
+  execute_sql:
+    type: cockroachdb-execute-sql
+    source: my_cockroachdb
+    description: Execute any SQL statement against the CockroachDB database
+```
+
+## Usage Examples
+
+### Simple SELECT Query
+
+```json
+{
+  "sql": "SELECT * FROM users LIMIT 10"
+}
+```
+
+### Query with Aggregations
+
+```json
+{
+  "sql": "SELECT category, COUNT(*) as count, SUM(amount) as total FROM expenses GROUP BY category ORDER BY total DESC"
+}
+```
+
+### Database Introspection
+
+```json
+{
+  "sql": "SHOW TABLES"
+}
+```
+
+```json
+{
+  "sql": "SHOW COLUMNS FROM expenses"
+}
+```
+
+### Multi-Region Information
+
+```json
+{
+  "sql": "SHOW REGIONS FROM DATABASE defaultdb"
+}
+```
+
+```json
+{
+  "sql": "SHOW ZONE CONFIGURATIONS"
+}
+```
+
+## CockroachDB-Specific Features
+
+### Check Cluster Version
+
+```json
+{
+  "sql": "SELECT version()"
+}
+```
+
+### View Node Status
+
+```json
+{
+  "sql": "SELECT node_id, address, locality, is_live FROM crdb_internal.gossip_nodes"
+}
+```
+
+### Check Replication Status
+
+```json
+{
+  "sql": "SELECT range_id, start_key, end_key, replicas, lease_holder FROM crdb_internal.ranges LIMIT 10"
+}
+```
+
+### View Table Regions
+
+```json
+{
+  "sql": "SHOW REGIONS FROM TABLE expenses"
+}
+```
+
+## Configuration
+
+### Required Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `type` | string | Must be `cockroachdb-execute-sql` |
+| `source` | string | Name of the CockroachDB source to use |
+| `description` | string | Human-readable description for the LLM |
+
+### Optional Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `authRequired` | array | List of authentication services required |
+
+## Parameters
+
+The tool accepts a single runtime parameter:
+
+| Parameter | Type | Description |
+|-----------|------|-------------|
+| `sql` | string | The SQL statement to execute |
+
+## Best Practices
+
+### Use for Exploration, Not Production
+
+This tool is ideal for:
+- Interactive database exploration
+- Ad-hoc analysis and reporting
+- Debugging and troubleshooting
+- Schema inspection
+
+For production use cases, use [cockroachdb-sql](./cockroachdb-sql.md) with parameterized queries.
+
+### Be Cautious with Data Modification
+
+While this tool can execute any SQL statement, be careful with:
+- `INSERT`, `UPDATE`, `DELETE` statements
+- `DROP` or `ALTER` statements
+- Schema changes in production
+
+### Use LIMIT for Large Results
+
+Always use `LIMIT` clauses when exploring data:
+
+```sql
+SELECT * FROM large_table LIMIT 100
+```
+
+### Leverage CockroachDB's SQL Extensions
+
+CockroachDB supports PostgreSQL syntax plus extensions:
+
+```sql
+-- Show database survival goal
+SHOW SURVIVAL GOAL FROM DATABASE defaultdb;
+
+-- View zone configurations
+SHOW ZONE CONFIGURATION FOR TABLE expenses;
+
+-- Check table localities
+SHOW CREATE TABLE expenses;
+```
+
+## Error Handling
+
+The tool will return descriptive errors for:
+- **Syntax errors**: Invalid SQL syntax
+- **Permission errors**: Insufficient user privileges
+- **Connection errors**: Network or authentication issues
+- **Runtime errors**: Constraint violations, type mismatches, etc.
+
+## Security Considerations
+
+### SQL Injection Risk
+
+Since this tool executes arbitrary SQL, it should only be used with:
+- Trusted users in interactive sessions
+- Human-in-the-loop workflows
+- Development and testing environments
+
+Never expose this tool directly to end users without proper authorization controls.
+
+### Use Authentication
+
+Configure the `authRequired` field to restrict access:
+
+```yaml
+tools:
+  execute_sql:
+    type: cockroachdb-execute-sql
+    source: my_cockroachdb
+    description: Execute SQL statements
+    authRequired:
+      - my-auth-service
+```
+
+### Read-Only Users
+
+For safer exploration, create read-only database users:
+
+```sql
+CREATE USER readonly_user;
+GRANT SELECT ON DATABASE defaultdb TO readonly_user;
+```
+
+## Common Use Cases
+
+### Database Administration
+
+```sql
+-- View database size
+SELECT
+  table_name,
+  pg_size_pretty(pg_total_relation_size(table_name::regclass)) AS size
+FROM information_schema.tables
+WHERE table_schema = 'public'
+ORDER BY pg_total_relation_size(table_name::regclass) DESC;
+```
+
+### Performance Analysis
+
+```sql
+-- Find slow queries
+SELECT query, count, mean_latency
+FROM crdb_internal.statement_statistics
+WHERE mean_latency > INTERVAL '1 second'
+ORDER BY mean_latency DESC
+LIMIT 10;
+```
+
+### Data Quality Checks
+
+```sql
+-- Find NULL values
+SELECT COUNT(*) as null_count
+FROM expenses
+WHERE description IS NULL OR amount IS NULL;
+
+-- Find duplicates
+SELECT user_id, email, COUNT(*) as count
+FROM users
+GROUP BY user_id, email
+HAVING COUNT(*) > 1;
+```
+
+## See Also
+
+- [cockroachdb-sql](./cockroachdb-sql.md) - For parameterized, production-ready queries
+- [cockroachdb-list-tables](./cockroachdb-list-tables.md) - List tables in the database
+- [cockroachdb-list-schemas](./cockroachdb-list-schemas.md) - List database schemas
+- [CockroachDB Source](../../sources/cockroachdb.md) - Source configuration reference
+- [CockroachDB SQL Reference](https://www.cockroachlabs.com/docs/stable/sql-statements.html) - Official SQL documentation
diff --git a/docs/en/resources/tools/cockroachdb/cockroachdb-list-schemas.md b/docs/en/resources/tools/cockroachdb/cockroachdb-list-schemas.md
new file mode 100644
index 0000000000..8a9ee11292
--- /dev/null
+++ b/docs/en/resources/tools/cockroachdb/cockroachdb-list-schemas.md
@@ -0,0 +1,305 @@
+---
+title: "cockroachdb-list-schemas"
+type: docs
+weight: 1
+description: >
+  List schemas in a CockroachDB database.
+
+---
+
+## About
+
+The `cockroachdb-list-schemas` tool retrieves a list of schemas (namespaces) in a CockroachDB database. Schemas are used to organize database objects such as tables, views, and functions into logical groups.
+
+This tool is useful for:
+- Understanding database organization
+- Discovering available schemas
+- Multi-tenant application analysis
+- Schema-level access control planning
+
+## Example
+
+```yaml
+sources:
+  my_cockroachdb:
+    type: cockroachdb
+    host: your-cluster.cockroachlabs.cloud
+    port: "26257"
+    user: myuser
+    password: mypassword
+    database: defaultdb
+    queryParams:
+      sslmode: require
+
+tools:
+  list_schemas:
+    type: cockroachdb-list-schemas
+    source: my_cockroachdb
+    description: List all schemas in the database
+```
+
+## Configuration
+
+### Required Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `type` | string | Must be `cockroachdb-list-schemas` |
+| `source` | string | Name of the CockroachDB source to use |
+| `description` | string | Human-readable description for the LLM |
+
+### Optional Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `authRequired` | array | List of authentication services required |
+
+## Output Structure
+
+The tool returns a list of schemas with the following information:
+
+```json
+[
+  {
+    "catalog_name": "defaultdb",
+    "schema_name": "public",
+    "is_user_defined": true
+  },
+  {
+    "catalog_name": "defaultdb",
+    "schema_name": "analytics",
+    "is_user_defined": true
+  }
+]
+```
+
+### Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `catalog_name` | string | The database (catalog) name |
+| `schema_name` | string | The schema name |
+| `is_user_defined` | boolean | Whether this is a user-created schema (excludes system schemas) |
+
+## Usage Example
+
+```json
+{}
+```
+
+No parameters are required. The tool automatically lists all user-defined schemas.
+
+## Default Schemas
+
+CockroachDB includes several standard schemas:
+
+- **`public`**: The default schema for user objects
+- **`pg_catalog`**: PostgreSQL system catalog (excluded from results)
+- **`information_schema`**: SQL standard metadata views (excluded from results)
+- **`crdb_internal`**: CockroachDB internal metadata (excluded from results)
+- **`pg_extension`**: PostgreSQL extension objects (excluded from results)
+
+The tool filters out system schemas and only returns user-defined schemas.
+
+## Schema Management in CockroachDB
+
+### Creating Schemas
+
+```sql
+CREATE SCHEMA analytics;
+```
+
+### Using Schemas
+
+```sql
+-- Create table in specific schema
+CREATE TABLE analytics.revenue (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  amount DECIMAL(10,2),
+  date DATE
+);
+
+-- Query from specific schema
+SELECT * FROM analytics.revenue;
+```
+
+### Schema Search Path
+
+The search path determines which schemas are searched for unqualified object names:
+
+```sql
+-- Show current search path
+SHOW search_path;
+
+-- Set search path
+SET search_path = analytics, public;
+```
+
+## Multi-Tenant Applications
+
+Schemas are commonly used for multi-tenant applications:
+
+```sql
+-- Create schema per tenant
+CREATE SCHEMA tenant_acme;
+CREATE SCHEMA tenant_globex;
+
+-- Create same table structure in each schema
+CREATE TABLE tenant_acme.orders (...);
+CREATE TABLE tenant_globex.orders (...);
+```
+
+The `cockroachdb-list-schemas` tool helps discover all tenant schemas:
+
+```yaml
+tools:
+  list_tenants:
+    type: cockroachdb-list-schemas
+    source: my_cockroachdb
+    description: |
+      List all tenant schemas in the database.
+      Each schema represents a separate tenant's data namespace.
+```
+
+## Best Practices
+
+### Use Schemas for Organization
+
+Group related tables into schemas:
+
+```sql
+CREATE SCHEMA sales;
+CREATE SCHEMA inventory;
+CREATE SCHEMA hr;
+
+CREATE TABLE sales.orders (...);
+CREATE TABLE inventory.products (...);
+CREATE TABLE hr.employees (...);
+```
+
+### Schema Naming Conventions
+
+Use clear, descriptive schema names:
+- Lowercase names
+- Use underscores for multi-word names
+- Avoid reserved keywords
+- Use prefixes for grouped schemas (e.g., `tenant_`, `app_`)
+
+### Schema-Level Permissions
+
+Schemas enable fine-grained access control:
+
+```sql
+-- Grant access to specific schema
+GRANT USAGE ON SCHEMA analytics TO analyst_role;
+GRANT SELECT ON ALL TABLES IN SCHEMA analytics TO analyst_role;
+
+-- Revoke access
+REVOKE ALL ON SCHEMA hr FROM public;
+```
+
+## Integration with Other Tools
+
+### Combined with List Tables
+
+```yaml
+tools:
+  list_schemas:
+    type: cockroachdb-list-schemas
+    source: my_cockroachdb
+    description: List all schemas first
+    
+  list_tables:
+    type: cockroachdb-list-tables
+    source: my_cockroachdb
+    description: |
+      List tables in the database.
+      Use list_schemas first to understand schema organization.
+```
+
+### Schema Discovery Workflow
+
+1. Call `cockroachdb-list-schemas` to discover schemas
+2. Call `cockroachdb-list-tables` to see tables in each schema
+3. Generate queries using fully qualified names: `schema.table`
+
+## Common Use Cases
+
+### Discover Database Structure
+
+```yaml
+tools:
+  discover_schemas:
+    type: cockroachdb-list-schemas
+    source: my_cockroachdb
+    description: |
+      Discover how the database is organized into schemas.
+      Use this to understand the logical grouping of tables.
+```
+
+### Multi-Tenant Analysis
+
+```yaml
+tools:
+  list_tenant_schemas:
+    type: cockroachdb-list-schemas
+    source: my_cockroachdb
+    description: |
+      List all tenant schemas (each tenant has their own schema).
+      Schema names follow the pattern: tenant_<company_name>
+```
+
+### Schema Migration Planning
+
+```yaml
+tools:
+  audit_schemas:
+    type: cockroachdb-list-schemas
+    source: my_cockroachdb
+    description: |
+      Audit existing schemas before migration.
+      Identifies all schemas that need to be migrated.
+```
+
+## Error Handling
+
+The tool handles common errors:
+- **Connection errors**: Returns connection failure details
+- **Permission errors**: Returns error if user lacks USAGE privilege
+- **Empty results**: Returns empty array if no user schemas exist
+
+## Permissions Required
+
+To list schemas, the user needs:
+- `CONNECT` privilege on the database
+- No specific schema privileges required for listing
+
+To query objects within schemas, the user needs:
+- `USAGE` privilege on the schema
+- Appropriate object privileges (SELECT, INSERT, etc.)
+
+## CockroachDB-Specific Features
+
+### System Schemas
+
+CockroachDB includes PostgreSQL-compatible system schemas plus CockroachDB-specific ones:
+
+- `crdb_internal.*`: CockroachDB internal metadata and statistics
+- `pg_catalog.*`: PostgreSQL system catalog
+- `information_schema.*`: SQL standard information schema
+
+These are automatically filtered from the results.
+
+### User-Defined Flag
+
+The `is_user_defined` field helps distinguish:
+- `true`: User-created schemas
+- `false`: System schemas (already filtered out)
+
+## See Also
+
+- [cockroachdb-sql](./cockroachdb-sql.md) - Execute parameterized queries
+- [cockroachdb-execute-sql](./cockroachdb-execute-sql.md) - Execute ad-hoc SQL
+- [cockroachdb-list-tables](./cockroachdb-list-tables.md) - List tables in the database
+- [CockroachDB Source](../../sources/cockroachdb.md) - Source configuration reference
+- [CockroachDB Schema Design](https://www.cockroachlabs.com/docs/stable/schema-design-overview.html) - Official documentation
diff --git a/docs/en/resources/tools/cockroachdb/cockroachdb-list-tables.md b/docs/en/resources/tools/cockroachdb/cockroachdb-list-tables.md
new file mode 100644
index 0000000000..339dbd2320
--- /dev/null
+++ b/docs/en/resources/tools/cockroachdb/cockroachdb-list-tables.md
@@ -0,0 +1,344 @@
+---
+title: "cockroachdb-list-tables"
+type: docs
+weight: 1
+description: >
+  List tables in a CockroachDB database with schema details.
+
+---
+
+## About
+
+The `cockroachdb-list-tables` tool retrieves a list of tables from a CockroachDB database. It provides detailed information about table structure, including columns, constraints, indexes, and foreign key relationships.
+
+This tool is useful for:
+- Database schema discovery
+- Understanding table relationships
+- Generating context for AI-powered database queries
+- Documentation and analysis
+
+## Example
+
+```yaml
+sources:
+  my_cockroachdb:
+    type: cockroachdb
+    host: your-cluster.cockroachlabs.cloud
+    port: "26257"
+    user: myuser
+    password: mypassword
+    database: defaultdb
+    queryParams:
+      sslmode: require
+
+tools:
+  list_all_tables:
+    type: cockroachdb-list-tables
+    source: my_cockroachdb
+    description: List all user tables in the database with their structure
+```
+
+## Configuration
+
+### Required Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `type` | string | Must be `cockroachdb-list-tables` |
+| `source` | string | Name of the CockroachDB source to use |
+| `description` | string | Human-readable description for the LLM |
+
+### Optional Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `authRequired` | array | List of authentication services required |
+
+## Parameters
+
+The tool accepts optional runtime parameters:
+
+| Parameter | Type | Default | Description |
+|-----------|------|---------|-------------|
+| `table_names` | array | all tables | List of specific table names to retrieve |
+| `output_format` | string | "detailed" | Output format: "simple" or "detailed" |
+
+## Output Formats
+
+### Simple Format
+
+Returns basic table information:
+- Table name
+- Row count estimate
+- Size information
+
+```json
+{
+  "table_names": ["users"],
+  "output_format": "simple"
+}
+```
+
+### Detailed Format (Default)
+
+Returns comprehensive table information:
+- Table name and schema
+- All columns with types and constraints
+- Primary keys
+- Foreign keys and relationships
+- Indexes
+- Check constraints
+- Table size and row counts
+
+```json
+{
+  "table_names": ["users", "orders"],
+  "output_format": "detailed"
+}
+```
+
+## Usage Examples
+
+### List All Tables
+
+```json
+{}
+```
+
+### List Specific Tables
+
+```json
+{
+  "table_names": ["users", "orders", "expenses"]
+}
+```
+
+### Simple Output
+
+```json
+{
+  "output_format": "simple"
+}
+```
+
+## Output Structure
+
+### Simple Format Output
+
+```json
+{
+  "table_name": "users",
+  "estimated_rows": 1000,
+  "size": "128 KB"
+}
+```
+
+### Detailed Format Output
+
+```json
+{
+  "table_name": "users",
+  "schema": "public",
+  "columns": [
+    {
+      "name": "id",
+      "type": "UUID",
+      "nullable": false,
+      "default": "gen_random_uuid()"
+    },
+    {
+      "name": "email",
+      "type": "STRING",
+      "nullable": false,
+      "default": null
+    },
+    {
+      "name": "created_at",
+      "type": "TIMESTAMP",
+      "nullable": false,
+      "default": "now()"
+    }
+  ],
+  "primary_key": ["id"],
+  "indexes": [
+    {
+      "name": "users_pkey",
+      "columns": ["id"],
+      "unique": true,
+      "primary": true
+    },
+    {
+      "name": "users_email_idx",
+      "columns": ["email"],
+      "unique": true,
+      "primary": false
+    }
+  ],
+  "foreign_keys": [],
+  "constraints": [
+    {
+      "name": "users_email_check",
+      "type": "CHECK",
+      "definition": "email ~* '^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\\.[A-Z|a-z]{2,}$'"
+    }
+  ]
+}
+```
+
+## CockroachDB-Specific Information
+
+### UUID Primary Keys
+
+The tool recognizes CockroachDB's recommended UUID primary key pattern:
+
+```sql
+CREATE TABLE users (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  ...
+);
+```
+
+### Multi-Region Tables
+
+For multi-region tables, the output includes locality information:
+
+```json
+{
+  "table_name": "users",
+  "locality": "REGIONAL BY ROW",
+  "regions": ["us-east-1", "us-west-2", "eu-west-1"]
+}
+```
+
+### Interleaved Tables
+
+The tool shows parent-child relationships for interleaved tables (legacy feature):
+
+```json
+{
+  "table_name": "order_items",
+  "interleaved_in": "orders"
+}
+```
+
+## Best Practices
+
+### Use for Schema Discovery
+
+The tool is ideal for helping AI assistants understand your database structure:
+
+```yaml
+tools:
+  discover_schema:
+    type: cockroachdb-list-tables
+    source: my_cockroachdb
+    description: |
+      Use this tool first to understand the database schema before generating queries.
+      It shows all tables, their columns, data types, and relationships.
+```
+
+### Filter Large Schemas
+
+For databases with many tables, specify relevant tables:
+
+```json
+{
+  "table_names": ["users", "orders", "products"],
+  "output_format": "detailed"
+}
+```
+
+### Use Simple Format for Overviews
+
+When you need just table names and sizes:
+
+```json
+{
+  "output_format": "simple"
+}
+```
+
+## Excluded Tables
+
+The tool automatically excludes system tables and schemas:
+- `pg_catalog.*` - PostgreSQL system catalog
+- `information_schema.*` - SQL standard information schema
+- `crdb_internal.*` - CockroachDB internal tables
+- `pg_extension.*` - PostgreSQL extension tables
+
+Only user-created tables in the public schema (and other user schemas) are returned.
+
+## Error Handling
+
+The tool handles common errors:
+- **Table not found**: Returns empty result for non-existent tables
+- **Permission errors**: Returns error if user lacks SELECT privileges
+- **Connection errors**: Returns connection failure details
+
+## Integration with AI Assistants
+
+### Prompt Example
+
+```yaml
+tools:
+  list_tables:
+    type: cockroachdb-list-tables
+    source: my_cockroachdb
+    description: |
+      Lists all tables in the database with detailed schema information.
+      Use this tool to understand:
+      - What tables exist
+      - What columns each table has
+      - Data types and constraints
+      - Relationships between tables (foreign keys)
+      - Available indexes
+      
+      Always call this tool before generating SQL queries to ensure
+      you use correct table and column names.
+```
+
+## Common Use Cases
+
+### Generate Context for Queries
+
+```json
+{}
+```
+
+This provides comprehensive schema information that helps AI assistants generate accurate SQL queries.
+
+### Analyze Table Structure
+
+```json
+{
+  "table_names": ["users"],
+  "output_format": "detailed"
+}
+```
+
+Perfect for understanding a specific table's structure, constraints, and relationships.
+
+### Quick Schema Overview
+
+```json
+{
+  "output_format": "simple"
+}
+```
+
+Gets a quick list of tables with basic statistics.
+
+## Performance Considerations
+
+- **Simple format** is faster for large databases
+- **Detailed format** queries system tables extensively
+- Specifying `table_names` reduces query time
+- Results are fetched in a single query for efficiency
+
+## See Also
+
+- [cockroachdb-sql](./cockroachdb-sql.md) - Execute parameterized queries
+- [cockroachdb-execute-sql](./cockroachdb-execute-sql.md) - Execute ad-hoc SQL
+- [cockroachdb-list-schemas](./cockroachdb-list-schemas.md) - List database schemas
+- [CockroachDB Source](../../sources/cockroachdb.md) - Source configuration reference
+- [CockroachDB Schema Design](https://www.cockroachlabs.com/docs/stable/schema-design-overview.html) - Best practices
diff --git a/docs/en/resources/tools/cockroachdb/cockroachdb-sql.md b/docs/en/resources/tools/cockroachdb/cockroachdb-sql.md
new file mode 100644
index 0000000000..aa31edcd52
--- /dev/null
+++ b/docs/en/resources/tools/cockroachdb/cockroachdb-sql.md
@@ -0,0 +1,291 @@
+---
+title: "cockroachdb-sql"
+type: docs
+weight: 1
+description: >
+  Execute parameterized SQL queries in CockroachDB.
+
+---
+
+## About
+
+The `cockroachdb-sql` tool allows you to execute parameterized SQL queries against a CockroachDB database. This tool supports prepared statements with parameter binding, template parameters for dynamic query construction, and automatic transaction retry for resilience against serialization conflicts.
+
+## Example
+
+```yaml
+sources:
+  my_cockroachdb:
+    type: cockroachdb
+    host: your-cluster.cockroachlabs.cloud
+    port: "26257"
+    user: myuser
+    password: mypassword
+    database: defaultdb
+    queryParams:
+      sslmode: require
+
+tools:
+  get_user_orders:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Get all orders for a specific user
+    statement: |
+      SELECT o.id, o.order_date, o.total_amount, o.status
+      FROM orders o
+      WHERE o.user_id = $1
+      ORDER BY o.order_date DESC
+    parameters:
+      - name: user_id
+        type: string
+        description: The UUID of the user
+```
+
+## Configuration
+
+### Required Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `type` | string | Must be `cockroachdb-sql` |
+| `source` | string | Name of the CockroachDB source to use |
+| `description` | string | Human-readable description of what the tool does |
+| `statement` | string | The SQL query to execute |
+
+### Optional Fields
+
+| Field | Type | Description |
+|-------|------|-------------|
+| `parameters` | array | List of parameter definitions for the query |
+| `templateParameters` | array | List of template parameters for dynamic query construction |
+| `authRequired` | array | List of authentication services required |
+
+## Parameters
+
+Parameters allow you to safely pass values into your SQL queries using prepared statements. CockroachDB uses PostgreSQL-style parameter placeholders: `$1`, `$2`, etc.
+
+### Parameter Types
+
+- `string`: Text values
+- `number`: Numeric values (integers or decimals)
+- `boolean`: True/false values
+- `array`: Array of values
+
+### Example with Multiple Parameters
+
+```yaml
+tools:
+  filter_expenses:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Filter expenses by category and date range
+    statement: |
+      SELECT id, description, amount, category, expense_date
+      FROM expenses
+      WHERE user_id = $1
+        AND category = $2
+        AND expense_date >= $3
+        AND expense_date <= $4
+      ORDER BY expense_date DESC
+    parameters:
+      - name: user_id
+        type: string
+        description: The user's UUID
+      - name: category
+        type: string
+        description: Expense category (e.g., "Food", "Transport")
+      - name: start_date
+        type: string
+        description: Start date in YYYY-MM-DD format
+      - name: end_date
+        type: string
+        description: End date in YYYY-MM-DD format
+```
+
+## Template Parameters
+
+Template parameters enable dynamic query construction by replacing placeholders in the SQL statement before parameter binding. This is useful for dynamic table names, column names, or query structure.
+
+### Example with Template Parameters
+
+```yaml
+tools:
+  get_column_data:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Get data from a specific column
+    statement: |
+      SELECT {{column_name}}
+      FROM {{table_name}}
+      WHERE user_id = $1
+      LIMIT 100
+    templateParameters:
+      - name: table_name
+        type: string
+        description: The table to query
+      - name: column_name
+        type: string
+        description: The column to retrieve
+    parameters:
+      - name: user_id
+        type: string
+        description: The user's UUID
+```
+
+## Best Practices
+
+### Use UUID Primary Keys
+
+CockroachDB performs best with UUID primary keys to avoid transaction hotspots:
+
+```sql
+CREATE TABLE orders (
+  id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
+  user_id UUID NOT NULL,
+  order_date TIMESTAMP DEFAULT now(),
+  total_amount DECIMAL(10,2)
+);
+```
+
+### Use Indexes for Performance
+
+Create indexes on frequently queried columns:
+
+```sql
+CREATE INDEX idx_orders_user_id ON orders(user_id);
+CREATE INDEX idx_orders_date ON orders(order_date DESC);
+```
+
+### Use JOINs Efficiently
+
+CockroachDB supports standard SQL JOINs. Keep joins efficient by:
+- Adding appropriate indexes
+- Using UUIDs for foreign keys
+- Limiting result sets with WHERE clauses
+
+```yaml
+tools:
+  get_user_with_orders:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Get user details with their recent orders
+    statement: |
+      SELECT u.name, u.email, o.id as order_id, o.order_date, o.total_amount
+      FROM users u
+      LEFT JOIN orders o ON u.id = o.user_id
+      WHERE u.id = $1
+      ORDER BY o.order_date DESC
+      LIMIT 10
+    parameters:
+      - name: user_id
+        type: string
+        description: The user's UUID
+```
+
+### Handle NULL Values
+
+Use COALESCE or NULL checks when dealing with nullable columns:
+
+```sql
+SELECT id, description, COALESCE(notes, 'No notes') as notes
+FROM expenses
+WHERE user_id = $1
+```
+
+## Error Handling
+
+The tool automatically handles:
+- **Connection errors**: Retried with exponential backoff
+- **Serialization conflicts**: Automatically retried using cockroach-go library
+- **Invalid parameters**: Returns descriptive error messages
+- **SQL syntax errors**: Returns database error details
+
+## Advanced Usage
+
+### Aggregations
+
+```yaml
+tools:
+  expense_summary:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Get expense summary by category for a user
+    statement: |
+      SELECT 
+        category,
+        COUNT(*) as count,
+        SUM(amount) as total_amount,
+        AVG(amount) as avg_amount
+      FROM expenses
+      WHERE user_id = $1
+        AND expense_date >= $2
+      GROUP BY category
+      ORDER BY total_amount DESC
+    parameters:
+      - name: user_id
+        type: string
+        description: The user's UUID
+      - name: start_date
+        type: string
+        description: Start date in YYYY-MM-DD format
+```
+
+### Window Functions
+
+```yaml
+tools:
+  running_total:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Get running total of expenses
+    statement: |
+      SELECT 
+        expense_date,
+        amount,
+        SUM(amount) OVER (ORDER BY expense_date) as running_total
+      FROM expenses
+      WHERE user_id = $1
+      ORDER BY expense_date
+    parameters:
+      - name: user_id
+        type: string
+        description: The user's UUID
+```
+
+### Common Table Expressions (CTEs)
+
+```yaml
+tools:
+  top_spenders:
+    type: cockroachdb-sql
+    source: my_cockroachdb
+    description: Find top spending users
+    statement: |
+      WITH user_totals AS (
+        SELECT 
+          user_id,
+          SUM(amount) as total_spent
+        FROM expenses
+        WHERE expense_date >= $1
+        GROUP BY user_id
+      )
+      SELECT 
+        u.name,
+        u.email,
+        ut.total_spent
+      FROM user_totals ut
+      JOIN users u ON ut.user_id = u.id
+      ORDER BY ut.total_spent DESC
+      LIMIT 10
+    parameters:
+      - name: start_date
+        type: string
+        description: Start date in YYYY-MM-DD format
+```
+
+## See Also
+
+- [cockroachdb-execute-sql](./cockroachdb-execute-sql.md) - For ad-hoc SQL execution
+- [cockroachdb-list-tables](./cockroachdb-list-tables.md) - List tables in the database
+- [cockroachdb-list-schemas](./cockroachdb-list-schemas.md) - List database schemas
+- [CockroachDB Source](../../sources/cockroachdb.md) - Source configuration reference
diff --git a/docs/en/resources/tools/couchbase/couchbase-sql.md b/docs/en/resources/tools/couchbase/couchbase-sql.md
index 0f83f3cf5d..3932bf0613 100644
--- a/docs/en/resources/tools/couchbase/couchbase-sql.md
+++ b/docs/en/resources/tools/couchbase/couchbase-sql.md
@@ -27,37 +27,37 @@ parameters will be used according to their name: e.g. `$id`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
-    search_products_by_category:
-        kind: couchbase-sql
-        source: my-couchbase-instance
-        statement: |
-            SELECT p.name, p.price, p.description
-            FROM products p
-            WHERE p.category = $category AND p.price < $max_price
-            ORDER BY p.price DESC
-            LIMIT 10
-        description: |
-            Use this tool to get a list of products for a specific category under a maximum price.
-            Takes a category name, e.g. "Electronics" and a maximum price e.g 500 and returns a list of product names, prices, and descriptions.
-            Do NOT use this tool with invalid category names. Do NOT guess a category name, Do NOT guess a price.
-            Example:
-            {{
-                "category": "Electronics",
-                "max_price": 500
-            }}
-            Example:
-            {{
-                "category": "Furniture",
-                "max_price": 1000
-            }}
-        parameters:
-            - name: category
-              type: string
-              description: Product category name
-            - name: max_price
-              type: integer
-              description: Maximum price (positive integer)
+kind: tools
+name: search_products_by_category
+type: couchbase-sql
+source: my-couchbase-instance
+statement: |
+    SELECT p.name, p.price, p.description
+    FROM products p
+    WHERE p.category = $category AND p.price < $max_price
+    ORDER BY p.price DESC
+    LIMIT 10
+description: |
+    Use this tool to get a list of products for a specific category under a maximum price.
+    Takes a category name, e.g. "Electronics" and a maximum price e.g 500 and returns a list of product names, prices, and descriptions.
+    Do NOT use this tool with invalid category names. Do NOT guess a category name, Do NOT guess a price.
+    Example:
+    {{
+        "category": "Electronics",
+        "max_price": 500
+    }}
+    Example:
+    {{
+        "category": "Furniture",
+        "max_price": 1000
+    }}
+parameters:
+    - name: category
+      type: string
+      description: Product category name
+    - name: max_price
+      type: integer
+      description: Maximum price (positive integer)
 ```
 
 ### Example with Template Parameters
@@ -69,29 +69,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: couchbase-sql
-    source: my-couchbase-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: couchbase-sql
+source: my-couchbase-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "couchbase-sql".                                                                                                               |
+| type               |                    string                    |     true     | Must be "couchbase-sql".                                                                                                               |
 | source             |                    string                    |     true     | Name of the source the SQL query should execute on.                                                                                    |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute                                                                                                               |
diff --git a/docs/en/resources/tools/dataform/dataform-compile-local.md b/docs/en/resources/tools/dataform/dataform-compile-local.md
index eb1127772e..ba24656260 100644
--- a/docs/en/resources/tools/dataform/dataform-compile-local.md
+++ b/docs/en/resources/tools/dataform/dataform-compile-local.md
@@ -44,15 +44,15 @@ for more details.
 ## Example
 
 ```yaml
-tools:  
-  my_dataform_compiler:  
-    kind: dataform-compile-local  
-    description: Use this tool to compile a local Dataform project.
+kind: tools
+name: my_dataform_compiler
+type: dataform-compile-local
+description: Use this tool to compile a local Dataform project.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |:------------|:---------|:-------------|:---------------------------------------------------|
-| kind        | string   | true         | Must be "dataform-compile-local".                  |
+| type        | string   | true         | Must be "dataform-compile-local".                  |
 | description | string   | true         | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/dataplex/dataplex-lookup-entry.md b/docs/en/resources/tools/dataplex/dataplex-lookup-entry.md
index ea19ed6451..669d47efc7 100644
--- a/docs/en/resources/tools/dataplex/dataplex-lookup-entry.md
+++ b/docs/en/resources/tools/dataplex/dataplex-lookup-entry.md
@@ -56,17 +56,17 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-tools:
-  lookup_entry:
-    kind: dataplex-lookup-entry
-    source: my-dataplex-source
-    description: Use this tool to retrieve a specific entry in Dataplex Catalog.
+kind: tools
+name: lookup_entry
+type: dataplex-lookup-entry
+source: my-dataplex-source
+description: Use this tool to retrieve a specific entry in Dataplex Catalog.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "dataplex-lookup-entry".                   |
+| type        |  string  |     true     | Must be "dataplex-lookup-entry".                   |
 | source      |  string  |     true     | Name of the source the tool should execute on.     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/dataplex/dataplex-search-aspect-types.md b/docs/en/resources/tools/dataplex/dataplex-search-aspect-types.md
index 75d7793966..1bb17579ba 100644
--- a/docs/en/resources/tools/dataplex/dataplex-search-aspect-types.md
+++ b/docs/en/resources/tools/dataplex/dataplex-search-aspect-types.md
@@ -49,17 +49,17 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-tools:
-  dataplex-search-aspect-types:
-    kind: dataplex-search-aspect-types
-    source: my-dataplex-source
-    description: Use this tool to find aspect types relevant to the query.
+kind: tools
+name: dataplex-search-aspect-types
+type: dataplex-search-aspect-types
+source: my-dataplex-source
+description: Use this tool to find aspect types relevant to the query.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "dataplex-search-aspect-types".            |
+| type        |  string  |     true     | Must be "dataplex-search-aspect-types".            |
 | source      |  string  |     true     | Name of the source the tool should execute on.     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/dataplex/dataplex-search-entries.md b/docs/en/resources/tools/dataplex/dataplex-search-entries.md
index 75099d64e8..b7c0bd3deb 100644
--- a/docs/en/resources/tools/dataplex/dataplex-search-entries.md
+++ b/docs/en/resources/tools/dataplex/dataplex-search-entries.md
@@ -49,17 +49,17 @@ applying IAM permissions and roles to an identity.
 ## Example
 
 ```yaml
-tools:
-  dataplex-search-entries:
-    kind: dataplex-search-entries
-    source: my-dataplex-source
-    description: Use this tool to get all the entries based on the provided query.
+kind: tools
+name: dataplex-search-entries
+type: dataplex-search-entries
+source: my-dataplex-source
+description: Use this tool to get all the entries based on the provided query.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "dataplex-search-entries".                 |
+| type        |  string  |     true     | Must be "dataplex-search-entries".                 |
 | source      |  string  |     true     | Name of the source the tool should execute on.     |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/dgraph/dgraph-dql.md b/docs/en/resources/tools/dgraph/dgraph-dql.md
index 3c8e7685f3..ba33a35a60 100644
--- a/docs/en/resources/tools/dgraph/dgraph-dql.md
+++ b/docs/en/resources/tools/dgraph/dgraph-dql.md
@@ -41,83 +41,83 @@ query.
 {{< tabpane persist="header" >}}
 {{< tab header="Query" lang="yaml" >}}
 
-tools:
-  search_user:
-    kind: dgraph-dql
-    source: my-dgraph-source
-    statement: |
-      query all($role: string){
-        users(func: has(name)) @filter(eq(role, $role) AND ge(age, 30) AND le(age, 50)) {
-          uid
-          name
-          email
-          role
-          age
-        }
-      }
-    isQuery: true
-    timeout: 20s
-    description: |
-     Use this tool to retrieve the details of users who are admins and are between 30 and 50 years old.
-     The query returns the user's name, email, role, and age.
-     This can be helpful when you want to fetch admin users within a specific age range.
-     Example: Fetch admins aged between 30 and 50:
-      [
-        {
-          "name": "Alice",
-          "role": "admin",
-          "age": 35
-        },
-        {
-          "name": "Bob",
-          "role": "admin",
-          "age": 45
-        }
-      ]
-    parameters:
-      - name: $role
-        type: string
-        description: admin
+kind: tools
+name: search_user
+type: dgraph-dql
+source: my-dgraph-source
+statement: |
+  query all($role: string){
+    users(func: has(name)) @filter(eq(role, $role) AND ge(age, 30) AND le(age, 50)) {
+      uid
+      name
+      email
+      role
+      age
+    }
+  }
+isQuery: true
+timeout: 20s
+description: |
+  Use this tool to retrieve the details of users who are admins and are between 30 and 50 years old.
+  The query returns the user's name, email, role, and age.
+  This can be helpful when you want to fetch admin users within a specific age range.
+  Example: Fetch admins aged between 30 and 50:
+   [
+     {
+       "name": "Alice",
+       "role": "admin",
+       "age": 35
+     },
+     {
+       "name": "Bob",
+       "role": "admin",
+       "age": 45
+     }
+   ]
+parameters:
+  - name: $role
+    type: string
+    description: admin
 
 {{< /tab >}}
 {{< tab header="Mutation" lang="yaml" >}}
 
-tools:
-  dgraph-manage-user-instance:
-    kind: dgraph-dql
-    source: my-dgraph-source
-    isQuery: false
-    statement: |
-           {
-            set {
-            _:user1 <name> $user1 .
-            _:user1 <email> $email1 .
-            _:user1 <role> "admin" .
-            _:user1 <age> "35" .
+kind: tools
+name: dgraph-manage-user-instance
+type: dgraph-dql
+source: my-dgraph-source
+isQuery: false
+statement: |
+       {
+        set {
+        _:user1 <name> $user1 .
+        _:user1 <email> $email1 .
+        _:user1 <role> "admin" .
+        _:user1 <age> "35" .
 
-            _:user2 <name> $user2 .
-            _:user2 <email> $email2 .
-            _:user2 <role> "admin" .
-            _:user2 <age> "45" .
-            }
-           }
-    description: |
-     Use this tool to insert or update user data into the Dgraph database.
-     The mutation adds or updates user details like name, email, role, and age.
-     Example: Add users Alice and Bob as admins with specific ages.
-    parameters:
-      - name: user1
-        type: string
-        description: Alice
-      - name: email1
-        type: string
-        description: alice@email.com
-      - name: user2
-        type: string
-        description: Bob
-      - name: email2
-        type: string
-        description: bob@email.com
+        _:user2 <name> $user2 .
+        _:user2 <email> $email2 .
+        _:user2 <role> "admin" .
+        _:user2 <age> "45" .
+        }
+       }
+description: |
+  Use this tool to insert or update user data into the Dgraph database.
+  The mutation adds or updates user details like name, email, role, and age.
+  Example: Add users Alice and Bob as admins with specific ages.
+parameters:
+  - name: user1
+    type: string
+    description: Alice
+  - name: email1
+    type: string
+    description: alice@email.com
+  - name: user2
+    type: string
+    description: Bob
+  - name: email2
+    type: string
+    description: bob@email.com
 
 {{< /tab >}}
 {{< /tabpane >}}
@@ -126,7 +126,7 @@ tools:
 
 | **field**   |                **type**                 | **required** | **description**                                                                           |
 |-------------|:---------------------------------------:|:------------:|-------------------------------------------------------------------------------------------|
-| kind        |                 string                  |     true     | Must be "dgraph-dql".                                                                     |
+| type        |                 string                  |     true     | Must be "dgraph-dql".                                                                     |
 | source      |                 string                  |     true     | Name of the source the dql query should execute on.                                       |
 | description |                 string                  |     true     | Description of the tool that is passed to the LLM.                                        |
 | statement   |                 string                  |     true     | dql statement to execute                                                                  |
diff --git a/docs/en/resources/tools/elasticsearch/elasticsearch-esql.md b/docs/en/resources/tools/elasticsearch/elasticsearch-esql.md
index 2df0ef6e54..1e0f5c70c1 100644
--- a/docs/en/resources/tools/elasticsearch/elasticsearch-esql.md
+++ b/docs/en/resources/tools/elasticsearch/elasticsearch-esql.md
@@ -20,20 +20,20 @@ for more information.
 ## Example
 
 ```yaml
-tools:
-  query_my_index:
-    kind: elasticsearch-esql
-    source: elasticsearch-source
-    description: Use this tool to execute ES|QL queries.
-    query: |
-      FROM my-index
-      | KEEP *
-      | LIMIT ?limit
-    parameters:
-      - name: limit
-        type: integer
-        description: Limit the number of results.
-        required: true
+kind: tools
+name: query_my_index
+type: elasticsearch-esql
+source: elasticsearch-source
+description: Use this tool to execute ES|QL queries.
+query: |
+  FROM my-index
+  | KEEP *
+  | LIMIT ?limit
+parameters:
+  - name: limit
+    type: integer
+    description: Limit the number of results.
+    required: true
 ```
 
 ## Parameters
diff --git a/docs/en/resources/tools/firebird/firebird-execute-sql.md b/docs/en/resources/tools/firebird/firebird-execute-sql.md
index fa75d04137..830037c3cf 100644
--- a/docs/en/resources/tools/firebird/firebird-execute-sql.md
+++ b/docs/en/resources/tools/firebird/firebird-execute-sql.md
@@ -25,17 +25,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
-  execute_sql_tool:
-    kind: firebird-execute-sql
-    source: my_firebird_db
-    description: Use this tool to execute a SQL statement against the Firebird database.
+kind: tools
+name: execute_sql_tool
+type: firebird-execute-sql
+source: my_firebird_db
+description: Use this tool to execute a SQL statement against the Firebird database.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "firebird-execute-sql".                    |
+| type        |  string  |     true     | Must be "firebird-execute-sql".                    |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/firebird/firebird-sql.md b/docs/en/resources/tools/firebird/firebird-sql.md
index d07c3cb53a..3e6614b9af 100644
--- a/docs/en/resources/tools/firebird/firebird-sql.md
+++ b/docs/en/resources/tools/firebird/firebird-sql.md
@@ -32,68 +32,68 @@ prepared statement.
 > names, or other parts of the query.
 
 ```yaml
-tools:
-  search_flights_by_number:
-    kind: firebird-sql
-    source: my_firebird_db
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: firebird-sql
+source: my_firebird_db
+statement: |
+  SELECT * FROM flights
+  WHERE airline = ?
+  AND flight_number = ?
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Named Parameters
 
 ```yaml
-tools:
-  search_flights_by_airline:
-    kind: firebird-sql
-    source: my_firebird_db
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = :airline
-      AND departure_date >= :start_date
-      AND departure_date <= :end_date
-      ORDER BY departure_date
-    description: |
-      Search for flights by airline within a date range using named parameters.
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: start_date
-        type: string
-        description: Start date in YYYY-MM-DD format
-      - name: end_date
-        type: string
-        description: End date in YYYY-MM-DD format
+kind: tools
+name: search_flights_by_airline
+type: firebird-sql
+source: my_firebird_db
+statement: |
+  SELECT * FROM flights
+  WHERE airline = :airline
+  AND departure_date >= :start_date
+  AND departure_date <= :end_date
+  ORDER BY departure_date
+description: |
+  Search for flights by airline within a date range using named parameters.
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: start_date
+    type: string
+    description: Start date in YYYY-MM-DD format
+  - name: end_date
+    type: string
+    description: End date in YYYY-MM-DD format
 ```
 
 ### Example with Template Parameters
@@ -105,29 +105,29 @@ tools:
 > [templateParameters](../#template-parameters).
 
 ```yaml
-tools:
-  list_table:
-    kind: firebird-sql
-    source: my_firebird_db
-    statement: |
-      SELECT * FROM {{.tableName}}
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: firebird-sql
+source: my_firebird_db
+statement: |
+  SELECT * FROM {{.tableName}}
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                    | **required** | **description**                                                                                                                         |
 |--------------------|:---------------------------------------------:|:------------:|-----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                     |     true     | Must be "firebird-sql".                                                                                                                 |
+| type               |                    string                     |     true     | Must be "firebird-sql".                                                                                                                 |
 | source             |                    string                     |     true     | Name of the source the SQL should execute on.                                                                                           |
 | description        |                    string                     |     true     | Description of the tool that is passed to the LLM.                                                                                      |
 | statement          |                    string                     |     true     | SQL statement to execute on.                                                                                                            |
diff --git a/docs/en/resources/tools/firestore/firestore-add-documents.md b/docs/en/resources/tools/firestore/firestore-add-documents.md
index 13f8b207ea..b777be7f8d 100644
--- a/docs/en/resources/tools/firestore/firestore-add-documents.md
+++ b/docs/en/resources/tools/firestore/firestore-add-documents.md
@@ -59,11 +59,11 @@ must be wrapped with its type indicator:
 ### Basic Document Creation
 
 ```yaml
-tools:
-  add-company-doc:
-    kind: firestore-add-documents
-    source: my-firestore
-    description: Add a new company document
+kind: tools
+name: add-company-doc
+type: firestore-add-documents
+source: my-firestore
+description: Add a new company document
 ```
 
 Usage:
@@ -246,14 +246,14 @@ Usage:
 The tool can be configured to require authentication:
 
 ```yaml
-tools:
-  secure-add-docs:
-    kind: firestore-add-documents
-    source: prod-firestore
-    description: Add documents with authentication required
-    authRequired:
-      - google-oauth
-      - api-key
+kind: tools
+name: secure-add-docs
+type: firestore-add-documents
+source: prod-firestore
+description: Add documents with authentication required
+authRequired:
+  - google-oauth
+  - api-key
 ```
 
 ## Error Handling
diff --git a/docs/en/resources/tools/firestore/firestore-delete-documents.md b/docs/en/resources/tools/firestore/firestore-delete-documents.md
index 66343231d0..36d6b61fc3 100644
--- a/docs/en/resources/tools/firestore/firestore-delete-documents.md
+++ b/docs/en/resources/tools/firestore/firestore-delete-documents.md
@@ -23,17 +23,17 @@ efficient batch deletion and returns the success status for each document.
 ## Example
 
 ```yaml
-tools:
-  delete_user_documents:
-    kind: firestore-delete-documents
-    source: my-firestore-source
-    description: Use this tool to delete multiple documents from Firestore.
+kind: tools
+name: delete_user_documents
+type: firestore-delete-documents
+source: my-firestore-source
+description: Use this tool to delete multiple documents from Firestore.
 ```
 
 ## Reference
 
 | **field**   |     **type**   | **required** | **description**                                          |
 |-------------|:--------------:|:------------:|----------------------------------------------------------|
-| kind        |     string     |     true     | Must be "firestore-delete-documents".                    |
+| type        |     string     |     true     | Must be "firestore-delete-documents".                    |
 | source      |     string     |     true     | Name of the Firestore source to delete documents from.   |
 | description |     string     |     true     | Description of the tool that is passed to the LLM.       |
diff --git a/docs/en/resources/tools/firestore/firestore-get-documents.md b/docs/en/resources/tools/firestore/firestore-get-documents.md
index 0bc1bef1b8..a4a5b0df0c 100644
--- a/docs/en/resources/tools/firestore/firestore-get-documents.md
+++ b/docs/en/resources/tools/firestore/firestore-get-documents.md
@@ -23,17 +23,17 @@ such as existence status, creation time, update time, and read time.
 ## Example
 
 ```yaml
-tools:
-  get_user_documents:
-    kind: firestore-get-documents
-    source: my-firestore-source
-    description: Use this tool to retrieve multiple documents from Firestore.
+kind: tools
+name: get_user_documents
+type: firestore-get-documents
+source: my-firestore-source
+description: Use this tool to retrieve multiple documents from Firestore.
 ```
 
 ## Reference
 
 | **field**   |    **type**    | **required** | **description**                                            |
 |-------------|:--------------:|:------------:|------------------------------------------------------------|
-| kind        |     string     |     true     | Must be "firestore-get-documents".                         |
+| type        |     string     |     true     | Must be "firestore-get-documents".                         |
 | source      |     string     |     true     | Name of the Firestore source to retrieve documents from.   |
 | description |     string     |     true     | Description of the tool that is passed to the LLM.         |
diff --git a/docs/en/resources/tools/firestore/firestore-get-rules.md b/docs/en/resources/tools/firestore/firestore-get-rules.md
index 568dc6b1da..28b48e53ab 100644
--- a/docs/en/resources/tools/firestore/firestore-get-rules.md
+++ b/docs/en/resources/tools/firestore/firestore-get-rules.md
@@ -23,17 +23,17 @@ content along with metadata such as the ruleset name, and timestamps.
 ## Example
 
 ```yaml
-tools:
-  get_firestore_rules:
-    kind: firestore-get-rules
-    source: my-firestore-source
-    description: Use this tool to retrieve the active Firestore security rules.
+kind: tools
+name: get_firestore_rules
+type: firestore-get-rules
+source: my-firestore-source
+description: Use this tool to retrieve the active Firestore security rules.
 ```
 
 ## Reference
 
 | **field**   |    **type**   | **required** | **description**                                       |
 |-------------|:-------------:|:------------:|-------------------------------------------------------|
-| kind        |     string    |     true     | Must be "firestore-get-rules".                        |
+| type        |     string    |     true     | Must be "firestore-get-rules".                        |
 | source      |     string    |     true     | Name of the Firestore source to retrieve rules from.  |
 | description |     string    |     true     | Description of the tool that is passed to the LLM.    |
diff --git a/docs/en/resources/tools/firestore/firestore-list-collections.md b/docs/en/resources/tools/firestore/firestore-list-collections.md
index b2cc7ef6b6..971aed02b8 100644
--- a/docs/en/resources/tools/firestore/firestore-list-collections.md
+++ b/docs/en/resources/tools/firestore/firestore-list-collections.md
@@ -26,17 +26,17 @@ not provided, it lists all root-level collections in the database.
 ## Example
 
 ```yaml
-tools:
-  list_firestore_collections:
-    kind: firestore-list-collections
-    source: my-firestore-source
-    description: Use this tool to list collections in Firestore.
+kind: tools
+name: list_firestore_collections
+type: firestore-list-collections
+source: my-firestore-source
+description: Use this tool to list collections in Firestore.
 ```
 
 ## Reference
 
 | **field**   |      **type**    | **required** | **description**                                        |
 |-------------|:----------------:|:------------:|--------------------------------------------------------|
-| kind        |      string      |     true     | Must be "firestore-list-collections".                  |
+| type        |      string      |     true     | Must be "firestore-list-collections".                  |
 | source      |      string      |     true     | Name of the Firestore source to list collections from. |
 | description |      string      |     true     | Description of the tool that is passed to the LLM.     |
diff --git a/docs/en/resources/tools/firestore/firestore-query-collection.md b/docs/en/resources/tools/firestore/firestore-query-collection.md
index f615a9bc2e..774aa9f29e 100644
--- a/docs/en/resources/tools/firestore/firestore-query-collection.md
+++ b/docs/en/resources/tools/firestore/firestore-query-collection.md
@@ -18,17 +18,17 @@ with filters, ordering, and limit capabilities.
 To use this tool, you need to configure it in your YAML configuration file:
 
 ```yaml
-sources:
-  my-firestore:
-    kind: firestore
-    project: my-gcp-project
-    database: "(default)"
-
-tools:
-  query_collection:
-    kind: firestore-query-collection
-    source: my-firestore
-    description: Query Firestore collections with advanced filtering
+kind: sources
+name: my-firestore
+type: firestore
+project: my-gcp-project
+database: "(default)"
+---
+kind: tools
+name: query_collection
+type: firestore-query-collection
+source: my-firestore
+description: Query Firestore collections with advanced filtering
 ```
 
 ## Parameters
diff --git a/docs/en/resources/tools/firestore/firestore-query.md b/docs/en/resources/tools/firestore/firestore-query.md
index 20fe9c8fd7..a3027e02d2 100644
--- a/docs/en/resources/tools/firestore/firestore-query.md
+++ b/docs/en/resources/tools/firestore/firestore-query.md
@@ -38,87 +38,87 @@ developers can use to create custom tools with specific query patterns.
 ### Basic Configuration
 
 ```yaml
-tools:
-  query_countries:
-    kind: firestore-query
-    source: my-firestore-source
-    description: Query countries with dynamic filters
-    collectionPath: "countries"
-    filters: |
-      {
-        "field": "continent",
-        "op": "==",
-        "value": {"stringValue": "{{.continent}}"}
-      }
-    parameters:
-      - name: continent
-        type: string
-        description: Continent to filter by
-        required: true
+kind: tools
+name: query_countries
+type: firestore-query
+source: my-firestore-source
+description: Query countries with dynamic filters
+collectionPath: "countries"
+filters: |
+  {
+    "field": "continent",
+    "op": "==",
+    "value": {"stringValue": "{{.continent}}"}
+  }
+parameters:
+  - name: continent
+    type: string
+    description: Continent to filter by
+    required: true
 ```
 
 ### Advanced Configuration with Complex Filters
 
 ```yaml
-tools:
-  advanced_query:
-    kind: firestore-query
-    source: my-firestore-source
-    description: Advanced query with complex filters
-    collectionPath: "{{.collection}}"
-    filters: |
+kind: tools
+name: advanced_query
+type: firestore-query
+source: my-firestore-source
+description: Advanced query with complex filters
+collectionPath: "{{.collection}}"
+filters: |
+  {
+    "or": [
+      {"field": "status", "op": "==", "value": {"stringValue": "{{.status}}"}},
       {
-        "or": [
-          {"field": "status", "op": "==", "value": {"stringValue": "{{.status}}"}},
-          {
-            "and": [
-              {"field": "priority", "op": ">", "value": {"integerValue": "{{.priority}}"}},
-              {"field": "area", "op": "<", "value": {"doubleValue": {{.maxArea}}}},
-              {"field": "active", "op": "==", "value": {"booleanValue": {{.isActive}}}}
-            ]
-          }
+        "and": [
+          {"field": "priority", "op": ">", "value": {"integerValue": "{{.priority}}"}},
+          {"field": "area", "op": "<", "value": {"doubleValue": {{.maxArea}}}},
+          {"field": "active", "op": "==", "value": {"booleanValue": {{.isActive}}}}
         ]
       }
-    select:
-      - name
-      - status
-      - priority
-    orderBy:
-      field: "{{.sortField}}"
-      direction: "{{.sortDirection}}"
-    limit: 100
-    analyzeQuery: true
-    parameters:
-      - name: collection
-        type: string
-        description: Collection to query
-        required: true
-      - name: status
-        type: string
-        description: Status to filter by
-        required: true
-      - name: priority
-        type: string
-        description: Minimum priority value
-        required: true
-      - name: maxArea
-        type: float
-        description: Maximum area value
-        required: true
-      - name: isActive
-        type: boolean
-        description: Filter by active status
-        required: true
-      - name: sortField
-        type: string
-        description: Field to sort by
-        required: false
-        default: "createdAt"
-      - name: sortDirection
-        type: string
-        description: Sort direction (ASCENDING or DESCENDING)
-        required: false
-        default: "DESCENDING"
+    ]
+  }
+select:
+  - name
+  - status
+  - priority
+orderBy:
+  field: "{{.sortField}}"
+  direction: "{{.sortDirection}}"
+limit: 100
+analyzeQuery: true
+parameters:
+  - name: collection
+    type: string
+    description: Collection to query
+    required: true
+  - name: status
+    type: string
+    description: Status to filter by
+    required: true
+  - name: priority
+    type: string
+    description: Minimum priority value
+    required: true
+  - name: maxArea
+    type: float
+    description: Maximum area value
+    required: true
+  - name: isActive
+    type: boolean
+    description: Filter by active status
+    required: true
+  - name: sortField
+    type: string
+    description: Field to sort by
+    required: false
+    default: "createdAt"
+  - name: sortDirection
+    type: string
+    description: Sort direction (ASCENDING or DESCENDING)
+    required: false
+    default: "DESCENDING"
 ```
 
 ## Parameters
@@ -127,7 +127,7 @@ tools:
 
 | Parameter        | Type    | Required | Description                                                                                                 |
 |------------------|---------|----------|-------------------------------------------------------------------------------------------------------------|
-| `kind`           | string  | Yes      | Must be `firestore-query`                                                                                   |
+| `type`           | string  | Yes      | Must be `firestore-query`                                                                                   |
 | `source`         | string  | Yes      | Name of the Firestore source to use                                                                         |
 | `description`    | string  | Yes      | Description of what this tool does                                                                          |
 | `collectionPath` | string  | Yes      | Path to the collection to query (supports templates)                                                        |
@@ -254,103 +254,103 @@ The tool supports all Firestore native JSON value types:
 ### Example 1: Query with Dynamic Collection Path
 
 ```yaml
-tools:
-  user_documents:
-    kind: firestore-query
-    source: my-firestore
-    description: Query user-specific documents
-    collectionPath: "users/{{.userId}}/documents"
-    filters: |
-      {
-        "field": "type",
-        "op": "==",
-        "value": {"stringValue": "{{.docType}}"}
-      }
-    parameters:
-      - name: userId
-        type: string
-        description: User ID
-        required: true
-      - name: docType
-        type: string
-        description: Document type to filter
-        required: true
+kind: tools
+name: user_documents
+type: firestore-query
+source: my-firestore
+description: Query user-specific documents
+collectionPath: "users/{{.userId}}/documents"
+filters: |
+  {
+    "field": "type",
+    "op": "==",
+    "value": {"stringValue": "{{.docType}}"}
+  }
+parameters:
+  - name: userId
+    type: string
+    description: User ID
+    required: true
+  - name: docType
+    type: string
+    description: Document type to filter
+    required: true
 ```
 
 ### Example 2: Complex Geographic Query
 
 ```yaml
-tools:
-  location_search:
-    kind: firestore-query
-    source: my-firestore
-    description: Search locations by area and population
-    collectionPath: "cities"
-    filters: |
-      {
-        "and": [
-          {"field": "country", "op": "==", "value": {"stringValue": "{{.country}}"}},
-          {"field": "population", "op": ">", "value": {"integerValue": "{{.minPopulation}}"}},
-          {"field": "area", "op": "<", "value": {"doubleValue": {{.maxArea}}}}
-        ]
-      }
-    orderBy:
-      field: "population"
-      direction: "DESCENDING"
-    limit: 50
-    parameters:
-      - name: country
-        type: string
-        description: Country code
-        required: true
-      - name: minPopulation
-        type: string
-        description: Minimum population (as string for large numbers)
-        required: true
-      - name: maxArea
-        type: float
-        description: Maximum area in square kilometers
-        required: true
+kind: tools
+name: location_search
+type: firestore-query
+source: my-firestore
+description: Search locations by area and population
+collectionPath: "cities"
+filters: |
+  {
+    "and": [
+      {"field": "country", "op": "==", "value": {"stringValue": "{{.country}}"}},
+      {"field": "population", "op": ">", "value": {"integerValue": "{{.minPopulation}}"}},
+      {"field": "area", "op": "<", "value": {"doubleValue": {{.maxArea}}}}
+    ]
+  }
+orderBy:
+  field: "population"
+  direction: "DESCENDING"
+limit: 50
+parameters:
+  - name: country
+    type: string
+    description: Country code
+    required: true
+  - name: minPopulation
+    type: string
+    description: Minimum population (as string for large numbers)
+    required: true
+  - name: maxArea
+    type: float
+    description: Maximum area in square kilometers
+    required: true
 ```
 
 ### Example 3: Time-based Query with Analysis
 
 ```yaml
-tools:
-  activity_log:
-    kind: firestore-query
-    source: my-firestore
-    description: Query activity logs within time range
-    collectionPath: "logs"
-    filters: |
-      {
-        "and": [
-          {"field": "timestamp", "op": ">=", "value": {"timestampValue": "{{.startTime}}"}},
-          {"field": "timestamp", "op": "<=", "value": {"timestampValue": "{{.endTime}}"}},
-          {"field": "severity", "op": "in", "value": {"arrayValue": {"values": [
-            {"stringValue": "ERROR"},
-            {"stringValue": "CRITICAL"}
-          ]}}}
-        ]
-      }
-    select:
-      - timestamp
-      - message
-      - severity
-      - userId
-    orderBy:
-      field: "timestamp"
-      direction: "DESCENDING"
-    analyzeQuery: true
-    parameters:
-      - name: startTime
-        type: string
-        description: Start time in RFC3339 format
-        required: true
-      - name: endTime
-        type: string
-        description: End time in RFC3339 format
-        required: true
+kind: tools
+name: activity_log
+type: firestore-query
+source: my-firestore
+description: Query activity logs within time range
+collectionPath: "logs"
+filters: |
+  {
+    "and": [
+      {"field": "timestamp", "op": ">=", "value": {"timestampValue": "{{.startTime}}"}},
+      {"field": "timestamp", "op": "<=", "value": {"timestampValue": "{{.endTime}}"}},
+      {"field": "severity", "op": "in", "value": {"arrayValue": {"values": [
+        {"stringValue": "ERROR"},
+        {"stringValue": "CRITICAL"}
+      ]}}}
+    ]
+  }
+select:
+  - timestamp
+  - message
+  - severity
+  - userId
+orderBy:
+  field: "timestamp"
+  direction: "DESCENDING"
+analyzeQuery: true
+parameters:
+  - name: startTime
+    type: string
+    description: Start time in RFC3339 format
+    required: true
+  - name: endTime
+    type: string
+    description: End time in RFC3339 format
+    required: true
 ```
 
 ## Usage
diff --git a/docs/en/resources/tools/firestore/firestore-update-document.md b/docs/en/resources/tools/firestore/firestore-update-document.md
index 56aad8d371..0cbda2cbfa 100644
--- a/docs/en/resources/tools/firestore/firestore-update-document.md
+++ b/docs/en/resources/tools/firestore/firestore-update-document.md
@@ -76,7 +76,7 @@ deleted. To delete a field, include it in the `updateMask` but omit it from
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "firestore-update-document".                 |
+| type        |  string  |     true     | Must be "firestore-update-document".                 |
 | source      |  string  |     true     | Name of the Firestore source to update documents in. |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.   |
 
@@ -85,11 +85,11 @@ deleted. To delete a field, include it in the `updateMask` but omit it from
 ### Basic Document Update (Full Merge)
 
 ```yaml
-tools:
-  update-user-doc:
-    kind: firestore-update-document
-    source: my-firestore
-    description: Update a user document
+kind: tools
+name: update-user-doc
+type: firestore-update-document
+source: my-firestore
+description: Update a user document
 ```
 
 Usage:
@@ -299,14 +299,14 @@ In this example:
 The tool can be configured to require authentication:
 
 ```yaml
-tools:
-  secure-update-doc:
-    kind: firestore-update-document
-    source: prod-firestore
-    description: Update documents with authentication required
-    authRequired:
-      - google-oauth
-      - api-key
+kind: tools
+name: secure-update-doc
+type: firestore-update-document
+source: prod-firestore
+description: Update documents with authentication required
+authRequired:
+  - google-oauth
+  - api-key
 ```
 
 ## Error Handling
diff --git a/docs/en/resources/tools/firestore/firestore-validate-rules.md b/docs/en/resources/tools/firestore/firestore-validate-rules.md
index 6f74bec527..3e6b069521 100644
--- a/docs/en/resources/tools/firestore/firestore-validate-rules.md
+++ b/docs/en/resources/tools/firestore/firestore-validate-rules.md
@@ -17,11 +17,11 @@ reporting with source positions and code snippets.
 ## Configuration
 
 ```yaml
-tools:
-  firestore-validate-rules:
-    kind: firestore-validate-rules
-    source: <firestore-source-name>
-    description: "Checks the provided Firestore Rules source for syntax and validation errors"
+kind: tools
+name: firestore-validate-rules
+type: firestore-validate-rules
+source: <firestore-source-name>
+description: "Checks the provided Firestore Rules source for syntax and validation errors"
 ```
 
 ## Authentication
diff --git a/docs/en/resources/tools/http/http.md b/docs/en/resources/tools/http/http.md
index 466a86c36d..19272c9035 100644
--- a/docs/en/resources/tools/http/http.md
+++ b/docs/en/resources/tools/http/http.md
@@ -31,36 +31,38 @@ For example, the following config allows you to reach different paths of the
 same server using multiple Tools:
 
 ```yaml
-sources:
-    my-http-source:
-        kind: http
-        baseUrl: https://api.example.com
-
-tools:
-    my-post-tool:
-        kind: http
-        source: my-http-source
-        method: POST
-        path: /update
-        description: Tool to update information to the example API
-
-    my-get-tool:
-        kind: http
-        source: my-http-source
-        method: GET
-        path: /search
-        description: Tool to search information from the example API
-
-    my-dynamic-path-tool:
-        kind: http
-        source: my-http-source
-        method: GET
-        path: /{{.myPathParam}}/search
-        description: Tool to reach endpoint based on the input to `myPathParam`
-        pathParams:
-            - name: myPathParam
-              type: string
-              description: The dynamic path parameter
+kind: sources
+name: my-http-source
+type: http
+baseUrl: https://api.example.com
+---
+kind: tools
+name: my-post-tool
+type: http
+source: my-http-source
+method: POST
+path: /update
+description: Tool to update information to the example API
+---
+kind: tools
+name: my-get-tool
+type: http
+source: my-http-source
+method: GET
+path: /search
+description: Tool to search information from the example API
+---
+kind: tools
+name: my-dynamic-path-tool
+type: http
+source: my-http-source
+method: GET
+path: /{{.myPathParam}}/search
+description: Tool to reach endpoint based on the input to `myPathParam`
+pathParams:
+    - name: myPathParam
+      type: string
+      description: The dynamic path parameter
 
 ```
 
@@ -77,15 +79,16 @@ The HTTP Tool allows you to specify headers in two different ways:
   same for every invocation:
 
 ```yaml
-my-http-tool:
-    kind: http
-    source: my-http-source
-    method: GET
-    path: /search
-    description: Tool to search data from API
-    headers:
-      Authorization: API_KEY
-      Content-Type: application/json
+kind: tools
+name: my-http-tool
+type: http
+source: my-http-source
+method: GET
+path: /search
+description: Tool to search data from API
+headers:
+  Authorization: API_KEY
+  Content-Type: application/json
 ```
 
 - Dynamic headers can be specified as parameters in the `headerParams` field.
@@ -93,16 +96,17 @@ my-http-tool:
   is determined by the LLM input upon Tool invocation:
 
 ```yaml
-my-http-tool:
-    kind: http
-    source: my-http-source
-    method: GET
-    path: /search
-    description: some description
-    headerParams:
-      - name: Content-Type # Example LLM input: "application/json"
-        description: request content type
-        type: string
+kind: tools
+name: my-http-tool
+type: http
+source: my-http-source
+method: GET
+path: /search
+description: some description
+headerParams:
+  - name: Content-Type # Example LLM input: "application/json"
+    description: request content type
+    type: string
 ```
 
 ### Query parameters
@@ -115,28 +119,30 @@ filtering or sorting data.
   the URL itself:
 
 ```yaml
-my-http-tool:
-    kind: http
-    source: my-http-source
-    method: GET
-    path: /search?language=en&id=1
-    description: Tool to search for item with ID 1 in English
+kind: tools
+name: my-http-tool
+type: http
+source: my-http-source
+method: GET
+path: /search?language=en&id=1
+description: Tool to search for item with ID 1 in English
 ```
 
 - Dynamic request query parameters should be specified as parameters in the
   `queryParams` section:
 
 ```yaml
-my-http-tool:
-    kind: http
-    source: my-http-source
-    method: GET
-    path: /search
-    description: Tool to search for item with ID
-    queryParams:
-      - name: id
-        description: item ID
-        type: integer
+kind: tools
+name: my-http-tool
+type: http
+source: my-http-source
+method: GET
+path: /search
+description: Tool to search for item with ID
+queryParams:
+  - name: id
+    description: item ID
+    type: integer
 ```
 
 ### Request body
@@ -150,24 +156,25 @@ body payload upon Tool invocation.
 Example:
 
 ```yaml
-my-http-tool:
-    kind: http
-    source: my-http-source
-    method: GET
-    path: /search
-    description: Tool to search for person with name and age
-    requestBody: |
-      {
-        "age": {{.age}},
-        "name": "{{.name}}"
-      }
-    bodyParams:
-      - name: age
-        description: age number
-        type: integer
-      - name: name
-        description: name string
-        type: string
+kind: tools
+name: my-http-tool
+type: http
+source: my-http-source
+method: GET
+path: /search
+description: Tool to search for person with name and age
+requestBody: |
+  {
+    "age": {{.age}},
+    "name": "{{.name}}"
+  }
+bodyParams:
+  - name: age
+    description: age number
+    type: integer
+  - name: name
+    description: name string
+    type: string
 ```
 
 #### Formatting Parameters
@@ -211,45 +218,46 @@ will send the following output:
 ## Example
 
 ```yaml
-my-http-tool:
-    kind: http
-    source: my-http-source
-    method: GET
-    path: /search
+kind: tools
+name: my-http-tool
+type: http
+source: my-http-source
+method: GET
+path: /search
+description: some description
+authRequired:
+  - my-google-auth-service
+  - other-auth-service
+queryParams:
+  - name: country
     description: some description
-    authRequired:
-      - my-google-auth-service
-      - other-auth-service
-    queryParams:
-      - name: country
-        description: some description
-        type: string
-    requestBody: |
-      {
-        "age": {{.age}},
-        "city": "{{.city}}"
-      }
-    bodyParams:
-      - name: age
-        description: age number
-        type: integer
-      - name: city
-        description: city string
-        type: string
-    headers:
-      Authorization: API_KEY
-      Content-Type: application/json
-    headerParams:
-      - name: Language
-        description: language string
-        type: string
+    type: string
+requestBody: |
+  {
+    "age": {{.age}},
+    "city": "{{.city}}"
+  }
+bodyParams:
+  - name: age
+    description: age number
+    type: integer
+  - name: city
+    description: city string
+    type: string
+headers:
+  Authorization: API_KEY
+  Content-Type: application/json
+headerParams:
+  - name: Language
+    description: language string
+    type: string
 ```
 
 ## Reference
 
 | **field**    |                **type**                 | **required** | **description**                                                                                                                                                                                                            |
 |--------------|:---------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind         |                 string                  |     true     | Must be "http".                                                                                                                                                                                                            |
+| type         |                 string                  |     true     | Must be "http".                                                                                                                                                                                                            |
 | source       |                 string                  |     true     | Name of the source the HTTP request should be sent to.                                                                                                                                                                     |
 | description  |                 string                  |     true     | Description of the tool that is passed to the LLM.                                                                                                                                                                         |
 | path         |                 string                  |     true     | The path of the HTTP request. You can include static query parameters in the path string.                                                                                                                                  |
diff --git a/docs/en/resources/tools/looker/looker-add-dashboard-element.md b/docs/en/resources/tools/looker/looker-add-dashboard-element.md
index 3c0a65f2d3..5e217fc865 100644
--- a/docs/en/resources/tools/looker/looker-add-dashboard-element.md
+++ b/docs/en/resources/tools/looker/looker-add-dashboard-element.md
@@ -25,42 +25,42 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    add_dashboard_element:
-        kind: looker-add-dashboard-element
-        source: looker-source
-        description: |
-          This tool creates a new tile (element) within an existing Looker dashboard.
-          Tiles are added in the order this tool is called for a given `dashboard_id`.
+kind: tools
+name: add_dashboard_element
+type: looker-add-dashboard-element
+source: looker-source
+description: |
+  This tool creates a new tile (element) within an existing Looker dashboard.
+  Tiles are added in the order this tool is called for a given `dashboard_id`.
 
-          CRITICAL ORDER OF OPERATIONS:
-          1. Create the dashboard using `make_dashboard`.
-          2. Add any dashboard-level filters using `add_dashboard_filter`.
-          3. Then, add elements (tiles) using this tool.
+  CRITICAL ORDER OF OPERATIONS:
+  1. Create the dashboard using `make_dashboard`.
+  2. Add any dashboard-level filters using `add_dashboard_filter`.
+  3. Then, add elements (tiles) using this tool.
 
-          Required Parameters:
-          - dashboard_id: The ID of the target dashboard, obtained from `make_dashboard`.
-          - model_name, explore_name, fields: These query parameters are inherited
-            from the `query` tool and are required to define the data for the tile.
+  Required Parameters:
+  - dashboard_id: The ID of the target dashboard, obtained from `make_dashboard`.
+  - model_name, explore_name, fields: These query parameters are inherited
+    from the `query` tool and are required to define the data for the tile.
 
-          Optional Parameters:
-          - title: An optional title for the dashboard tile.
-          - pivots, filters, sorts, limit, query_timezone: These query parameters are
-            inherited from the `query` tool and can be used to customize the tile's query.
-          - vis_config: A JSON object defining the visualization settings for this tile.
-            The structure and options are the same as for the `query_url` tool's `vis_config`.
+  Optional Parameters:
+  - title: An optional title for the dashboard tile.
+  - pivots, filters, sorts, limit, query_timezone: These query parameters are
+    inherited from the `query` tool and can be used to customize the tile's query.
+  - vis_config: A JSON object defining the visualization settings for this tile.
+    The structure and options are the same as for the `query_url` tool's `vis_config`.
 
-          Connecting to Dashboard Filters:
-          A dashboard element can be connected to one or more dashboard filters (created with
-          `add_dashboard_filter`). To do this, specify the `name` of the dashboard filter
-          and the `field` from the element's query that the filter should apply to.
-          The format for specifying the field is `view_name.field_name`.
+  Connecting to Dashboard Filters:
+  A dashboard element can be connected to one or more dashboard filters (created with
+  `add_dashboard_filter`). To do this, specify the `name` of the dashboard filter
+  and the `field` from the element's query that the filter should apply to.
+  The format for specifying the field is `view_name.field_name`.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |:------------|:--------:|:------------:|----------------------------------------------------|
-| kind        | string   | true         | Must be "looker-add-dashboard-element".            |
+| type        | string   | true         | Must be "looker-add-dashboard-element".            |
 | source      | string   | true         | Name of the source the SQL should execute on.      |
 | description | string   | true         | Description of the tool that is passed to the LLM. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/looker/looker-add-dashboard-filter.md b/docs/en/resources/tools/looker/looker-add-dashboard-filter.md
index e5cf5ba34d..ca88afebfc 100644
--- a/docs/en/resources/tools/looker/looker-add-dashboard-filter.md
+++ b/docs/en/resources/tools/looker/looker-add-dashboard-filter.md
@@ -39,37 +39,37 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-  add_dashboard_filter:
-    kind: looker-add-dashboard-filter
-    source: looker-source
-    description: |
-      This tool adds a filter to a Looker dashboard.
+kind: tools
+name: add_dashboard_filter
+type: looker-add-dashboard-filter
+source: looker-source
+description: |
+  This tool adds a filter to a Looker dashboard.
 
-      CRITICAL ORDER OF OPERATIONS:
-      1. Create a dashboard using `make_dashboard`.
-      2. Add all desired filters using this tool (`add_dashboard_filter`).
-      3. Finally, add dashboard elements (tiles) using `add_dashboard_element`.
+  CRITICAL ORDER OF OPERATIONS:
+  1. Create a dashboard using `make_dashboard`.
+  2. Add all desired filters using this tool (`add_dashboard_filter`).
+  3. Finally, add dashboard elements (tiles) using `add_dashboard_element`.
 
-      Parameters:
-      - dashboard_id (required): The ID from `make_dashboard`.
-      - name (required): A unique internal identifier for the filter. You will use this `name` later in `add_dashboard_element` to bind tiles to this filter.
-      - title (required): The label displayed to users in the UI.
-      - filter_type (required): One of `date_filter`, `number_filter`, `string_filter`, or `field_filter`.
-      - default_value (optional): The initial value for the filter.
+  Parameters:
+  - dashboard_id (required): The ID from `make_dashboard`.
+  - name (required): A unique internal identifier for the filter. You will use this `name` later in `add_dashboard_element` to bind tiles to this filter.
+  - title (required): The label displayed to users in the UI.
+  - filter_type (required): One of `date_filter`, `number_filter`, `string_filter`, or `field_filter`.
+  - default_value (optional): The initial value for the filter.
 
-      Field Filters (`flter_type: field_filter`):
-      If creating a field filter, you must also provide:
-      - model
-      - explore
-      - dimension
-      The filter will inherit suggestions and type information from this LookML field.
+  Field Filters (`flter_type: field_filter`):
+  If creating a field filter, you must also provide:
+  - model
+  - explore
+  - dimension
+  The filter will inherit suggestions and type information from this LookML field.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-add-dashboard-filter".             |
+| type        |  string  |     true     | Must be "looker-add-dashboard-filter".             |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
\ No newline at end of file
diff --git a/docs/en/resources/tools/looker/looker-conversational-analytics.md b/docs/en/resources/tools/looker/looker-conversational-analytics.md
index 150f347cf7..6e064cf7a4 100644
--- a/docs/en/resources/tools/looker/looker-conversational-analytics.md
+++ b/docs/en/resources/tools/looker/looker-conversational-analytics.md
@@ -29,21 +29,21 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    ask_data_insights:
-        kind: looker-conversational-analytics
-        source: looker-source
-        description: |
-          Use this tool to ask questions about your data using the Looker Conversational
-          Analytics API. You must provide a natural language query and a list of
-          1 to 5 model and explore combinations (e.g. [{'model': 'the_model', 'explore': 'the_explore'}]).
-          Use the 'get_models' and 'get_explores' tools to discover available models and explores.
+kind: tools
+name: ask_data_insights
+type: looker-conversational-analytics
+source: looker-source
+description: |
+  Use this tool to ask questions about your data using the Looker Conversational
+  Analytics API. You must provide a natural language query and a list of
+  1 to 5 model and explore combinations (e.g. [{'model': 'the_model', 'explore': 'the_explore'}]).
+  Use the 'get_models' and 'get_explores' tools to discover available models and explores.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "lookerca-conversational-analytics".       |
+| type        |  string  |     true     | Must be "lookerca-conversational-analytics".       |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-create-project-file.md b/docs/en/resources/tools/looker/looker-create-project-file.md
index 826dda98e9..3e36fe73d0 100644
--- a/docs/en/resources/tools/looker/looker-create-project-file.md
+++ b/docs/en/resources/tools/looker/looker-create-project-file.md
@@ -22,29 +22,29 @@ as well as the file content.
 ## Example
 
 ```yaml
-tools:
-    create_project_file:
-        kind: looker-create-project-file
-        source: looker-source
-        description: |
-          This tool creates a new LookML file within a specified project, populating
-          it with the provided content.
+kind: tools
+name: create_project_file
+type: looker-create-project-file
+source: looker-source
+description: |
+  This tool creates a new LookML file within a specified project, populating
+  it with the provided content.
 
-          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+  Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
 
-          Parameters:
-          - project_id (required): The unique ID of the LookML project.
-          - file_path (required): The desired path and filename for the new file within the project.
-          - content (required): The full LookML content to write into the new file.
+  Parameters:
+  - project_id (required): The unique ID of the LookML project.
+  - file_path (required): The desired path and filename for the new file within the project.
+  - content (required): The full LookML content to write into the new file.
 
-          Output:
-          A confirmation message upon successful file creation.
+  Output:
+  A confirmation message upon successful file creation.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-create-project-file".              |
+| type        |  string  |     true     | Must be "looker-create-project-file".              |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-delete-project-file.md b/docs/en/resources/tools/looker/looker-delete-project-file.md
index e5bf06948d..11419b8a19 100644
--- a/docs/en/resources/tools/looker/looker-delete-project-file.md
+++ b/docs/en/resources/tools/looker/looker-delete-project-file.md
@@ -21,28 +21,28 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    delete_project_file:
-        kind: looker-delete-project-file
-        source: looker-source
-        description: |
-          This tool permanently deletes a specified LookML file from within a project.
-          Use with caution, as this action cannot be undone through the API.
+kind: tools
+name: delete_project_file
+type: looker-delete-project-file
+source: looker-source
+description: |
+  This tool permanently deletes a specified LookML file from within a project.
+  Use with caution, as this action cannot be undone through the API.
 
-          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+  Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
 
-          Parameters:
-          - project_id (required): The unique ID of the LookML project.
-          - file_path (required): The exact path to the LookML file to delete within the project.
+  Parameters:
+  - project_id (required): The unique ID of the LookML project.
+  - file_path (required): The exact path to the LookML file to delete within the project.
 
-          Output:
-          A confirmation message upon successful file deletion.
+  Output:
+  A confirmation message upon successful file deletion.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-delete-project-file".              |
+| type        |  string  |     true     | Must be "looker-delete-project-file".              |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-dev-mode.md b/docs/en/resources/tools/looker/looker-dev-mode.md
index 9f69343ad5..33509ea54b 100644
--- a/docs/en/resources/tools/looker/looker-dev-mode.md
+++ b/docs/en/resources/tools/looker/looker-dev-mode.md
@@ -22,24 +22,24 @@ to exit dev mode.
 ## Example
 
 ```yaml
-tools:
-    dev_mode:
-        kind: looker-dev-mode
-        source: looker-source
-        description: |
-          This tool allows toggling the Looker IDE session between Development Mode and Production Mode.
-          Development Mode enables making and testing changes to LookML projects.
+kind: tools
+name: dev_mode
+type: looker-dev-mode
+source: looker-source
+description: |
+  This tool allows toggling the Looker IDE session between Development Mode and Production Mode.
+  Development Mode enables making and testing changes to LookML projects.
 
-          Parameters:
-          - enable (required): A boolean value.
-            - `true`: Switches the current session to Development Mode.
-            - `false`: Switches the current session to Production Mode.
+  Parameters:
+  - enable (required): A boolean value.
+    - `true`: Switches the current session to Development Mode.
+    - `false`: Switches the current session to Production Mode.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-dev-mode".                         |
+| type        |  string  |     true     | Must be "looker-dev-mode".                         |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-generate-embed-url.md b/docs/en/resources/tools/looker/looker-generate-embed-url.md
index 1e136165da..bf7f4c1f23 100644
--- a/docs/en/resources/tools/looker/looker-generate-embed-url.md
+++ b/docs/en/resources/tools/looker/looker-generate-embed-url.md
@@ -31,28 +31,28 @@ supplied to this tool.
 ## Example
 
 ```yaml
-tools:
-    generate_embed_url:
-        kind: looker-generate-embed-url
-        source: looker-source
-        description: |
-          This tool generates a signed, private embed URL for specific Looker content,
-          allowing users to access it directly.
+kind: tools
+name: generate_embed_url
+type: looker-generate-embed-url
+source: looker-source
+description: |
+  This tool generates a signed, private embed URL for specific Looker content,
+  allowing users to access it directly.
 
-          Parameters:
-          - type (required): The type of content to embed. Common values include:
-            - `dashboards`
-            - `looks`
-            - `explore`
-          - id (required): The unique identifier for the content.
-            - For dashboards and looks, use the numeric ID (e.g., "123").
-            - For explores, use the format "model_name/explore_name".
+  Parameters:
+  - type (required): The type of content to embed. Common values include:
+    - `dashboards`
+    - `looks`
+    - `explore`
+  - id (required): The unique identifier for the content.
+    - For dashboards and looks, use the numeric ID (e.g., "123").
+    - For explores, use the format "model_name/explore_name".
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-generate-embed-url"                |
+| type        |  string  |     true     | Must be "looker-generate-embed-url"                |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-connection-databases.md b/docs/en/resources/tools/looker/looker-get-connection-databases.md
index 23611fc2a1..b46459c26e 100644
--- a/docs/en/resources/tools/looker/looker-get-connection-databases.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-databases.md
@@ -21,27 +21,27 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_connection_databases:
-        kind: looker-get-connection-databases
-        source: looker-source
-        description: |
-          This tool retrieves a list of databases available through a specified Looker connection.
-          This is only applicable for connections that support multiple databases.
-          Use `get_connections` to check if a connection supports multiple databases.
+kind: tools
+name: get_connection_databases
+type: looker-get-connection-databases
+source: looker-source
+description: |
+  This tool retrieves a list of databases available through a specified Looker connection.
+  This is only applicable for connections that support multiple databases.
+  Use `get_connections` to check if a connection supports multiple databases.
 
-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
+  Parameters:
+  - connection_name (required): The name of the database connection, obtained from `get_connections`.
 
-          Output:
-          A JSON array of strings, where each string is the name of an available database.
-          If the connection does not support multiple databases, an empty list or an error will be returned.
+  Output:
+  A JSON array of strings, where each string is the name of an available database.
+  If the connection does not support multiple databases, an empty list or an error will be returned.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-connection-databases".         |
+| type        |  string  |     true     | Must be "looker-get-connection-databases".         |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-connection-schemas.md b/docs/en/resources/tools/looker/looker-get-connection-schemas.md
index 0ef34015c3..de568b8e0e 100644
--- a/docs/en/resources/tools/looker/looker-get-connection-schemas.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-schemas.md
@@ -21,27 +21,27 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_connection_schemas:
-        kind: looker-get-connection-schemas
-        source: looker-source
-        description: |
-          This tool retrieves a list of database schemas available through a specified
-          Looker connection.
+kind: tools
+name: get_connection_schemas
+type: looker-get-connection-schemas
+source: looker-source
+description: |
+  This tool retrieves a list of database schemas available through a specified
+  Looker connection.
 
-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-          - database (optional): An optional database name to filter the schemas.
-            Only applicable for connections that support multiple databases.
+  Parameters:
+  - connection_name (required): The name of the database connection, obtained from `get_connections`.
+  - database (optional): An optional database name to filter the schemas.
+    Only applicable for connections that support multiple databases.
 
-          Output:
-          A JSON array of strings, where each string is the name of an available schema.
+  Output:
+  A JSON array of strings, where each string is the name of an available schema.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-connection-schemas".           |
+| type        |  string  |     true     | Must be "looker-get-connection-schemas".           |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-connection-table-columns.md b/docs/en/resources/tools/looker/looker-get-connection-table-columns.md
index f4db6445fe..8f19bd372b 100644
--- a/docs/en/resources/tools/looker/looker-get-connection-table-columns.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-table-columns.md
@@ -21,31 +21,31 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_connection_table_columns:
-        kind: looker-get-connection-table-columns
-        source: looker-source
-        description: |
-          This tool retrieves a list of columns for one or more specified tables within a
-          given database schema and connection.
+kind: tools
+name: get_connection_table_columns
+type: looker-get-connection-table-columns
+source: looker-source
+description: |
+  This tool retrieves a list of columns for one or more specified tables within a
+  given database schema and connection.
 
-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-          - schema (required): The name of the schema where the tables reside, obtained from `get_connection_schemas`.
-          - tables (required): A comma-separated string of table names for which to retrieve columns
-            (e.g., "users,orders,products"), obtained from `get_connection_tables`.
-          - database (optional): The name of the database to filter by. Only applicable for connections
-            that support multiple databases (check with `get_connections`).
+  Parameters:
+  - connection_name (required): The name of the database connection, obtained from `get_connections`.
+  - schema (required): The name of the schema where the tables reside, obtained from `get_connection_schemas`.
+  - tables (required): A comma-separated string of table names for which to retrieve columns
+    (e.g., "users,orders,products"), obtained from `get_connection_tables`.
+  - database (optional): The name of the database to filter by. Only applicable for connections
+    that support multiple databases (check with `get_connections`).
 
-          Output:
-          A JSON array of objects, where each object represents a column and contains details
-          such as `table_name`, `column_name`, `data_type`, and `is_nullable`.
+  Output:
+  A JSON array of objects, where each object represents a column and contains details
+  such as `table_name`, `column_name`, `data_type`, and `is_nullable`.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-connection-table-columns".     |
+| type        |  string  |     true     | Must be "looker-get-connection-table-columns".     |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-connection-tables.md b/docs/en/resources/tools/looker/looker-get-connection-tables.md
index 86a2830cd9..5d191828bf 100644
--- a/docs/en/resources/tools/looker/looker-get-connection-tables.md
+++ b/docs/en/resources/tools/looker/looker-get-connection-tables.md
@@ -22,28 +22,28 @@ and an optional `db` parameter.
 ## Example
 
 ```yaml
-tools:
-    get_connection_tables:
-        kind: looker-get-connection-tables
-        source: looker-source
-        description: |
-          This tool retrieves a list of tables available within a specified database schema
-          through a Looker connection.
+kind: tools
+name: get_connection_tables
+type: looker-get-connection-tables
+source: looker-source
+description: |
+  This tool retrieves a list of tables available within a specified database schema
+  through a Looker connection.
 
-          Parameters:
-          - connection_name (required): The name of the database connection, obtained from `get_connections`.
-          - schema (required): The name of the schema to list tables from, obtained from `get_connection_schemas`.
-          - database (optional): The name of the database to filter by. Only applicable for connections
-            that support multiple databases (check with `get_connections`).
+  Parameters:
+  - connection_name (required): The name of the database connection, obtained from `get_connections`.
+  - schema (required): The name of the schema to list tables from, obtained from `get_connection_schemas`.
+  - database (optional): The name of the database to filter by. Only applicable for connections
+    that support multiple databases (check with `get_connections`).
 
-          Output:
-          A JSON array of strings, where each string is the name of an available table.
+  Output:
+  A JSON array of strings, where each string is the name of an available table.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-connection-tables".            |
+| type        |  string  |     true     | Must be "looker-get-connection-tables".            |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-connections.md b/docs/en/resources/tools/looker/looker-get-connections.md
index c6c0159789..52a1c96780 100644
--- a/docs/en/resources/tools/looker/looker-get-connections.md
+++ b/docs/en/resources/tools/looker/looker-get-connections.md
@@ -21,29 +21,29 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_connections:
-        kind: looker-get-connections
-        source: looker-source
-        description: |
-          This tool retrieves a list of all database connections configured in the Looker system.
+kind: tools
+name: get_connections
+type: looker-get-connections
+source: looker-source
+description: |
+  This tool retrieves a list of all database connections configured in the Looker system.
 
-          Parameters:
-          This tool takes no parameters.
+  Parameters:
+  This tool takes no parameters.
 
-          Output:
-          A JSON array of objects, each representing a database connection and including details such as:
-          - `name`: The connection's unique identifier.
-          - `dialect`: The database dialect (e.g., "mysql", "postgresql", "bigquery").
-          - `default_schema`: The default schema for the connection.
-          - `database`: The associated database name (if applicable).
-          - `supports_multiple_databases`: A boolean indicating if the connection can access multiple databases.
+  Output:
+  A JSON array of objects, each representing a database connection and including details such as:
+  - `name`: The connection's unique identifier.
+  - `dialect`: The database dialect (e.g., "mysql", "postgresql", "bigquery").
+  - `default_schema`: The default schema for the connection.
+  - `database`: The associated database name (if applicable).
+  - `supports_multiple_databases`: A boolean indicating if the connection can access multiple databases.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-connections".                  |
+| type        |  string  |     true     | Must be "looker-get-connections".                  |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-dashboards.md b/docs/en/resources/tools/looker/looker-get-dashboards.md
index db5c9e532e..a8f117d278 100644
--- a/docs/en/resources/tools/looker/looker-get-dashboards.md
+++ b/docs/en/resources/tools/looker/looker-get-dashboards.md
@@ -28,36 +28,36 @@ default to 100 and 0.
 ## Example
 
 ```yaml
-tools:
-        get_dashboards:
-            kind: looker-get-dashboards
-            source: looker-source
-            description: |
-              This tool searches for saved dashboards in a Looker instance. It returns a list of JSON objects, each representing a dashboard.
-    
-              Search Parameters:
-              - title (optional): Filter by dashboard title (supports wildcards).
-              - folder_id (optional): Filter by the ID of the folder where the dashboard is saved.
-              - user_id (optional): Filter by the ID of the user who created the dashboard.
-              - description (optional): Filter by description content (supports wildcards).
-              - id (optional): Filter by specific dashboard ID.
-              - limit (optional): Maximum number of results to return. Defaults to a system limit.
-              - offset (optional): Starting point for pagination.
-    
-              String Search Behavior:
-              - Case-insensitive matching.
-              - Supports SQL LIKE pattern match wildcards:
-                - `%`: Matches any sequence of zero or more characters. (e.g., `"finan%"` matches "financial", "finance")
-                - `_`: Matches any single character. (e.g., `"s_les"` matches "sales")
-              - Special expressions for null checks:
-                - `"IS NULL"`: Matches dashboards where the field is null.
-                - `"NOT NULL"`: Excludes dashboards where the field is null.
+kind: tools
+name: get_dashboards
+type: looker-get-dashboards
+source: looker-source
+description: |
+  This tool searches for saved dashboards in a Looker instance. It returns a list of JSON objects, each representing a dashboard.
+
+  Search Parameters:
+  - title (optional): Filter by dashboard title (supports wildcards).
+  - folder_id (optional): Filter by the ID of the folder where the dashboard is saved.
+  - user_id (optional): Filter by the ID of the user who created the dashboard.
+  - description (optional): Filter by description content (supports wildcards).
+  - id (optional): Filter by specific dashboard ID.
+  - limit (optional): Maximum number of results to return. Defaults to a system limit.
+  - offset (optional): Starting point for pagination.
+
+  String Search Behavior:
+  - Case-insensitive matching.
+  - Supports SQL LIKE pattern match wildcards:
+    - `%`: Matches any sequence of zero or more characters. (e.g., `"finan%"` matches "financial", "finance")
+    - `_`: Matches any single character. (e.g., `"s_les"` matches "sales")
+  - Special expressions for null checks:
+    - `"IS NULL"`: Matches dashboards where the field is null.
+    - `"NOT NULL"`: Excludes dashboards where the field is null.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-dashboards"                    |
+| type        |  string  |     true     | Must be "looker-get-dashboards"                    |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-dimensions.md b/docs/en/resources/tools/looker/looker-get-dimensions.md
index 17f3bb68f7..41a899eac7 100644
--- a/docs/en/resources/tools/looker/looker-get-dimensions.md
+++ b/docs/en/resources/tools/looker/looker-get-dimensions.md
@@ -23,25 +23,25 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_dimensions:
-        kind: looker-get-dimensions
-        source: looker-source
-        description: |
-          This tool retrieves a list of dimensions defined within a specific Looker explore.
-          Dimensions are non-aggregatable attributes or characteristics of your data
-          (e.g., product name, order date, customer city) that can be used for grouping,
-          filtering, or segmenting query results.
+kind: tools
+name: get_dimensions
+type: looker-get-dimensions
+source: looker-source
+description: |
+  This tool retrieves a list of dimensions defined within a specific Looker explore.
+  Dimensions are non-aggregatable attributes or characteristics of your data
+  (e.g., product name, order date, customer city) that can be used for grouping,
+  filtering, or segmenting query results.
 
-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+  Parameters:
+  - model_name (required): The name of the LookML model, obtained from `get_models`.
+  - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
 
-          Output Details:
-          - If a dimension includes a `suggestions` field, its contents are valid values
-            that can be used directly as filters for that dimension.
-          - If a `suggest_explore` and `suggest_dimension` are provided, you can query
-            that specified explore and dimension to retrieve a list of valid filter values.
+  Output Details:
+  - If a dimension includes a `suggestions` field, its contents are valid values
+    that can be used directly as filters for that dimension.
+  - If a `suggest_explore` and `suggest_dimension` are provided, you can query
+    that specified explore and dimension to retrieve a list of valid filter values.
 
 ```
 
@@ -66,6 +66,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-dimensions".                   |
+| type        |  string  |     true     | Must be "looker-get-dimensions".                   |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-explores.md b/docs/en/resources/tools/looker/looker-get-explores.md
index d92942de9d..3b7a695d1b 100644
--- a/docs/en/resources/tools/looker/looker-get-explores.md
+++ b/docs/en/resources/tools/looker/looker-get-explores.md
@@ -35,24 +35,24 @@ The return type is an array of maps, each map is formatted like:
 ## Example
 
 ```yaml
-tools:
-    get_explores:
-        kind: looker-get-explores
-        source: looker-source
-        description: |
-          This tool retrieves a list of explores defined within a specific LookML model.
-          Explores represent a curated view of your data, typically joining several
-          tables together to allow for focused analysis on a particular subject area.
-          The output provides details like the explore's `name` and `label`.
+kind: tools
+name: get_explores
+type: looker-get-explores
+source: looker-source
+description: |
+  This tool retrieves a list of explores defined within a specific LookML model.
+  Explores represent a curated view of your data, typically joining several
+  tables together to allow for focused analysis on a particular subject area.
+  The output provides details like the explore's `name` and `label`.
 
-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
+  Parameters:
+  - model_name (required): The name of the LookML model, obtained from `get_models`.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-explores".                     |
+| type        |  string  |     true     | Must be "looker-get-explores".                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-filters.md b/docs/en/resources/tools/looker/looker-get-filters.md
index 2657936fd6..a455363de2 100644
--- a/docs/en/resources/tools/looker/looker-get-filters.md
+++ b/docs/en/resources/tools/looker/looker-get-filters.md
@@ -23,23 +23,23 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_filters:
-        kind: looker-get-filters
-        source: looker-source
-        description: |
-          This tool retrieves a list of "filter-only fields" defined within a specific
-          Looker explore. These are special fields defined in LookML specifically to
-          create user-facing filter controls that do not directly affect the `GROUP BY`
-          clause of the SQL query. They are often used in conjunction with liquid templating
-          to create dynamic queries.
+kind: tools
+name: get_filters
+type: looker-get-filters
+source: looker-source
+description: |
+  This tool retrieves a list of "filter-only fields" defined within a specific
+  Looker explore. These are special fields defined in LookML specifically to
+  create user-facing filter controls that do not directly affect the `GROUP BY`
+  clause of the SQL query. They are often used in conjunction with liquid templating
+  to create dynamic queries.
 
-          Note: Regular dimensions and measures can also be used as filters in a query.
-          This tool *only* returns fields explicitly defined as `filter:` in LookML.
+  Note: Regular dimensions and measures can also be used as filters in a query.
+  This tool *only* returns fields explicitly defined as `filter:` in LookML.
 
-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+  Parameters:
+  - model_name (required): The name of the LookML model, obtained from `get_models`.
+  - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
 ```
 
 The response is a json array with the following elements:
@@ -63,6 +63,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-filters".                      |
+| type        |  string  |     true     | Must be "looker-get-filters".                      |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-looks.md b/docs/en/resources/tools/looker/looker-get-looks.md
index 06bc5f7856..a15f5f31ba 100644
--- a/docs/en/resources/tools/looker/looker-get-looks.md
+++ b/docs/en/resources/tools/looker/looker-get-looks.md
@@ -29,37 +29,37 @@ default to 100 and 0.
 ## Example
 
 ```yaml
-tools:
-    get_looks:
-        kind: looker-get-looks
-        source: looker-source
-        description: |
-          This tool searches for saved Looks (pre-defined queries and visualizations)
-          in a Looker instance. It returns a list of JSON objects, each representing a Look.
+kind: tools
+name: get_looks
+type: looker-get-looks
+source: looker-source
+description: |
+  This tool searches for saved Looks (pre-defined queries and visualizations)
+  in a Looker instance. It returns a list of JSON objects, each representing a Look.
 
-          Search Parameters:
-          - title (optional): Filter by Look title (supports wildcards).
-          - folder_id (optional): Filter by the ID of the folder where the Look is saved.
-          - user_id (optional): Filter by the ID of the user who created the Look.
-          - description (optional): Filter by description content (supports wildcards).
-          - id (optional): Filter by specific Look ID.
-          - limit (optional): Maximum number of results to return. Defaults to a system limit.
-          - offset (optional): Starting point for pagination.
+  Search Parameters:
+  - title (optional): Filter by Look title (supports wildcards).
+  - folder_id (optional): Filter by the ID of the folder where the Look is saved.
+  - user_id (optional): Filter by the ID of the user who created the Look.
+  - description (optional): Filter by description content (supports wildcards).
+  - id (optional): Filter by specific Look ID.
+  - limit (optional): Maximum number of results to return. Defaults to a system limit.
+  - offset (optional): Starting point for pagination.
 
-          String Search Behavior:
-          - Case-insensitive matching.
-          - Supports SQL LIKE pattern match wildcards:
-            - `%`: Matches any sequence of zero or more characters. (e.g., `"dan%"` matches "danger", "Danzig")
-            - `_`: Matches any single character. (e.g., `"D_m%"` matches "Damage", "dump")
-          - Special expressions for null checks:
-            - `"IS NULL"`: Matches Looks where the field is null.
-            - `"NOT NULL"`: Excludes Looks where the field is null.
+  String Search Behavior:
+  - Case-insensitive matching.
+  - Supports SQL LIKE pattern match wildcards:
+    - `%`: Matches any sequence of zero or more characters. (e.g., `"dan%"` matches "danger", "Danzig")
+    - `_`: Matches any single character. (e.g., `"D_m%"` matches "Damage", "dump")
+  - Special expressions for null checks:
+    - `"IS NULL"`: Matches Looks where the field is null.
+    - `"NOT NULL"`: Excludes Looks where the field is null.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-looks"                         |
+| type        |  string  |     true     | Must be "looker-get-looks"                         |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-measures.md b/docs/en/resources/tools/looker/looker-get-measures.md
index 7304031855..bcc390a19f 100644
--- a/docs/en/resources/tools/looker/looker-get-measures.md
+++ b/docs/en/resources/tools/looker/looker-get-measures.md
@@ -23,24 +23,24 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_measures:
-        kind: looker-get-measures
-        source: looker-source
-        description: |
-          This tool retrieves a list of measures defined within a specific Looker explore.
-          Measures are aggregatable metrics (e.g., total sales, average price, count of users)
-          that are used for calculations and quantitative analysis in your queries.
+kind: tools
+name: get_measures
+type: looker-get-measures
+source: looker-source
+description: |
+  This tool retrieves a list of measures defined within a specific Looker explore.
+  Measures are aggregatable metrics (e.g., total sales, average price, count of users)
+  that are used for calculations and quantitative analysis in your queries.
 
-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+  Parameters:
+  - model_name (required): The name of the LookML model, obtained from `get_models`.
+  - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
 
-          Output Details:
-          - If a measure includes a `suggestions` field, its contents are valid values
-            that can be used directly as filters for that measure.
-          - If a `suggest_explore` and `suggest_dimension` are provided, you can query
-            that specified explore and dimension to retrieve a list of valid filter values.
+  Output Details:
+  - If a measure includes a `suggestions` field, its contents are valid values
+    that can be used directly as filters for that measure.
+  - If a `suggest_explore` and `suggest_dimension` are provided, you can query
+    that specified explore and dimension to retrieve a list of valid filter values.
 
 ```
 
@@ -65,6 +65,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-measures".                     |
+| type        |  string  |     true     | Must be "looker-get-measures".                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-models.md b/docs/en/resources/tools/looker/looker-get-models.md
index 81002cf3a2..dbaf456384 100644
--- a/docs/en/resources/tools/looker/looker-get-models.md
+++ b/docs/en/resources/tools/looker/looker-get-models.md
@@ -21,23 +21,23 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_models:
-        kind: looker-get-models
-        source: looker-source
-        description: |
-          This tool retrieves a list of available LookML models in the Looker instance.
-          LookML models define the data structure and relationships that users can query.
-          The output includes details like the model's `name` and `label`, which are
-          essential for subsequent calls to tools like `get_explores` or `query`.
+kind: tools
+name: get_models
+type: looker-get-models
+source: looker-source
+description: |
+  This tool retrieves a list of available LookML models in the Looker instance.
+  LookML models define the data structure and relationships that users can query.
+  The output includes details like the model's `name` and `label`, which are
+  essential for subsequent calls to tools like `get_explores` or `query`.
 
-          This tool takes no parameters.
+  This tool takes no parameters.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-models".                       |
+| type        |  string  |     true     | Must be "looker-get-models".                       |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-parameters.md b/docs/en/resources/tools/looker/looker-get-parameters.md
index f40398568d..bc3413093b 100644
--- a/docs/en/resources/tools/looker/looker-get-parameters.md
+++ b/docs/en/resources/tools/looker/looker-get-parameters.md
@@ -23,20 +23,20 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_parameters:
-        kind: looker-get-parameters
-        source: looker-source
-        description: |
-          This tool retrieves a list of parameters defined within a specific Looker explore.
-          LookML parameters are dynamic input fields that allow users to influence query
-          behavior without directly modifying the underlying LookML. They are often used
-          with `liquid` templating to create flexible dashboards and reports, enabling
-          users to choose dimensions, measures, or other query components at runtime.
+kind: tools
+name: get_parameters
+type: looker-get-parameters
+source: looker-source
+description: |
+  This tool retrieves a list of parameters defined within a specific Looker explore.
+  LookML parameters are dynamic input fields that allow users to influence query
+  behavior without directly modifying the underlying LookML. They are often used
+  with `liquid` templating to create flexible dashboards and reports, enabling
+  users to choose dimensions, measures, or other query components at runtime.
 
-          Parameters:
-          - model_name (required): The name of the LookML model, obtained from `get_models`.
-          - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
+  Parameters:
+  - model_name (required): The name of the LookML model, obtained from `get_models`.
+  - explore_name (required): The name of the explore within the model, obtained from `get_explores`.
 ```
 
 The response is a json array with the following elements:
@@ -60,6 +60,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-parameters".                   |
+| type        |  string  |     true     | Must be "looker-get-parameters".                   |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-project-file.md b/docs/en/resources/tools/looker/looker-get-project-file.md
index 440615efa4..83f23ce08e 100644
--- a/docs/en/resources/tools/looker/looker-get-project-file.md
+++ b/docs/en/resources/tools/looker/looker-get-project-file.md
@@ -21,26 +21,26 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_project_file:
-        kind: looker-get-project-file
-        source: looker-source
-        description: |
-          This tool retrieves the raw content of a specific LookML file from within a project.
+kind: tools
+name: get_project_file
+type: looker-get-project-file
+source: looker-source
+description: |
+  This tool retrieves the raw content of a specific LookML file from within a project.
 
-          Parameters:
-          - project_id (required): The unique ID of the LookML project, obtained from `get_projects`.
-          - file_path (required): The path to the LookML file within the project,
-            typically obtained from `get_project_files`.
+  Parameters:
+  - project_id (required): The unique ID of the LookML project, obtained from `get_projects`.
+  - file_path (required): The path to the LookML file within the project,
+    typically obtained from `get_project_files`.
 
-          Output:
-          The raw text content of the specified LookML file.
+  Output:
+  The raw text content of the specified LookML file.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-project-file".                 |
+| type        |  string  |     true     | Must be "looker-get-project-file".                 |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-project-files.md b/docs/en/resources/tools/looker/looker-get-project-files.md
index 48ea273228..dc28e61e66 100644
--- a/docs/en/resources/tools/looker/looker-get-project-files.md
+++ b/docs/en/resources/tools/looker/looker-get-project-files.md
@@ -21,26 +21,26 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_project_files:
-        kind: looker-get-project-files
-        source: looker-source
-        description: |
-          This tool retrieves a list of all LookML files within a specified project,
-          providing details about each file.
+kind: tools
+name: get_project_files
+type: looker-get-project-files
+source: looker-source
+description: |
+  This tool retrieves a list of all LookML files within a specified project,
+  providing details about each file.
 
-          Parameters:
-          - project_id (required): The unique ID of the LookML project, obtained from `get_projects`.
+  Parameters:
+  - project_id (required): The unique ID of the LookML project, obtained from `get_projects`.
 
-          Output:
-          A JSON array of objects, each representing a LookML file and containing
-          details such as `path`, `id`, `type`, and `git_status`.
+  Output:
+  A JSON array of objects, each representing a LookML file and containing
+  details such as `path`, `id`, `type`, and `git_status`.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-project-files".                |
+| type        |  string  |     true     | Must be "looker-get-project-files".                |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-get-projects.md b/docs/en/resources/tools/looker/looker-get-projects.md
index 7c582eeae0..f6ad8def95 100644
--- a/docs/en/resources/tools/looker/looker-get-projects.md
+++ b/docs/en/resources/tools/looker/looker-get-projects.md
@@ -21,27 +21,27 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    get_projects:
-        kind: looker-get-projects
-        source: looker-source
-        description: |
-          This tool retrieves a list of all LookML projects available on the Looker instance.
-          It is useful for identifying projects before performing actions like retrieving
-          project files or making modifications.
+kind: tools
+name: get_projects
+type: looker-get-projects
+source: looker-source
+description: |
+  This tool retrieves a list of all LookML projects available on the Looker instance.
+  It is useful for identifying projects before performing actions like retrieving
+  project files or making modifications.
 
-          Parameters:
-          This tool takes no parameters.
+  Parameters:
+  This tool takes no parameters.
 
-          Output:
-          A JSON array of objects, each containing the `project_id` and `project_name`
-          for a LookML project.
+  Output:
+  A JSON array of objects, each containing the `project_id` and `project_name`
+  for a LookML project.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-get-projects".                     |
+| type        |  string  |     true     | Must be "looker-get-projects".                     |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-health-analyze.md b/docs/en/resources/tools/looker/looker-health-analyze.md
index bc44d3f301..59b2575c44 100644
--- a/docs/en/resources/tools/looker/looker-health-analyze.md
+++ b/docs/en/resources/tools/looker/looker-health-analyze.md
@@ -37,29 +37,29 @@ instance. The `action` parameter selects the type of analysis to perform:
 ## Example
 
 ```yaml
-tools:
-  health_analyze:
-    kind: looker-health-analyze
-    source: looker-source
-    description: |
-      This tool calculates the usage statistics for Looker projects, models, and explores.
+kind: tools
+name: health_analyze
+type: looker-health-analyze
+source: looker-source
+description: |
+  This tool calculates the usage statistics for Looker projects, models, and explores.
 
-      Parameters:
-      - action (required): The type of resource to analyze. Can be `"projects"`, `"models"`, or `"explores"`.
-      - project (optional): The specific project ID to analyze.
-      - model (optional): The specific model name to analyze. Requires `project` if used without `explore`.
-      - explore (optional): The specific explore name to analyze. Requires `model` if used.
-      - timeframe (optional): The lookback period in days for usage data. Defaults to `90` days.
-      - min_queries (optional): The minimum number of queries for a resource to be considered active. Defaults to `1`.
+  Parameters:
+  - action (required): The type of resource to analyze. Can be `"projects"`, `"models"`, or `"explores"`.
+  - project (optional): The specific project ID to analyze.
+  - model (optional): The specific model name to analyze. Requires `project` if used without `explore`.
+  - explore (optional): The specific explore name to analyze. Requires `model` if used.
+  - timeframe (optional): The lookback period in days for usage data. Defaults to `90` days.
+  - min_queries (optional): The minimum number of queries for a resource to be considered active. Defaults to `1`.
 
-      Output:
-      The result is a JSON object containing usage metrics for the specified resources.
+  Output:
+  The result is a JSON object containing usage metrics for the specified resources.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-health-analyze"                    |
+| type        |  string  |     true     | Must be "looker-health-analyze"                    |
 | source      |  string  |     true     | Looker source name                                 |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-health-pulse.md b/docs/en/resources/tools/looker/looker-health-pulse.md
index ccbc05be34..1ef1ab6e14 100644
--- a/docs/en/resources/tools/looker/looker-health-pulse.md
+++ b/docs/en/resources/tools/looker/looker-health-pulse.md
@@ -44,33 +44,33 @@ The `looker-health-pulse` tool performs health checks on a Looker instance. The
 ## Example
 
 ```yaml
-tools:
-  health_pulse:
-    kind: looker-health-pulse
-    source: looker-source
-    description: |
-      This tool performs various health checks on a Looker instance.
+kind: tools
+name: health_pulse
+type: looker-health-pulse
+source: looker-source
+description: |
+  This tool performs various health checks on a Looker instance.
 
-      Parameters:
-      - action (required): Specifies the type of health check to perform.
-        Choose one of the following:
-        - `check_db_connections`: Verifies database connectivity.
-        - `check_dashboard_performance`: Assesses dashboard loading performance.
-        - `check_dashboard_errors`: Identifies errors within dashboards.
-        - `check_explore_performance`: Evaluates explore query performance.
-        - `check_schedule_failures`: Reports on failed scheduled deliveries.
-        - `check_legacy_features`: Checks for the usage of legacy features.
+  Parameters:
+  - action (required): Specifies the type of health check to perform.
+    Choose one of the following:
+    - `check_db_connections`: Verifies database connectivity.
+    - `check_dashboard_performance`: Assesses dashboard loading performance.
+    - `check_dashboard_errors`: Identifies errors within dashboards.
+    - `check_explore_performance`: Evaluates explore query performance.
+    - `check_schedule_failures`: Reports on failed scheduled deliveries.
+    - `check_legacy_features`: Checks for the usage of legacy features.
 
-      Note on `check_legacy_features`:
-      This action is exclusively available in Looker Core instances. If invoked
-      on a non-Looker Core instance, it will return a notice rather than an error.
-      This notice should be considered normal behavior and not an indication of an issue.
+  Note on `check_legacy_features`:
+  This action is exclusively available in Looker Core instances. If invoked
+  on a non-Looker Core instance, it will return a notice rather than an error.
+  This notice should be considered normal behavior and not an indication of an issue.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-health-pulse"                      |
+| type        |  string  |     true     | Must be "looker-health-pulse"                      |
 | source      |  string  |     true     | Looker source name                                 |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-health-vacuum.md b/docs/en/resources/tools/looker/looker-health-vacuum.md
index f4d635ccc5..dc9ec7545c 100644
--- a/docs/en/resources/tools/looker/looker-health-vacuum.md
+++ b/docs/en/resources/tools/looker/looker-health-vacuum.md
@@ -34,28 +34,28 @@ Identify unnused fields (*in this case, less than 1 query in the last 20 days*)
 and joins in the `order_items` explore and `thelook` model
 
 ```yaml
-tools:
-  health_vacuum:
-    kind: looker-health-vacuum
-    source: looker-source
-    description: |
-      This tool identifies and suggests LookML models or explores that can be
-      safely removed due to inactivity or low usage.
+kind: tools
+name: health_vacuum
+type: looker-health-vacuum
+source: looker-source
+description: |
+  This tool identifies and suggests LookML models or explores that can be
+  safely removed due to inactivity or low usage.
 
-      Parameters:
-      - action (required): The type of resource to analyze for removal candidates. Can be `"models"` or `"explores"`.
-      - project (optional): The specific project ID to consider.
-      - model (optional): The specific model name to consider. Requires `project` if used without `explore`.
-      - explore (optional): The specific explore name to consider. Requires `model` if used.
-      - timeframe (optional): The lookback period in days to assess usage. Defaults to `90` days.
-      - min_queries (optional): The minimum number of queries for a resource to be considered active. Defaults to `1`.
+  Parameters:
+  - action (required): The type of resource to analyze for removal candidates. Can be `"models"` or `"explores"`.
+  - project (optional): The specific project ID to consider.
+  - model (optional): The specific model name to consider. Requires `project` if used without `explore`.
+  - explore (optional): The specific explore name to consider. Requires `model` if used.
+  - timeframe (optional): The lookback period in days to assess usage. Defaults to `90` days.
+  - min_queries (optional): The minimum number of queries for a resource to be considered active. Defaults to `1`.
 
-      Output:
-      A JSON array of objects, each representing a model or explore that is a candidate for deletion due to low usage.
+  Output:
+  A JSON array of objects, each representing a model or explore that is a candidate for deletion due to low usage.
 ```
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-health-vacuum"                     |
+| type        |  string  |     true     | Must be "looker-health-vacuum"                     |
 | source      |  string  |     true     | Looker source name                                 |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-make-dashboard.md b/docs/en/resources/tools/looker/looker-make-dashboard.md
index f8112bcd5d..3e7dc03dda 100644
--- a/docs/en/resources/tools/looker/looker-make-dashboard.md
+++ b/docs/en/resources/tools/looker/looker-make-dashboard.md
@@ -27,30 +27,30 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    make_dashboard:
-        kind: looker-make-dashboard
-        source: looker-source
-        description: |
-          This tool creates a new, empty dashboard in Looker. Dashboards are stored
-          in the user's personal folder, and the dashboard name must be unique.
-          After creation, use `add_dashboard_filter` to add filters and
-          `add_dashboard_element` to add content tiles.
+kind: tools
+name: make_dashboard
+type: looker-make-dashboard
+source: looker-source
+description: |
+  This tool creates a new, empty dashboard in Looker. Dashboards are stored
+  in the user's personal folder, and the dashboard name must be unique.
+  After creation, use `add_dashboard_filter` to add filters and
+  `add_dashboard_element` to add content tiles.
 
-          Required Parameters:
-          - title (required): A unique title for the new dashboard.
-          - description (required): A brief description of the dashboard's purpose.
+  Required Parameters:
+  - title (required): A unique title for the new dashboard.
+  - description (required): A brief description of the dashboard's purpose.
 
-          Output:
-          A JSON object containing a link (`url`) to the newly created dashboard and
-          its unique `id`. This `dashboard_id` is crucial for subsequent calls to
-          `add_dashboard_filter` and `add_dashboard_element`.
+  Output:
+  A JSON object containing a link (`url`) to the newly created dashboard and
+  its unique `id`. This `dashboard_id` is crucial for subsequent calls to
+  `add_dashboard_filter` and `add_dashboard_element`.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-make-dashboard"                    |
+| type        |  string  |     true     | Must be "looker-make-dashboard"                    |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-make-look.md b/docs/en/resources/tools/looker/looker-make-look.md
index 9c69898437..58e8b09e0d 100644
--- a/docs/en/resources/tools/looker/looker-make-look.md
+++ b/docs/en/resources/tools/looker/looker-make-look.md
@@ -36,35 +36,35 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    make_look:
-        kind: looker-make-look
-        source: looker-source
-        description: |
-          This tool creates a new Look (saved query with visualization) in Looker.
-          The Look will be saved in the user's personal folder, and its name must be unique.
+kind: tools
+name: make_look
+type: looker-make-look
+source: looker-source
+description: |
+  This tool creates a new Look (saved query with visualization) in Looker.
+  The Look will be saved in the user's personal folder, and its name must be unique.
 
-          Required Parameters:
-          - title: A unique title for the new Look.
-          - description: A brief description of the Look's purpose.
-          - model_name: The name of the LookML model (from `get_models`).
-          - explore_name: The name of the explore (from `get_explores`).
-          - fields: A list of field names (dimensions, measures, filters, or parameters) to include in the query.
+  Required Parameters:
+  - title: A unique title for the new Look.
+  - description: A brief description of the Look's purpose.
+  - model_name: The name of the LookML model (from `get_models`).
+  - explore_name: The name of the explore (from `get_explores`).
+  - fields: A list of field names (dimensions, measures, filters, or parameters) to include in the query.
 
-          Optional Parameters:
-          - pivots, filters, sorts, limit, query_timezone: These parameters are identical
-            to those described for the `query` tool.
-          - vis_config: A JSON object defining the visualization settings for the Look.
-            The structure and options are the same as for the `query_url` tool's `vis_config`.
+  Optional Parameters:
+  - pivots, filters, sorts, limit, query_timezone: These parameters are identical
+    to those described for the `query` tool.
+  - vis_config: A JSON object defining the visualization settings for the Look.
+    The structure and options are the same as for the `query_url` tool's `vis_config`.
 
-          Output:
-          A JSON object containing a link (`url`) to the newly created Look, along with its `id` and `slug`.
+  Output:
+  A JSON object containing a link (`url`) to the newly created Look, along with its `id` and `slug`.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-make-look"                         |
+| type        |  string  |     true     | Must be "looker-make-look"                         |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-query-sql.md b/docs/en/resources/tools/looker/looker-query-sql.md
index 064464ea5d..ca61df1007 100644
--- a/docs/en/resources/tools/looker/looker-query-sql.md
+++ b/docs/en/resources/tools/looker/looker-query-sql.md
@@ -36,28 +36,28 @@ to find MCP Toolbox queries.
 ## Example
 
 ```yaml
-tools:
-    query_sql:
-        kind: looker-query-sql
-        source: looker-source
-        description: |
-          This tool generates the underlying SQL query that Looker would execute
-          against the database for a given set of parameters. It is useful for
-          understanding how Looker translates a request into SQL.
+kind: tools
+name: query_sql
+type: looker-query-sql
+source: looker-source
+description: |
+  This tool generates the underlying SQL query that Looker would execute
+  against the database for a given set of parameters. It is useful for
+  understanding how Looker translates a request into SQL.
 
-          Parameters:
-          All parameters for this tool are identical to those of the `query` tool.
-          This includes `model_name`, `explore_name`, `fields` (required),
-          and optional parameters like `pivots`, `filters`, `sorts`, `limit`, and `query_timezone`.
+  Parameters:
+  All parameters for this tool are identical to those of the `query` tool.
+  This includes `model_name`, `explore_name`, `fields` (required),
+  and optional parameters like `pivots`, `filters`, `sorts`, `limit`, and `query_timezone`.
 
-          Output:
-          The result of this tool is the raw SQL text.
+  Output:
+  The result of this tool is the raw SQL text.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-query-sql"                         |
+| type        |  string  |     true     | Must be "looker-query-sql"                         |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-query-url.md b/docs/en/resources/tools/looker/looker-query-url.md
index af1f138509..b883a9c5d1 100644
--- a/docs/en/resources/tools/looker/looker-query-url.md
+++ b/docs/en/resources/tools/looker/looker-query-url.md
@@ -32,465 +32,465 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    query_url:
-        kind: looker-query-url
-        source: looker-source
-        description: |
-          This tool generates a shareable URL for a Looker query, allowing users to
-          explore the query further within the Looker UI. It returns the generated URL,
-          along with the `query_id` and `slug`.
+kind: tools
+name: query_url
+type: looker-query-url
+source: looker-source
+description: |
+  This tool generates a shareable URL for a Looker query, allowing users to
+  explore the query further within the Looker UI. It returns the generated URL,
+  along with the `query_id` and `slug`.
 
-          Parameters:
-          All query parameters (e.g., `model_name`, `explore_name`, `fields`, `pivots`,
-          `filters`, `sorts`, `limit`, `query_timezone`) are the same as the `query` tool.
+  Parameters:
+  All query parameters (e.g., `model_name`, `explore_name`, `fields`, `pivots`,
+  `filters`, `sorts`, `limit`, `query_timezone`) are the same as the `query` tool.
 
-          Additionally, it accepts an optional `vis_config` parameter:
-          - vis_config (optional): A JSON object that controls the default visualization
-            settings for the generated query.
+  Additionally, it accepts an optional `vis_config` parameter:
+  - vis_config (optional): A JSON object that controls the default visualization
+    settings for the generated query.
 
-          vis_config Details:
-          The `vis_config` object supports a wide range of properties for various chart types.
-          Here are some notes on making visualizations.
+  vis_config Details:
+  The `vis_config` object supports a wide range of properties for various chart types.
+  Here are some notes on making visualizations.
 
-          ### Cartesian Charts (Area, Bar, Column, Line, Scatter)
+  ### Cartesian Charts (Area, Bar, Column, Line, Scatter)
 
-          These chart types share a large number of configuration options.
+  These chart types share a large number of configuration options.
 
-          **General**
-          *   `type`: The type of visualization (`looker_area`, `looker_bar`, `looker_column`, `looker_line`, `looker_scatter`).
-          *   `series_types`: Override the chart type for individual series.
-          *   `show_view_names`: Display view names in labels and tooltips (`true`/`false`).
-          *   `series_labels`: Provide custom names for series.
+  **General**
+  *   `type`: The type of visualization (`looker_area`, `looker_bar`, `looker_column`, `looker_line`, `looker_scatter`).
+  *   `series_types`: Override the chart type for individual series.
+  *   `show_view_names`: Display view names in labels and tooltips (`true`/`false`).
+  *   `series_labels`: Provide custom names for series.
 
-          **Styling & Colors**
-          *   `colors`: An array of color values to be used for the chart series.
-          *   `series_colors`: A mapping of series names to specific color values.
-          *   `color_application`: Advanced controls for color palette application (collection, palette, reverse, etc.).
-          *   `font_size`: Font size for labels (e.g., '12px').
+  **Styling & Colors**
+  *   `colors`: An array of color values to be used for the chart series.
+  *   `series_colors`: A mapping of series names to specific color values.
+  *   `color_application`: Advanced controls for color palette application (collection, palette, reverse, etc.).
+  *   `font_size`: Font size for labels (e.g., '12px').
 
-          **Legend**
-          *   `hide_legend`: Show or hide the chart legend (`true`/`false`).
-          *   `legend_position`: Placement of the legend (`'center'`, `'left'`, `'right'`).
+  **Legend**
+  *   `hide_legend`: Show or hide the chart legend (`true`/`false`).
+  *   `legend_position`: Placement of the legend (`'center'`, `'left'`, `'right'`).
 
-          **Axes**
-          *   `swap_axes`: Swap the X and Y axes (`true`/`false`).
-          *   `x_axis_scale`: Scale of the x-axis (`'auto'`, `'ordinal'`, `'linear'`, `'time'`).
-          *   `x_axis_reversed`, `y_axis_reversed`: Reverse the direction of an axis (`true`/`false`).
-          *   `x_axis_gridlines`, `y_axis_gridlines`: Display gridlines for an axis (`true`/`false`).
-          *   `show_x_axis_label`, `show_y_axis_label`: Show or hide the axis title (`true`/`false`).
-          *   `show_x_axis_ticks`, `show_y_axis_ticks`: Show or hide axis tick marks (`true`/`false`).
-          *   `x_axis_label`, `y_axis_label`: Set a custom title for an axis.
-          *   `x_axis_datetime_label`: A format string for datetime labels on the x-axis (e.g., `'%Y-%m'`).
-          *   `x_padding_left`, `x_padding_right`: Adjust padding on the ends of the x-axis.
-          *   `x_axis_label_rotation`, `x_axis_label_rotation_bar`: Set rotation for x-axis labels.
-          *   `x_axis_zoom`, `y_axis_zoom`: Enable zooming on an axis (`true`/`false`).
-          *   `y_axes`: An array of configuration objects for multiple y-axes.
+  **Axes**
+  *   `swap_axes`: Swap the X and Y axes (`true`/`false`).
+  *   `x_axis_scale`: Scale of the x-axis (`'auto'`, `'ordinal'`, `'linear'`, `'time'`).
+  *   `x_axis_reversed`, `y_axis_reversed`: Reverse the direction of an axis (`true`/`false`).
+  *   `x_axis_gridlines`, `y_axis_gridlines`: Display gridlines for an axis (`true`/`false`).
+  *   `show_x_axis_label`, `show_y_axis_label`: Show or hide the axis title (`true`/`false`).
+  *   `show_x_axis_ticks`, `show_y_axis_ticks`: Show or hide axis tick marks (`true`/`false`).
+  *   `x_axis_label`, `y_axis_label`: Set a custom title for an axis.
+  *   `x_axis_datetime_label`: A format string for datetime labels on the x-axis (e.g., `'%Y-%m'`).
+  *   `x_padding_left`, `x_padding_right`: Adjust padding on the ends of the x-axis.
+  *   `x_axis_label_rotation`, `x_axis_label_rotation_bar`: Set rotation for x-axis labels.
+  *   `x_axis_zoom`, `y_axis_zoom`: Enable zooming on an axis (`true`/`false`).
+  *   `y_axes`: An array of configuration objects for multiple y-axes.
 
-          **Data & Series**
-          *   `stacking`: How to stack series (`''` for none, `'normal'`, `'percent'`).
-          *   `ordering`: Order of series in a stack (`'none'`, etc.).
-          *   `limit_displayed_rows`: Enable or disable limiting the number of rows displayed (`true`/`false`).
-          *   `limit_displayed_rows_values`: Configuration for the row limit (e.g., `{ "first_last": "first", "show_hide": "show", "num_rows": 10 }`).
-          *   `discontinuous_nulls`: How to render null values in line charts (`true`/`false`).
-          *   `point_style`: Style for points on line and area charts (`'none'`, `'circle'`, `'circle_outline'`).
-          *   `series_point_styles`: Override point styles for individual series.
-          *   `interpolation`: Line interpolation style (`'linear'`, `'monotone'`, `'step'`, etc.).
-          *   `show_value_labels`: Display values on data points (`true`/`false`).
-          *   `label_value_format`: A format string for value labels.
-          *   `show_totals_labels`: Display total labels on stacked charts (`true`/`false`).
-          *   `totals_color`: Color for total labels.
-          *   `show_silhouette`: Display a "silhouette" of hidden series in stacked charts (`true`/`false`).
-          *   `hidden_series`: An array of series names to hide from the visualization.
+  **Data & Series**
+  *   `stacking`: How to stack series (`''` for none, `'normal'`, `'percent'`).
+  *   `ordering`: Order of series in a stack (`'none'`, etc.).
+  *   `limit_displayed_rows`: Enable or disable limiting the number of rows displayed (`true`/`false`).
+  *   `limit_displayed_rows_values`: Configuration for the row limit (e.g., `{ "first_last": "first", "show_hide": "show", "num_rows": 10 }`).
+  *   `discontinuous_nulls`: How to render null values in line charts (`true`/`false`).
+  *   `point_style`: Style for points on line and area charts (`'none'`, `'circle'`, `'circle_outline'`).
+  *   `series_point_styles`: Override point styles for individual series.
+  *   `interpolation`: Line interpolation style (`'linear'`, `'monotone'`, `'step'`, etc.).
+  *   `show_value_labels`: Display values on data points (`true`/`false`).
+  *   `label_value_format`: A format string for value labels.
+  *   `show_totals_labels`: Display total labels on stacked charts (`true`/`false`).
+  *   `totals_color`: Color for total labels.
+  *   `show_silhouette`: Display a "silhouette" of hidden series in stacked charts (`true`/`false`).
+  *   `hidden_series`: An array of series names to hide from the visualization.
 
-          **Scatter/Bubble Specific**
-          *   `size_by_field`: The field used to determine the size of bubbles.
-          *   `color_by_field`: The field used to determine the color of bubbles.
-          *   `plot_size_by_field`: Whether to display the size-by field in the legend.
-          *   `cluster_points`: Group nearby points into clusters (`true`/`false`).
-          *   `quadrants_enabled`: Display quadrants on the chart (`true`/`false`).
-          *   `quadrant_properties`: Configuration for quadrant labels and colors.
-          *   `custom_quadrant_value_x`, `custom_quadrant_value_y`: Set quadrant boundaries as a percentage.
-          *   `custom_quadrant_point_x`, `custom_quadrant_point_y`: Set quadrant boundaries to a specific value.
+  **Scatter/Bubble Specific**
+  *   `size_by_field`: The field used to determine the size of bubbles.
+  *   `color_by_field`: The field used to determine the color of bubbles.
+  *   `plot_size_by_field`: Whether to display the size-by field in the legend.
+  *   `cluster_points`: Group nearby points into clusters (`true`/`false`).
+  *   `quadrants_enabled`: Display quadrants on the chart (`true`/`false`).
+  *   `quadrant_properties`: Configuration for quadrant labels and colors.
+  *   `custom_quadrant_value_x`, `custom_quadrant_value_y`: Set quadrant boundaries as a percentage.
+  *   `custom_quadrant_point_x`, `custom_quadrant_point_y`: Set quadrant boundaries to a specific value.
 
-          **Miscellaneous**
-          *   `reference_lines`: Configuration for displaying reference lines.
-          *   `trend_lines`: Configuration for displaying trend lines.
-          *   `trellis`: Configuration for creating trellis (small multiple) charts.
-          *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering interactions.
+  **Miscellaneous**
+  *   `reference_lines`: Configuration for displaying reference lines.
+  *   `trend_lines`: Configuration for displaying trend lines.
+  *   `trellis`: Configuration for creating trellis (small multiple) charts.
+  *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering interactions.
 
-          ### Boxplot
+  ### Boxplot
 
-          *   Inherits most of the Cartesian chart options.
-          *   `type`: Must be `looker_boxplot`.
+  *   Inherits most of the Cartesian chart options.
+  *   `type`: Must be `looker_boxplot`.
 
-          ### Funnel
+  ### Funnel
 
-          *   `type`: Must be `looker_funnel`.
-          *   `orientation`: How data is read (`'automatic'`, `'dataInRows'`, `'dataInColumns'`).
-          *   `percentType`: How percentages are calculated (`'percentOfMaxValue'`, `'percentOfPriorRow'`).
-          *   `labelPosition`, `valuePosition`, `percentPosition`: Placement of labels (`'left'`, `'right'`, `'inline'`, `'hidden'`).
-          *   `labelColor`, `labelColorEnabled`: Set a custom color for labels.
-          *   `labelOverlap`: Allow labels to overlap (`true`/`false`).
-          *   `barColors`: An array of colors for the funnel steps.
-          *   `color_application`: Advanced color palette controls.
-          *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering.
+  *   `type`: Must be `looker_funnel`.
+  *   `orientation`: How data is read (`'automatic'`, `'dataInRows'`, `'dataInColumns'`).
+  *   `percentType`: How percentages are calculated (`'percentOfMaxValue'`, `'percentOfPriorRow'`).
+  *   `labelPosition`, `valuePosition`, `percentPosition`: Placement of labels (`'left'`, `'right'`, `'inline'`, `'hidden'`).
+  *   `labelColor`, `labelColorEnabled`: Set a custom color for labels.
+  *   `labelOverlap`: Allow labels to overlap (`true`/`false`).
+  *   `barColors`: An array of colors for the funnel steps.
+  *   `color_application`: Advanced color palette controls.
+  *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering.
 
-          ### Pie / Donut
+  ### Pie / Donut
 
-          *   `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'`).
-          *   `start_angle`, `end_angle`: The start and end angles of the pie chart.
-          *   `inner_radius`: The inner radius, used to create a donut chart.
-          *   `series_colors`, `series_labels`: Override colors and labels for specific slices.
-          *   `color_application`: Advanced color palette controls.
-          *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering.
-          *   `advanced_vis_config`: A string containing JSON for advanced Highcharts configuration.
+  *   `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'`).
+  *   `start_angle`, `end_angle`: The start and end angles of the pie chart.
+  *   `inner_radius`: The inner radius, used to create a donut chart.
+  *   `series_colors`, `series_labels`: Override colors and labels for specific slices.
+  *   `color_application`: Advanced color palette controls.
+  *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering.
+  *   `advanced_vis_config`: A string containing JSON for advanced Highcharts configuration.
 
-          ### Waterfall
+  ### Waterfall
 
-          *   Inherits most of the Cartesian chart options.
-          *   `type`: Must be `looker_waterfall`.
-          *   `up_color`: Color for positive (increasing) values.
-          *   `down_color`: Color for negative (decreasing) values.
-          *   `total_color`: Color for the total bar.
+  *   Inherits most of the Cartesian chart options.
+  *   `type`: Must be `looker_waterfall`.
+  *   `up_color`: Color for positive (increasing) values.
+  *   `down_color`: Color for negative (decreasing) values.
+  *   `total_color`: Color for the total bar.
 
-          ### Word Cloud
+  ### Word Cloud
 
-          *   `type`: Must be `looker_wordcloud`.
-          *   `rotation`: Enable random word rotation (`true`/`false`).
-          *   `colors`: An array of colors for the words.
-          *   `color_application`: Advanced color palette controls.
-          *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering.
+  *   `type`: Must be `looker_wordcloud`.
+  *   `rotation`: Enable random word rotation (`true`/`false`).
+  *   `colors`: An array of colors for the words.
+  *   `color_application`: Advanced color palette controls.
+  *   `crossfilterEnabled`, `crossfilters`: Configuration for cross-filtering.
 
-          These are some sample vis_config settings.
+  These are some sample vis_config settings.
 
-          A bar chart -
-          {{
-            "defaults_version": 1,
-            "label_density": 25,
-            "legend_position": "center",
-            "limit_displayed_rows": false,
-            "ordering": "none",
-            "plot_size_by_field": false,
-            "point_style": "none",
-            "show_null_labels": false,
-            "show_silhouette": false,
-            "show_totals_labels": false,
-            "show_value_labels": false,
-            "show_view_names": false,
-            "show_x_axis_label": true,
-            "show_x_axis_ticks": true,
-            "show_y_axis_labels": true,
-            "show_y_axis_ticks": true,
-            "stacking": "normal",
-            "totals_color": "#808080",
-            "trellis": "",
-            "type": "looker_bar",
-            "x_axis_gridlines": false,
-            "x_axis_reversed": false,
-            "x_axis_scale": "auto",
-            "x_axis_zoom": true,
-            "y_axis_combined": true,
-            "y_axis_gridlines": true,
-            "y_axis_reversed": false,
-            "y_axis_scale_mode": "linear",
-            "y_axis_tick_density": "default",
-            "y_axis_tick_density_custom": 5,
-            "y_axis_zoom": true
-          }}
+  A bar chart -
+  {{
+    "defaults_version": 1,
+    "label_density": 25,
+    "legend_position": "center",
+    "limit_displayed_rows": false,
+    "ordering": "none",
+    "plot_size_by_field": false,
+    "point_style": "none",
+    "show_null_labels": false,
+    "show_silhouette": false,
+    "show_totals_labels": false,
+    "show_value_labels": false,
+    "show_view_names": false,
+    "show_x_axis_label": true,
+    "show_x_axis_ticks": true,
+    "show_y_axis_labels": true,
+    "show_y_axis_ticks": true,
+    "stacking": "normal",
+    "totals_color": "#808080",
+    "trellis": "",
+    "type": "looker_bar",
+    "x_axis_gridlines": false,
+    "x_axis_reversed": false,
+    "x_axis_scale": "auto",
+    "x_axis_zoom": true,
+    "y_axis_combined": true,
+    "y_axis_gridlines": true,
+    "y_axis_reversed": false,
+    "y_axis_scale_mode": "linear",
+    "y_axis_tick_density": "default",
+    "y_axis_tick_density_custom": 5,
+    "y_axis_zoom": true
+  }}
 
-          A column chart with an option advanced_vis_config -
-          {{
-            "advanced_vis_config": "{ chart: { type: 'pie', spacingBottom: 50, spacingLeft: 50, spacingRight: 50, spacingTop: 50, }, legend: { enabled: false, }, plotOptions: { pie: { dataLabels: { enabled: true, format: '\u003cb\u003e{key}\u003c/b\u003e\u003cspan style=\"font-weight: normal\"\u003e - {percentage:.2f}%\u003c/span\u003e', }, showInLegend: false, }, }, series: [], }",
-            "colors": [
-              "grey"
-            ],
-            "defaults_version": 1,
-            "hidden_fields": [],
-            "label_density": 25,
-            "legend_position": "center",
-            "limit_displayed_rows": false,
-            "note_display": "below",
-            "note_state": "collapsed",
-            "note_text": "Unsold inventory only",
-            "ordering": "none",
-            "plot_size_by_field": false,
-            "point_style": "none",
-            "series_colors": {},
-            "show_null_labels": false,
-            "show_silhouette": false,
-            "show_totals_labels": false,
-            "show_value_labels": true,
-            "show_view_names": false,
-            "show_x_axis_label": true,
-            "show_x_axis_ticks": true,
-            "show_y_axis_labels": true,
-            "show_y_axis_ticks": true,
-            "stacking": "normal",
-            "totals_color": "#808080",
-            "trellis": "",
-            "type": "looker_column",
-            "x_axis_gridlines": false,
-            "x_axis_reversed": false,
-            "x_axis_scale": "auto",
-            "x_axis_zoom": true,
-            "y_axes": [],
-            "y_axis_combined": true,
-            "y_axis_gridlines": true,
-            "y_axis_reversed": false,
-            "y_axis_scale_mode": "linear",
-            "y_axis_tick_density": "default",
-            "y_axis_tick_density_custom": 5,
-            "y_axis_zoom": true
-          }}
+  A column chart with an option advanced_vis_config -
+  {{
+    "advanced_vis_config": "{ chart: { type: 'pie', spacingBottom: 50, spacingLeft: 50, spacingRight: 50, spacingTop: 50, }, legend: { enabled: false, }, plotOptions: { pie: { dataLabels: { enabled: true, format: '\u003cb\u003e{key}\u003c/b\u003e\u003cspan style=\"font-weight: normal\"\u003e - {percentage:.2f}%\u003c/span\u003e', }, showInLegend: false, }, }, series: [], }",
+    "colors": [
+      "grey"
+    ],
+    "defaults_version": 1,
+    "hidden_fields": [],
+    "label_density": 25,
+    "legend_position": "center",
+    "limit_displayed_rows": false,
+    "note_display": "below",
+    "note_state": "collapsed",
+    "note_text": "Unsold inventory only",
+    "ordering": "none",
+    "plot_size_by_field": false,
+    "point_style": "none",
+    "series_colors": {},
+    "show_null_labels": false,
+    "show_silhouette": false,
+    "show_totals_labels": false,
+    "show_value_labels": true,
+    "show_view_names": false,
+    "show_x_axis_label": true,
+    "show_x_axis_ticks": true,
+    "show_y_axis_labels": true,
+    "show_y_axis_ticks": true,
+    "stacking": "normal",
+    "totals_color": "#808080",
+    "trellis": "",
+    "type": "looker_column",
+    "x_axis_gridlines": false,
+    "x_axis_reversed": false,
+    "x_axis_scale": "auto",
+    "x_axis_zoom": true,
+    "y_axes": [],
+    "y_axis_combined": true,
+    "y_axis_gridlines": true,
+    "y_axis_reversed": false,
+    "y_axis_scale_mode": "linear",
+    "y_axis_tick_density": "default",
+    "y_axis_tick_density_custom": 5,
+    "y_axis_zoom": true
+  }}
 
-          A line chart -
-          {{
-            "defaults_version": 1,
-            "hidden_pivots": {},
-            "hidden_series": [],
-            "interpolation": "linear",
-            "label_density": 25,
-            "legend_position": "center",
-            "limit_displayed_rows": false,
-            "plot_size_by_field": false,
-            "point_style": "none",
-            "series_types": {},
-            "show_null_points": true,
-            "show_value_labels": false,
-            "show_view_names": false,
-            "show_x_axis_label": true,
-            "show_x_axis_ticks": true,
-            "show_y_axis_labels": true,
-            "show_y_axis_ticks": true,
-            "stacking": "",
-            "trellis": "",
-            "type": "looker_line",
-            "x_axis_gridlines": false,
-            "x_axis_reversed": false,
-            "x_axis_scale": "auto",
-            "y_axis_combined": true,
-            "y_axis_gridlines": true,
-            "y_axis_reversed": false,
-            "y_axis_scale_mode": "linear",
-            "y_axis_tick_density": "default",
-            "y_axis_tick_density_custom": 5
-          }}
+  A line chart -
+  {{
+    "defaults_version": 1,
+    "hidden_pivots": {},
+    "hidden_series": [],
+    "interpolation": "linear",
+    "label_density": 25,
+    "legend_position": "center",
+    "limit_displayed_rows": false,
+    "plot_size_by_field": false,
+    "point_style": "none",
+    "series_types": {},
+    "show_null_points": true,
+    "show_value_labels": false,
+    "show_view_names": false,
+    "show_x_axis_label": true,
+    "show_x_axis_ticks": true,
+    "show_y_axis_labels": true,
+    "show_y_axis_ticks": true,
+    "stacking": "",
+    "trellis": "",
+    "type": "looker_line",
+    "x_axis_gridlines": false,
+    "x_axis_reversed": false,
+    "x_axis_scale": "auto",
+    "y_axis_combined": true,
+    "y_axis_gridlines": true,
+    "y_axis_reversed": false,
+    "y_axis_scale_mode": "linear",
+    "y_axis_tick_density": "default",
+    "y_axis_tick_density_custom": 5
+  }}
 
-          An area chart -
-          {{
-            "defaults_version": 1,
-            "interpolation": "linear",
-            "label_density": 25,
-            "legend_position": "center",
-            "limit_displayed_rows": false,
-            "plot_size_by_field": false,
-            "point_style": "none",
-            "series_types": {},
-            "show_null_points": true,
-            "show_silhouette": false,
-            "show_totals_labels": false,
-            "show_value_labels": false,
-            "show_view_names": false,
-            "show_x_axis_label": true,
-            "show_x_axis_ticks": true,
-            "show_y_axis_labels": true,
-            "show_y_axis_ticks": true,
-            "stacking": "normal",
-            "totals_color": "#808080",
-            "trellis": "",
-            "type": "looker_area",
-            "x_axis_gridlines": false,
-            "x_axis_reversed": false,
-            "x_axis_scale": "auto",
-            "x_axis_zoom": true,
-            "y_axis_combined": true,
-            "y_axis_gridlines": true,
-            "y_axis_reversed": false,
-            "y_axis_scale_mode": "linear",
-            "y_axis_tick_density": "default",
-            "y_axis_tick_density_custom": 5,
-            "y_axis_zoom": true
-          }}
+  An area chart -
+  {{
+    "defaults_version": 1,
+    "interpolation": "linear",
+    "label_density": 25,
+    "legend_position": "center",
+    "limit_displayed_rows": false,
+    "plot_size_by_field": false,
+    "point_style": "none",
+    "series_types": {},
+    "show_null_points": true,
+    "show_silhouette": false,
+    "show_totals_labels": false,
+    "show_value_labels": false,
+    "show_view_names": false,
+    "show_x_axis_label": true,
+    "show_x_axis_ticks": true,
+    "show_y_axis_labels": true,
+    "show_y_axis_ticks": true,
+    "stacking": "normal",
+    "totals_color": "#808080",
+    "trellis": "",
+    "type": "looker_area",
+    "x_axis_gridlines": false,
+    "x_axis_reversed": false,
+    "x_axis_scale": "auto",
+    "x_axis_zoom": true,
+    "y_axis_combined": true,
+    "y_axis_gridlines": true,
+    "y_axis_reversed": false,
+    "y_axis_scale_mode": "linear",
+    "y_axis_tick_density": "default",
+    "y_axis_tick_density_custom": 5,
+    "y_axis_zoom": true
+  }}
 
-          A scatter plot -
-          {{
-            "cluster_points": false,
-            "custom_quadrant_point_x": 5,
-            "custom_quadrant_point_y": 5,
-            "custom_value_label_column": "",
-            "custom_x_column": "",
-            "custom_y_column": "",
-            "defaults_version": 1,
-            "hidden_fields": [],
-            "hidden_pivots": {},
-            "hidden_points_if_no": [],
-            "hidden_series": [],
-            "interpolation": "linear",
-            "label_density": 25,
-            "legend_position": "center",
-            "limit_displayed_rows": false,
-            "limit_displayed_rows_values": {
-              "first_last": "first",
-              "num_rows": 0,
-              "show_hide": "hide"
-            },
-            "plot_size_by_field": false,
-            "point_style": "circle",
-            "quadrant_properties": {
-              "0": {
-                "color": "",
-                "label": "Quadrant 1"
-              },
-              "1": {
-                "color": "",
-                "label": "Quadrant 2"
-              },
-              "2": {
-                "color": "",
-                "label": "Quadrant 3"
-              },
-              "3": {
-                "color": "",
-                "label": "Quadrant 4"
-              }
-            },
-            "quadrants_enabled": false,
-            "series_labels": {},
-            "series_types": {},
-            "show_null_points": false,
-            "show_value_labels": false,
-            "show_view_names": true,
-            "show_x_axis_label": true,
-            "show_x_axis_ticks": true,
-            "show_y_axis_labels": true,
-            "show_y_axis_ticks": true,
-            "size_by_field": "roi",
-            "stacking": "normal",
-            "swap_axes": true,
-            "trellis": "",
-            "type": "looker_scatter",
-            "x_axis_gridlines": false,
-            "x_axis_reversed": false,
-            "x_axis_scale": "auto",
-            "x_axis_zoom": true,
-            "y_axes": [
-              {
-                "label": "",
-                "orientation": "bottom",
-                "series": [
-                  {
-                    "axisId": "Channel_0 - average_of_roi_first",
-                    "id": "Channel_0 - average_of_roi_first",
-                    "name": "Channel_0"
-                  },
-                  {
-                    "axisId": "Channel_1 - average_of_roi_first",
-                    "id": "Channel_1 - average_of_roi_first",
-                    "name": "Channel_1"
-                  },
-                  {
-                    "axisId": "Channel_2 - average_of_roi_first",
-                    "id": "Channel_2 - average_of_roi_first",
-                    "name": "Channel_2"
-                  },
-                  {
-                    "axisId": "Channel_3 - average_of_roi_first",
-                    "id": "Channel_3 - average_of_roi_first",
-                    "name": "Channel_3"
-                  },
-                  {
-                    "axisId": "Channel_4 - average_of_roi_first",
-                    "id": "Channel_4 - average_of_roi_first",
-                    "name": "Channel_4"
-                  }
-                ],
-                "showLabels": true,
-                "showValues": true,
-                "tickDensity": "custom",
-                "tickDensityCustom": 100,
-                "type": "linear",
-                "unpinAxis": false
-              }
-            ],
-            "y_axis_combined": true,
-            "y_axis_gridlines": true,
-            "y_axis_reversed": false,
-            "y_axis_scale_mode": "linear",
-            "y_axis_tick_density": "default",
-            "y_axis_tick_density_custom": 5,
-            "y_axis_zoom": true
-          }}
+  A scatter plot -
+  {{
+    "cluster_points": false,
+    "custom_quadrant_point_x": 5,
+    "custom_quadrant_point_y": 5,
+    "custom_value_label_column": "",
+    "custom_x_column": "",
+    "custom_y_column": "",
+    "defaults_version": 1,
+    "hidden_fields": [],
+    "hidden_pivots": {},
+    "hidden_points_if_no": [],
+    "hidden_series": [],
+    "interpolation": "linear",
+    "label_density": 25,
+    "legend_position": "center",
+    "limit_displayed_rows": false,
+    "limit_displayed_rows_values": {
+      "first_last": "first",
+      "num_rows": 0,
+      "show_hide": "hide"
+    },
+    "plot_size_by_field": false,
+    "point_style": "circle",
+    "quadrant_properties": {
+      "0": {
+        "color": "",
+        "label": "Quadrant 1"
+      },
+      "1": {
+        "color": "",
+        "label": "Quadrant 2"
+      },
+      "2": {
+        "color": "",
+        "label": "Quadrant 3"
+      },
+      "3": {
+        "color": "",
+        "label": "Quadrant 4"
+      }
+    },
+    "quadrants_enabled": false,
+    "series_labels": {},
+    "series_types": {},
+    "show_null_points": false,
+    "show_value_labels": false,
+    "show_view_names": true,
+    "show_x_axis_label": true,
+    "show_x_axis_ticks": true,
+    "show_y_axis_labels": true,
+    "show_y_axis_ticks": true,
+    "size_by_field": "roi",
+    "stacking": "normal",
+    "swap_axes": true,
+    "trellis": "",
+    "type": "looker_scatter",
+    "x_axis_gridlines": false,
+    "x_axis_reversed": false,
+    "x_axis_scale": "auto",
+    "x_axis_zoom": true,
+    "y_axes": [
+      {
+        "label": "",
+        "orientation": "bottom",
+        "series": [
+          {
+            "axisId": "Channel_0 - average_of_roi_first",
+            "id": "Channel_0 - average_of_roi_first",
+            "name": "Channel_0"
+          },
+          {
+            "axisId": "Channel_1 - average_of_roi_first",
+            "id": "Channel_1 - average_of_roi_first",
+            "name": "Channel_1"
+          },
+          {
+            "axisId": "Channel_2 - average_of_roi_first",
+            "id": "Channel_2 - average_of_roi_first",
+            "name": "Channel_2"
+          },
+          {
+            "axisId": "Channel_3 - average_of_roi_first",
+            "id": "Channel_3 - average_of_roi_first",
+            "name": "Channel_3"
+          },
+          {
+            "axisId": "Channel_4 - average_of_roi_first",
+            "id": "Channel_4 - average_of_roi_first",
+            "name": "Channel_4"
+          }
+        ],
+        "showLabels": true,
+        "showValues": true,
+        "tickDensity": "custom",
+        "tickDensityCustom": 100,
+        "type": "linear",
+        "unpinAxis": false
+      }
+    ],
+    "y_axis_combined": true,
+    "y_axis_gridlines": true,
+    "y_axis_reversed": false,
+    "y_axis_scale_mode": "linear",
+    "y_axis_tick_density": "default",
+    "y_axis_tick_density_custom": 5,
+    "y_axis_zoom": true
+  }}
 
-          A single record visualization -
-          {{
-            "defaults_version": 1,
-            "show_view_names": false,
-            "type": "looker_single_record"
-          }}
+  A single record visualization -
+  {{
+    "defaults_version": 1,
+    "show_view_names": false,
+    "type": "looker_single_record"
+  }}
 
-          A single value visualization -
-          {{
-            "comparison_reverse_colors": false,
-            "comparison_type": "value",                                                                                                                                            "conditional_formatting_include_nulls": false,                                                                                                                         "conditional_formatting_include_totals": false,
-            "custom_color": "#1A73E8",
-            "custom_color_enabled": true,
-            "defaults_version": 1,
-            "enable_conditional_formatting": false,
-            "series_types": {},
-            "show_comparison": false,
-            "show_comparison_label": true,
-            "show_single_value_title": true,
-            "single_value_title": "Total Clicks",
-            "type": "single_value"
-          }}
+  A single value visualization -
+  {{
+    "comparison_reverse_colors": false,
+    "comparison_type": "value",                                                                                                                                            "conditional_formatting_include_nulls": false,                                                                                                                         "conditional_formatting_include_totals": false,
+    "custom_color": "#1A73E8",
+    "custom_color_enabled": true,
+    "defaults_version": 1,
+    "enable_conditional_formatting": false,
+    "series_types": {},
+    "show_comparison": false,
+    "show_comparison_label": true,
+    "show_single_value_title": true,
+    "single_value_title": "Total Clicks",
+    "type": "single_value"
+  }}
 
-          A Pie chart -
-          {{
-            "defaults_version": 1,
-            "label_density": 25,
-            "label_type": "labPer",
-            "legend_position": "center",
-            "limit_displayed_rows": false,
-            "ordering": "none",
-            "plot_size_by_field": false,
-            "point_style": "none",
-            "series_types": {},
-            "show_null_labels": false,
-            "show_silhouette": false,
-            "show_totals_labels": false,
-            "show_value_labels": false,
-            "show_view_names": false,
-            "show_x_axis_label": true,
-            "show_x_axis_ticks": true,
-            "show_y_axis_labels": true,
-            "show_y_axis_ticks": true,
-            "stacking": "",
-            "totals_color": "#808080",
-            "trellis": "",
-            "type": "looker_pie",
-            "value_labels": "legend",
-            "x_axis_gridlines": false,
-            "x_axis_reversed": false,
-            "x_axis_scale": "auto",
-            "y_axis_combined": true,
-            "y_axis_gridlines": true,
-            "y_axis_reversed": false,
-            "y_axis_scale_mode": "linear",
-            "y_axis_tick_density": "default",
-            "y_axis_tick_density_custom": 5
-          }}
+  A Pie chart -
+  {{
+    "defaults_version": 1,
+    "label_density": 25,
+    "label_type": "labPer",
+    "legend_position": "center",
+    "limit_displayed_rows": false,
+    "ordering": "none",
+    "plot_size_by_field": false,
+    "point_style": "none",
+    "series_types": {},
+    "show_null_labels": false,
+    "show_silhouette": false,
+    "show_totals_labels": false,
+    "show_value_labels": false,
+    "show_view_names": false,
+    "show_x_axis_label": true,
+    "show_x_axis_ticks": true,
+    "show_y_axis_labels": true,
+    "show_y_axis_ticks": true,
+    "stacking": "",
+    "totals_color": "#808080",
+    "trellis": "",
+    "type": "looker_pie",
+    "value_labels": "legend",
+    "x_axis_gridlines": false,
+    "x_axis_reversed": false,
+    "x_axis_scale": "auto",
+    "y_axis_combined": true,
+    "y_axis_gridlines": true,
+    "y_axis_reversed": false,
+    "y_axis_scale_mode": "linear",
+    "y_axis_tick_density": "default",
+    "y_axis_tick_density_custom": 5
+  }}
 
-          The result is a JSON object with the id, slug, the url, and
-          the long_url.
+  The result is a JSON object with the id, slug, the url, and
+  the long_url.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-query-url"                         |
+| type        |  string  |     true     | Must be "looker-query-url"                         |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-query.md b/docs/en/resources/tools/looker/looker-query.md
index 7ba3292763..6fe10c0a2e 100644
--- a/docs/en/resources/tools/looker/looker-query.md
+++ b/docs/en/resources/tools/looker/looker-query.md
@@ -36,37 +36,37 @@ to find MCP Toolbox queries.
 ## Example
 
 ```yaml
-tools:
-    query:
-        kind: looker-query
-        source: looker-source
-        description: |
-          This tool runs a query against a LookML model and returns the results in JSON format.
+kind: tools
+name: query
+type: looker-query
+source: looker-source
+description: |
+  This tool runs a query against a LookML model and returns the results in JSON format.
 
-          Required Parameters:
-          - model_name: The name of the LookML model (from `get_models`).
-          - explore_name: The name of the explore (from `get_explores`).
-          - fields: A list of field names (dimensions, measures, filters, or parameters) to include in the query.
+  Required Parameters:
+  - model_name: The name of the LookML model (from `get_models`).
+  - explore_name: The name of the explore (from `get_explores`).
+  - fields: A list of field names (dimensions, measures, filters, or parameters) to include in the query.
 
-          Optional Parameters:
-          - pivots: A list of fields to pivot the results by. These fields must also be included in the `fields` list.
-          - filters: A map of filter expressions, e.g., `{"view.field": "value", "view.date": "7 days"}`.
-            - Do not quote field names.
-            - Use `not null` instead of `-NULL`.
-            - If a value contains a comma, enclose it in single quotes (e.g., "'New York, NY'").
-          - sorts: A list of fields to sort by, optionally including direction (e.g., `["view.field desc"]`).
-          - limit: Row limit (default 500). Use "-1" for unlimited.
-          - query_timezone: specific timezone for the query (e.g. `America/Los_Angeles`).
+  Optional Parameters:
+  - pivots: A list of fields to pivot the results by. These fields must also be included in the `fields` list.
+  - filters: A map of filter expressions, e.g., `{"view.field": "value", "view.date": "7 days"}`.
+    - Do not quote field names.
+    - Use `not null` instead of `-NULL`.
+    - If a value contains a comma, enclose it in single quotes (e.g., "'New York, NY'").
+  - sorts: A list of fields to sort by, optionally including direction (e.g., `["view.field desc"]`).
+  - limit: Row limit (default 500). Use "-1" for unlimited.
+  - query_timezone: specific timezone for the query (e.g. `America/Los_Angeles`).
 
-          Note: Use `get_dimensions`, `get_measures`, `get_filters`, and `get_parameters` to find valid fields.
+  Note: Use `get_dimensions`, `get_measures`, `get_filters`, and `get_parameters` to find valid fields.
 
-          The result of the query tool is JSON
+  The result of the query tool is JSON
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-query"                             |
+| type        |  string  |     true     | Must be "looker-query"                             |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-run-dashboard.md b/docs/en/resources/tools/looker/looker-run-dashboard.md
index cc2c2072df..2682977b49 100644
--- a/docs/en/resources/tools/looker/looker-run-dashboard.md
+++ b/docs/en/resources/tools/looker/looker-run-dashboard.md
@@ -22,26 +22,26 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    run_dashboard:
-        kind: looker-run-dashboard
-        source: looker-source
-        description: |
-          This tool executes the queries associated with each tile in a specified dashboard
-          and returns the aggregated data in a JSON structure.
+kind: tools
+name: run_dashboard
+type: looker-run-dashboard
+source: looker-source
+description: |
+  This tool executes the queries associated with each tile in a specified dashboard
+  and returns the aggregated data in a JSON structure.
 
-          Parameters:
-          - dashboard_id (required): The unique identifier of the dashboard to run,
-            typically obtained from the `get_dashboards` tool.
+  Parameters:
+  - dashboard_id (required): The unique identifier of the dashboard to run,
+    typically obtained from the `get_dashboards` tool.
 
-          Output:
-          The data from all dashboard tiles is returned as a JSON object.
+  Output:
+  The data from all dashboard tiles is returned as a JSON object.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-run-dashboard"                     |
+| type        |  string  |     true     | Must be "looker-run-dashboard"                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-run-look.md b/docs/en/resources/tools/looker/looker-run-look.md
index eb2f57eedb..f2a2989323 100644
--- a/docs/en/resources/tools/looker/looker-run-look.md
+++ b/docs/en/resources/tools/looker/looker-run-look.md
@@ -22,26 +22,26 @@ It's compatible with the following sources:
 ## Example
 
 ```yaml
-tools:
-    run_look:
-        kind: looker-run-look
-        source: looker-source
-        description: |
-          This tool executes the query associated with a saved Look and
-          returns the resulting data in a JSON structure.
+kind: tools
+name: run_look
+type: looker-run-look
+source: looker-source
+description: |
+  This tool executes the query associated with a saved Look and
+  returns the resulting data in a JSON structure.
 
-          Parameters:
-          - look_id (required): The unique identifier of the Look to run,
-            typically obtained from the `get_looks` tool.
+  Parameters:
+  - look_id (required): The unique identifier of the Look to run,
+    typically obtained from the `get_looks` tool.
 
-          Output:
-          The query results are returned as a JSON object.
+  Output:
+  The query results are returned as a JSON object.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-run-look"                          |
+| type        |  string  |     true     | Must be "looker-run-look"                          |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-update-project-file.md b/docs/en/resources/tools/looker/looker-update-project-file.md
index af8cabd81b..de4b092f1c 100644
--- a/docs/en/resources/tools/looker/looker-update-project-file.md
+++ b/docs/en/resources/tools/looker/looker-update-project-file.md
@@ -22,28 +22,28 @@ as well as the new file content.
 ## Example
 
 ```yaml
-tools:
-    update_project_file:
-        kind: looker-update-project-file
-        source: looker-source
-        description: |
-          This tool modifies the content of an existing LookML file within a specified project.
+kind: tools
+name: update_project_file
+type: looker-update-project-file
+source: looker-source
+description: |
+  This tool modifies the content of an existing LookML file within a specified project.
 
-          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+  Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
 
-          Parameters:
-          - project_id (required): The unique ID of the LookML project.
-          - file_path (required): The exact path to the LookML file to modify within the project.
-          - content (required): The new, complete LookML content to overwrite the existing file.
+  Parameters:
+  - project_id (required): The unique ID of the LookML project.
+  - file_path (required): The exact path to the LookML file to modify within the project.
+  - content (required): The new, complete LookML content to overwrite the existing file.
 
-          Output:
-          A confirmation message upon successful file modification.
+  Output:
+  A confirmation message upon successful file modification.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "looker-update-project-file".              |
+| type        |  string  |     true     | Must be "looker-update-project-file".              |
 | source      |  string  |     true     | Name of the source Looker instance.                |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/looker/looker-validate-project.md b/docs/en/resources/tools/looker/looker-validate-project.md
new file mode 100644
index 0000000000..956588b11d
--- /dev/null
+++ b/docs/en/resources/tools/looker/looker-validate-project.md
@@ -0,0 +1,47 @@
+---
+title: "looker-validate-project"
+type: docs
+weight: 1
+description: >
+  A "looker-validate-project" tool checks the syntax of a LookML project and reports any errors
+aliases:
+- /resources/tools/looker-validate-project
+---
+
+## About
+
+A "looker-validate-project" tool checks the syntax of a LookML project and reports any errors
+
+It's compatible with the following sources:
+
+- [looker](../../sources/looker.md)
+
+`looker-validate-project` accepts a project_id parameter.
+
+## Example
+
+```yaml
+tools:
+    validate_project:
+        kind: looker-validate-project
+        source: looker-source
+        description: |
+          This tool checks a LookML project for syntax errors.
+
+          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+
+          Parameters:
+          - project_id (required): The unique ID of the LookML project.
+
+          Output:
+          A list of error details including the file path and line number, and also a list of models
+          that are not currently valid due to LookML errors.
+```
+
+## Reference
+
+| **field**   | **type** | **required** | **description**                                    |
+|-------------|:--------:|:------------:|----------------------------------------------------|
+| kind        |  string  |     true     | Must be "looker-validate-project".                 |
+| source      |  string  |     true     | Name of the source Looker instance.                |
+| description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/mindsdb/_index.md b/docs/en/resources/tools/mindsdb/_index.md
index 1a2f2cdff1..89d7828adb 100644
--- a/docs/en/resources/tools/mindsdb/_index.md
+++ b/docs/en/resources/tools/mindsdb/_index.md
@@ -117,20 +117,20 @@ federated database capabilities.
 Here's a complete working configuration that has been tested:
 
 ```yaml
-sources:
-  my-pg-source:
-    kind: mindsdb
-    host: 127.0.0.1
-    port: 47335
-    database: files
-    user: mindsdb
-
-tools:
-  mindsdb-execute-sql:
-    kind: mindsdb-execute-sql
-    source: my-pg-source
-    description: |
-      Execute SQL queries directly on MindsDB database.
-      Use this tool to run any SQL statement against your MindsDB instance.
-      Example: SELECT * FROM my_table LIMIT 10
+kind: sources
+name: my-pg-source
+type: mindsdb
+host: 127.0.0.1
+port: 47335
+database: files
+user: mindsdb
+---
+kind: tools
+name: mindsdb-execute-sql
+type: mindsdb-execute-sql
+source: my-pg-source
+description: |
+  Execute SQL queries directly on MindsDB database.
+  Use this tool to run any SQL statement against your MindsDB instance.
+  Example: SELECT * FROM my_table LIMIT 10
 ```
diff --git a/docs/en/resources/tools/mindsdb/mindsdb-execute-sql.md b/docs/en/resources/tools/mindsdb/mindsdb-execute-sql.md
index 1228caf837..7b6da914d5 100644
--- a/docs/en/resources/tools/mindsdb/mindsdb-execute-sql.md
+++ b/docs/en/resources/tools/mindsdb/mindsdb-execute-sql.md
@@ -97,11 +97,11 @@ ORDER BY created_at DESC;
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: mindsdb-execute-sql
-    source: my-mindsdb-instance
-    description: Use this tool to execute SQL statements across multiple datasources and ML models.
+kind: tools
+name: execute_sql_tool
+type: mindsdb-execute-sql
+source: my-mindsdb-instance
+description: Use this tool to execute SQL statements across multiple datasources and ML models.
 ```
 
 ### Working Configuration Example
@@ -109,28 +109,28 @@ tools:
 Here's a working configuration that has been tested:
 
 ```yaml
-sources:
-  my-pg-source:
-    kind: mindsdb
-    host: 127.0.0.1
-    port: 47335
-    database: files
-    user: mindsdb
-
-tools:
-  mindsdb-execute-sql:
-    kind: mindsdb-execute-sql
-    source: my-pg-source
-    description: |
-      Execute SQL queries directly on MindsDB database.
-      Use this tool to run any SQL statement against your MindsDB instance.
-      Example: SELECT * FROM my_table LIMIT 10
+kind: sources
+name: my-pg-source
+type: mindsdb
+host: 127.0.0.1
+port: 47335
+database: files
+user: mindsdb
+---
+kind: tools
+name: mindsdb-execute-sql
+type: mindsdb-execute-sql
+source: my-pg-source
+description: |
+  Execute SQL queries directly on MindsDB database.
+  Use this tool to run any SQL statement against your MindsDB instance.
+  Example: SELECT * FROM my_table LIMIT 10
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "mindsdb-execute-sql".                     |
+| type        |  string  |     true     | Must be "mindsdb-execute-sql".                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/mindsdb/mindsdb-sql.md b/docs/en/resources/tools/mindsdb/mindsdb-sql.md
index b0cfc189dc..44bea0d27c 100644
--- a/docs/en/resources/tools/mindsdb/mindsdb-sql.md
+++ b/docs/en/resources/tools/mindsdb/mindsdb-sql.md
@@ -97,41 +97,41 @@ ORDER BY created_at DESC;
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: mindsdb-sql
-    source: my-mindsdb-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: mindsdb-sql
+source: my-mindsdb-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = ?
+  AND flight_number = ?
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -143,29 +143,29 @@ tools:
 > [templateParameters](../#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: mindsdb-sql
-    source: my-mindsdb-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: mindsdb-sql
+source: my-mindsdb-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                  **type**                        | **required** | **description**                                                                                                                            |
 |--------------------|:------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                   string                         |     true     | Must be "mindsdb-sql".                                                                                                                     |
+| type               |                   string                         |     true     | Must be "mindsdb-sql".                                                                                                                     |
 | source             |                   string                         |     true     | Name of the source the SQL should execute on.                                                                                              |
 | description        |                   string                         |     true     | Description of the tool that is passed to the LLM.                                                                                         |
 | statement          |                   string                         |     true     | SQL statement to execute on.                                                                                                               |
diff --git a/docs/en/resources/tools/mongodb/mongodb-aggregate.md b/docs/en/resources/tools/mongodb/mongodb-aggregate.md
index e37217ec77..43707e2a4e 100644
--- a/docs/en/resources/tools/mongodb/mongodb-aggregate.md
+++ b/docs/en/resources/tools/mongodb/mongodb-aggregate.md
@@ -22,7 +22,7 @@ array of documents produced by the final stage of the pipeline.
 A `readOnly` flag can be set to `true` as a safety measure to ensure the
 pipeline does not contain any write stages (like `$out` or `$merge`).
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -32,45 +32,45 @@ Here is an example that calculates the average price and total count of products
 for each category, but only for products with an "active" status.
 
 ```yaml
-tools:
-  get_category_stats:
-    kind: mongodb-aggregate
-    source: my-mongo-source
-    description: Calculates average price and count of products, grouped by category.
-    database: ecommerce
-    collection: products
-    readOnly: true
-    pipelinePayload: |
-      [
-        {
-          "$match": {
-            "status": {{json .status_filter}}
-          }
-        },
-        {
-          "$group": {
-            "_id": "$category",
-            "average_price": { "$avg": "$price" },
-            "item_count": { "$sum": 1 }
-          }
-        },
-        {
-          "$sort": {
-            "average_price": -1
-          }
-        }
-      ]
-    pipelineParams:
-      - name: status_filter
-        type: string
-        description: The product status to filter by (e.g., "active").
+kind: tools
+name: get_category_stats
+type: mongodb-aggregate
+source: my-mongo-source
+description: Calculates average price and count of products, grouped by category.
+database: ecommerce
+collection: products
+readOnly: true
+pipelinePayload: |
+  [
+    {
+      "$match": {
+        "status": {{json .status_filter}}
+      }
+    },
+    {
+      "$group": {
+        "_id": "$category",
+        "average_price": { "$avg": "$price" },
+        "item_count": { "$sum": 1 }
+      }
+    },
+    {
+      "$sort": {
+        "average_price": -1
+      }
+    }
+  ]
+pipelineParams:
+  - name: status_filter
+    type: string
+    description: The product status to filter by (e.g., "active").
 ```
 
 ## Reference
 
 | **field**       | **type** | **required** | **description**                                                                                                |
 |:----------------|:---------|:-------------|:---------------------------------------------------------------------------------------------------------------|
-| kind            | string   | true         | Must be `mongodb-aggregate`.                                                                                   |
+| type            | string   | true         | Must be `mongodb-aggregate`.                                                                                   |
 | source          | string   | true         | The name of the `mongodb` source to use.                                                                       |
 | description     | string   | true         | A description of the tool that is passed to the LLM.                                                           |
 | database        | string   | true         | The name of the MongoDB database containing the collection.                                                    |
diff --git a/docs/en/resources/tools/mongodb/mongodb-delete-many.md b/docs/en/resources/tools/mongodb/mongodb-delete-many.md
index 9e35a72124..b6ffcacc25 100644
--- a/docs/en/resources/tools/mongodb/mongodb-delete-many.md
+++ b/docs/en/resources/tools/mongodb/mongodb-delete-many.md
@@ -17,7 +17,7 @@ The tool returns the total count of documents that were deleted. If the filter
 does not match any documents (i.e., the deleted count is 0), the tool will
 return an error.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -29,26 +29,26 @@ Here is an example that performs a cleanup task by deleting all products from
 the `inventory` collection that belong to a discontinued brand.
 
 ```yaml
-tools:
-  retire_brand_products:
-    kind: mongodb-delete-many
-    source: my-mongo-source
-    description: Deletes all products from a specified discontinued brand.
-    database: ecommerce
-    collection: inventory
-    filterPayload: |
-        { "brand_name": {{json .brand_to_delete}} }
-    filterParams:
-      - name: brand_to_delete
-        type: string
-        description: The name of the discontinued brand whose products should be deleted.
+kind: tools
+name: retire_brand_products
+type: mongodb-delete-many
+source: my-mongo-source
+description: Deletes all products from a specified discontinued brand.
+database: ecommerce
+collection: inventory
+filterPayload: |
+    { "brand_name": {{json .brand_to_delete}} }
+filterParams:
+  - name: brand_to_delete
+    type: string
+    description: The name of the discontinued brand whose products should be deleted.
 ```
 
 ## Reference
 
 | **field**     | **type** | **required** | **description**                                                                                                     |
 |:--------------|:---------|:-------------|:--------------------------------------------------------------------------------------------------------------------|
-| kind          | string   | true         | Must be `mongodb-delete-many`.                                                                                      |
+| type          | string   | true         | Must be `mongodb-delete-many`.                                                                                      |
 | source        | string   | true         | The name of the `mongodb` source to use.                                                                            |
 | description   | string   | true         | A description of the tool that is passed to the LLM.                                                                |
 | database      | string   | true         | The name of the MongoDB database containing the collection.                                                         |
diff --git a/docs/en/resources/tools/mongodb/mongodb-delete-one.md b/docs/en/resources/tools/mongodb/mongodb-delete-one.md
index 0cede56c13..3d9dc8dfa9 100644
--- a/docs/en/resources/tools/mongodb/mongodb-delete-one.md
+++ b/docs/en/resources/tools/mongodb/mongodb-delete-one.md
@@ -21,7 +21,7 @@ such as a user account or a single item from an inventory based on a unique ID.
 The tool returns the number of documents deleted, which will be either `1` if a
 document was found and deleted, or `0` if no matching document was found.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -33,26 +33,26 @@ Here is an example that deletes a specific user account from the `users`
 collection by matching their unique email address. This is a permanent action.
 
 ```yaml
-tools:
-  delete_user_account:
-    kind: mongodb-delete-one
-    source: my-mongo-source
-    description: Permanently deletes a user account by their email address.
-    database: user_data
-    collection: users
-    filterPayload: |
-        { "email": {{json .email_address}} }
-    filterParams:
-      - name: email_address
-        type: string
-        description: The email of the user account to delete.
+kind: tools
+name: delete_user_account
+type: mongodb-delete-one
+source: my-mongo-source
+description: Permanently deletes a user account by their email address.
+database: user_data
+collection: users
+filterPayload: |
+    { "email": {{json .email_address}} }
+filterParams:
+  - name: email_address
+    type: string
+    description: The email of the user account to delete.
 ```
 
 ## Reference
 
 | **field**     | **type** | **required** | **description**                                                                                                    |
 |:--------------|:---------|:-------------|:-------------------------------------------------------------------------------------------------------------------|
-| kind          | string   | true         | Must be `mongodb-delete-one`.                                                                                      |
+| type          | string   | true         | Must be `mongodb-delete-one`.                                                                                      |
 | source        | string   | true         | The name of the `mongodb` source to use.                                                                           |
 | description   | string   | true         | A description of the tool that is passed to the LLM.                                                               |
 | database      | string   | true         | The name of the MongoDB database containing the collection.                                                        |
diff --git a/docs/en/resources/tools/mongodb/mongodb-find-one.md b/docs/en/resources/tools/mongodb/mongodb-find-one.md
index 395262d91a..47f72cb289 100644
--- a/docs/en/resources/tools/mongodb/mongodb-find-one.md
+++ b/docs/en/resources/tools/mongodb/mongodb-find-one.md
@@ -18,7 +18,7 @@ returned. Otherwise, the selection is not guaranteed.
 The tool returns a single JSON object representing the document, wrapped in a
 JSON array.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -31,31 +31,31 @@ and returning their profile information, while excluding sensitive fields like
 the password hash.
 
 ```yaml
-tools:
-  get_user_profile:
-    kind: mongodb-find-one
-    source: my-mongo-source
-    description: Retrieves a user's profile by their email address.
-    database: user_data
-    collection: profiles
-    filterPayload: |
-        { "email": {{json .email}} }
-    filterParams:
-      - name: email
-        type: string
-        description: The email address of the user to find.
-    projectPayload: |
-        { 
-          "password_hash": 0,
-          "login_history": 0
-        }
+kind: tools
+name: get_user_profile
+type: mongodb-find-one
+source: my-mongo-source
+description: Retrieves a user's profile by their email address.
+database: user_data
+collection: profiles
+filterPayload: |
+    { "email": {{json .email}} }
+filterParams:
+  - name: email
+    type: string
+    description: The email address of the user to find.
+projectPayload: |
+    { 
+      "password_hash": 0,
+      "login_history": 0
+    }
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                                              |
 |:---------------|:---------|:-------------|:---------------------------------------------------------------------------------------------------------------------------------------------|
-| kind           | string   | true         | Must be `mongodb-find-one`.                                                                                                                  |
+| type           | string   | true         | Must be `mongodb-find-one`.                                                                                                                  |
 | source         | string   | true         | The name of the `mongodb` source to use.                                                                                                     |
 | description    | string   | true         | A description of the tool that is passed to the LLM.                                                                                         |
 | database       | string   | true         | The name of the MongoDB database to query.                                                                                                   |
diff --git a/docs/en/resources/tools/mongodb/mongodb-find.md b/docs/en/resources/tools/mongodb/mongodb-find.md
index d927c737c1..c2ce3da0a3 100644
--- a/docs/en/resources/tools/mongodb/mongodb-find.md
+++ b/docs/en/resources/tools/mongodb/mongodb-find.md
@@ -18,7 +18,7 @@ results (**sorting**), and restricting the number of documents returned
 
 The tool returns a JSON array of the documents found.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -29,40 +29,40 @@ live in a specific city. The results are sorted by their last name, and only
 their first name, last name, and email are returned.
 
 ```yaml
-tools:
-  find_local_customers:
-    kind: mongodb-find
-    source: my-mongo-source
-    description: Finds customers by city, sorted by last name.
-    database: crm
-    collection: customers
-    limit: 10
-    filterPayload: |
-        { "address.city": {{json .city}} }
-    filterParams:
-      - name: city
-        type: string
-        description: The city to search for customers in.
-    projectPayload: |
-        { 
-          "first_name": 1,
-          "last_name": 1,
-          "email": 1,
-          "_id": 0
-        }
-    sortPayload: |
-        { "last_name": {{json .sort_order}} }
-    sortParams:
-      - name: sort_order
-        type: integer
-        description: The sort order (1 for ascending, -1 for descending).
+kind: tools
+name: find_local_customers
+type: mongodb-find
+source: my-mongo-source
+description: Finds customers by city, sorted by last name.
+database: crm
+collection: customers
+limit: 10
+filterPayload: |
+    { "address.city": {{json .city}} }
+filterParams:
+  - name: city
+    type: string
+    description: The city to search for customers in.
+projectPayload: |
+    { 
+      "first_name": 1,
+      "last_name": 1,
+      "email": 1,
+      "_id": 0
+    }
+sortPayload: |
+    { "last_name": {{json .sort_order}} }
+sortParams:
+  - name: sort_order
+    type: integer
+    description: The sort order (1 for ascending, -1 for descending).
 ```
 
 ## Reference
 
 | **field**      | **type** | **required** | **description**                                                                                                             |
 |:---------------|:---------|:-------------|:----------------------------------------------------------------------------------------------------------------------------|
-| kind           | string   | true         | Must be `mongodb-find`.                                                                                                     |
+| type           | string   | true         | Must be `mongodb-find`.                                                                                                     |
 | source         | string   | true         | The name of the `mongodb` source to use.                                                                                    |
 | description    | string   | true         | A description of the tool that is passed to the LLM.                                                                        |
 | database       | string   | true         | The name of the MongoDB database to query.                                                                                  |
diff --git a/docs/en/resources/tools/mongodb/mongodb-insert-many.md b/docs/en/resources/tools/mongodb/mongodb-insert-many.md
index cc6c385375..cc6e0438d7 100644
--- a/docs/en/resources/tools/mongodb/mongodb-insert-many.md
+++ b/docs/en/resources/tools/mongodb/mongodb-insert-many.md
@@ -19,7 +19,7 @@ be a string containing a **JSON array of document objects**. Upon successful
 insertion, the tool returns a JSON array containing the unique `_id` of **each**
 new document that was created.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -30,14 +30,14 @@ This tool is compatible with the following source kind:
 Here is an example configuration for a tool that logs multiple events at once.
 
 ```yaml
-tools:
-  log_batch_events:
-    kind: mongodb-insert-many
-    source: my-mongo-source
-    description: Inserts a batch of event logs into the database.
-    database: logging
-    collection: events
-    canonical: true
+kind: tools
+name: log_batch_events
+type: mongodb-insert-many
+source: my-mongo-source
+description: Inserts a batch of event logs into the database.
+database: logging
+collection: events
+canonical: true
 ```
 
 An LLM would call this tool by providing an array of documents as a JSON string
@@ -50,7 +50,7 @@ in the `data` parameter, like this:
 
 | **field**   | **type** | **required** | **description**                                                                                                         |
 |:------------|:---------|:-------------|:------------------------------------------------------------------------------------------------------------------------|
-| kind        | string   | true         | Must be `mongodb-insert-many`.                                                                                          |
+| type        | string   | true         | Must be `mongodb-insert-many`.                                                                                          |
 | source      | string   | true         | The name of the `mongodb` source to use.                                                                                |
 | description | string   | true         | A description of the tool that is passed to the LLM.                                                                    |
 | database    | string   | true         | The name of the MongoDB database containing the collection.                                                             |
diff --git a/docs/en/resources/tools/mongodb/mongodb-insert-one.md b/docs/en/resources/tools/mongodb/mongodb-insert-one.md
index 7214f2b4d6..8545cc8e10 100644
--- a/docs/en/resources/tools/mongodb/mongodb-insert-one.md
+++ b/docs/en/resources/tools/mongodb/mongodb-insert-one.md
@@ -17,7 +17,7 @@ This tool takes one required parameter named `data`, which must be a string
 containing the JSON object you want to insert. Upon successful insertion, the
 tool returns the unique `_id` of the newly created document.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -27,14 +27,14 @@ Here is an example configuration for a tool that adds a new user to a `users`
 collection.
 
 ```yaml
-tools:
-  create_new_user:
-    kind: mongodb-insert-one
-    source: my-mongo-source
-    description: Creates a new user record in the database.
-    database: user_data
-    collection: users
-    canonical: false
+kind: tools
+name: create_new_user
+type: mongodb-insert-one
+source: my-mongo-source
+description: Creates a new user record in the database.
+database: user_data
+collection: users
+canonical: false
 ```
 
 An LLM would call this tool by providing the document as a JSON string in the
@@ -45,7 +45,7 @@ An LLM would call this tool by providing the document as a JSON string in the
 
 | **field**   | **type** | **required** | **description**                                                                                                         |
 |:------------|:---------|:-------------|:------------------------------------------------------------------------------------------------------------------------|
-| kind        | string   | true         | Must be `mongodb-insert-one`.                                                                                           |
+| type        | string   | true         | Must be `mongodb-insert-one`.                                                                                           |
 | source      | string   | true         | The name of the `mongodb` source to use.                                                                                |
 | description | string   | true         | A description of the tool that is passed to the LLM.                                                                    |
 | database    | string   | true         | The name of the MongoDB database containing the collection.                                                             |
diff --git a/docs/en/resources/tools/mongodb/mongodb-update-many.md b/docs/en/resources/tools/mongodb/mongodb-update-many.md
index ef3b144364..5fdb2e650e 100644
--- a/docs/en/resources/tools/mongodb/mongodb-update-many.md
+++ b/docs/en/resources/tools/mongodb/mongodb-update-many.md
@@ -17,7 +17,7 @@ MongoDB collection that match a given filter. It locates the documents using a
 The tool returns an array of three integers: `[ModifiedCount, UpsertedCount,
 MatchedCount]`.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -29,37 +29,37 @@ Here's an example configuration. This tool applies a discount to all items
 within a specific category and also marks them as being on sale.
 
 ```yaml
-tools:
-  apply_category_discount:
-    kind: mongodb-update-many
-    source: my-mongo-source
-    description: Use this tool to apply a discount to all items in a given category.
-    database: products
-    collection: inventory
-    filterPayload: |
-        { "category": {{json .category_name}} }
-    filterParams:
-      - name: category_name
-        type: string
-        description: The category of items to update.
-    updatePayload: |
-        { 
-          "$mul": { "price": {{json .discount_multiplier}} },
-          "$set": { "on_sale": true }
-        }
-    updateParams:
-      - name: discount_multiplier
-        type: number
-        description: The multiplier to apply to the price (e.g., 0.8 for a 20% discount).
-    canonical: false
-    upsert: false
+kind: tools
+name: apply_category_discount
+type: mongodb-update-many
+source: my-mongo-source
+description: Use this tool to apply a discount to all items in a given category.
+database: products
+collection: inventory
+filterPayload: |
+    { "category": {{json .category_name}} }
+filterParams:
+  - name: category_name
+    type: string
+    description: The category of items to update.
+updatePayload: |
+    { 
+      "$mul": { "price": {{json .discount_multiplier}} },
+      "$set": { "on_sale": true }
+    }
+updateParams:
+  - name: discount_multiplier
+    type: number
+    description: The multiplier to apply to the price (e.g., 0.8 for a 20% discount).
+canonical: false
+upsert: false
 ```
 
 ## Reference
 
 | **field**     | **type** | **required** | **description**                                                                                                                                                                                                                                  |
 |:--------------|:---------|:-------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind          | string   | true         | Must be `mongodb-update-many`.                                                                                                                                                                                                                   |
+| type          | string   | true         | Must be `mongodb-update-many`.                                                                                                                                                                                                                   |
 | source        | string   | true         | The name of the `mongodb` source to use.                                                                                                                                                                                                         |
 | description   | string   | true         | A description of the tool that is passed to the LLM.                                                                                                                                                                                             |
 | database      | string   | true         | The name of the MongoDB database containing the collection.                                                                                                                                                                                      |
diff --git a/docs/en/resources/tools/mongodb/mongodb-update-one.md b/docs/en/resources/tools/mongodb/mongodb-update-one.md
index 063ea0b192..e0bf51e3dd 100644
--- a/docs/en/resources/tools/mongodb/mongodb-update-one.md
+++ b/docs/en/resources/tools/mongodb/mongodb-update-one.md
@@ -15,7 +15,7 @@ collection. It locates the document to be updated using a `filterPayload` and
 applies modifications defined in an `updatePayload`. If the filter matches
 multiple documents, only the first one found will be updated.
 
-This tool is compatible with the following source kind:
+This tool is compatible with the following source type:
 
 * [`mongodb`](../../sources/mongodb.md)
 
@@ -29,37 +29,37 @@ collection where the `item` field matches a provided value. If no matching
 document is found, the `upsert: true` option will create a new one.
 
 ```yaml
-tools:
-  update_inventory_item:
-    kind: mongodb-update-one
-    source: my-mongo-source
-    description: Use this tool to update an item's stock and status in the inventory.
-    database: products
-    collection: inventory
-    filterPayload: |
-        { "item": {{json .item_name}} }
-    filterParams:
-      - name: item_name
-        type: string
-        description: The name of the item to update.
-    updatePayload: |
-        { "$set": { "stock": {{json .new_stock}}, "status": {{json .new_status}} } }
-    updateParams:
-      - name: new_stock
-        type: integer
-        description: The new stock quantity.
-      - name: new_status
-        type: string
-        description: The new status of the item (e.g., "In Stock", "Backordered").
-    canonical: false
-    upsert: true
+kind: tools
+name: update_inventory_item
+type: mongodb-update-one
+source: my-mongo-source
+description: Use this tool to update an item's stock and status in the inventory.
+database: products
+collection: inventory
+filterPayload: |
+    { "item": {{json .item_name}} }
+filterParams:
+  - name: item_name
+    type: string
+    description: The name of the item to update.
+updatePayload: |
+    { "$set": { "stock": {{json .new_stock}}, "status": {{json .new_status}} } }
+updateParams:
+  - name: new_stock
+    type: integer
+    description: The new stock quantity.
+  - name: new_status
+    type: string
+    description: The new status of the item (e.g., "In Stock", "Backordered").
+canonical: false
+upsert: true
 ```
 
 ## Reference
 
 | **field**     | **type** | **required** | **description**                                                                                                                                                                                                                                                        |
 |:--------------|:---------|:-------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| kind          | string   | true         | Must be `mongodb-update-one`.                                                                                                                                                                                                                                          |
+| type          | string   | true         | Must be `mongodb-update-one`.                                                                                                                                                                                                                                          |
 | source        | string   | true         | The name of the `mongodb` source to use.                                                                                                                                                                                                                               |
 | description   | string   | true         | A description of the tool that is passed to the LLM.                                                                                                                                                                                                                   |
 | database      | string   | true         | The name of the MongoDB database containing the collection.                                                                                                                                                                                                            |
diff --git a/docs/en/resources/tools/mssql/mssql-execute-sql.md b/docs/en/resources/tools/mssql/mssql-execute-sql.md
index 4667dcf46b..23bdbf6640 100644
--- a/docs/en/resources/tools/mssql/mssql-execute-sql.md
+++ b/docs/en/resources/tools/mssql/mssql-execute-sql.md
@@ -26,17 +26,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: mssql-execute-sql
-    source: my-mssql-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: mssql-execute-sql
+source: my-mssql-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                    |
 |-------------|:------------------------------------------:|:------------:|----------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "mssql-execute-sql".                       |
+| type        |                   string                   |     true     | Must be "mssql-execute-sql".                       |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.      |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/mssql/mssql-list-tables.md b/docs/en/resources/tools/mssql/mssql-list-tables.md
index 4a7fdf7a8d..d80c79cc17 100644
--- a/docs/en/resources/tools/mssql/mssql-list-tables.md
+++ b/docs/en/resources/tools/mssql/mssql-list-tables.md
@@ -32,17 +32,17 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  mssql_list_tables:
-    kind: mssql-list-tables
-    source: mssql-source
-    description: Use this tool to retrieve schema information for all or specified tables. Output format can be simple (only table names) or detailed.
+kind: tools
+name: mssql_list_tables
+type: mssql-list-tables
+source: mssql-source
+description: Use this tool to retrieve schema information for all or specified tables. Output format can be simple (only table names) or detailed.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "mssql-list-tables".                         |
+| type        |  string  |     true     | Must be "mssql-list-tables".                         |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |     true     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/mssql/mssql-sql.md b/docs/en/resources/tools/mssql/mssql-sql.md
index e4c63184c2..c5d212f096 100644
--- a/docs/en/resources/tools/mssql/mssql-sql.md
+++ b/docs/en/resources/tools/mssql/mssql-sql.md
@@ -36,41 +36,41 @@ db.QueryContext(ctx, `select * from t where ID = @ID and Name = @p2;`, sql.Named
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: mssql-sql
-    source: my-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = @airline
-      AND flight_number = @flight_number
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: mssql-sql
+source: my-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = @airline
+  AND flight_number = @flight_number
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -82,29 +82,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: mssql-sql
-    source: my-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: mssql-sql
+source: my-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "mssql-sql".                                                                                                                   |
+| type               |                    string                    |     true     | Must be "mssql-sql".                                                                                                                   |
 | source             |                    string                    |     true     | Name of the source the T-SQL statement should execute on.                                                                              |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute.                                                                                                              |
diff --git a/docs/en/resources/tools/mysql/mysql-execute-sql.md b/docs/en/resources/tools/mysql/mysql-execute-sql.md
index ff68b06516..dce8070471 100644
--- a/docs/en/resources/tools/mysql/mysql-execute-sql.md
+++ b/docs/en/resources/tools/mysql/mysql-execute-sql.md
@@ -26,17 +26,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: mysql-execute-sql
-    source: my-mysql-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: mysql-execute-sql
+source: my-mysql-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "mysql-execute-sql".                                                                     |
+| type        |                   string                   |     true     | Must be "mysql-execute-sql".                                                                     |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/mysql/mysql-get-query-plan.md b/docs/en/resources/tools/mysql/mysql-get-query-plan.md
index d77b81e097..b3e259b5af 100644
--- a/docs/en/resources/tools/mysql/mysql-get-query-plan.md
+++ b/docs/en/resources/tools/mysql/mysql-get-query-plan.md
@@ -23,17 +23,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- get_query_plan_tool:
-    kind: mysql-get-query-plan
-    source: my-mysql-instance
-    description: Use this tool to get the execution plan for a sql statement.
+kind: tools
+name: get_query_plan_tool
+type: mysql-get-query-plan
+source: my-mysql-instance
+description: Use this tool to get the execution plan for a sql statement.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "mysql-get-query-plan".                                                                     |
+| type        |                   string                   |     true     | Must be "mysql-get-query-plan".                                                                     |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/mysql/mysql-list-active-queries.md b/docs/en/resources/tools/mysql/mysql-list-active-queries.md
index f7a2721aba..7f0ba3c0fd 100644
--- a/docs/en/resources/tools/mysql/mysql-list-active-queries.md
+++ b/docs/en/resources/tools/mysql/mysql-list-active-queries.md
@@ -27,11 +27,11 @@ This tool takes 2 optional input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_active_queries:
-    kind: mysql-list-active-queries
-    source: my-mysql-instance
-    description: Lists top N (default 10) ongoing queries from processlist and innodb_trx, ordered by execution time in descending order. Returns detailed information of those queries in json format, including process id, query, transaction duration, transaction wait duration, process time, transaction state, process state, username with host, transaction rows locked, transaction rows modified, and db schema.
+kind: tools
+name: list_active_queries
+type: mysql-list-active-queries
+source: my-mysql-instance
+description: Lists top N (default 10) ongoing queries from processlist and innodb_trx, ordered by execution time in descending order. Returns detailed information of those queries in json format, including process id, query, transaction duration, transaction wait duration, process time, transaction state, process state, username with host, transaction rows locked, transaction rows modified, and db schema.
 ```
 
 The response is a json array with the following fields:
@@ -57,6 +57,6 @@ The response is a json array with the following fields:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "mysql-list-active-queries".               |
+| type        |  string  |     true     | Must be "mysql-list-active-queries".               |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/mysql/mysql-list-table-fragmentation.md b/docs/en/resources/tools/mysql/mysql-list-table-fragmentation.md
index 1af1308a71..3e0ce0c5a9 100644
--- a/docs/en/resources/tools/mysql/mysql-list-table-fragmentation.md
+++ b/docs/en/resources/tools/mysql/mysql-list-table-fragmentation.md
@@ -34,11 +34,11 @@ This tool takes 4 optional input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_table_fragmentation:
-    kind: mysql-list-table-fragmentation
-    source: my-mysql-instance
-    description: List table fragmentation in MySQL, by calculating the size of the data and index files and free space allocated to each table. The query calculates fragmentation percentage which represents the proportion of free space relative to the total data and index size. Storage can be reclaimed for tables with high fragmentation using OPTIMIZE TABLE.
+kind: tools
+name: list_table_fragmentation
+type: mysql-list-table-fragmentation
+source: my-mysql-instance
+description: List table fragmentation in MySQL, by calculating the size of the data and index files and free space allocated to each table. The query calculates fragmentation percentage which represents the proportion of free space relative to the total data and index size. Storage can be reclaimed for tables with high fragmentation using OPTIMIZE TABLE.
 ```
 
 The response is a json array with the following fields:
@@ -58,6 +58,6 @@ The response is a json array with the following fields:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "mysql-list-table-fragmentation".          |
+| type        |  string  |     true     | Must be "mysql-list-table-fragmentation".          |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/mysql/mysql-list-tables-missing-unique-indexes.md b/docs/en/resources/tools/mysql/mysql-list-tables-missing-unique-indexes.md
index 087860141a..7c1c08296a 100644
--- a/docs/en/resources/tools/mysql/mysql-list-tables-missing-unique-indexes.md
+++ b/docs/en/resources/tools/mysql/mysql-list-tables-missing-unique-indexes.md
@@ -27,11 +27,11 @@ parameters:
 ## Example
 
 ```yaml
-tools:
-  list_tables_missing_unique_indexes:
-    kind: mysql-list-tables-missing-unique-indexes
-    source: my-mysql-instance
-    description: Find tables that do not have primary or unique key constraint. A primary key or unique key is the only mechanism that guaranttes a row is unique. Without them, the database-level protection against data integrity issues will be missing.
+kind: tools
+name: list_tables_missing_unique_indexes
+type: mysql-list-tables-missing-unique-indexes
+source: my-mysql-instance
+description: Find tables that do not have primary or unique key constraint. A primary key or unique key is the only mechanism that guaranttes a row is unique. Without them, the database-level protection against data integrity issues will be missing.
 ```
 
 The response is a json array with the following fields:
@@ -47,6 +47,6 @@ The response is a json array with the following fields:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "mysql-list-active-queries".               |
+| type        |  string  |     true     | Must be "mysql-list-active-queries".               |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/mysql/mysql-list-tables.md b/docs/en/resources/tools/mysql/mysql-list-tables.md
index f07eef7c68..62da629c3b 100644
--- a/docs/en/resources/tools/mysql/mysql-list-tables.md
+++ b/docs/en/resources/tools/mysql/mysql-list-tables.md
@@ -33,17 +33,17 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  mysql_list_tables:
-    kind: mysql-list-tables
-    source: mysql-source
-    description: Use this tool to retrieve schema information for all or specified tables. Output format can be simple (only table names) or detailed.
+kind: tools
+name: mysql_list_tables
+type: mysql-list-tables
+source: mysql-source
+description: Use this tool to retrieve schema information for all or specified tables. Output format can be simple (only table names) or detailed.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "mysql-list-tables".                         |
+| type        |  string  |     true     | Must be "mysql-list-tables".                         |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |     true     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/mysql/mysql-sql.md b/docs/en/resources/tools/mysql/mysql-sql.md
index 56850ba0b2..9d534a6c03 100644
--- a/docs/en/resources/tools/mysql/mysql-sql.md
+++ b/docs/en/resources/tools/mysql/mysql-sql.md
@@ -30,41 +30,41 @@ and expects parameters in the SQL query to be in the form of placeholders `?`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: mysql-sql
-    source: my-mysql-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: mysql-sql
+source: my-mysql-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = ?
+  AND flight_number = ?
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -76,29 +76,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: mysql-sql
-    source: my-mysql-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: mysql-sql
+source: my-mysql-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                  **type**                        | **required** | **description**                                                                                                                            |
 |--------------------|:------------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                   string                         |     true     | Must be "mysql-sql".                                                                                                                       |
+| type               |                   string                         |     true     | Must be "mysql-sql".                                                                                                                       |
 | source             |                   string                         |     true     | Name of the source the SQL should execute on.                                                                                              |
 | description        |                   string                         |     true     | Description of the tool that is passed to the LLM.                                                                                         |
 | statement          |                   string                         |     true     | SQL statement to execute on.                                                                                                               |
diff --git a/docs/en/resources/tools/neo4j/neo4j-cypher.md b/docs/en/resources/tools/neo4j/neo4j-cypher.md
index 1086f13693..f058c4eca6 100644
--- a/docs/en/resources/tools/neo4j/neo4j-cypher.md
+++ b/docs/en/resources/tools/neo4j/neo4j-cypher.md
@@ -31,46 +31,46 @@ their name: e.g. `$id`.
 ## Example
 
 ```yaml
-tools:
- search_movies_by_actor:
-    kind: neo4j-cypher
-    source: my-neo4j-movies-instance
-    statement: |
-      MATCH (m:Movie)<-[:ACTED_IN]-(p:Person)
-      WHERE p.name = $name AND m.year > $year
-      RETURN m.title, m.year
-      LIMIT 10
-    description: |
-      Use this tool to get a list of movies for a specific actor and a given minimum release year.
-      Takes a full actor name, e.g. "Tom Hanks" and a year e.g 1993 and returns a list of movie titles and release years.
-      Do NOT use this tool with a movie title. Do NOT guess an actor name, Do NOT guess a year.
-      A actor name is a fully qualified name with first and last name separated by a space.
-      For example, if given "Hanks, Tom" the actor name is "Tom Hanks".
-      If the tool returns more than one option choose the most recent movies.
-      Example:
-      {{
-          "name": "Meg Ryan",
-          "year": 1993
-      }}
-      Example:
-      {{
-          "name": "Clint Eastwood",
-          "year": 2000
-      }}
-    parameters:
-      - name: name
-        type: string
-        description: Full actor name, "firstname lastname"
-      - name: year
-        type: integer
-        description: 4 digit number starting in 1900 up to the current year
+kind: tools
+name: search_movies_by_actor
+type: neo4j-cypher
+source: my-neo4j-movies-instance
+statement: |
+  MATCH (m:Movie)<-[:ACTED_IN]-(p:Person)
+  WHERE p.name = $name AND m.year > $year
+  RETURN m.title, m.year
+  LIMIT 10
+description: |
+  Use this tool to get a list of movies for a specific actor and a given minimum release year.
+  Takes a full actor name, e.g. "Tom Hanks" and a year e.g 1993 and returns a list of movie titles and release years.
+  Do NOT use this tool with a movie title. Do NOT guess an actor name, Do NOT guess a year.
+  A actor name is a fully qualified name with first and last name separated by a space.
+  For example, if given "Hanks, Tom" the actor name is "Tom Hanks".
+  If the tool returns more than one option choose the most recent movies.
+  Example:
+  {{
+      "name": "Meg Ryan",
+      "year": 1993
+  }}
+  Example:
+  {{
+      "name": "Clint Eastwood",
+      "year": 2000
+  }}
+parameters:
+  - name: name
+    type: string
+    description: Full actor name, "firstname lastname"
+  - name: year
+    type: integer
+    description: 4 digit number starting in 1900 up to the current year
 ```
 
 ## Reference
 
 | **field**   |                **type**                 | **required** | **description**                                                                              |
 |-------------|:---------------------------------------:|:------------:|----------------------------------------------------------------------------------------------|
-| kind        |                 string                  |     true     | Must be "neo4j-cypher".                                                                      |
+| type        |                 string                  |     true     | Must be "neo4j-cypher".                                                                      |
 | source      |                 string                  |     true     | Name of the source the Cypher query should execute on.                                       |
 | description |                 string                  |     true     | Description of the tool that is passed to the LLM.                                           |
 | statement   |                 string                  |     true     | Cypher statement to execute                                                                  |
diff --git a/docs/en/resources/tools/neo4j/neo4j-execute-cypher.md b/docs/en/resources/tools/neo4j/neo4j-execute-cypher.md
index 642f4234cf..e3828693d8 100644
--- a/docs/en/resources/tools/neo4j/neo4j-execute-cypher.md
+++ b/docs/en/resources/tools/neo4j/neo4j-execute-cypher.md
@@ -37,26 +37,26 @@ parameter to validate a query without executing it.
 ## Example
 
 ```yaml
-tools:
-  query_neo4j:
-    kind: neo4j-execute-cypher
-    source: my-neo4j-prod-db
-    readOnly: true
-    description: |
-      Use this tool to execute a Cypher query against the production database.
-      Only read-only queries are allowed.
-      Takes a single 'cypher' parameter containing the full query string.
-      Example:
-      {{
-          "cypher": "MATCH (m:Movie {title: 'The Matrix'}) RETURN m.released"
-      }}
+kind: tools
+name: query_neo4j
+type: neo4j-execute-cypher
+source: my-neo4j-prod-db
+readOnly: true
+description: |
+  Use this tool to execute a Cypher query against the production database.
+  Only read-only queries are allowed.
+  Takes a single 'cypher' parameter containing the full query string.
+  Example:
+  {{
+      "cypher": "MATCH (m:Movie {title: 'The Matrix'}) RETURN m.released"
+  }}
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                                                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------------------------------------------------------|
-| kind        |  string  |     true     | Must be "neo4j-cypher".                                                                              |
+| type        |  string  |     true     | Must be "neo4j-cypher".                                                                              |
 | source      |  string  |     true     | Name of the source the Cypher query should execute on.                                               |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.                                                   |
 | readOnly    | boolean  |    false     | If set to `true`, the tool will reject any write operations in the Cypher query. Default is `false`. |
diff --git a/docs/en/resources/tools/neo4j/neo4j-schema.md b/docs/en/resources/tools/neo4j/neo4j-schema.md
index aee380ebc5..31c3bcb81a 100644
--- a/docs/en/resources/tools/neo4j/neo4j-schema.md
+++ b/docs/en/resources/tools/neo4j/neo4j-schema.md
@@ -28,24 +28,24 @@ tool is compatible with a `neo4j` source and takes no parameters.
 ## Example
 
 ```yaml
-tools:
-  get_movie_db_schema:
-    kind: neo4j-schema
-    source: my-neo4j-movies-instance
-    description: |
-      Use this tool to get the full schema of the movie database.
-      This provides information on all available node labels (like Movie, Person), 
-      relationships (like ACTED_IN), and the properties on each.
-      This tool takes no parameters.
-    # Optional configuration to cache the schema for 2 hours
-    cacheExpireMinutes: 120
+kind: tools
+name: get_movie_db_schema
+type: neo4j-schema
+source: my-neo4j-movies-instance
+description: |
+  Use this tool to get the full schema of the movie database.
+  This provides information on all available node labels (like Movie, Person), 
+  relationships (like ACTED_IN), and the properties on each.
+  This tool takes no parameters.
+# Optional configuration to cache the schema for 2 hours
+cacheExpireMinutes: 120
 ```
 
 ## Reference
 
 | **field**          | **type** | **required** | **description**                                         |
 |--------------------|:--------:|:------------:|---------------------------------------------------------|
-| kind               |  string  |     true     | Must be `neo4j-schema`.                                 |
+| type               |  string  |     true     | Must be `neo4j-schema`.                                 |
 | source             |  string  |     true     | Name of the source the schema should be extracted from. |
 | description        |  string  |     true     | Description of the tool that is passed to the LLM.      |
 | cacheExpireMinutes | integer  |    false     | Cache expiration time in minutes. Defaults to 60.       |
diff --git a/docs/en/resources/tools/oceanbase/oceanbase-execute-sql.md b/docs/en/resources/tools/oceanbase/oceanbase-execute-sql.md
index 36432b2e8b..fe43ff54b9 100644
--- a/docs/en/resources/tools/oceanbase/oceanbase-execute-sql.md
+++ b/docs/en/resources/tools/oceanbase/oceanbase-execute-sql.md
@@ -24,17 +24,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
-  execute_sql_tool:
-    kind: oceanbase-execute-sql
-    source: my-oceanbase-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: oceanbase-execute-sql
+source: my-oceanbase-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "oceanbase-execute-sql".                   |
+| type        |  string  |     true     | Must be "oceanbase-execute-sql".                   |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/oceanbase/oceanbase-sql.md b/docs/en/resources/tools/oceanbase/oceanbase-sql.md
index ee33d3cd7c..aafdadc3d6 100644
--- a/docs/en/resources/tools/oceanbase/oceanbase-sql.md
+++ b/docs/en/resources/tools/oceanbase/oceanbase-sql.md
@@ -29,31 +29,31 @@ form of placeholders `?`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
-  search_flights_by_number:
-    kind: oceanbase-sql
-    source: my-oceanbase-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    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.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: oceanbase-sql
+source: my-oceanbase-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = ?
+  AND flight_number = ?
+  LIMIT 10
+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.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -64,64 +64,64 @@ tools:
 > recommended for performance and safety reasons.
 
 ```yaml
-tools:
-  list_table:
-    kind: oceanbase-sql
-    source: my-oceanbase-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: oceanbase-sql
+source: my-oceanbase-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ### Example with Array Parameters
 
 ```yaml
-tools:
-  search_flights_by_ids:
-    kind: oceanbase-sql
-    source: my-oceanbase-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE id IN (?)
-      AND status IN (?)
-    description: |
-      Use this tool to get information for multiple flights by their IDs and statuses.
-      Example:
-      {{
-          "flight_ids": [1, 2, 3],
-          "statuses": ["active", "scheduled"]
-      }}
-    parameters:
-      - name: flight_ids
-        type: array
-        description: List of flight IDs to search for
-        items:
-          name: flight_id
-          type: integer
-          description: Individual flight ID
-      - name: statuses
-        type: array
-        description: List of flight statuses to filter by
-        items:
-          name: status
-          type: string
-          description: Individual flight status
+kind: tools
+name: search_flights_by_ids
+type: oceanbase-sql
+source: my-oceanbase-instance
+statement: |
+  SELECT * FROM flights
+  WHERE id IN (?)
+  AND status IN (?)
+description: |
+  Use this tool to get information for multiple flights by their IDs and statuses.
+  Example:
+  {{
+      "flight_ids": [1, 2, 3],
+      "statuses": ["active", "scheduled"]
+  }}
+parameters:
+  - name: flight_ids
+    type: array
+    description: List of flight IDs to search for
+    items:
+      name: flight_id
+      type: integer
+      description: Individual flight ID
+  - name: statuses
+    type: array
+    description: List of flight statuses to filter by
+    items:
+      name: status
+      type: string
+      description: Individual flight status
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "oceanbase-sql".                                                                                                               |
+| type               |                    string                    |     true     | Must be "oceanbase-sql".                                                                                                               |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/oracle/oracle-execute-sql.md b/docs/en/resources/tools/oracle/oracle-execute-sql.md
index c66cce2b8c..cbfd79037b 100644
--- a/docs/en/resources/tools/oracle/oracle-execute-sql.md
+++ b/docs/en/resources/tools/oracle/oracle-execute-sql.md
@@ -24,8 +24,9 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
-  execute_sql_tool:
-    kind: oracle-execute-sql
-    source: my-oracle-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: oracle-execute-sql
+source: my-oracle-instance
+description: Use this tool to execute sql statement.
+```
diff --git a/docs/en/resources/tools/oracle/oracle-sql.md b/docs/en/resources/tools/oracle/oracle-sql.md
index 045031f60c..49d665be36 100644
--- a/docs/en/resources/tools/oracle/oracle-sql.md
+++ b/docs/en/resources/tools/oracle/oracle-sql.md
@@ -29,29 +29,29 @@ to be in the native Oracle format (e.g., `:1`, `:2`).
 > names, or other parts of the query.
 
 ```yaml
-tools:
-  search_flights_by_number:
-    kind: oracle-sql
-    source: my-oracle-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = :1
-      AND flight_number = :2
-      FETCH FIRST 10 ROWS ONLY
-    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.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: oracle-sql
+source: my-oracle-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = :1
+  AND flight_number = :2
+  FETCH FIRST 10 ROWS ONLY
+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.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
diff --git a/docs/en/resources/tools/postgres/postgres-database-overview.md b/docs/en/resources/tools/postgres/postgres-database-overview.md
index 485a8625fb..1dcb23dc45 100644
--- a/docs/en/resources/tools/postgres/postgres-database-overview.md
+++ b/docs/en/resources/tools/postgres/postgres-database-overview.md
@@ -23,12 +23,12 @@ This tool does not take any input parameters.
 ## Example
 
 ```yaml
-tools:
-  database_overview:
-    kind: postgres-database-overview
-    source: cloudsql-pg-source
-    description: |
-    fetches the current state of the PostgreSQL server. It returns the postgres version, whether it's a replica, uptime duration, maximum connection limit, number of current connections, number of active connections and the percentage of connections in use.
+kind: tools
+name: database_overview
+type: postgres-database-overview
+source: cloudsql-pg-source
+description: |
+  fetches the current state of the PostgreSQL server. It returns the postgres version, whether it's a replica, uptime duration, maximum connection limit, number of current connections, number of active connections and the percentage of connections in use.
 ```
 
 The response is a JSON object with the following elements:
@@ -49,6 +49,6 @@ The response is a JSON object with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-database-overview".                |
+| type        |  string  |     true     | Must be "postgres-database-overview".                |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-execute-sql.md b/docs/en/resources/tools/postgres/postgres-execute-sql.md
index 6670efcb0b..07a3847405 100644
--- a/docs/en/resources/tools/postgres/postgres-execute-sql.md
+++ b/docs/en/resources/tools/postgres/postgres-execute-sql.md
@@ -27,17 +27,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: postgres-execute-sql
-    source: my-pg-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: postgres-execute-sql
+source: my-pg-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "postgres-execute-sql".                                                                  |
+| type        |                   string                   |     true     | Must be "postgres-execute-sql".                                                                  |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/postgres/postgres-get-column-cardinality.md b/docs/en/resources/tools/postgres/postgres-get-column-cardinality.md
index 2563ead4f1..4cd778d19d 100644
--- a/docs/en/resources/tools/postgres/postgres-get-column-cardinality.md
+++ b/docs/en/resources/tools/postgres/postgres-get-column-cardinality.md
@@ -30,11 +30,11 @@ the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  get_column_cardinality:
-    kind: postgres-get-column-cardinality
-    source: postgres-source
-    description: Estimates the number of unique values (cardinality) quickly for one or all columns in a specific PostgreSQL table by using the database's internal statistics, returning the results in descending order of estimated cardinality. Please run ANALYZE on the table before using this tool to get accurate results. The tool returns the column_name and the estimated_cardinality. If the column_name is not provided, the tool returns all columns along with their estimated cardinality.
+kind: tools
+name: get_column_cardinality
+type: postgres-get-column-cardinality
+source: postgres-source
+description: Estimates the number of unique values (cardinality) quickly for one or all columns in a specific PostgreSQL table by using the database's internal statistics, returning the results in descending order of estimated cardinality. Please run ANALYZE on the table before using this tool to get accurate results. The tool returns the column_name and the estimated_cardinality. If the column_name is not provided, the tool returns all columns along with their estimated cardinality.
 ```
 
 The response is a json array with the following elements:
@@ -58,6 +58,6 @@ to estimate cardinality.
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-get-column-cardinality".           |
+| type        |  string  |     true     | Must be "postgres-get-column-cardinality".           |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.   |
diff --git a/docs/en/resources/tools/postgres/postgres-list-active-queries.md b/docs/en/resources/tools/postgres/postgres-list-active-queries.md
index 2184d96f70..2c533b15ba 100644
--- a/docs/en/resources/tools/postgres/postgres-list-active-queries.md
+++ b/docs/en/resources/tools/postgres/postgres-list-active-queries.md
@@ -33,11 +33,11 @@ active queries. The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_active_queries:
-    kind: postgres-list-active-queries
-    source: postgres-source
-    description: List the top N (default 50) currently running queries (state='active') from pg_stat_activity, ordered by longest-running first. Returns pid, user, database, application_name, client_addr, state, wait_event_type/wait_event, backend/xact/query start times, computed query_duration, and the SQL text.
+kind: tools
+name: list_active_queries
+type: postgres-list-active-queries
+source: postgres-source
+description: List the top N (default 50) currently running queries (state='active') from pg_stat_activity, ordered by longest-running first. Returns pid, user, database, application_name, client_addr, state, wait_event_type/wait_event, backend/xact/query start times, computed query_duration, and the SQL text.
 ```
 
 The response is a json array with the following elements:
@@ -64,6 +64,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-active-queries".            |
+| type        |  string  |     true     | Must be "postgres-list-active-queries".            |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-available-extensions.md b/docs/en/resources/tools/postgres/postgres-list-available-extensions.md
index dc823c78a5..cc2845baa3 100644
--- a/docs/en/resources/tools/postgres/postgres-list-available-extensions.md
+++ b/docs/en/resources/tools/postgres/postgres-list-available-extensions.md
@@ -26,11 +26,11 @@ not support any input parameter.
 ## Example
 
 ```yaml
-tools:
-  list_available_extensions:
-    kind: postgres-list-available-extensions
-    source: postgres-source
-    description: Discover all PostgreSQL extensions available for installation on this server, returning name, default_version, and description.
+kind: tools
+name: list_available_extensions
+type: postgres-list-available-extensions
+source: postgres-source
+description: Discover all PostgreSQL extensions available for installation on this server, returning name, default_version, and description.
 ```
 
 ## Reference
diff --git a/docs/en/resources/tools/postgres/postgres-list-database-stats.md b/docs/en/resources/tools/postgres/postgres-list-database-stats.md
index 01537bcfa7..7d9e3f57aa 100644
--- a/docs/en/resources/tools/postgres/postgres-list-database-stats.md
+++ b/docs/en/resources/tools/postgres/postgres-list-database-stats.md
@@ -30,31 +30,31 @@ takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_database_stats:
-    kind: postgres-list-database-stats
-    source: postgres-source
-    description: |
-       Lists the key performance and activity statistics for each PostgreSQL
-        database in the instance, offering insights into cache efficiency,
-        transaction throughput row-level activity, temporary file usage, and
-        contention. It returns: the database name, whether the database is
-        connectable, database owner, default tablespace name, the percentage of
-        data blocks found in the buffer cache rather than being read from disk
-        (a higher value indicates better cache performance), the total number of
-        disk blocks read from disk, the total number of times disk blocks were
-        found already in the cache; the total number of committed transactions,
-        the total number of rolled back transactions, the percentage of rolled
-        back transactions compared to the total number of completed
-        transactions, the total number of rows returned by queries, the total
-        number of live rows fetched by scans, the total number of rows inserted,
-        the total number of rows updated, the total number of rows deleted, the
-        number of temporary files created by queries, the total size of
-        temporary files used by queries in bytes, the number of query
-        cancellations due to conflicts with recovery, the number of deadlocks
-        detected, the current number of active backend connections, the
-        timestamp when the database statistics were last reset, and the total
-        database size in bytes.
+kind: tools
+name: list_database_stats
+type: postgres-list-database-stats
+source: postgres-source
+description: |
+  Lists the key performance and activity statistics for each PostgreSQL
+  database in the instance, offering insights into cache efficiency,
+  transaction throughput row-level activity, temporary file usage, and
+  contention. It returns: the database name, whether the database is
+  connectable, database owner, default tablespace name, the percentage of
+  data blocks found in the buffer cache rather than being read from disk
+  (a higher value indicates better cache performance), the total number of
+  disk blocks read from disk, the total number of times disk blocks were
+  found already in the cache; the total number of committed transactions,
+  the total number of rolled back transactions, the percentage of rolled
+  back transactions compared to the total number of completed
+  transactions, the total number of rows returned by queries, the total
+  number of live rows fetched by scans, the total number of rows inserted,
+  the total number of rows updated, the total number of rows deleted, the
+  number of temporary files created by queries, the total size of
+  temporary files used by queries in bytes, the number of query
+  cancellations due to conflicts with recovery, the number of deadlocks
+  detected, the current number of active backend connections, the
+  timestamp when the database statistics were last reset, and the total
+  database size in bytes.
 ```
 
 The response is a json array with the following elements:
@@ -90,6 +90,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-database-stats".              |
+| type        |  string  |     true     | Must be "postgres-list-database-stats".              |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-indexes.md b/docs/en/resources/tools/postgres/postgres-list-indexes.md
index f528ae97ec..590b09bb33 100644
--- a/docs/en/resources/tools/postgres/postgres-list-indexes.md
+++ b/docs/en/resources/tools/postgres/postgres-list-indexes.md
@@ -30,18 +30,18 @@ takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_indexes:
-    kind: postgres-list-indexes
-    source: postgres-source
-    description: |
-      Lists available user indexes in the database, excluding system schemas (pg_catalog, 
-      information_schema). For each index, the following properties are returned: 
-      schema name, table name, index name, index type (access method), a boolean 
-      indicating if it's a unique index, a boolean indicating if it's for a primary key,
-      the index definition, index size in bytes, the number of index scans, the number of 
-      index tuples read, the number of table tuples fetched via index scans, and a boolean 
-      indicating if the index has been used at least once. 
+kind: tools
+name: list_indexes
+type: postgres-list-indexes
+source: postgres-source
+description: |
+  Lists available user indexes in the database, excluding system schemas (pg_catalog, 
+  information_schema). For each index, the following properties are returned: 
+  schema name, table name, index name, index type (access method), a boolean 
+  indicating if it's a unique index, a boolean indicating if it's for a primary key,
+  the index definition, index size in bytes, the number of index scans, the number of 
+  index tuples read, the number of table tuples fetched via index scans, and a boolean 
+  indicating if the index has been used at least once. 
 ```
 
 The response is a json array with the following elements:
@@ -67,6 +67,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-indexes".                     |
+| type        |  string  |     true     | Must be "postgres-list-indexes".                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-installed-extensions.md b/docs/en/resources/tools/postgres/postgres-list-installed-extensions.md
index d3ff4eb26f..afda5031bc 100644
--- a/docs/en/resources/tools/postgres/postgres-list-installed-extensions.md
+++ b/docs/en/resources/tools/postgres/postgres-list-installed-extensions.md
@@ -26,17 +26,17 @@ support any input parameter.
 ## Example
 
 ```yaml
-tools:
-  list_installed_extensions:
-    kind: postgres-list-installed-extensions
-    source: postgres-source
-    description: List all installed PostgreSQL extensions with their name, version, schema, owner, and description.
+kind: tools
+name: list_installed_extensions
+type: postgres-list-installed-extensions
+source: postgres-source
+description: List all installed PostgreSQL extensions with their name, version, schema, owner, and description.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-active-queries".            |
+| type        |  string  |     true     | Must be "postgres-list-active-queries".            |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-locks.md b/docs/en/resources/tools/postgres/postgres-list-locks.md
index a0d60e93d9..4b7b8c6bb2 100644
--- a/docs/en/resources/tools/postgres/postgres-list-locks.md
+++ b/docs/en/resources/tools/postgres/postgres-list-locks.md
@@ -49,11 +49,11 @@ GROUP BY
 ## Example
 
 ```yaml
-tools:
-  list_locks:
-    kind: postgres-list-locks
-    source: postgres-source
-    description: "Lists active locks with associated process and query information."
+kind: tools
+name: list_locks
+type: postgres-list-locks
+source: postgres-source
+description: "Lists active locks with associated process and query information."
 ```
 
 Example response element (aggregated per process):
diff --git a/docs/en/resources/tools/postgres/postgres-list-pg-settings.md b/docs/en/resources/tools/postgres/postgres-list-pg-settings.md
index 23d5e28e92..895dbebf21 100644
--- a/docs/en/resources/tools/postgres/postgres-list-pg-settings.md
+++ b/docs/en/resources/tools/postgres/postgres-list-pg-settings.md
@@ -25,16 +25,16 @@ takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_indexes:
-    kind: postgres-list-pg-settings
-    source: postgres-source
-    description: |
-        Lists configuration parameters for the postgres server ordered lexicographically, 
-        with a default limit of 50 rows. It returns the parameter name, its current setting,
-        unit of measurement, a short description, the source of the current setting (e.g.,
-        default, configuration file, session), and whether a restart is required when the
-        parameter value is changed."
+kind: tools
+name: list_indexes
+type: postgres-list-pg-settings
+source: postgres-source
+description: |
+  Lists configuration parameters for the postgres server ordered lexicographically, 
+  with a default limit of 50 rows. It returns the parameter name, its current setting,
+  unit of measurement, a short description, the source of the current setting (e.g.,
+  default, configuration file, session), and whether a restart is required when the
+  parameter value is changed."
 ```
 
 The response is a json array with the following elements:
@@ -54,6 +54,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-pg-settings".                     |
+| type        |  string  |     true     | Must be "postgres-list-pg-settings".                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-publication-tables.md b/docs/en/resources/tools/postgres/postgres-list-publication-tables.md
index a437d11783..981402aa15 100644
--- a/docs/en/resources/tools/postgres/postgres-list-publication-tables.md
+++ b/docs/en/resources/tools/postgres/postgres-list-publication-tables.md
@@ -28,18 +28,18 @@ of tables) as part of the logical replication feature. The tool takes the follow
 ## Example
 
 ```yaml
-tools:
-  list_indexes:
-    kind: postgres-list-publication-tables
-    source: postgres-source
-    description: |
-      Lists all tables that are explicitly part of a publication in the database.
-      Tables that are part of a publication via 'FOR ALL TABLES' are not included,
-      unless they are also explicitly added to the publication.
-      Returns the publication name, schema name, and table name, along with
-      definition details indicating if it publishes all tables, whether it
-      replicates inserts, updates, deletes, or truncates, and the publication
-      owner.
+kind: tools
+name: list_indexes
+type: postgres-list-publication-tables
+source: postgres-source
+description: |
+  Lists all tables that are explicitly part of a publication in the database.
+  Tables that are part of a publication via 'FOR ALL TABLES' are not included,
+  unless they are also explicitly added to the publication.
+  Returns the publication name, schema name, and table name, along with
+  definition details indicating if it publishes all tables, whether it
+  replicates inserts, updates, deletes, or truncates, and the publication
+  owner.
 ```
 
 The response is a JSON array with the following elements:
@@ -61,6 +61,6 @@ The response is a JSON array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-publication-tables".          |
+| type        |  string  |     true     | Must be "postgres-list-publication-tables".          |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-query-stats.md b/docs/en/resources/tools/postgres/postgres-list-query-stats.md
index d6bfc9cb57..b5120cf357 100644
--- a/docs/en/resources/tools/postgres/postgres-list-query-stats.md
+++ b/docs/en/resources/tools/postgres/postgres-list-query-stats.md
@@ -29,11 +29,11 @@ total execution time in descending order. The tool takes the following input par
 ## Example
 
 ```yaml
-tools:
-  list_query_stats:
-    kind: postgres-list-query-stats
-    source: postgres-source
-    description: List query statistics from pg_stat_statements, showing performance metrics for queries including execution counts, timing information, and resource usage. Results are ordered by total execution time descending.
+kind: tools
+name: list_query_stats
+type: postgres-list-query-stats
+source: postgres-source
+description: List query statistics from pg_stat_statements, showing performance metrics for queries including execution counts, timing information, and resource usage. Results are ordered by total execution time descending.
 ```
 
 The response is a json array with the following elements:
@@ -66,6 +66,6 @@ identifying slow queries and understanding query performance patterns.
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-query-stats".                 |
+| type        |  string  |     true     | Must be "postgres-list-query-stats".                 |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.   |
diff --git a/docs/en/resources/tools/postgres/postgres-list-roles.md b/docs/en/resources/tools/postgres/postgres-list-roles.md
index d3de6abdfb..abfaefc84e 100644
--- a/docs/en/resources/tools/postgres/postgres-list-roles.md
+++ b/docs/en/resources/tools/postgres/postgres-list-roles.md
@@ -26,19 +26,19 @@ takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_indexes:
-    kind: postgres-list-roles
-    source: postgres-source
-    description: |
-      Lists all the user-created roles in the instance . It returns the role name,
-      Object ID, the maximum number of concurrent connections the role can make,
-      along with boolean indicators for: superuser status, privilege inheritance
-      from member roles, ability to create roles, ability to create databases,
-      ability to log in, replication privilege, and the ability to bypass
-      row-level security, the password expiration timestamp, a list of direct
-      members belonging to this role, and a list of other roles/groups that this
-      role is a member of.
+kind: tools
+name: list_indexes
+type: postgres-list-roles
+source: postgres-source
+description: |
+  Lists all the user-created roles in the instance . It returns the role name,
+  Object ID, the maximum number of concurrent connections the role can make,
+  along with boolean indicators for: superuser status, privilege inheritance
+  from member roles, ability to create roles, ability to create databases,
+  ability to log in, replication privilege, and the ability to bypass
+  row-level security, the password expiration timestamp, a list of direct
+  members belonging to this role, and a list of other roles/groups that this
+  role is a member of.
 ```
 
 The response is a json array with the following elements:
@@ -65,6 +65,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-roles".                     |
+| type        |  string  |     true     | Must be "postgres-list-roles".                     |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-schemas.md b/docs/en/resources/tools/postgres/postgres-list-schemas.md
index 6c0eb9e82a..5933085fe1 100644
--- a/docs/en/resources/tools/postgres/postgres-list-schemas.md
+++ b/docs/en/resources/tools/postgres/postgres-list-schemas.md
@@ -28,11 +28,11 @@ tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_schemas:
-    kind: postgres-list-schemas
-    source: postgres-source
-    description: "Lists all schemas in the database ordered by schema name and excluding system and temporary schemas. It returns the schema name, schema owner, grants, number of functions, number of tables and number of views within each schema."
+kind: tools
+name: list_schemas
+type: postgres-list-schemas
+source: postgres-source
+description: "Lists all schemas in the database ordered by schema name and excluding system and temporary schemas. It returns the schema name, schema owner, grants, number of functions, number of tables and number of views within each schema."
 ```
 
 The response is a json array with the following elements:
@@ -52,6 +52,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-schemas".                   |
+| type        |  string  |     true     | Must be "postgres-list-schemas".                   |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |    false     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-sequences.md b/docs/en/resources/tools/postgres/postgres-list-sequences.md
index e51915525a..3f5efe853b 100644
--- a/docs/en/resources/tools/postgres/postgres-list-sequences.md
+++ b/docs/en/resources/tools/postgres/postgres-list-sequences.md
@@ -29,16 +29,16 @@ The tool takes the following input parameters:
 ## Example
 
 ```yaml
-tools:
-  list_indexes:
-    kind: postgres-list-sequences
-    source: postgres-source
-    description: |
-        Lists all the sequences in the database ordered by sequence name.
-        Returns sequence name, schema name, sequence owner, data type of the
-        sequence, starting value, minimum value, maximum value of the sequence,
-        the value by which the sequence is incremented, and the last value
-        generated by generated by the sequence in the current session.
+kind: tools
+name: list_indexes
+type: postgres-list-sequences
+source: postgres-source
+description: |
+  Lists all the sequences in the database ordered by sequence name.
+  Returns sequence name, schema name, sequence owner, data type of the
+  sequence, starting value, minimum value, maximum value of the sequence,
+  the value by which the sequence is incremented, and the last value
+  generated by generated by the sequence in the current session.
 ```
 
 The response is a json array with the following elements:
@@ -61,6 +61,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-sequences".                   |
+| type        |  string  |     true     | Must be "postgres-list-sequences".                   |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-stored-procedure.md b/docs/en/resources/tools/postgres/postgres-list-stored-procedure.md
index ec03365e55..cd6a86aa1f 100644
--- a/docs/en/resources/tools/postgres/postgres-list-stored-procedure.md
+++ b/docs/en/resources/tools/postgres/postgres-list-stored-procedure.md
@@ -31,11 +31,11 @@ The tool returns a JSON array where each element represents a stored procedure w
 ## Example
 
 ```yaml
-tools:
-  list_stored_procedure:
-    kind: postgres-list-stored-procedure
-    source: postgres-source
-    description: "Retrieves stored procedure metadata including definitions and owners."
+kind: tools
+name: list_stored_procedure
+type: postgres-list-stored-procedure
+source: postgres-source
+description: "Retrieves stored procedure metadata including definitions and owners."
 ```
 
 ### Example Requests
diff --git a/docs/en/resources/tools/postgres/postgres-list-table-stats.md b/docs/en/resources/tools/postgres/postgres-list-table-stats.md
index 666a126aca..cecc8b81d8 100644
--- a/docs/en/resources/tools/postgres/postgres-list-table-stats.md
+++ b/docs/en/resources/tools/postgres/postgres-list-table-stats.md
@@ -23,11 +23,11 @@ The tool returns a JSON array where each element represents statistics for a tab
 ## Example
 
 ```yaml
-tools:
-  list_table_stats:
-    kind: postgres-list-table-stats
-    source: postgres-source
-    description: "Lists table statistics including size, scans, and bloat metrics."
+kind: tools
+name: list_table_stats
+type: postgres-list-table-stats
+source: postgres-source
+description: "Lists table statistics including size, scans, and bloat metrics."
 ```
 
 ### Example Requests
diff --git a/docs/en/resources/tools/postgres/postgres-list-tables.md b/docs/en/resources/tools/postgres/postgres-list-tables.md
index f40076bd49..04f56cbfaf 100644
--- a/docs/en/resources/tools/postgres/postgres-list-tables.md
+++ b/docs/en/resources/tools/postgres/postgres-list-tables.md
@@ -31,18 +31,18 @@ constraints, indexes, triggers, owner, comment) as JSON for user-created tables
 ## Example
 
 ```yaml
-tools:
-  postgres_list_tables:
-    kind: postgres-list-tables
-    source: postgres-source
-    description: Use this tool to retrieve schema information for all or
-    specified tables. Output format can be simple (only table names) or detailed.
+kind: tools
+name: postgres_list_tables
+type: postgres-list-tables
+source: postgres-source
+description: Use this tool to retrieve schema information for all or
+  specified tables. Output format can be simple (only table names) or detailed.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-tables".                      |
+| type        |  string  |     true     | Must be "postgres-list-tables".                      |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |     true     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-tablespaces.md b/docs/en/resources/tools/postgres/postgres-list-tablespaces.md
index bf63f61b8f..5e78bf5cbe 100644
--- a/docs/en/resources/tools/postgres/postgres-list-tablespaces.md
+++ b/docs/en/resources/tools/postgres/postgres-list-tablespaces.md
@@ -24,15 +24,15 @@ The `postgres-list-tablespaces` tool lists available tablespaces in the database
 ## Example
 
 ```yaml
-tools:
-  list_tablespaces:
-    kind: postgres-list-tablespaces
-    source: postgres-source
-    description: |
-      Lists all tablespaces in the database. Returns the tablespace name,
-      owner name, size in bytes(if the current user has CREATE privileges on
-      the tablespace, otherwise NULL), internal object ID, the access control
-      list regarding permissions, and any specific tablespace options.
+kind: tools
+name: list_tablespaces
+type: postgres-list-tablespaces
+source: postgres-source
+description: |
+  Lists all tablespaces in the database. Returns the tablespace name,
+  owner name, size in bytes(if the current user has CREATE privileges on
+  the tablespace, otherwise NULL), internal object ID, the access control
+  list regarding permissions, and any specific tablespace options.
 ```
 The response is a json array with the following elements:
 
@@ -51,6 +51,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required**  | **description**                                      |
 |-------------|:--------:|:-------------:|------------------------------------------------------|
-| kind        |  string  |     true      | Must be "postgres-list-tablespaces".                      |
+| type        |  string  |     true      | Must be "postgres-list-tablespaces".                      |
 | source      |  string  |     true      | Name of the source the SQL should execute on.        |
 | description |  string  |     false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-triggers.md b/docs/en/resources/tools/postgres/postgres-list-triggers.md
index b270894001..5c93e6fc50 100644
--- a/docs/en/resources/tools/postgres/postgres-list-triggers.md
+++ b/docs/en/resources/tools/postgres/postgres-list-triggers.md
@@ -31,13 +31,12 @@ tool takes the following input parameters:
 ## Example
 
 ```yaml
-```yaml
-tools:
-  list_triggers:
-    kind: postgres-list-triggers
-    source: postgres-source
-    description: |
-        Lists all non-internal triggers in a database. Returns trigger name, schema name, table name, wether its enabled or disabled,  timing (e.g BEFORE/AFTER of the event), the  events that cause the trigger to fire such as INSERT, UPDATE, or DELETE, whether the trigger activates per ROW or per STATEMENT, the handler function executed by the trigger and full definition.
+kind: tools
+name: list_triggers
+type: postgres-list-triggers
+source: postgres-source
+description: |
+  Lists all non-internal triggers in a database. Returns trigger name, schema name, table name, wether its enabled or disabled,  timing (e.g BEFORE/AFTER of the event), the  events that cause the trigger to fire such as INSERT, UPDATE, or DELETE, whether the trigger activates per ROW or per STATEMENT, the handler function executed by the trigger and full definition.
 ```
 
 The response is a json array with the following elements:
@@ -60,6 +59,6 @@ The response is a json array with the following elements:
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-triggers".                    |
+| type        |  string  |     true     | Must be "postgres-list-triggers".                    |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-list-views.md b/docs/en/resources/tools/postgres/postgres-list-views.md
index b6f1687f33..a99b092276 100644
--- a/docs/en/resources/tools/postgres/postgres-list-views.md
+++ b/docs/en/resources/tools/postgres/postgres-list-views.md
@@ -29,16 +29,16 @@ parameters:
 ## Example
 
 ```yaml
-tools:
-  list_views:
-    kind: postgres-list-views
-    source: cloudsql-pg-source
+kind: tools
+name: list_views
+type: postgres-list-views
+source: cloudsql-pg-source
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                      |
 |-------------|:--------:|:------------:|------------------------------------------------------|
-| kind        |  string  |     true     | Must be "postgres-list-views".                       |
+| type        |  string  |     true     | Must be "postgres-list-views".                       |
 | source      |  string  |     true     | Name of the source the SQL should execute on.        |
 | description |  string  |    false     | Description of the tool that is passed to the agent. |
diff --git a/docs/en/resources/tools/postgres/postgres-long-running-transactions.md b/docs/en/resources/tools/postgres/postgres-long-running-transactions.md
index 0380ca7c21..fc264bb6ee 100644
--- a/docs/en/resources/tools/postgres/postgres-long-running-transactions.md
+++ b/docs/en/resources/tools/postgres/postgres-long-running-transactions.md
@@ -60,11 +60,11 @@ LIMIT
 ## Example
 
 ```yaml
-tools:
-  long_running_transactions:
-    kind: postgres-long-running-transactions
-    source: postgres-source
-    description: "Identifies transactions open longer than a threshold and returns details including query text and durations."
+kind: tools
+name: long_running_transactions
+type: postgres-long-running-transactions
+source: postgres-source
+description: "Identifies transactions open longer than a threshold and returns details including query text and durations."
 ```
 
 Example response element:
diff --git a/docs/en/resources/tools/postgres/postgres-replication-stats.md b/docs/en/resources/tools/postgres/postgres-replication-stats.md
index c9dfdc81cb..b257753955 100644
--- a/docs/en/resources/tools/postgres/postgres-replication-stats.md
+++ b/docs/en/resources/tools/postgres/postgres-replication-stats.md
@@ -23,11 +23,11 @@ This tool takes no parameters. It returns a JSON array; each element represents
 ## Example
 
 ```yaml
-tools:
-  replication_stats:
-    kind: postgres-replication-stats
-    source: postgres-source
-    description: "Lists replication connections and readable WAL lag metrics."
+kind: tools
+name: replication_stats
+type: postgres-replication-stats
+source: postgres-source
+description: "Lists replication connections and readable WAL lag metrics."
 ```
 
 Example response element:
diff --git a/docs/en/resources/tools/postgres/postgres-sql.md b/docs/en/resources/tools/postgres/postgres-sql.md
index 190f9478e3..067386b957 100644
--- a/docs/en/resources/tools/postgres/postgres-sql.md
+++ b/docs/en/resources/tools/postgres/postgres-sql.md
@@ -34,41 +34,41 @@ of the prepared statement.
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = $1
-      AND flight_number = $2
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = $1
+  AND flight_number = $2
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -80,29 +80,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: postgres-sql
-    source: my-pg-instance
-    statement: |
-      SELECT * FROM {{.tableName}}
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: postgres-sql
+source: my-pg-instance
+statement: |
+  SELECT * FROM {{.tableName}}
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "postgres-sql".                                                                                                                |
+| type               |                    string                    |     true     | Must be "postgres-sql".                                                                                                                |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/redis/redis.md b/docs/en/resources/tools/redis/redis.md
index 53dc344d6a..fade388416 100644
--- a/docs/en/resources/tools/redis/redis.md
+++ b/docs/en/resources/tools/redis/redis.md
@@ -42,21 +42,21 @@ to be executed after argument expansion will be `[SADD, userNames, Alice, Sid, B
 ## Example
 
 ```yaml
-tools:
-  user_data_tool:
-    kind: redis
-    source: my-redis-instance
-    description: |
-      Use this tool to interact with user data stored in Redis.
-      It can set, retrieve, and delete user-specific information.
-    commands:
-      - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
-      - [GET, $userId]
-    parameters:
-      - name: userId
-        type: string
-        description: The unique identifier for the user.
-      - name: userNames
-        type: array
-        description: The user names to be set.  
+kind: tools
+name: user_data_tool
+type: redis
+source: my-redis-instance
+description: |
+  Use this tool to interact with user data stored in Redis.
+  It can set, retrieve, and delete user-specific information.
+commands:
+  - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
+  - [GET, $userId]
+parameters:
+  - name: userId
+    type: string
+    description: The unique identifier for the user.
+  - name: userNames
+    type: array
+    description: The user names to be set.  
 ```
diff --git a/docs/en/resources/tools/serverless-spark/serverless-spark-cancel-batch.md b/docs/en/resources/tools/serverless-spark/serverless-spark-cancel-batch.md
index 7af6f05ed4..61fa321170 100644
--- a/docs/en/resources/tools/serverless-spark/serverless-spark-cancel-batch.md
+++ b/docs/en/resources/tools/serverless-spark/serverless-spark-cancel-batch.md
@@ -30,11 +30,11 @@ The tool inherits the `project` and `location` from the source configuration.
 ## Example
 
 ```yaml
-tools:
-  cancel_spark_batch:
-    kind: serverless-spark-cancel-batch
-    source: my-serverless-spark-source
-    description: Use this tool to cancel a running serverless spark batch operation.
+kind: tools
+name: cancel_spark_batch
+type: serverless-spark-cancel-batch
+source: my-serverless-spark-source
+description: Use this tool to cancel a running serverless spark batch operation.
 ```
 
 ## Response Format
@@ -47,7 +47,7 @@ tools:
 
 | **field**    | **type** | **required** | **description**                                    |
 | ------------ | :------: | :----------: | -------------------------------------------------- |
-| kind         |  string  |     true     | Must be "serverless-spark-cancel-batch".           |
+| type         |  string  |     true     | Must be "serverless-spark-cancel-batch".           |
 | source       |  string  |     true     | Name of the source the tool should use.            |
 | description  |  string  |     true     | Description of the tool that is passed to the LLM. |
 | authRequired | string[] |    false     | List of auth services required to invoke this tool |
diff --git a/docs/en/resources/tools/serverless-spark/serverless-spark-create-pyspark-batch.md b/docs/en/resources/tools/serverless-spark/serverless-spark-create-pyspark-batch.md
index b94d386b2d..e0d2a5c097 100644
--- a/docs/en/resources/tools/serverless-spark/serverless-spark-create-pyspark-batch.md
+++ b/docs/en/resources/tools/serverless-spark/serverless-spark-create-pyspark-batch.md
@@ -43,16 +43,16 @@ prebuilt config.
 ### Example `tools.yaml`
 
 ```yaml
-tools:
-  - name: "serverless-spark-create-pyspark-batch"
-    kind: "serverless-spark-create-pyspark-batch"
-    source: "my-serverless-spark-source"
-    runtimeConfig:
-      properties:
-        spark.driver.memory: "1024m"
-    environmentConfig:
-      executionConfig:
-        networkUri: "my-network"
+kind: tools
+name: serverless-spark-create-pyspark-batch
+type: serverless-spark-create-pyspark-batch
+source: "my-serverless-spark-source"
+runtimeConfig:
+  properties:
+    spark.driver.memory: "1024m"
+environmentConfig:
+  executionConfig:
+    networkUri: "my-network"
 ```
 
 ## Response Format
@@ -89,7 +89,7 @@ detailed information.
 
 | **field**         | **type** | **required** | **description**                                                                                                                                          |
 | ----------------- | :------: | :----------: | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| kind              |  string  |     true     | Must be "serverless-spark-create-pyspark-batch".                                                                                                         |
+| type              |  string  |     true     | Must be "serverless-spark-create-pyspark-batch".                                                                                                         |
 | source            |  string  |     true     | Name of the source the tool should use.                                                                                                                  |
 | description       |  string  |    false     | Description of the tool that is passed to the LLM.                                                                                                       |
 | runtimeConfig     |   map    |    false     | [Runtime config](https://docs.cloud.google.com/dataproc-serverless/docs/reference/rest/v1/RuntimeConfig) for all batches created with this tool.         |
diff --git a/docs/en/resources/tools/serverless-spark/serverless-spark-create-spark-batch.md b/docs/en/resources/tools/serverless-spark/serverless-spark-create-spark-batch.md
index 8264be00b0..46a0b87292 100644
--- a/docs/en/resources/tools/serverless-spark/serverless-spark-create-spark-batch.md
+++ b/docs/en/resources/tools/serverless-spark/serverless-spark-create-spark-batch.md
@@ -48,16 +48,16 @@ prebuilt config.
 ### Example `tools.yaml`
 
 ```yaml
-tools:
-  - name: "serverless-spark-create-spark-batch"
-    kind: "serverless-spark-create-spark-batch"
-    source: "my-serverless-spark-source"
-    runtimeConfig:
-      properties:
-        spark.driver.memory: "1024m"
-    environmentConfig:
-      executionConfig:
-        networkUri: "my-network"
+kind: tools
+name: "serverless-spark-create-spark-batch"
+type: "serverless-spark-create-spark-batch"
+source: "my-serverless-spark-source"
+runtimeConfig:
+  properties:
+    spark.driver.memory: "1024m"
+environmentConfig:
+  executionConfig:
+    networkUri: "my-network"
 ```
 
 ## Response Format
@@ -94,7 +94,7 @@ detailed information.
 
 | **field**         | **type** | **required** | **description**                                                                                                                                          |
 | ----------------- | :------: | :----------: | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| kind              |  string  |     true     | Must be "serverless-spark-create-spark-batch".                                                                                                           |
+| type              |  string  |     true     | Must be "serverless-spark-create-spark-batch".                                                                                                           |
 | source            |  string  |     true     | Name of the source the tool should use.                                                                                                                  |
 | description       |  string  |    false     | Description of the tool that is passed to the LLM.                                                                                                       |
 | runtimeConfig     |   map    |    false     | [Runtime config](https://docs.cloud.google.com/dataproc-serverless/docs/reference/rest/v1/RuntimeConfig) for all batches created with this tool.         |
diff --git a/docs/en/resources/tools/serverless-spark/serverless-spark-get-batch.md b/docs/en/resources/tools/serverless-spark/serverless-spark-get-batch.md
index 754aab9fd9..a43d6fdb04 100644
--- a/docs/en/resources/tools/serverless-spark/serverless-spark-get-batch.md
+++ b/docs/en/resources/tools/serverless-spark/serverless-spark-get-batch.md
@@ -25,11 +25,11 @@ The tool gets the `project` and `location` from the source configuration.
 ## Example
 
 ```yaml
-tools:
-  get_my_batch:
-    kind: serverless-spark-get-batch
-    source: my-serverless-spark-source
-    description: Use this tool to get a serverless spark batch.
+kind: tools
+name: get_my_batch
+type: serverless-spark-get-batch
+source: my-serverless-spark-source
+description: Use this tool to get a serverless spark batch.
 ```
 
 ## Response Format
@@ -85,7 +85,7 @@ detailed information.
 
 | **field**    | **type** | **required** | **description**                                    |
 | ------------ | :------: | :----------: | -------------------------------------------------- |
-| kind         |  string  |     true     | Must be "serverless-spark-get-batch".              |
+| type         |  string  |     true     | Must be "serverless-spark-get-batch".              |
 | source       |  string  |     true     | Name of the source the tool should use.            |
 | description  |  string  |     true     | Description of the tool that is passed to the LLM. |
 | authRequired | string[] |    false     | List of auth services required to invoke this tool |
diff --git a/docs/en/resources/tools/serverless-spark/serverless-spark-list-batches.md b/docs/en/resources/tools/serverless-spark/serverless-spark-list-batches.md
index 9f0e5f0e7c..7a74006084 100644
--- a/docs/en/resources/tools/serverless-spark/serverless-spark-list-batches.md
+++ b/docs/en/resources/tools/serverless-spark/serverless-spark-list-batches.md
@@ -33,11 +33,11 @@ The tool gets the `project` and `location` from the source configuration.
 ## Example
 
 ```yaml
-tools:
-  list_spark_batches:
-    kind: serverless-spark-list-batches
-    source: my-serverless-spark-source
-    description: Use this tool to list and filter serverless spark batches.
+kind: tools
+name: list_spark_batches
+type: serverless-spark-list-batches
+source: my-serverless-spark-source
+description: Use this tool to list and filter serverless spark batches.
 ```
 
 ## Response Format
@@ -72,7 +72,7 @@ tools:
 
 | **field**    | **type** | **required** | **description**                                    |
 | ------------ | :------: | :----------: | -------------------------------------------------- |
-| kind         |  string  |     true     | Must be "serverless-spark-list-batches".           |
+| type         |  string  |     true     | Must be "serverless-spark-list-batches".           |
 | source       |  string  |     true     | Name of the source the tool should use.            |
 | description  |  string  |     true     | Description of the tool that is passed to the LLM. |
 | authRequired | string[] |    false     | List of auth services required to invoke this tool |
diff --git a/docs/en/resources/tools/singlestore/singlestore-execute-sql.md b/docs/en/resources/tools/singlestore/singlestore-execute-sql.md
index c4c007eaf1..fc2e9fbf55 100644
--- a/docs/en/resources/tools/singlestore/singlestore-execute-sql.md
+++ b/docs/en/resources/tools/singlestore/singlestore-execute-sql.md
@@ -25,17 +25,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: singlestore-execute-sql
-    source: my-s2-instance
-    description: Use this tool to execute sql statement
+kind: tools
+name: execute_sql_tool
+type: singlestore-execute-sql
+source: my-s2-instance
+description: Use this tool to execute sql statement
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "singlestore-execute-sql".                 |
+| type        |  string  |     true     | Must be "singlestore-execute-sql".                 |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/singlestore/singlestore-sql.md b/docs/en/resources/tools/singlestore/singlestore-sql.md
index c745e2d9f3..885fbc959f 100644
--- a/docs/en/resources/tools/singlestore/singlestore-sql.md
+++ b/docs/en/resources/tools/singlestore/singlestore-sql.md
@@ -27,41 +27,41 @@ form of placeholders `?`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: singlestore-sql
-    source: my-s2-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: singlestore-sql
+source: my-s2-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = ?
+  AND flight_number = ?
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -73,29 +73,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: singlestore-sql
-    source: my-s2-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: singlestore-sql
+source: my-s2-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "singlestore-sql".                                                                                                             |
+| type               |                    string                    |     true     | Must be "singlestore-sql".                                                                                                             |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/snowflake/snowflake-execute-sql.md b/docs/en/resources/tools/snowflake/snowflake-execute-sql.md
index 1d6af931bd..b5af0fe63f 100644
--- a/docs/en/resources/tools/snowflake/snowflake-execute-sql.md
+++ b/docs/en/resources/tools/snowflake/snowflake-execute-sql.md
@@ -23,18 +23,18 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: snowflake-execute-sql
-    source: my-snowflake-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: snowflake-execute-sql
+source: my-snowflake-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**    |   **type**    | **required** | **description**                                           |
 |--------------|:-------------:|:------------:|-----------------------------------------------------------|
-| kind         |    string     |     true     | Must be "snowflake-execute-sql".                          |
+| type         |    string     |     true     | Must be "snowflake-execute-sql".                          |
 | source       |    string     |     true     | Name of the source the SQL should execute on.             |
 | description  |    string     |     true     | Description of the tool that is passed to the LLM.        |
 | authRequired | array[string] |    false     | List of auth services that are required to use this tool. |
diff --git a/docs/en/resources/tools/snowflake/snowflake-sql.md b/docs/en/resources/tools/snowflake/snowflake-sql.md
index d55241e32f..b66041cac5 100644
--- a/docs/en/resources/tools/snowflake/snowflake-sql.md
+++ b/docs/en/resources/tools/snowflake/snowflake-sql.md
@@ -26,41 +26,41 @@ first parameter specified, `:2` will be the second parameter, and so on.
 ## Example
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: snowflake-sql
-    source: my-snowflake-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = :1
-      AND flight_number = :2
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: snowflake-sql
+source: my-snowflake-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = :1
+  AND flight_number = :2
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -72,29 +72,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: snowflake
-    source: my-snowflake-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: snowflake
+source: my-snowflake-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "snowflake-sql".                                                                                                               |
+| type               |                    string                    |     true     | Must be "snowflake-sql".                                                                                                               |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/spanner/spanner-execute-sql.md b/docs/en/resources/tools/spanner/spanner-execute-sql.md
index b04e90e34e..b9e5c6c255 100644
--- a/docs/en/resources/tools/spanner/spanner-execute-sql.md
+++ b/docs/en/resources/tools/spanner/spanner-execute-sql.md
@@ -25,18 +25,18 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: spanner-execute-sql
-    source: my-spanner-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: spanner-execute-sql
+source: my-spanner-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                                                          |
 |-------------|:--------:|:------------:|------------------------------------------------------------------------------------------|
-| kind        |  string  |     true     | Must be "spanner-execute-sql".                                                           |
+| type        |  string  |     true     | Must be "spanner-execute-sql".                                                           |
 | source      |  string  |     true     | Name of the source the SQL should execute on.                                            |
 | description |  string  |     true     | Description of the tool that is passed to the LLM.                                       |
 | readOnly    |   bool   |    false     | When set to `true`, the `statement` is run as a read-only transaction. Default: `false`. |
diff --git a/docs/en/resources/tools/spanner/spanner-list-graphs.md b/docs/en/resources/tools/spanner/spanner-list-graphs.md
index e846fdfe77..7d8ae63fbc 100644
--- a/docs/en/resources/tools/spanner/spanner-list-graphs.md
+++ b/docs/en/resources/tools/spanner/spanner-list-graphs.md
@@ -35,35 +35,35 @@ source dialect, as Spanner Graph isn't available in the PostgreSQL dialect.
 ### Basic Usage - List All Graphs
 
 ```yaml
-sources:
-  my-spanner-db:
-    kind: spanner
-    project: ${SPANNER_PROJECT}
-    instance: ${SPANNER_INSTANCE}
-    database: ${SPANNER_DATABASE}
-    dialect: googlesql  # wont work for postgresql
-
-tools:
-  list_all_graphs:
-    kind: spanner-list-graphs
-    source: my-spanner-db
-    description: Lists all graphs with their complete schema information
+kind: sources
+name: my-spanner-db
+type: spanner
+project: ${SPANNER_PROJECT}
+instance: ${SPANNER_INSTANCE}
+database: ${SPANNER_DATABASE}
+dialect: googlesql  # wont work for postgresql
+---
+kind: tools
+name: list_all_graphs
+type: spanner-list-graphs
+source: my-spanner-db
+description: Lists all graphs with their complete schema information
 ```
 
 ### List Specific Graphs
 
 ```yaml
-tools:
-  list_specific_graphs:
-    kind: spanner-list-graphs
-    source: my-spanner-db
-    description: |
-      Lists schema information for specific graphs.
-      Example usage:
-      {
-        "graph_names": "FinGraph,SocialGraph",
-        "output_format": "detailed"
-      }
+kind: tools
+name: list_specific_graphs
+type: spanner-list-graphs
+source: my-spanner-db
+description: |
+  Lists schema information for specific graphs.
+  Example usage:
+  {
+    "graph_names": "FinGraph,SocialGraph",
+    "output_format": "detailed"
+  }
 ```
 
 ## Parameters
@@ -235,36 +235,36 @@ comprehensive schema information:
 ## Example with Agent Integration
 
 ```yaml
-sources:
-  spanner-db:
-    kind: spanner
-    project: my-project
-    instance: my-instance
-    database: my-database
-    dialect: googlesql
-
-tools:
-  schema_inspector:
-    kind: spanner-list-graphs
-    source: spanner-db
-    description: |
-      Use this tool to inspect database schema information.
-      You can:
-      - List all graphs by leaving graph_names empty
-      - Get specific graph schemas by providing comma-separated graph names
-      - Choose between simple (names only) or detailed (full schema) output
-      
-      Examples:
-      1. List all graphs with details: {"output_format": "detailed"}
-      2. Get specific graphs: {"graph_names": "FinGraph,SocialGraph", "output_format": "detailed"}
-      3. Just get graph names: {"output_format": "simple"}
+kind: sources
+name: spanner-db
+type: spanner
+project: my-project
+instance: my-instance
+database: my-database
+dialect: googlesql
+---
+kind: tools
+name: schema_inspector
+type: spanner-list-graphs
+source: spanner-db
+description: |
+  Use this tool to inspect database schema information.
+  You can:
+  - List all graphs by leaving graph_names empty
+  - Get specific graph schemas by providing comma-separated graph names
+  - Choose between simple (names only) or detailed (full schema) output
+  
+  Examples:
+  1. List all graphs with details: {"output_format": "detailed"}
+  2. Get specific graphs: {"graph_names": "FinGraph,SocialGraph", "output_format": "detailed"}
+  3. Just get graph names: {"output_format": "simple"}
 ```
 
 ## Reference
 
 | **field**    | **type** | **required** | **description**                                                 |
 |--------------|:--------:|:------------:|-----------------------------------------------------------------|
-| kind         |  string  |     true     | Must be "spanner-list-graphs"                                   |
+| type         |  string  |     true     | Must be "spanner-list-graphs"                                   |
 | source       |  string  |     true     | Name of the Spanner source to query (dialect must be GoogleSQL) |
 | description  |  string  |    false     | Description of the tool that is passed to the LLM               |
 | authRequired | string[] |    false     | List of auth services required to invoke this tool              |
diff --git a/docs/en/resources/tools/spanner/spanner-list-tables.md b/docs/en/resources/tools/spanner/spanner-list-tables.md
index 3a7f6ea48a..d1b196fa9c 100644
--- a/docs/en/resources/tools/spanner/spanner-list-tables.md
+++ b/docs/en/resources/tools/spanner/spanner-list-tables.md
@@ -36,35 +36,35 @@ syntax.
 ### Basic Usage - List All Tables
 
 ```yaml
-sources:
-  my-spanner-db:
-    kind: spanner
-    project: ${SPANNER_PROJECT}
-    instance: ${SPANNER_INSTANCE}
-    database: ${SPANNER_DATABASE}
-    dialect: googlesql  # or postgresql
-
-tools:
-  list_all_tables:
-    kind: spanner-list-tables
-    source: my-spanner-db
-    description: Lists all tables with their complete schema information
+kind: sources
+name: my-spanner-db
+type: spanner
+project: ${SPANNER_PROJECT}
+instance: ${SPANNER_INSTANCE}
+database: ${SPANNER_DATABASE}
+dialect: googlesql  # or postgresql
+---
+kind: tools
+name: list_all_tables
+type: spanner-list-tables
+source: my-spanner-db
+description: Lists all tables with their complete schema information
 ```
 
 ### List Specific Tables
 
 ```yaml
-tools:
-  list_specific_tables:
-    kind: spanner-list-tables
-    source: my-spanner-db
-    description: |
-      Lists schema information for specific tables.
-      Example usage:
-      {
-        "table_names": "users,orders,products",
-        "output_format": "detailed"
-      }
+kind: tools
+name: list_specific_tables
+type: spanner-list-tables
+source: my-spanner-db
+description: |
+  Lists schema information for specific tables.
+  Example usage:
+  {
+    "table_names": "users,orders,products",
+    "output_format": "detailed"
+  }
 ```
 
 ## Parameters
@@ -177,36 +177,36 @@ comprehensive schema information:
 ## Example with Agent Integration
 
 ```yaml
-sources:
-  spanner-db:
-    kind: spanner
-    project: my-project
-    instance: my-instance
-    database: my-database
-    dialect: googlesql
-
-tools:
-  schema_inspector:
-    kind: spanner-list-tables
-    source: spanner-db
-    description: |
-      Use this tool to inspect database schema information.
-      You can:
-      - List all tables by leaving table_names empty
-      - Get specific table schemas by providing comma-separated table names
-      - Choose between simple (names only) or detailed (full schema) output
-      
-      Examples:
-      1. List all tables with details: {"output_format": "detailed"}
-      2. Get specific tables: {"table_names": "users,orders", "output_format": "detailed"}
-      3. Just get table names: {"output_format": "simple"}
+kind: sources
+name: spanner-db
+type: spanner
+project: my-project
+instance: my-instance
+database: my-database
+dialect: googlesql
+---
+kind: tools
+name: schema_inspector
+type: spanner-list-tables
+source: spanner-db
+description: |
+  Use this tool to inspect database schema information.
+  You can:
+  - List all tables by leaving table_names empty
+  - Get specific table schemas by providing comma-separated table names
+  - Choose between simple (names only) or detailed (full schema) output
+  
+  Examples:
+  1. List all tables with details: {"output_format": "detailed"}
+  2. Get specific tables: {"table_names": "users,orders", "output_format": "detailed"}
+  3. Just get table names: {"output_format": "simple"}
 ```
 
 ## Reference
 
 | **field**    | **type** | **required** | **description**                                    |
 |--------------|:--------:|:------------:|----------------------------------------------------|
-| kind         |  string  |     true     | Must be "spanner-list-tables"                      |
+| type         |  string  |     true     | Must be "spanner-list-tables"                      |
 | source       |  string  |     true     | Name of the Spanner source to query                |
 | description  |  string  |    false     | Description of the tool that is passed to the LLM  |
 | authRequired | string[] |    false     | List of auth services required to invoke this tool |
diff --git a/docs/en/resources/tools/spanner/spanner-sql.md b/docs/en/resources/tools/spanner/spanner-sql.md
index edf21254b4..221ecc7288 100644
--- a/docs/en/resources/tools/spanner/spanner-sql.md
+++ b/docs/en/resources/tools/spanner/spanner-sql.md
@@ -50,80 +50,80 @@ the second parameter, and so on.
 {{< tabpane persist="header" >}}
 {{< tab header="GoogleSQL" lang="yaml" >}}
 
-tools:
- search_flights_by_number:
-    kind: spanner-sql
-    source: my-spanner-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = @airline
-      AND flight_number = @flight_number
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: spanner-sql
+source: my-spanner-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = @airline
+  AND flight_number = @flight_number
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 
 {{< /tab >}}
 {{< tab header="PostgreSQL" lang="yaml" >}}
 
-tools:
- search_flights_by_number:
-    kind: spanner
-    source: my-spanner-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = $1
-      AND flight_number = $2
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: spanner
+source: my-spanner-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = $1
+  AND flight_number = $2
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 
 {{< /tab >}}
 {{< /tabpane >}}
@@ -137,29 +137,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: spanner
-    source: my-spanner-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: spanner
+source: my-spanner-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "spanner-sql".                                                                                                                 |
+| type               |                    string                    |     true     | Must be "spanner-sql".                                                                                                                 |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/sqlite/sqlite-execute-sql.md b/docs/en/resources/tools/sqlite/sqlite-execute-sql.md
index 0360154a44..7e5d293641 100644
--- a/docs/en/resources/tools/sqlite/sqlite-execute-sql.md
+++ b/docs/en/resources/tools/sqlite/sqlite-execute-sql.md
@@ -25,17 +25,17 @@ This tool is designed for direct execution of SQL statements. It takes a single
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: sqlite-execute-sql
-    source: my-sqlite-db
-    description: Use this tool to execute a SQL statement.
+kind: tools
+name: execute_sql_tool
+type: sqlite-execute-sql
+source: my-sqlite-db
+description: Use this tool to execute a SQL statement.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "sqlite-execute-sql".                      |
+| type        |  string  |     true     | Must be "sqlite-execute-sql".                      |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/sqlite/sqlite-sql.md b/docs/en/resources/tools/sqlite/sqlite-sql.md
index ecc714dfb2..de5c9bc48b 100644
--- a/docs/en/resources/tools/sqlite/sqlite-sql.md
+++ b/docs/en/resources/tools/sqlite/sqlite-sql.md
@@ -30,19 +30,19 @@ DDL statements.
 > names, or other parts of the query.
 
 ```yaml
-tools:
-  search-users:
-    kind: sqlite-sql
-    source: my-sqlite-db
-    description: Search users by name and age
-    parameters:
-      - name: name
-        type: string
-        description: The name to search for
-      - name: min_age
-        type: integer
-        description: Minimum age
-    statement: SELECT * FROM users WHERE name LIKE ? AND age >= ?
+kind: tools
+name: search-users
+type: sqlite-sql
+source: my-sqlite-db
+description: Search users by name and age
+parameters:
+  - name: name
+    type: string
+    description: The name to search for
+  - name: min_age
+    type: integer
+    description: Minimum age
+statement: SELECT * FROM users WHERE name LIKE ? AND age >= ?
 ```
 
 ### Example with Template Parameters
@@ -54,29 +54,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: sqlite-sql
-    source: my-sqlite-db
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: sqlite-sql
+source: my-sqlite-db
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "sqlite-sql".                                                                                                                  |
+| type               |                    string                    |     true     | Must be "sqlite-sql".                                                                                                                  |
 | source             |                    string                    |     true     | Name of the source the SQLite source configuration.                                                                                    |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | The SQL statement to execute.                                                                                                          |
diff --git a/docs/en/resources/tools/tidb/tidb-execute-sql.md b/docs/en/resources/tools/tidb/tidb-execute-sql.md
index 8b1e68b8b2..fd36d7a845 100644
--- a/docs/en/resources/tools/tidb/tidb-execute-sql.md
+++ b/docs/en/resources/tools/tidb/tidb-execute-sql.md
@@ -25,17 +25,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: tidb-execute-sql
-    source: my-tidb-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: tidb-execute-sql
+source: my-tidb-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   | **type** | **required** | **description**                                    |
 |-------------|:--------:|:------------:|----------------------------------------------------|
-| kind        |  string  |     true     | Must be "tidb-execute-sql".                        |
+| type        |  string  |     true     | Must be "tidb-execute-sql".                        |
 | source      |  string  |     true     | Name of the source the SQL should execute on.      |
 | description |  string  |     true     | Description of the tool that is passed to the LLM. |
diff --git a/docs/en/resources/tools/tidb/tidb-sql.md b/docs/en/resources/tools/tidb/tidb-sql.md
index 3ec6caff45..8883d7ef42 100644
--- a/docs/en/resources/tools/tidb/tidb-sql.md
+++ b/docs/en/resources/tools/tidb/tidb-sql.md
@@ -29,41 +29,41 @@ and expects parameters in the SQL query to be in the form of placeholders `?`.
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: tidb-sql
-    source: my-tidb-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = ?
-      AND flight_number = ?
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: tidb-sql
+source: my-tidb-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = ?
+  AND flight_number = ?
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -75,29 +75,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: tidb-sql
-    source: my-tidb-instance
-    statement: |
-      SELECT * FROM {{.tableName}};
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: tidb-sql
+source: my-tidb-instance
+statement: |
+  SELECT * FROM {{.tableName}};
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "tidb-sql".                                                                                                                    |
+| type               |                    string                    |     true     | Must be "tidb-sql".                                                                                                                    |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/trino/trino-execute-sql.md b/docs/en/resources/tools/trino/trino-execute-sql.md
index 3d18cd6ee8..3d07133e03 100644
--- a/docs/en/resources/tools/trino/trino-execute-sql.md
+++ b/docs/en/resources/tools/trino/trino-execute-sql.md
@@ -25,17 +25,17 @@ statement against the `source`.
 ## Example
 
 ```yaml
-tools:
- execute_sql_tool:
-    kind: trino-execute-sql
-    source: my-trino-instance
-    description: Use this tool to execute sql statement.
+kind: tools
+name: execute_sql_tool
+type: trino-execute-sql
+source: my-trino-instance
+description: Use this tool to execute sql statement.
 ```
 
 ## Reference
 
 | **field**   |                  **type**                  | **required** | **description**                                                                                  |
 |-------------|:------------------------------------------:|:------------:|--------------------------------------------------------------------------------------------------|
-| kind        |                   string                   |     true     | Must be "trino-execute-sql".                                                                     |
+| type        |                   string                   |     true     | Must be "trino-execute-sql".                                                                     |
 | source      |                   string                   |     true     | Name of the source the SQL should execute on.                                                    |
 | description |                   string                   |     true     | Description of the tool that is passed to the LLM.                                               |
diff --git a/docs/en/resources/tools/trino/trino-sql.md b/docs/en/resources/tools/trino/trino-sql.md
index 4b0f8b21d5..1ee22b4239 100644
--- a/docs/en/resources/tools/trino/trino-sql.md
+++ b/docs/en/resources/tools/trino/trino-sql.md
@@ -28,41 +28,41 @@ The specified SQL statement is executed as a [prepared statement][trino-prepare]
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_orders_by_region:
-    kind: trino-sql
-    source: my-trino-instance
-    statement: |
-      SELECT * FROM hive.sales.orders
-      WHERE region = ?
-      AND order_date >= DATE(?)
-      LIMIT 10
-    description: |
-      Use this tool to get information for orders in a specific region.
-      Takes a region code and date and returns info on the orders.
-      Do NOT use this tool with an order id. Do NOT guess a region code or date.
-      A region code is a code for a geographic region consisting of two-character
-      region designator and followed by optional subregion.
-      For example, if given US-WEST, the region is "US-WEST".
-      Another example for this is EU-CENTRAL, the region is "EU-CENTRAL".
-      If the tool returns more than one option choose the date closest to today.
-      Example:
-      {{
-          "region": "US-WEST",
-          "order_date": "2024-01-01",
-      }}
-      Example:
-      {{
-          "region": "EU-CENTRAL",
-          "order_date": "2024-01-15",
-      }}
-    parameters:
-      - name: region
-        type: string
-        description: Region unique identifier
-      - name: order_date
-        type: string
-        description: Order date in YYYY-MM-DD format
+kind: tools
+name: search_orders_by_region
+type: trino-sql
+source: my-trino-instance
+statement: |
+  SELECT * FROM hive.sales.orders
+  WHERE region = ?
+  AND order_date >= DATE(?)
+  LIMIT 10
+description: |
+  Use this tool to get information for orders in a specific region.
+  Takes a region code and date and returns info on the orders.
+  Do NOT use this tool with an order id. Do NOT guess a region code or date.
+  A region code is a code for a geographic region consisting of two-character
+  region designator and followed by optional subregion.
+  For example, if given US-WEST, the region is "US-WEST".
+  Another example for this is EU-CENTRAL, the region is "EU-CENTRAL".
+  If the tool returns more than one option choose the date closest to today.
+  Example:
+  {{
+      "region": "US-WEST",
+      "order_date": "2024-01-01",
+  }}
+  Example:
+  {{
+      "region": "EU-CENTRAL",
+      "order_date": "2024-01-15",
+  }}
+parameters:
+  - name: region
+    type: string
+    description: Region unique identifier
+  - name: order_date
+    type: string
+    description: Order date in YYYY-MM-DD format
 ```
 
 ### Example with Template Parameters
@@ -74,29 +74,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: trino-sql
-    source: my-trino-instance
-    statement: |
-      SELECT * FROM {{.tableName}}
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "hive.sales.orders",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: trino-sql
+source: my-trino-instance
+statement: |
+  SELECT * FROM {{.tableName}}
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "hive.sales.orders",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "trino-sql".                                                                                                                   |
+| type               |                    string                    |     true     | Must be "trino-sql".                                                                                                                   |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/resources/tools/utility/wait.md b/docs/en/resources/tools/utility/wait.md
index 1fde916ce5..c58d69a24b 100644
--- a/docs/en/resources/tools/utility/wait.md
+++ b/docs/en/resources/tools/utility/wait.md
@@ -24,17 +24,17 @@ and shouldn't be used for production agents.
 ## Example
 
 ```yaml
-tools:
-  wait_for_tool:
-    kind: wait
-    description: Use this tool to pause execution for a specified duration.
-    timeout: 30s
+kind: tools
+name: wait_for_tool
+type: wait
+description: Use this tool to pause execution for a specified duration.
+timeout: 30s
 ```
 
 ## Reference
 
 | **field**   |    **type**    | **required** | **description**                                       |
 |-------------|:--------------:|:------------:|-------------------------------------------------------|
-| kind        |     string     |     true     | Must be "wait".                                       |
+| type        |     string     |     true     | Must be "wait".                                       |
 | description |     string     |     true     | Description of the tool that is passed to the LLM.    |
 | timeout     |     string     |     true     | The default duration the tool can wait for.           |
diff --git a/docs/en/resources/tools/valkey/valkey.md b/docs/en/resources/tools/valkey/valkey.md
index fab9e5e3b1..3b801fcae9 100644
--- a/docs/en/resources/tools/valkey/valkey.md
+++ b/docs/en/resources/tools/valkey/valkey.md
@@ -38,21 +38,21 @@ to be executed after argument expansion will be `[SADD, userNames, Alice, Sid, B
 ## Example
 
 ```yaml
-tools:
-  user_data_tool:
-    kind: valkey
-    source: my-valkey-instance
-    description: |
-      Use this tool to interact with user data stored in Valkey.
-      It can set, retrieve, and delete user-specific information.
-    commands:
-      - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
-      - [GET, $userId]
-    parameters:
-      - name: userId
-        type: string
-        description: The unique identifier for the user.
-      - name: userNames
-        type: array
-        description: The user names to be set.  
+kind: tools
+name: user_data_tool
+type: valkey
+source: my-valkey-instance
+description: |
+  Use this tool to interact with user data stored in Valkey.
+  It can set, retrieve, and delete user-specific information.
+commands:
+  - [SADD, userNames, $userNames] # Array will be flattened into multiple arguments.
+  - [GET, $userId]
+parameters:
+  - name: userId
+    type: string
+    description: The unique identifier for the user.
+  - name: userNames
+    type: array
+    description: The user names to be set.  
 ```
diff --git a/docs/en/resources/tools/yuagbytedb/yugabytedb-sql.md b/docs/en/resources/tools/yuagbytedb/yugabytedb-sql.md
index e96ab9e6be..82329c42c8 100644
--- a/docs/en/resources/tools/yuagbytedb/yugabytedb-sql.md
+++ b/docs/en/resources/tools/yuagbytedb/yugabytedb-sql.md
@@ -26,41 +26,41 @@ of the prepared statement.
 > names, or other parts of the query.
 
 ```yaml
-tools:
- search_flights_by_number:
-    kind: yugabytedb-sql
-    source: my-yb-instance
-    statement: |
-      SELECT * FROM flights
-      WHERE airline = $1
-      AND flight_number = $2
-      LIMIT 10
-    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 closes to today.
-      Example:
-      {{
-          "airline": "CY",
-          "flight_number": "888",
-      }}
-      Example:
-      {{
-          "airline": "DL",
-          "flight_number": "1234",
-      }}
-    parameters:
-      - name: airline
-        type: string
-        description: Airline unique 2 letter identifier
-      - name: flight_number
-        type: string
-        description: 1 to 4 digit number
+kind: tools
+name: search_flights_by_number
+type: yugabytedb-sql
+source: my-yb-instance
+statement: |
+  SELECT * FROM flights
+  WHERE airline = $1
+  AND flight_number = $2
+  LIMIT 10
+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 closes to today.
+  Example:
+  {{
+      "airline": "CY",
+      "flight_number": "888",
+  }}
+  Example:
+  {{
+      "airline": "DL",
+      "flight_number": "1234",
+  }}
+parameters:
+  - name: airline
+    type: string
+    description: Airline unique 2 letter identifier
+  - name: flight_number
+    type: string
+    description: 1 to 4 digit number
 ```
 
 ### Example with Template Parameters
@@ -72,29 +72,29 @@ tools:
 > [templateParameters](..#template-parameters).
 
 ```yaml
-tools:
- list_table:
-    kind: yugabytedb-sql
-    source: my-yb-instance
-    statement: |
-      SELECT * FROM {{.tableName}}
-    description: |
-      Use this tool to list all information from a specific table.
-      Example:
-      {{
-          "tableName": "flights",
-      }}
-    templateParameters:
-      - name: tableName
-        type: string
-        description: Table to select from
+kind: tools
+name: list_table
+type: yugabytedb-sql
+source: my-yb-instance
+statement: |
+  SELECT * FROM {{.tableName}}
+description: |
+  Use this tool to list all information from a specific table.
+  Example:
+  {{
+      "tableName": "flights",
+  }}
+templateParameters:
+  - name: tableName
+    type: string
+    description: Table to select from
 ```
 
 ## Reference
 
 | **field**          |                   **type**                   | **required** | **description**                                                                                                                        |
 |--------------------|:--------------------------------------------:|:------------:|----------------------------------------------------------------------------------------------------------------------------------------|
-| kind               |                    string                    |     true     | Must be "yugabytedb-sql".                                                                                                              |
+| type               |                    string                    |     true     | Must be "yugabytedb-sql".                                                                                                              |
 | source             |                    string                    |     true     | Name of the source the SQL should execute on.                                                                                          |
 | description        |                    string                    |     true     | Description of the tool that is passed to the LLM.                                                                                     |
 | statement          |                    string                    |     true     | SQL statement to execute on.                                                                                                           |
diff --git a/docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb b/docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb
index f931a2119b..aba3c2a7d2 100644
--- a/docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb
+++ b/docs/en/samples/alloydb/ai-nl/alloydb_ai_nl.ipynb
@@ -771,7 +771,7 @@
       },
       "outputs": [],
       "source": [
-        "version = \"0.26.0\" # x-release-please-version\n",
+        "version = \"0.27.0\" # x-release-please-version\n",
         "! curl -L -o /content/toolbox https://storage.googleapis.com/genai-toolbox/v{version}/linux/amd64/toolbox\n",
         "\n",
         "# Make the binary executable\n",
@@ -801,27 +801,30 @@
         "# Create a tools file\n",
         "tools_file_name = \"tools.yml\"\n",
         "file_content = f\"\"\"\n",
-        "sources:\n",
-        "  my-alloydb-pg-source:\n",
-        "    kind: alloydb-postgres\n",
-        "    project: {project_id}\n",
-        "    region: {region}\n",
-        "    cluster: {cluster_name}\n",
-        "    instance: {instance_name}\n",
-        "    database: {database_name}\n",
-        "    user: postgres\n",
-        "    password: {password}\n",
-        "tools:\n",
-        "  ask_questions:\n",
-        "    kind: alloydb-ai-nl\n",
-        "    source: my-alloydb-pg-source\n",
-        "    description: 'Ask any natural language questions about the tables'\n",
-        "    nlConfig: 'nla_demo_cfg'\n",
-        "  basic_sql:\n",
-        "    kind: postgres-sql\n",
-        "    source: my-alloydb-pg-source\n",
-        "    description: 'Check if db is connected'\n",
-        "    statement: SELECT * from nla_demo.products;\n",
+        "kind: sources\n",
+        "name: my-alloydb-pg-source\n",
+        "type: alloydb-postgres\n",
+        "project: {project_id}\n",
+        "region: {region}\n",
+        "cluster: {cluster_name}\n",
+        "instance: {instance_name}\n",
+        "database: {database_name}\n",
+        "user: postgres\n",
+        "password: {password}\n",
+        "---\n",
+        "kind: tools\n",
+        "name: ask_questions\n",
+        "type: alloydb-ai-nl\n",
+        "source: my-alloydb-pg-source\n",
+        "description: 'Ask any natural language questions about the tables'\n",
+        "nlConfig: 'nla_demo_cfg'\n",
+        "---\n",
+        "kind: tools\n",
+        "name: basic_sql\n",
+        "type: postgres-sql\n",
+        "source: my-alloydb-pg-source\n",
+        "description: 'Check if db is connected'\n",
+        "statement: SELECT * from nla_demo.products;\n",
         "\"\"\""
       ]
     },
diff --git a/docs/en/samples/alloydb/mcp_quickstart.md b/docs/en/samples/alloydb/mcp_quickstart.md
index 82bd5198e7..43ae7fd311 100644
--- a/docs/en/samples/alloydb/mcp_quickstart.md
+++ b/docs/en/samples/alloydb/mcp_quickstart.md
@@ -123,7 +123,7 @@ In this section, we will download and install the Toolbox binary.
     <!-- {x-release-please-start-version} -->
     ```bash
     export OS="linux/amd64" # one of linux/amd64, darwin/arm64, darwin/amd64, or windows/amd64
-    export VERSION="0.26.0"
+    export VERSION="0.27.0"
     curl -O https://storage.googleapis.com/genai-toolbox/v$VERSION/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
@@ -143,16 +143,16 @@ First, define the data source for your tools. This tells Toolbox how to connect
 to your AlloyDB instance.
 
 ```yaml
-sources:
-  alloydb-pg-source:
-    kind: alloydb-postgres
-    project: YOUR_PROJECT_ID
-    region: YOUR_REGION
-    cluster: YOUR_CLUSTER
-    instance: YOUR_INSTANCE
-    database: YOUR_DATABASE
-    user: YOUR_USER
-    password: YOUR_PASSWORD
+kind: sources
+name: alloydb-pg-source
+type: alloydb-postgres
+project: YOUR_PROJECT_ID
+region: YOUR_REGION
+cluster: YOUR_CLUSTER
+instance: YOUR_INSTANCE
+database: YOUR_DATABASE
+user: YOUR_USER
+password: YOUR_PASSWORD
 ```
 
 Next, define the tools the agent can use. We will categorize them into three
@@ -165,76 +165,77 @@ structured queries like managing a shopping cart. Add the following to your
 `tools.yaml` file:
 
 ```yaml
-tools:
-
-  access-cart-information:
-    kind: postgres-sql
-    source: alloydb-pg-source
-    description: >-
-      List items in customer cart.
-      Use this tool to list items in a customer cart. This tool requires the cart ID.
-    parameters:
-      - name: cart_id
-        type: integer
-        description: The id of the cart.
-    statement: |
-      SELECT
-        p.name AS product_name,
-        ci.quantity,
-        ci.price AS item_price,
-        (ci.quantity * ci.price) AS total_item_price,
-        c.created_at AS cart_created_at,
-        ci.product_id AS product_id
-      FROM
-        cart_items ci JOIN cart c ON ci.cart_id = c.cart_id
-        JOIN products p ON ci.product_id = p.product_id
-      WHERE
-        c.cart_id = $1;
-
-  add-to-cart:
-    kind: postgres-sql
-    source: alloydb-pg-source
-    description: >-
-      Add items to customer cart using the product ID and product prices from the product list.
-      Use this tool to add items to a customer cart.
-      This tool requires the cart ID, product ID, quantity, and price.
-    parameters:
-      - name: cart_id
-        type: integer
-        description: The id of the cart.
-      - name: product_id
-        type: integer
-        description: The id of the product.
-      - name: quantity
-        type: integer
-        description: The quantity of items to add.
-      - name: price
-        type: float
-        description: The price of items to add.
-    statement: |
-      INSERT INTO
-        cart_items (cart_id, product_id, quantity, price)
-      VALUES($1,$2,$3,$4);
-
-  delete-from-cart:
-    kind: postgres-sql
-    source: alloydb-pg-source
-    description: >-
-      Remove products from customer cart.
-      Use this tool to remove products from a customer cart.
-      This tool requires the cart ID and product ID.
-    parameters:
-      - name: cart_id
-        type: integer
-        description: The id of the cart.
-      - name: product_id
-        type: integer
-        description: The id of the product.
-    statement: |
-      DELETE FROM
-        cart_items
-      WHERE
-        cart_id = $1 AND product_id = $2;
+kind: tools
+name: access-cart-information
+type: postgres-sql
+source: alloydb-pg-source
+description: >-
+  List items in customer cart.
+  Use this tool to list items in a customer cart. This tool requires the cart ID.
+parameters:
+  - name: cart_id
+    type: integer
+    description: The id of the cart.
+statement: |
+  SELECT
+    p.name AS product_name,
+    ci.quantity,
+    ci.price AS item_price,
+    (ci.quantity * ci.price) AS total_item_price,
+    c.created_at AS cart_created_at,
+    ci.product_id AS product_id
+  FROM
+    cart_items ci JOIN cart c ON ci.cart_id = c.cart_id
+    JOIN products p ON ci.product_id = p.product_id
+  WHERE
+    c.cart_id = $1;
+---
+kind: tools
+name: add-to-cart
+type: postgres-sql
+source: alloydb-pg-source
+description: >-
+  Add items to customer cart using the product ID and product prices from the product list.
+  Use this tool to add items to a customer cart.
+  This tool requires the cart ID, product ID, quantity, and price.
+parameters:
+  - name: cart_id
+    type: integer
+    description: The id of the cart.
+  - name: product_id
+    type: integer
+    description: The id of the product.
+  - name: quantity
+    type: integer
+    description: The quantity of items to add.
+  - name: price
+    type: float
+    description: The price of items to add.
+statement: |
+  INSERT INTO
+    cart_items (cart_id, product_id, quantity, price)
+  VALUES($1,$2,$3,$4);
+---
+kind: tools
+name: delete-from-cart
+type: postgres-sql
+source: alloydb-pg-source
+description: >-
+  Remove products from customer cart.
+  Use this tool to remove products from a customer cart.
+  This tool requires the cart ID and product ID.
+parameters:
+  - name: cart_id
+    type: integer
+    description: The id of the cart.
+  - name: product_id
+    type: integer
+    description: The id of the product.
+statement: |
+  DELETE FROM
+    cart_items
+  WHERE
+    cart_id = $1 AND product_id = $2;
 ```
 
 ### 2. Semantic Search Tools
@@ -244,27 +245,28 @@ meaning of a user's query, rather than just keywords. Append the following tools
 to the `tools` section in your `tools.yaml`:
 
 ```yaml
-  search-product-recommendations:
-    kind: postgres-sql
-    source: alloydb-pg-source
-    description: >-
-      Search for products based on user needs.
-      Use this tool to search for products. This tool requires the user's needs.
-    parameters:
-      - name: query
-        type: string
-        description: The product characteristics
-    statement: |
-      SELECT
-        product_id,
-        name,
-        description,
-        ROUND(CAST(price AS numeric), 2) as price
-      FROM
-        products
-      ORDER BY
-        embedding('gemini-embedding-001', $1)::vector <=> embedding
-      LIMIT 5;
+kind: tools
+name: search-product-recommendations
+type: postgres-sql
+source: alloydb-pg-source
+description: >-
+  Search for products based on user needs.
+  Use this tool to search for products. This tool requires the user's needs.
+parameters:
+  - name: query
+    type: string
+    description: The product characteristics
+statement: |
+  SELECT
+    product_id,
+    name,
+    description,
+    ROUND(CAST(price AS numeric), 2) as price
+  FROM
+    products
+  ORDER BY
+    embedding('gemini-embedding-001', $1)::vector <=> embedding
+  LIMIT 5;
 ```
 
 ### 3. Natural Language to SQL (NL2SQL) Tools
@@ -286,27 +288,29 @@ to the `tools` section in your `tools.yaml`:
    section:
 
 ```yaml
-  ask-questions-about-products:
-    kind: alloydb-ai-nl
-    source: alloydb-pg-source
-    nlConfig: flower_shop
-    description: >-
-      Ask questions related to products or brands.
-      Use this tool to ask questions about products or brands.
-      Always SELECT the IDs of objects when generating queries.
+kind: tools
+name: ask-questions-about-products
+type: alloydb-ai-nl
+source: alloydb-pg-source
+nlConfig: flower_shop
+description: >-
+  Ask questions related to products or brands.
+  Use this tool to ask questions about products or brands.
+  Always SELECT the IDs of objects when generating queries.
 ```
 
 Finally, group the tools into a `toolset` to make them available to the model.
 Add the following to the end of your `tools.yaml` file:
 
 ```yaml
-toolsets:
-  flower_shop:
-    - access-cart-information
-    - search-product-recommendations
-    - ask-questions-about-products
-    - add-to-cart
-    - delete-from-cart
+kind: toolsets
+name: flower_shop
+tools:
+  - access-cart-information
+  - search-product-recommendations
+  - ask-questions-about-products
+  - add-to-cart
+  - delete-from-cart
 ```
 
 For more info on tools, check out the
diff --git a/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb b/docs/en/samples/bigquery/colab_quickstart_bigquery.ipynb
index 9c13b6e86e..6dbdc66e57 100644
--- 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.26.0\" # x-release-please-version\n",
+        "version = \"0.27.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",
@@ -273,72 +273,83 @@
         "# You can also upload a tools file and use that to run toolbox.\n",
         "tools_file_name = \"tools.yml\"\n",
         "file_content = f\"\"\"\n",
-        "sources:\n",
-        "  my-bigquery-source:\n",
-        "    kind: bigquery\n",
-        "    project: {BIGQUERY_PROJECT}\n",
+        "kind: sources\n",
+        "name: my-bigquery-source\n",
+        "type: bigquery\n",
+        "project: {BIGQUERY_PROJECT}\n",
+        "---\n",
+        "kind: tools\n",
+        "name: search-hotels-by-name\n",
+        "type: bigquery-sql\n",
+        "source: my-bigquery-source\n",
+        "description: Search for hotels based on name.\n",
+        "parameters:\n",
+        "  - name: name\n",
+        "    type: string\n",
+        "    description: The name of the hotel.\n",
+        "statement: SELECT * FROM `{DATASET}.{TABLE_ID}` WHERE LOWER(name) LIKE LOWER(CONCAT('%', @name, '%'));\n",
+        "---\n",
+        "kind: tools\n",
+        "name: search-hotels-by-location\n",
+        "type: bigquery-sql\n",
+        "source: my-bigquery-source\n",
+        "description: Search for hotels based on location.\n",
+        "parameters:\n",
+        "  - name: location\n",
+        "    type: string\n",
+        "    description: The location of the hotel.\n",
+        "statement: SELECT * FROM `{DATASET}.{TABLE_ID}` WHERE LOWER(location) LIKE LOWER(CONCAT('%', @location, '%'));\n",
+        "---\n",
+        "kind: tools\n",
+        "name: book-hotel\n",
+        "type: bigquery-sql\n",
+        "source: my-bigquery-source\n",
+        "description: >-\n",
+        "    Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.\n",
+        "parameters:\n",
+        "  - name: hotel_id\n",
+        "    type: integer\n",
+        "    description: The ID of the hotel to book.\n",
+        "statement: UPDATE `{DATASET}.{TABLE_ID}` SET booked = TRUE WHERE id = @hotel_id;\n",
+        "---\n",
+        "kind: tools\n",
+        "name: update-hotel\n",
+        "type: bigquery-sql\n",
+        "source: my-bigquery-source\n",
+        "description: >-\n",
+        "  Update a hotel's check-in and check-out dates by its ID. Returns a message indicating whether the hotel was successfully updated or not.\n",
+        "parameters:\n",
+        "  - name: checkin_date\n",
+        "    type: string\n",
+        "    description: The new check-in date of the hotel.\n",
+        "  - name: checkout_date\n",
+        "    type: string\n",
+        "    description: The new check-out date of the hotel.\n",
+        "  - name: hotel_id\n",
+        "    type: integer\n",
+        "    description: The ID of the hotel to update.\n",
+        "statement: >-\n",
+        "  UPDATE `{DATASET}.{TABLE_ID}` SET checkin_date = PARSE_DATE('%Y-%m-%d', @checkin_date), checkout_date = PARSE_DATE('%Y-%m-%d', @checkout_date) WHERE id = @hotel_id;\n",
+        "---\n",
+        "kind: tools\n",
+        "name: cancel-hotel\n",
+        "type: bigquery-sql\n",
+        "source: my-bigquery-source\n",
+        "description: Cancel a hotel by its ID.\n",
+        "parameters:\n",
+        "  - name: hotel_id\n",
+        "    type: integer\n",
+        "    description: The ID of the hotel to cancel.\n",
+        "statement: UPDATE `{DATASET}.{TABLE_ID}` SET booked = FALSE WHERE id = @hotel_id;\n",
+        "---\n",
+        "kind: toolsets\n",
+        "name: my-toolset\n",
         "tools:\n",
-        "  search-hotels-by-name:\n",
-        "    kind: bigquery-sql\n",
-        "    source: my-bigquery-source\n",
-        "    description: Search for hotels based on name.\n",
-        "    parameters:\n",
-        "      - name: name\n",
-        "        type: string\n",
-        "        description: The name of the hotel.\n",
-        "    statement: SELECT * FROM `{DATASET}.{TABLE_ID}` WHERE LOWER(name) LIKE LOWER(CONCAT('%', @name, '%'));\n",
-        "  search-hotels-by-location:\n",
-        "    kind: bigquery-sql\n",
-        "    source: my-bigquery-source\n",
-        "    description: Search for hotels based on location.\n",
-        "    parameters:\n",
-        "      - name: location\n",
-        "        type: string\n",
-        "        description: The location of the hotel.\n",
-        "    statement: SELECT * FROM `{DATASET}.{TABLE_ID}` WHERE LOWER(location) LIKE LOWER(CONCAT('%', @location, '%'));\n",
-        "  book-hotel:\n",
-        "    kind: bigquery-sql\n",
-        "    source: my-bigquery-source\n",
-        "    description: >-\n",
-        "       Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.\n",
-        "    parameters:\n",
-        "      - name: hotel_id\n",
-        "        type: integer\n",
-        "        description: The ID of the hotel to book.\n",
-        "    statement: UPDATE `{DATASET}.{TABLE_ID}` SET booked = TRUE WHERE id = @hotel_id;\n",
-        "  update-hotel:\n",
-        "    kind: bigquery-sql\n",
-        "    source: my-bigquery-source\n",
-        "    description: >-\n",
-        "      Update a hotel's check-in and check-out dates by its ID. Returns a message indicating whether the hotel was successfully updated or not.\n",
-        "    parameters:\n",
-        "      - name: checkin_date\n",
-        "        type: string\n",
-        "        description: The new check-in date of the hotel.\n",
-        "      - name: checkout_date\n",
-        "        type: string\n",
-        "        description: The new check-out date of the hotel.\n",
-        "      - name: hotel_id\n",
-        "        type: integer\n",
-        "        description: The ID of the hotel to update.\n",
-        "    statement: >-\n",
-        "      UPDATE `{DATASET}.{TABLE_ID}` SET checkin_date = PARSE_DATE('%Y-%m-%d', @checkin_date), checkout_date = PARSE_DATE('%Y-%m-%d', @checkout_date) WHERE id = @hotel_id;\n",
-        "  cancel-hotel:\n",
-        "    kind: bigquery-sql\n",
-        "    source: my-bigquery-source\n",
-        "    description: Cancel a hotel by its ID.\n",
-        "    parameters:\n",
-        "      - name: hotel_id\n",
-        "        type: integer\n",
-        "        description: The ID of the hotel to cancel.\n",
-        "    statement: UPDATE `{DATASET}.{TABLE_ID}` SET booked = FALSE WHERE id = @hotel_id;\n",
-        "toolsets:\n",
-        "  my-toolset:\n",
-        "    - search-hotels-by-name\n",
-        "    - search-hotels-by-location\n",
-        "    - book-hotel\n",
-        "    - update-hotel\n",
-        "    - cancel-hotel\n",
+        "  - search-hotels-by-name\n",
+        "  - search-hotels-by-location\n",
+        "  - book-hotel\n",
+        "  - update-hotel\n",
+        "  - cancel-hotel\n",
         "\"\"\""
       ]
     },
diff --git a/docs/en/samples/bigquery/local_quickstart.md b/docs/en/samples/bigquery/local_quickstart.md
index 5735a1a515..e8e64cd9ee 100644
--- 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.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
@@ -201,66 +201,75 @@ to use BigQuery, and then run the Toolbox server.
     {{< /notice >}}
 
     ```yaml
-    sources:
-      my-bigquery-source:
-        kind: bigquery
-        project: YOUR_PROJECT_ID
-        location: us
-    tools:
-      search-hotels-by-name:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: Search for hotels based on name.
-        parameters:
-          - name: name
-            type: string
-            description: The name of the hotel.
-        statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(name) LIKE LOWER(CONCAT('%', @name, '%'));
-      search-hotels-by-location:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: Search for hotels based on location.
-        parameters:
-          - name: location
-            type: string
-            description: The location of the hotel.
-        statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(location) LIKE LOWER(CONCAT('%', @location, '%'));
-      book-hotel:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: >-
-           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
-        parameters:
-          - name: hotel_id
-            type: integer
-            description: The ID of the hotel to book.
-        statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = TRUE WHERE id = @hotel_id;
-      update-hotel:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: >-
-          Update a hotel's check-in and check-out dates by its ID. Returns a message indicating whether the hotel was successfully updated or not.
-        parameters:
-          - name: checkin_date
-            type: string
-            description: The new check-in date of the hotel.
-          - name: checkout_date
-            type: string
-            description: The new check-out date of the hotel.
-          - name: hotel_id
-            type: integer
-            description: The ID of the hotel to update.
-        statement: >-
-          UPDATE `YOUR_DATASET_NAME.hotels` SET checkin_date = PARSE_DATE('%Y-%m-%d', @checkin_date), checkout_date = PARSE_DATE('%Y-%m-%d', @checkout_date) WHERE id = @hotel_id;
-      cancel-hotel:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: Cancel a hotel by its ID.
-        parameters:
-          - name: hotel_id
-            type: integer
-            description: The ID of the hotel to cancel.
-        statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = FALSE WHERE id = @hotel_id;
+    kind: sources
+    name: my-bigquery-source
+    type: bigquery
+    project: YOUR_PROJECT_ID
+    location: us
+    ---
+    kind: tools
+    name: search-hotels-by-name
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: Search for hotels based on name.
+    parameters:
+        - name: name
+        type: string
+        description: The name of the hotel.
+    statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(name) LIKE LOWER(CONCAT('%', @name, '%'));
+    ---
+    kind: tools
+    name: search-hotels-by-location
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: Search for hotels based on location.
+    parameters:
+        - name: location
+        type: string
+        description: The location of the hotel.
+    statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(location) LIKE LOWER(CONCAT('%', @location, '%'));
+    ---
+    kind: tools
+    name: book-hotel
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: >-
+        Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+    parameters:
+        - name: hotel_id
+        type: integer
+        description: The ID of the hotel to book.
+    statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = TRUE WHERE id = @hotel_id;
+    ---
+    kind: tools
+    name: update-hotel
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: >-
+        Update a hotel's check-in and check-out dates by its ID. Returns a message indicating whether the hotel was successfully updated or not.
+    parameters:
+        - name: checkin_date
+        type: string
+        description: The new check-in date of the hotel.
+        - name: checkout_date
+        type: string
+        description: The new check-out date of the hotel.
+        - name: hotel_id
+        type: integer
+        description: The ID of the hotel to update.
+    statement: >-
+        UPDATE `YOUR_DATASET_NAME.hotels` SET checkin_date = PARSE_DATE('%Y-%m-%d', @checkin_date), checkout_date = PARSE_DATE('%Y-%m-%d', @checkout_date) WHERE id = @hotel_id;
+    ---
+    kind: tools
+    name: cancel-hotel
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: Cancel a hotel by its ID.
+    parameters:
+        - name: hotel_id
+        type: integer
+        description: The ID of the hotel to cancel.
+    statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = FALSE WHERE id = @hotel_id;
     ```
 
     **Important Note on `toolsets`**: The `tools.yaml` content above does not
@@ -272,8 +281,9 @@ to use BigQuery, and then run the Toolbox server.
     ```yaml
     # Add this to your tools.yaml if using load_toolset("my-toolset")
     # Ensure it's at the same indentation level as 'sources:' and 'tools:'
-    toolsets:
-      my-toolset:
+    kind: toolsets
+    name: my-toolset
+    tools:
         - search-hotels-by-name
         - search-hotels-by-location
         - book-hotel
@@ -325,7 +335,7 @@ pip install toolbox-llamaindex
 {{< /tab >}}
 {{< tab header="ADK" lang="bash" >}}
 
-pip install google-adk
+pip install google-adk[toolbox]
 {{< /tab >}}
 
 {{< /tabpane >}}
@@ -365,7 +375,7 @@ pip install llama-index-llms-google-genai
 
 {{< /tab >}}
 {{< tab header="ADK" lang="bash" >}}
-pip install toolbox-core
+# No other dependencies required for ADK
 {{< /tab >}}
 {{< /tabpane >}}
 
@@ -607,8 +617,8 @@ from google.adk.agents import Agent
 from google.adk.runners import Runner
 from google.adk.sessions import InMemorySessionService
 from google.adk.artifacts.in_memory_artifact_service import InMemoryArtifactService
+from google.adk.tools.toolbox_toolset import ToolboxToolset
 from google.genai import types # For constructing message content
-from toolbox_core import ToolboxSyncClient
 
 import os
 os.environ['GOOGLE_GENAI_USE_VERTEXAI'] = 'True'
@@ -623,48 +633,47 @@ os.environ['GOOGLE_CLOUD_LOCATION'] = 'us-central1'
 
 # --- Load Tools from Toolbox ---
 
-# TODO(developer): Ensure the Toolbox server is running at <http://127.0.0.1:5000>
+# TODO(developer): Ensure the Toolbox server is running at http://127.0.0.1:5000
+toolset = ToolboxToolset(server_url="http://127.0.0.1:5000")
 
-with ToolboxSyncClient("<http://127.0.0.1:5000>") as toolbox_client:
-    # TODO(developer): Replace "my-toolset" with the actual ID of your toolset as configured in your MCP Toolbox server.
-    agent_toolset = toolbox_client.load_toolset("my-toolset")
+# --- Define the Agent's Prompt ---
+prompt = """
+  You're a helpful hotel assistant. You handle hotel searching, booking and
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel ids while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
+  update checkin or checkout dates if mentioned by the user.
+  Don't ask for confirmations from the user.
+"""
 
-    # --- Define the Agent's Prompt ---
-    prompt = """
-      You're a helpful hotel assistant. You handle hotel searching, booking and
-      cancellations. When the user searches for a hotel, mention it's name, id,
-      location and price tier. Always mention hotel ids while performing any
-      searches. This is very important for any operations. For any bookings or
-      cancellations, please provide the appropriate confirmation. Be sure to
-      update checkin or checkout dates if mentioned by the user.
-      Don't ask for confirmations from the user.
-    """
+# --- Configure the Agent ---
 
-    # --- Configure the Agent ---
+root_agent = Agent(
+    model='gemini-2.0-flash-001',
+    name='hotel_agent',
+    description='A helpful AI assistant that can search and book hotels.',
+    instruction=prompt,
+    tools=[toolset], # Pass the loaded toolset
+)
 
-    root_agent = Agent(
-        model='gemini-2.0-flash-001',
-        name='hotel_agent',
-        description='A helpful AI assistant that can search and book hotels.',
-        instruction=prompt,
-        tools=agent_toolset, # Pass the loaded toolset
-    )
+# --- Initialize Services for Running the Agent ---
+session_service = InMemorySessionService()
+artifacts_service = InMemoryArtifactService()
 
-    # --- Initialize Services for Running the Agent ---
-    session_service = InMemorySessionService()
-    artifacts_service = InMemoryArtifactService()
+runner = Runner(
+    app_name='hotel_agent',
+    agent=root_agent,
+    artifact_service=artifacts_service,
+    session_service=session_service,
+)
+
+async def main():
     # Create a new session for the interaction.
-    session = session_service.create_session(
+    session = await session_service.create_session(
         state={}, app_name='hotel_agent', user_id='123'
     )
 
-    runner = Runner(
-        app_name='hotel_agent',
-        agent=root_agent,
-        artifact_service=artifacts_service,
-        session_service=session_service,
-    )
-
     # --- Define Queries and Run the Agent ---
     queries = [
         "Find hotels in Basel with Basel in it's name.",
@@ -687,6 +696,10 @@ with ToolboxSyncClient("<http://127.0.0.1:5000>") as toolbox_client:
 
         for text in responses:
           print(text)
+
+import asyncio
+if __name__ == "__main__":
+    asyncio.run(main())
 {{< /tab >}}
 {{< /tabpane >}}
 
diff --git a/docs/en/samples/bigquery/mcp_quickstart/_index.md b/docs/en/samples/bigquery/mcp_quickstart/_index.md
index 53250e06fd..3ca10183b1 100644
--- 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.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
@@ -120,73 +120,84 @@ In this section, we will download Toolbox, configure our tools in a
     {{< /notice >}}
 
     ```yaml
-    sources:
-      my-bigquery-source:
-        kind: bigquery
-        project: YOUR_PROJECT_ID
-        location: us
+    kind: sources
+    name: my-bigquery-source
+    type: bigquery
+    project: YOUR_PROJECT_ID
+    location: us
+    ---
+    kind: tools
+    name: search-hotels-by-name
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: Search for hotels based on name.
+    parameters:
+      - name: name
+        type: string
+        description: The name of the hotel.
+    statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(name) LIKE LOWER(CONCAT('%', @name, '%'));
+    ---
+    kind: tools
+    name: search-hotels-by-location
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: Search for hotels based on location.
+    parameters:
+      - name: location
+        type: string
+        description: The location of the hotel.
+    statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(location) LIKE LOWER(CONCAT('%', @location, '%'));
+    ---
+    kind: tools
+    name: book-hotel
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: >-
+        Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
+    parameters:
+      - name: hotel_id
+        type: integer
+        description: The ID of the hotel to book.
+    statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = TRUE WHERE id = @hotel_id;
+    ---
+    kind: tools
+    name: update-hotel
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: >-
+      Update a hotel's check-in and check-out dates by its ID. Returns a message indicating whether the hotel was successfully updated or not.
+    parameters:
+      - name: checkin_date
+        type: string
+        description: The new check-in date of the hotel.
+      - name: checkout_date
+        type: string
+        description: The new check-out date of the hotel.
+      - name: hotel_id
+        type: integer
+        description: The ID of the hotel to update.
+    statement: >-
+      UPDATE `YOUR_DATASET_NAME.hotels` SET checkin_date = PARSE_DATE('%Y-%m-%d', @checkin_date), checkout_date = PARSE_DATE('%Y-%m-%d', @checkout_date) WHERE id = @hotel_id;
+    ---
+    kind: tools
+    name: cancel-hotel
+    type: bigquery-sql
+    source: my-bigquery-source
+    description: Cancel a hotel by its ID.
+    parameters:
+      - name: hotel_id
+        type: integer
+        description: The ID of the hotel to cancel.
+    statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = FALSE WHERE id = @hotel_id;
+    ---
+    kind: toolsets
+    name: my-toolset
     tools:
-      search-hotels-by-name:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: Search for hotels based on name.
-        parameters:
-          - name: name
-            type: string
-            description: The name of the hotel.
-        statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(name) LIKE LOWER(CONCAT('%', @name, '%'));
-      search-hotels-by-location:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: Search for hotels based on location.
-        parameters:
-          - name: location
-            type: string
-            description: The location of the hotel.
-        statement: SELECT * FROM `YOUR_DATASET_NAME.hotels` WHERE LOWER(location) LIKE LOWER(CONCAT('%', @location, '%'));
-      book-hotel:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: >-
-           Book a hotel by its ID. If the hotel is successfully booked, returns a NULL, raises an error if not.
-        parameters:
-          - name: hotel_id
-            type: integer
-            description: The ID of the hotel to book.
-        statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = TRUE WHERE id = @hotel_id;
-      update-hotel:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: >-
-          Update a hotel's check-in and check-out dates by its ID. Returns a message indicating whether the hotel was successfully updated or not.
-        parameters:
-          - name: checkin_date
-            type: string
-            description: The new check-in date of the hotel.
-          - name: checkout_date
-            type: string
-            description: The new check-out date of the hotel.
-          - name: hotel_id
-            type: integer
-            description: The ID of the hotel to update.
-        statement: >-
-          UPDATE `YOUR_DATASET_NAME.hotels` SET checkin_date = PARSE_DATE('%Y-%m-%d', @checkin_date), checkout_date = PARSE_DATE('%Y-%m-%d', @checkout_date) WHERE id = @hotel_id;
-      cancel-hotel:
-        kind: bigquery-sql
-        source: my-bigquery-source
-        description: Cancel a hotel by its ID.
-        parameters:
-          - name: hotel_id
-            type: integer
-            description: The ID of the hotel to cancel.
-        statement: UPDATE `YOUR_DATASET_NAME.hotels` SET booked = FALSE WHERE id = @hotel_id;
-    toolsets:
-      my-toolset:
-        - search-hotels-by-name
-        - search-hotels-by-location
-        - book-hotel
-        - update-hotel
-        - cancel-hotel
+      - search-hotels-by-name
+      - search-hotels-by-location
+      - book-hotel
+      - update-hotel
+      - cancel-hotel
     ```
 
     For more info on tools, check out the
diff --git a/docs/en/samples/looker/looker_gemini.md b/docs/en/samples/looker/looker_gemini.md
index 33ed1fe580..70bde9465a 100644
--- 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.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
diff --git a/docs/en/samples/looker/looker_gemini_oauth/_index.md b/docs/en/samples/looker/looker_gemini_oauth/_index.md
index b9e224a1a1..5e7b574c55 100644
--- a/docs/en/samples/looker/looker_gemini_oauth/_index.md
+++ b/docs/en/samples/looker/looker_gemini_oauth/_index.md
@@ -48,7 +48,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.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
diff --git a/docs/en/samples/looker/looker_mcp_inspector/_index.md b/docs/en/samples/looker/looker_mcp_inspector/_index.md
index ca0de51f99..56338b3576 100644
--- a/docs/en/samples/looker/looker_mcp_inspector/_index.md
+++ b/docs/en/samples/looker/looker_mcp_inspector/_index.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.26.0/$OS/toolbox
+    curl -O https://storage.googleapis.com/genai-toolbox/v0.27.0/$OS/toolbox
     ```
     <!-- {x-release-please-end} -->
 
diff --git a/docs/en/samples/neo4j/mcp_quickstart.md b/docs/en/samples/neo4j/mcp_quickstart.md
index fa36ac6ce3..ebcb70a70e 100644
--- a/docs/en/samples/neo4j/mcp_quickstart.md
+++ b/docs/en/samples/neo4j/mcp_quickstart.md
@@ -61,37 +61,38 @@ Write the following into a `tools.yaml` file:
 \+
 
 ```yaml
-sources:
-  my-neo4j-source:
-    kind: neo4j
-    uri: bolt://localhost:7687
-    user: neo4j
-    password: my-password # Replace with your actual password
-
-tools:
-  search-movies-by-actor:
-    kind: neo4j-cypher
-    source: my-neo4j-source
-    description: "Searches for movies an actor has appeared in based on their name. Useful for questions like 'What movies has Tom Hanks been in?'"
-    parameters:
-      - name: actor_name
-        type: string
-        description: The full name of the actor to search for.
-    statement: |
-      MATCH (p:Person {name: $actor_name}) -[:ACTED_IN]-> (m:Movie)
-      RETURN m.title AS title, m.year AS year, m.genre AS genre
-  
-  get-actor-for-movie:
-    kind: neo4j-cypher
-    source: my-neo4j-source
-    description: "Finds the actors who starred in a specific movie. Useful for questions like 'Who acted in Inception?'"
-    parameters:
-      - name: movie_title
-        type: string
-        description: The exact title of the movie.
-    statement: |
-      MATCH (p:Person) -[:ACTED_IN]-> (m:Movie {title: $movie_title})
-      RETURN p.name AS actor
+kind: sources
+name: my-neo4j-source
+type: neo4j
+uri: bolt://localhost:7687
+user: neo4j
+password: my-password # Replace with your actual password
+---
+kind: tools
+name: search-movies-by-actor
+type: neo4j-cypher
+source: my-neo4j-source
+description: "Searches for movies an actor has appeared in based on their name. Useful for questions like 'What movies has Tom Hanks been in?'"
+parameters:
+  - name: actor_name
+    type: string
+    description: The full name of the actor to search for.
+statement: |
+  MATCH (p:Person {name: $actor_name}) -[:ACTED_IN]-> (m:Movie)
+  RETURN m.title AS title, m.year AS year, m.genre AS genre
+---
+kind: tools
+name: get-actor-for-movie
+type: neo4j-cypher
+source: my-neo4j-source
+description: "Finds the actors who starred in a specific movie. Useful for questions like 'Who acted in Inception?'"
+parameters:
+  - name: movie_title
+    type: string
+    description: The exact title of the movie.
+statement: |
+  MATCH (p:Person) -[:ACTED_IN]-> (m:Movie {title: $movie_title})
+  RETURN p.name AS actor
 ```
 
 . **Start the Toolbox server.**
diff --git a/docs/en/samples/pre_post_processing/_index.md b/docs/en/samples/pre_post_processing/_index.md
new file mode 100644
index 0000000000..6fcf570027
--- /dev/null
+++ b/docs/en/samples/pre_post_processing/_index.md
@@ -0,0 +1,54 @@
+---
+title: "Pre- and Post- Processing"
+type: docs
+weight: 1
+description: >
+  Intercept and modify interactions between the agent and its tools either before or after a tool is executed.
+---
+
+Pre- and post- processing allow developers to intercept and modify interactions between the agent and its tools or the user.
+
+{{< notice note >}}
+
+These capabilities are typically features of **orchestration frameworks** (like LangChain, LangGraph, or Agent Builder) rather than the Toolbox SDK itself. However, Toolbox tools are designed to fully leverage these framework capabilities to support robust, secure, and compliant agent architectures.
+
+{{< /notice >}}
+
+## Types of Processing
+
+### Pre-processing
+
+Pre-processing occurs before a tool is executed or an agent processes a message. Key types include:
+
+- **Input Sanitization & Redaction**: Detecting and masking sensitive information (like PII) in user queries or tool arguments to prevent it from being logged or sent to unauthorized systems.
+- **Business Logic Validation**: Verifying that the proposed action complies with business rules (e.g., ensuring a requested hotel stay does not exceed 14 days, or checking if a user has sufficient permission).
+- **Security Guardrails**: Analyzing inputs for potential prompt injection attacks or malicious payloads.
+
+### Post-processing
+
+Post-processing occurs after a tool has executed or the model has generated a response. Key types include:
+
+- **Response Enrichment**: Injecting additional data into the tool output that wasn't part of the raw API response (e.g., calculating loyalty points earned based on the booking value).
+- **Output Formatting**: Transforming raw data (like JSON or XML) into a more human-readable or model-friendly format to improve the agent's understanding.
+- **Compliance Auditing**: Logging the final outcome of transactions, including the original request and the result, to a secure audit trail.
+
+## Processing Scopes
+
+While processing logic can be applied at various levels (Agent, Model, Tool), this guide primarily focuses on **Tool Level** processing, which is most relevant for granular control over tool execution.
+
+### Tool Level (Primary Focus)
+
+Wraps individual tool executions. This is best for logic specific to a single tool or a set of tools.
+
+- **Scope**: Intercepts the raw inputs (arguments) to a tool and its outputs.
+- **Use Cases**: Argument validation, output formatting, specific privacy rules for sensitive tools.
+
+### Other Levels
+
+It is helpful to understand how tool-level processing differs from other scopes:
+
+- **Model Level**: Intercepts individual calls to the LLM (prompts and responses). Unlike tool-level, this applies globally to all text sent/received, making it better for global PII redaction or token tracking.
+- **Agent Level**: Wraps the high-level execution loop (e.g., a "turn" in the conversation). Unlike tool-level, this envelopes the entire turn (user input to final response), making it suitable for session management or end-to-end auditing.
+
+
+## Samples
diff --git a/docs/en/samples/pre_post_processing/python.md b/docs/en/samples/pre_post_processing/python.md
new file mode 100644
index 0000000000..1c4311f487
--- /dev/null
+++ b/docs/en/samples/pre_post_processing/python.md
@@ -0,0 +1,40 @@
+---
+title: "Python"
+type: docs
+weight: 1
+description: >
+  How to add pre- and post- processing to your Agents using Python.
+---
+
+## Prerequisites
+
+This tutorial assumes that you have set up Toolbox with a basic agent as described in the [local quickstart](../../getting-started/local_quickstart.md).
+
+This guide demonstrates how to implement these patterns in your Toolbox applications.
+
+## Implementation
+
+{{< tabpane persist=header >}}
+{{% tab header="ADK" text=true %}}
+Coming soon.
+{{% /tab %}}
+{{% tab header="Langchain" text=true %}}
+The following example demonstrates how to use `ToolboxClient` with LangChain's middleware to implement pre- and post- processing for tool calls.
+
+```py
+{{< include "python/langchain/agent.py" >}}
+```
+
+You can also add model-level (`wrap_model`) and agent-level (`before_agent`, `after_agent`) hooks to intercept messages at different stages of the execution loop. See the [LangChain Middleware documentation](https://docs.langchain.com/oss/python/langchain/middleware/custom#wrap-style-hooks) for details on these additional hook types.
+{{% /tab %}}
+{{< /tabpane >}}
+
+## Results
+
+The output should look similar to the following. Note that exact responses may vary due to the non-deterministic nature of LLMs and differences between orchestration frameworks.
+
+```
+AI: Booking Confirmed! You earned 500 Loyalty Points with this stay.
+
+AI: Error: Maximum stay duration is 14 days.
+```
diff --git a/docs/en/samples/pre_post_processing/python/__init__.py b/docs/en/samples/pre_post_processing/python/__init__.py
new file mode 100644
index 0000000000..f5b7c1bfd2
--- /dev/null
+++ b/docs/en/samples/pre_post_processing/python/__init__.py
@@ -0,0 +1,19 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+# This file makes the 'pre_post_processing/python' directory a Python package.
+
+# You can include any package-level initialization logic here if needed.
+# For now, this file is empty.
diff --git a/docs/en/samples/pre_post_processing/python/agent_test.py b/docs/en/samples/pre_post_processing/python/agent_test.py
new file mode 100644
index 0000000000..36c5b8e27d
--- /dev/null
+++ b/docs/en/samples/pre_post_processing/python/agent_test.py
@@ -0,0 +1,51 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import asyncio
+import importlib
+import os
+from pathlib import Path
+
+import pytest
+
+ORCH_NAME = os.environ.get("ORCH_NAME")
+module_path = f"python.{ORCH_NAME}.agent"
+agent = importlib.import_module(module_path)
+
+GOLDEN_KEYWORDS = [
+    "AI:",
+    "Loyalty Points",
+    "POLICY CHECK: Intercepting 'update-hotel'",
+]
+
+# --- Execution Tests ---
+class TestExecution:
+    """Test framework execution and output validation."""
+
+    @pytest.fixture(scope="function")
+    def script_output(self, capsys):
+        """Run the agent function and return its output."""
+        asyncio.run(agent.main())
+        return capsys.readouterr()
+
+    def test_script_runs_without_errors(self, script_output):
+        """Test that the script runs and produces no stderr."""
+        assert script_output.err == "", f"Script produced stderr: {script_output.err}"
+
+    def test_keywords_in_output(self, script_output):
+        """Test that expected keywords are present in the script's output."""
+        output = script_output.out
+        print(f"\nAgent Output:\n{output}\n")
+        missing_keywords = [kw for kw in GOLDEN_KEYWORDS if kw not in output]
+        assert not missing_keywords, f"Missing keywords in output: {missing_keywords}"
diff --git a/docs/en/samples/pre_post_processing/python/langchain/agent.py b/docs/en/samples/pre_post_processing/python/langchain/agent.py
new file mode 100644
index 0000000000..5e174943a7
--- /dev/null
+++ b/docs/en/samples/pre_post_processing/python/langchain/agent.py
@@ -0,0 +1,116 @@
+import asyncio
+from datetime import datetime
+
+from langchain.agents import create_agent
+from langchain.agents.middleware import wrap_tool_call
+from langchain_core.messages import ToolMessage
+from langchain_google_vertexai import ChatVertexAI
+from toolbox_langchain import ToolboxClient
+
+system_prompt = """
+  You're a helpful hotel assistant. You handle hotel searching, booking and
+  cancellations. When the user searches for a hotel, mention it's name, id,
+  location and price tier. Always mention hotel ids while performing any
+  searches. This is very important for any operations. For any bookings or
+  cancellations, please provide the appropriate confirmation. Be sure to
+  update checkin or checkout dates if mentioned by the user.
+  Don't ask for confirmations from the user.
+"""
+
+
+# Pre processing
+@wrap_tool_call
+async def enforce_business_rules(request, handler):
+    """
+    Business Logic Validation:
+    Enforces max stay duration (e.g., max 14 days).
+    """
+    tool_call = request.tool_call
+    name = tool_call["name"]
+    args = tool_call["args"]
+
+    print(f"POLICY CHECK: Intercepting '{name}'")
+
+    if name == "update-hotel":
+        if "checkin_date" in args and "checkout_date" in args:
+            try:
+                start = datetime.fromisoformat(args["checkin_date"])
+                end = datetime.fromisoformat(args["checkout_date"])
+                duration = (end - start).days
+
+                if duration > 14:
+                    print("BLOCKED: Stay too long")
+                    return ToolMessage(
+                        content="Error: Maximum stay duration is 14 days.",
+                        tool_call_id=tool_call["id"],
+                    )
+            except ValueError:
+                pass  # Ignore invalid date formats
+
+    # PRE: Code here runs BEFORE the tool execution
+    
+    # EXEC: Execute the tool (or next middleware)
+    result = await handler(request)
+
+    # POST: Code here runs AFTER the tool execution
+    return result
+
+
+# Post processing
+@wrap_tool_call
+async def enrich_response(request, handler):
+    """
+    Post-Processing & Enrichment:
+    Adds loyalty points information to successful bookings.
+    Standardizes output format.
+    """
+    # PRE: Code here runs BEFORE the tool execution
+    
+    # EXEC: Execute the tool (or next middleware)
+    result = await handler(request)
+
+    # POST: Code here runs AFTER the tool execution
+    if isinstance(result, ToolMessage):
+        content = str(result.content)
+        tool_name = request.tool_call["name"]
+
+        if tool_name == "book-hotel" and "Error" not in content:
+            loyalty_bonus = 500
+            result.content = f"Booking Confirmed!\n You earned {loyalty_bonus} Loyalty Points with this stay.\n\nSystem Details: {content}"
+
+    return result
+
+
+async def main():
+    async with ToolboxClient("http://127.0.0.1:5000") as client:
+        tools = await client.aload_toolset("my-toolset")
+        model = ChatVertexAI(model="gemini-2.5-flash")
+        agent = create_agent(
+            system_prompt=system_prompt,
+            model=model,
+            tools=tools,
+            # add any pre and post processing methods
+            middleware=[enforce_business_rules, enrich_response],
+        )
+
+        user_input = "Book hotel with id 3."
+        response = await agent.ainvoke(
+            {"messages": [{"role": "user", "content": user_input}]}
+        )
+
+        print("-" * 50)
+        last_ai_msg = response["messages"][-1].content
+        print(f"AI: {last_ai_msg}")
+
+        # Test Pre-processing
+        print("-" * 50)
+        user_input = "Update my hotel with id 3 with checkin date 2025-01-18 and checkout date 2025-01-20"
+        response = await agent.ainvoke(
+            {"messages": [{"role": "user", "content": user_input}]}
+        )
+        last_ai_msg = response["messages"][-1].content
+        print(f"AI: {last_ai_msg}")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())
diff --git a/docs/en/samples/pre_post_processing/python/langchain/requirements.txt b/docs/en/samples/pre_post_processing/python/langchain/requirements.txt
new file mode 100644
index 0000000000..5638e0c108
--- /dev/null
+++ b/docs/en/samples/pre_post_processing/python/langchain/requirements.txt
@@ -0,0 +1,3 @@
+langchain==1.2.6
+langchain-google-vertexai==3.2.2
+toolbox-langchain==0.5.8
\ No newline at end of file
diff --git a/docs/en/samples/snowflake/_index.md b/docs/en/samples/snowflake/_index.md
index 0149544eba..6f3ca05e8d 100644
--- a/docs/en/samples/snowflake/_index.md
+++ b/docs/en/samples/snowflake/_index.md
@@ -79,32 +79,33 @@ You have two options:
 Create a `tools.yaml` file and add the following content. You must replace the placeholders with your actual Snowflake configuration.
 
 ```yaml
-sources:
-  snowflake-source:
-    kind: snowflake
-    account: ${SNOWFLAKE_ACCOUNT}
-    user: ${SNOWFLAKE_USER}
-    password: ${SNOWFLAKE_PASSWORD}
-    database: ${SNOWFLAKE_DATABASE}
-    schema: ${SNOWFLAKE_SCHEMA}
-    warehouse: ${SNOWFLAKE_WAREHOUSE}
-    role: ${SNOWFLAKE_ROLE}
-
-tools:
-    execute_sql:
-        kind: snowflake-execute-sql
-        source: snowflake-source
-        description: Use this tool to execute SQL.
-
-    list_tables:
-        kind: snowflake-sql
-        source: snowflake-source
-        description: "Lists detailed schema information for user-created tables."
-        statement: |
-           SELECT table_name, table_type 
-           FROM information_schema.tables 
-           WHERE table_schema = current_schema()
-           ORDER BY table_name;
+kind: sources
+name: snowflake-source
+type: snowflake
+account: ${SNOWFLAKE_ACCOUNT}
+user: ${SNOWFLAKE_USER}
+password: ${SNOWFLAKE_PASSWORD}
+database: ${SNOWFLAKE_DATABASE}
+schema: ${SNOWFLAKE_SCHEMA}
+warehouse: ${SNOWFLAKE_WAREHOUSE}
+role: ${SNOWFLAKE_ROLE}
+---
+kind: tools
+name: execute_sql
+type: snowflake-execute-sql
+source: snowflake-source
+description: Use this tool to execute SQL.
+---
+kind: tools
+name: list_tables
+type: snowflake-sql
+source: snowflake-source
+description: "Lists detailed schema information for user-created tables."
+statement: |
+    SELECT table_name, table_type 
+    FROM information_schema.tables 
+    WHERE table_schema = current_schema()
+    ORDER BY table_name;
 ```
 
 For more info on tools, check out the
diff --git a/docs/en/samples/snowflake/snowflake-config.yaml b/docs/en/samples/snowflake/snowflake-config.yaml
index 085433e346..29660de2bf 100644
--- a/docs/en/samples/snowflake/snowflake-config.yaml
+++ b/docs/en/samples/snowflake/snowflake-config.yaml
@@ -12,57 +12,60 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sources:
-  my-snowflake-db:
-    kind: snowflake
-    account: ${SNOWFLAKE_ACCOUNT}
-    user: ${SNOWFLAKE_USER}
-    password: ${SNOWFLAKE_PASSWORD}
-    database: ${SNOWFLAKE_DATABASE}
-    schema: ${SNOWFLAKE_SCHEMA}
-    warehouse: ${SNOWFLAKE_WAREHOUSE}  # Optional, defaults to COMPUTE_WH if not set
-    role: ${SNOWFLAKE_ROLE}           # Optional, defaults to ACCOUNTADMIN if not set
-
+kind: sources
+name: my-snowflake-db
+type: snowflake
+account: ${SNOWFLAKE_ACCOUNT}
+user: ${SNOWFLAKE_USER}
+password: ${SNOWFLAKE_PASSWORD}
+database: ${SNOWFLAKE_DATABASE}
+schema: ${SNOWFLAKE_SCHEMA}
+warehouse: ${SNOWFLAKE_WAREHOUSE}  # Optional, defaults to COMPUTE_WH if not set
+role: ${SNOWFLAKE_ROLE}           # Optional, defaults to ACCOUNTADMIN if not set
+---
+kind: tools
+name: execute_sql
+type: snowflake-execute-sql
+source: my-snowflake-db
+description: Execute arbitrary SQL statements on Snowflake
+---
+kind: tools
+name: get_customer_orders
+type: snowflake-sql
+source: my-snowflake-db
+description: Get orders for a specific customer
+statement: |
+  SELECT o.order_id, o.order_date, o.total_amount, o.status
+  FROM orders o
+  WHERE o.customer_id = $1
+  ORDER BY o.order_date DESC
+parameters:
+  - name: customer_id
+    type: string
+    description: The customer ID to look up orders for
+---
+kind: tools
+name: daily_sales_report
+type: snowflake-sql
+source: my-snowflake-db
+description: Generate daily sales report for a specific date
+statement: |
+  SELECT 
+    DATE(order_date) as sales_date,
+    COUNT(*) as total_orders,
+    SUM(total_amount) as total_revenue,
+    AVG(total_amount) as avg_order_value
+  FROM orders
+  WHERE DATE(order_date) = $1
+  GROUP BY DATE(order_date)
+parameters:
+  - name: report_date
+    type: string
+    description: The date to generate report for (YYYY-MM-DD format)
+---
+kind: toolsets
+name: snowflake-analytics
 tools:
-  execute_sql:
-    kind: snowflake-execute-sql
-    source: my-snowflake-db
-    description: Execute arbitrary SQL statements on Snowflake
-
-  get_customer_orders:
-    kind: snowflake-sql
-    source: my-snowflake-db
-    description: Get orders for a specific customer
-    statement: |
-      SELECT o.order_id, o.order_date, o.total_amount, o.status
-      FROM orders o
-      WHERE o.customer_id = $1
-      ORDER BY o.order_date DESC
-    parameters:
-      - name: customer_id
-        type: string
-        description: The customer ID to look up orders for
-
-  daily_sales_report:
-    kind: snowflake-sql
-    source: my-snowflake-db
-    description: Generate daily sales report for a specific date
-    statement: |
-      SELECT 
-        DATE(order_date) as sales_date,
-        COUNT(*) as total_orders,
-        SUM(total_amount) as total_revenue,
-        AVG(total_amount) as avg_order_value
-      FROM orders
-      WHERE DATE(order_date) = $1
-      GROUP BY DATE(order_date)
-    parameters:
-      - name: report_date
-        type: string
-        description: The date to generate report for (YYYY-MM-DD format)
-
-toolsets:
-  snowflake-analytics:
-    - execute_sql
-    - get_customer_orders
-    - daily_sales_report
+  - execute_sql
+  - get_customer_orders
+  - daily_sales_report
diff --git a/gemini-extension.json b/gemini-extension.json
index 7e6a846b15..4a5c0e0b8d 100644
--- a/gemini-extension.json
+++ b/gemini-extension.json
@@ -1,6 +1,6 @@
 {
   "name": "mcp-toolbox-for-databases",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "description": "MCP Toolbox for Databases is an open-source MCP server for more than 30 different datasources.",
   "contextFileName": "MCP-TOOLBOX-EXTENSION.md"
 }
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 2254089cee..9fd4617e1b 100644
--- a/go.mod
+++ b/go.mod
@@ -13,6 +13,7 @@ require (
 	cloud.google.com/go/dataproc/v2 v2.15.0
 	cloud.google.com/go/firestore v1.20.0
 	cloud.google.com/go/geminidataanalytics v0.3.0
+	cloud.google.com/go/logging v1.13.1
 	cloud.google.com/go/longrunning v0.7.0
 	cloud.google.com/go/spanner v1.86.1
 	github.com/ClickHouse/clickhouse-go/v2 v2.40.3
@@ -20,6 +21,7 @@ require (
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/exporter/trace v1.30.0
 	github.com/apache/cassandra-gocql-driver/v2 v2.0.0
 	github.com/cenkalti/backoff/v5 v5.0.3
+	github.com/cockroachdb/cockroach-go/v2 v2.4.2
 	github.com/couchbase/gocb/v2 v2.11.1
 	github.com/couchbase/tools-common/http v1.0.9
 	github.com/elastic/elastic-transport-go/v8 v8.8.0
@@ -46,11 +48,12 @@ require (
 	github.com/sijms/go-ora/v2 v2.9.0
 	github.com/snowflakedb/gosnowflake v1.18.1
 	github.com/spf13/cobra v1.10.1
+	github.com/testcontainers/testcontainers-go v0.40.0
 	github.com/thlib/go-timezone-local v0.0.7
 	github.com/trinodb/trino-go-client v0.330.0
 	github.com/valkey-io/valkey-go v1.0.68
 	github.com/yugabyte/pgx/v5 v5.5.3-yb-5
-	go.mongodb.org/mongo-driver v1.17.4
+	go.mongodb.org/mongo-driver/v2 v2.4.2
 	go.opentelemetry.io/contrib/propagators/autoprop v0.62.0
 	go.opentelemetry.io/otel v1.38.0
 	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0
@@ -90,16 +93,19 @@ require (
 	cloud.google.com/go/iam v1.5.3 // indirect
 	cloud.google.com/go/monitoring v1.24.3 // indirect
 	cloud.google.com/go/trace v1.11.7 // indirect
+	dario.cat/mergo v1.0.2 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
 	github.com/99designs/keyring v1.2.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 // indirect
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
 	github.com/BurntSushi/toml v1.4.0 // indirect
 	github.com/GoogleCloudPlatform/grpc-gcp-go/grpcgcp v1.5.3 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/detectors/gcp v1.29.0 // indirect
 	github.com/GoogleCloudPlatform/opentelemetry-operations-go/internal/resourcemapping v0.54.0 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/PuerkitoBio/goquery v1.10.3 // indirect
 	github.com/VictoriaMetrics/easyproto v0.1.4 // indirect
 	github.com/ajg/form v1.5.1 // indirect
@@ -125,17 +131,29 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.34.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sts v1.38.4 // indirect
 	github.com/aws/smithy-go v1.23.0 // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 // indirect
+	github.com/containerd/errdefs v1.0.0 // indirect
+	github.com/containerd/errdefs/pkg v0.3.0 // indirect
+	github.com/containerd/log v0.1.0 // indirect
+	github.com/containerd/platforms v0.2.1 // indirect
 	github.com/couchbase/gocbcore/v10 v10.8.1 // indirect
 	github.com/couchbase/gocbcoreps v0.1.4 // indirect
 	github.com/couchbase/goprotostellar v1.0.2 // indirect
 	github.com/couchbase/tools-common/errors v1.0.0 // indirect
 	github.com/couchbaselabs/gocbconnstr/v2 v2.0.0 // indirect
+	github.com/cpuguy83/dockercfg v0.3.2 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/docker/docker v28.5.1+incompatible // indirect
+	github.com/docker/go-connections v0.6.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/dvsekhvalnov/jose2go v1.7.0 // indirect
+	github.com/ebitengine/purego v0.8.4 // indirect
 	github.com/envoyproxy/go-control-plane/envoy v1.32.4 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -144,6 +162,7 @@ require (
 	github.com/go-logfmt/logfmt v0.6.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
@@ -179,27 +198,46 @@ require (
 	github.com/klauspost/compress v1.18.0 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.11 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
+	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect
 	github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/moby/go-archive v0.1.0 // indirect
+	github.com/moby/patternmatcher v0.6.0 // indirect
+	github.com/moby/sys/sequential v0.6.0 // indirect
+	github.com/moby/sys/user v0.4.0 // indirect
+	github.com/moby/sys/userns v0.1.0 // indirect
+	github.com/moby/term v0.5.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/montanaflynn/stats v0.7.1 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/mtibben/percent v0.2.1 // indirect
 	github.com/nakagami/chacha20 v0.1.0 // indirect
 	github.com/ncruces/go-strftime v0.1.9 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.1 // indirect
 	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
 	github.com/pierrec/lz4/v4 v4.1.22 // indirect
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
+	github.com/shirou/gopsutil/v4 v4.25.6 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.9 // indirect
 	github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
+	github.com/stretchr/testify v1.11.1 // indirect
+	github.com/tklauser/go-sysconf v0.3.12 // indirect
+	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.2 // indirect
 	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	github.com/zeebo/errs v1.4.0 // indirect
 	github.com/zeebo/xxh3 v1.0.2 // indirect
 	gitlab.com/nyarla/go-crypt v0.0.0-20160106005555-d9a5dc2b789b // indirect
@@ -232,6 +270,7 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 	modernc.org/libc v1.66.10 // indirect
 	modernc.org/mathutil v1.7.1 // indirect
 	modernc.org/memory v1.11.0 // indirect
diff --git a/go.sum b/go.sum
index 791f5b2457..8ebebe11d5 100644
--- a/go.sum
+++ b/go.sum
@@ -370,8 +370,8 @@ cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6
 cloud.google.com/go/lifesciences v0.8.0/go.mod h1:lFxiEOMqII6XggGbOnKiyZ7IBwoIqA84ClvoezaA/bo=
 cloud.google.com/go/logging v1.6.1/go.mod h1:5ZO0mHHbvm8gEmeEUHrmDlTDSu5imF6MUP9OfilNXBw=
 cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
-cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
-cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
+cloud.google.com/go/logging v1.13.1 h1:O7LvmO0kGLaHY/gq8cV7T0dyp6zJhYAOtZPX4TF3QtY=
+cloud.google.com/go/logging v1.13.1/go.mod h1:XAQkfkMBxQRjQek96WLPNze7vsOmay9H5PqfsNYDqvw=
 cloud.google.com/go/longrunning v0.1.1/go.mod h1:UUFxuDWkv22EuY93jjmDMFT5GPQKeFVJBIF6QlTqdsE=
 cloud.google.com/go/longrunning v0.3.0/go.mod h1:qth9Y41RRSUE69rDcOn6DdK3HfQfsUI0YSmW3iIlLJc=
 cloud.google.com/go/longrunning v0.4.1/go.mod h1:4iWDqhBZ70CvZ6BfETbvam3T8FMvLK+eFj0E6AaRQTo=
@@ -647,6 +647,8 @@ github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMb
 github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4=
 github.com/99designs/keyring v1.2.2 h1:pZd3neh/EmUzWONb35LxQfvuY7kiSXAq3HQd97+XBn0=
 github.com/99designs/keyring v1.2.2/go.mod h1:wes/FrByc8j7lFOAGLGSNEg8f/PaI3cgTBqhFkHUrPk=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 h1:He8afgbRMd7mFxO99hRNu+6tazq8nFF9lIwo9JFroBk=
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 h1:Gt0j3wceWMwPmiazCa8MzMA0MfhmPIz0Qp0FJ6qcM0U=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0/go.mod h1:Ot/6aikWnKWi4l9QB7qVSwa8iMphQNqkWALMoNT3rzM=
 github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
@@ -798,8 +800,18 @@ github.com/cncf/xds/go v0.0.0-20230105202645-06c439db220b/go.mod h1:eXthEFrGJvWH
 github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv1aFbZMiM9vblcSArJRf2Irls=
 github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
+github.com/cockroachdb/cockroach-go/v2 v2.4.2 h1:QB0ozDWQUUJ0GP8Zw63X/qHefPTCpLvtfCs6TLrPgyE=
+github.com/cockroachdb/cockroach-go/v2 v2.4.2/go.mod h1:9U179XbCx4qFWtNhc7BiWLPfuyMVQ7qdAhfrwLz1vH0=
 github.com/containerd/continuity v0.4.5 h1:ZRoN1sXq9u7V6QoHMcVWGhOwDFqZ4B9i5H6un1Wh0x4=
 github.com/containerd/continuity v0.4.5/go.mod h1:/lNJvtJKUQStBzpVQ1+rasXO1LAWtUQssk28EZvJ3nE=
+github.com/containerd/errdefs v1.0.0 h1:tg5yIfIlQIrxYtu9ajqY42W3lpS19XqdxRQeEwYG8PI=
+github.com/containerd/errdefs v1.0.0/go.mod h1:+YBYIdtsnF4Iw6nWZhJcqGSg/dwvV7tyJ/kCkyJ2k+M=
+github.com/containerd/errdefs/pkg v0.3.0 h1:9IKJ06FvyNlexW690DXuQNx2KA2cUJXx151Xdx3ZPPE=
+github.com/containerd/errdefs/pkg v0.3.0/go.mod h1:NJw6s9HwNuRhnjJhM7pylWwMyAkmCQvQ4GpJHEqRLVk=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
+github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
 github.com/couchbase/gocb/v2 v2.11.1 h1:xWDco7Qk/XSvGUjbUWRaXi0V35nsMijJnm4vHXN/rqY=
 github.com/couchbase/gocb/v2 v2.11.1/go.mod h1:aSh1Cmd1sPRpYyiBD5iWPehPWaTVF/oYhrtOAITWb/4=
 github.com/couchbase/gocbcore/v10 v10.8.1 h1:i4SnH0DH9APGC4GS2vS2m+3u08V7oJwviamOXdgAZOQ=
@@ -816,8 +828,12 @@ github.com/couchbaselabs/gocaves/client v0.0.0-20250107114554-f96479220ae8 h1:MQ
 github.com/couchbaselabs/gocaves/client v0.0.0-20250107114554-f96479220ae8/go.mod h1:AVekAZwIY2stsJOMWLAS/0uA/+qdp7pjO8EHnl61QkY=
 github.com/couchbaselabs/gocbconnstr/v2 v2.0.0 h1:HU9DlAYYWR69jQnLN6cpg0fh0hxW/8d5hnglCXXjW78=
 github.com/couchbaselabs/gocbconnstr/v2 v2.0.0/go.mod h1:o7T431UOfFVHDNvMBUmUxpHnhivwv7BziUao/nMl81E=
+github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
+github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
+github.com/creack/pty v1.1.18/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
 github.com/danieljoos/wincred v1.2.2/go.mod h1:w7w4Utbrz8lqeMbDAK0lkNJUv5sAOkFi7nd/ogr0Uh8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -826,10 +842,12 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
 github.com/docker/cli v28.4.0+incompatible h1:RBcf3Kjw2pMtwui5V0DIMdyeab8glEw5QY0UUU4C9kY=
 github.com/docker/cli v28.4.0+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
-github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk=
-github.com/docker/docker v28.4.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
+github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pMmjSD94=
 github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
 github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
@@ -840,6 +858,8 @@ github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkp
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/dvsekhvalnov/jose2go v1.7.0 h1:bnQc8+GMnidJZA8zc6lLEAb4xNrIqHwO+9TzqvtQZPo=
 github.com/dvsekhvalnov/jose2go v1.7.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
+github.com/ebitengine/purego v0.8.4 h1:CF7LEKg5FFOsASUj0+QwaXf8Ht6TlFxg09+S9wz0omw=
+github.com/ebitengine/purego v0.8.4/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
 github.com/elastic/elastic-transport-go/v8 v8.8.0 h1:7k1Ua+qluFr6p1jfJjGDl97ssJS/P7cHNInzfxgBQAo=
 github.com/elastic/elastic-transport-go/v8 v8.8.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk=
 github.com/elastic/go-elasticsearch/v9 v9.2.0 h1:COeL/g20+ixnUbffe4Wfbu88emrHjAq/LhVfmrjqRQs=
@@ -913,6 +933,8 @@ github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
 github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/go-pdf/fpdf v0.5.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-pdf/fpdf v0.6.0/go.mod h1:HzcnA+A23uwogo0tp9yU+l3V+KXhiESpt1PMayhOh5M=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
@@ -940,6 +962,8 @@ github.com/godror/godror v0.49.6 h1:ts4ZGw8uLJ42e1D7aXmVuSrld0/lzUzmIUjuUuQOgGM=
 github.com/godror/godror v0.49.6/go.mod h1:kTMcxZzRw73RT5kn9v3JkBK4kHI6dqowHotqV72ebU8=
 github.com/godror/knownpb v0.3.0 h1:+caUdy8hTtl7X05aPl3tdL540TvCcaQA6woZQroLZMw=
 github.com/godror/knownpb v0.3.0/go.mod h1:PpTyfJwiOEAzQl7NtVCM8kdPCnp3uhxsZYIzZ5PV4zU=
+github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
+github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo=
 github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
@@ -1174,9 +1198,13 @@ github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw=
 github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/looker-open-source/sdk-codegen/go v0.25.22 h1:DGYt1v2R2uE/m71sWAvgxsJnDLM9B7C40N5/CTDlE2A=
 github.com/looker-open-source/sdk-codegen/go v0.25.22/go.mod h1:Br1ntSiruDJ/4nYNjpYyWyCbqJ7+GQceWbIgn0hYims=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
+github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
 github.com/lyft/protoc-gen-star v0.6.0/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
 github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
+github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
+github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
@@ -1194,8 +1222,18 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 h1:+n/aFZefKZp7spd8D
 github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8IeTMnF8JTXieKnO4Z6JCsikNEzj0DwauVzE=
 github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
 github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/go-archive v0.1.0 h1:Kk/5rdW/g+H8NHdJW2gsXyZ7UnzvJNOy6VKJqueWdcQ=
+github.com/moby/go-archive v0.1.0/go.mod h1:G9B+YoujNohJmrIYFBpSd54GTUB4lt9S+xVQvsJyFuo=
+github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
+github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
+github.com/moby/sys/atomicwriter v0.1.0 h1:kw5D/EqkBwsBFi0ss9v1VG3wIkVhzGvLklJ+w3A14Sw=
+github.com/moby/sys/atomicwriter v0.1.0/go.mod h1:Ul8oqv2ZMNHOceF643P6FKPXeCmYtlQMvpizfsSoaWs=
+github.com/moby/sys/sequential v0.6.0 h1:qrx7XFUd/5DxtqcoH1h438hF5TmOvzC/lspjy7zgvCU=
+github.com/moby/sys/sequential v0.6.0/go.mod h1:uyv8EUTrca5PnDsdMGXhZe6CCe8U/UiTWd+lL+7b/Ko=
 github.com/moby/sys/user v0.4.0 h1:jhcMKit7SA80hivmFJcbB1vqmw//wU61Zdui2eQXuMs=
 github.com/moby/sys/user v0.4.0/go.mod h1:bG+tYYYJgaMtRKgEmuueC0hJEAZWwtIbZTB+85uoHjs=
+github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
+github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
 github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
 github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -1204,8 +1242,8 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJ
 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/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs=
 github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns=
 github.com/nakagami/chacha20 v0.1.0 h1:2fbf5KeVUw7oRpAe6/A7DqvBJLYYu0ka5WstFbnkEVo=
@@ -1254,6 +1292,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
+github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w=
@@ -1275,6 +1315,8 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF
 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/shirou/gopsutil/v4 v4.25.6 h1:kLysI2JsKorfaFPcYmcJqbzROzsBWEOAtw6A7dIfqXs=
+github.com/shirou/gopsutil/v4 v4.25.6/go.mod h1:PfybzyydfZcN+JMMjkF6Zb8Mq1A/VcogFFg7hj50W9c=
 github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
 github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sijms/go-ora/v2 v2.9.0 h1:+iQbUeTeCOFMb5BsOMgUhV8KWyrv9yjKpcK4x7+MFrg=
@@ -1312,9 +1354,15 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
 github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
+github.com/testcontainers/testcontainers-go v0.40.0 h1:pSdJYLOVgLE8YdUY2FHQ1Fxu+aMnb6JfVz1mxk7OeMU=
+github.com/testcontainers/testcontainers-go v0.40.0/go.mod h1:FSXV5KQtX2HAMlm7U3APNyLkkap35zNLxukw9oBi/MY=
 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/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
+github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
+github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
+github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
 github.com/trinodb/trino-go-client v0.330.0 h1:TBbHjFBuRjYbGtkNyRAJfzLOcwvz8ECihtMtxSzXqOc=
 github.com/trinodb/trino-go-client v0.330.0/go.mod h1:BXj9QNy6pA4Gn8eIu9dVdRhetABCjFAOZ6xxsVsOZJE=
 github.com/valkey-io/valkey-go v1.0.68 h1:bTbfonp49b41DqrF30q+y2JL3gcbjd2IiacFAtO4JBA=
@@ -1347,6 +1395,8 @@ github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9dec
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
 github.com/zeebo/assert v1.3.0 h1:g7C04CbJuIDKNPFHmsk4hwZDO5O+kntRxzaUoNXj+IQ=
 github.com/zeebo/assert v1.3.0/go.mod h1:Pq9JiuJQpG8JLJdtkwrJESF0Foym2/D9XMU5ciN/wJ0=
 github.com/zeebo/errs v1.4.0 h1:XNdoD/RRMKP7HD0UhJnIzUy74ISdGGxURlYG8HSWSfM=
@@ -1356,8 +1406,8 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD
 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.mongodb.org/mongo-driver/v2 v2.4.2 h1:HrJ+Auygxceby9MLp3YITobef5a8Bv4HcPFIkml1U7U=
+go.mongodb.org/mongo-driver/v2 v2.4.2/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1627,6 +1677,7 @@ golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1648,6 +1699,7 @@ golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -1700,6 +1752,7 @@ golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -2129,6 +2182,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
+gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
diff --git a/internal/auth/auth.go b/internal/auth/auth.go
index e8f15e4f11..5fd30d1f45 100644
--- a/internal/auth/auth.go
+++ b/internal/auth/auth.go
@@ -21,13 +21,13 @@ import (
 
 // AuthServiceConfig is the interface for configuring authentication services.
 type AuthServiceConfig interface {
-	AuthServiceConfigKind() string
+	AuthServiceConfigType() string
 	Initialize() (AuthService, error)
 }
 
 // AuthService is the interface for authentication services.
 type AuthService interface {
-	AuthServiceKind() string
+	AuthServiceType() string
 	GetName() string
 	GetClaimsFromHeader(context.Context, http.Header) (map[string]any, error)
 	ToConfig() AuthServiceConfig
diff --git a/internal/auth/google/google.go b/internal/auth/google/google.go
index 90cb809589..4027950557 100644
--- a/internal/auth/google/google.go
+++ b/internal/auth/google/google.go
@@ -23,7 +23,7 @@ import (
 	"google.golang.org/api/idtoken"
 )
 
-const AuthServiceKind string = "google"
+const AuthServiceType string = "google"
 
 // validate interface
 var _ auth.AuthServiceConfig = Config{}
@@ -31,13 +31,13 @@ var _ auth.AuthServiceConfig = Config{}
 // Auth service configuration
 type Config struct {
 	Name     string `yaml:"name" validate:"required"`
-	Kind     string `yaml:"kind" validate:"required"`
+	Type     string `yaml:"type" validate:"required"`
 	ClientID string `yaml:"clientId" validate:"required"`
 }
 
-// Returns the auth service kind
-func (cfg Config) AuthServiceConfigKind() string {
-	return AuthServiceKind
+// Returns the auth service type
+func (cfg Config) AuthServiceConfigType() string {
+	return AuthServiceType
 }
 
 // Initialize a Google auth service
@@ -55,9 +55,9 @@ type AuthService struct {
 	Config
 }
 
-// Returns the auth service kind
-func (a AuthService) AuthServiceKind() string {
-	return AuthServiceKind
+// Returns the auth service type
+func (a AuthService) AuthServiceType() string {
+	return AuthServiceType
 }
 
 func (a AuthService) ToConfig() auth.AuthServiceConfig {
diff --git a/internal/embeddingmodels/embeddingmodels.go b/internal/embeddingmodels/embeddingmodels.go
index d038dd231e..5f82ee32f1 100644
--- a/internal/embeddingmodels/embeddingmodels.go
+++ b/internal/embeddingmodels/embeddingmodels.go
@@ -22,12 +22,12 @@ import (
 
 // EmbeddingModelConfig is the interface for configuring embedding models.
 type EmbeddingModelConfig interface {
-	EmbeddingModelConfigKind() string
+	EmbeddingModelConfigType() string
 	Initialize(context.Context) (EmbeddingModel, error)
 }
 
 type EmbeddingModel interface {
-	EmbeddingModelKind() string
+	EmbeddingModelType() string
 	ToConfig() EmbeddingModelConfig
 	EmbedParameters(context.Context, []string) ([][]float32, error)
 }
diff --git a/internal/embeddingmodels/gemini/gemini.go b/internal/embeddingmodels/gemini/gemini.go
index 1a31060e7b..fa63b12acb 100644
--- a/internal/embeddingmodels/gemini/gemini.go
+++ b/internal/embeddingmodels/gemini/gemini.go
@@ -23,22 +23,22 @@ import (
 	"google.golang.org/genai"
 )
 
-const EmbeddingModelKind string = "gemini"
+const EmbeddingModelType string = "gemini"
 
 // validate interface
 var _ embeddingmodels.EmbeddingModelConfig = Config{}
 
 type Config struct {
 	Name      string `yaml:"name" validate:"required"`
-	Kind      string `yaml:"kind" validate:"required"`
+	Type      string `yaml:"type" validate:"required"`
 	Model     string `yaml:"model" validate:"required"`
 	ApiKey    string `yaml:"apiKey"`
 	Dimension int32  `yaml:"dimension"`
 }
 
-// Returns the embedding model kind
-func (cfg Config) EmbeddingModelConfigKind() string {
-	return EmbeddingModelKind
+// Returns the embedding model type
+func (cfg Config) EmbeddingModelConfigType() string {
+	return EmbeddingModelType
 }
 
 // Initialize a Gemini embedding model
@@ -69,9 +69,9 @@ type EmbeddingModel struct {
 	Config
 }
 
-// Returns the embedding model kind
-func (m EmbeddingModel) EmbeddingModelKind() string {
-	return EmbeddingModelKind
+// Returns the embedding model type
+func (m EmbeddingModel) EmbeddingModelType() string {
+	return EmbeddingModelType
 }
 
 func (m EmbeddingModel) ToConfig() embeddingmodels.EmbeddingModelConfig {
diff --git a/internal/embeddingmodels/gemini/gemini_test.go b/internal/embeddingmodels/gemini/gemini_test.go
index c4c3b8dcdc..e04e1df1b6 100644
--- a/internal/embeddingmodels/gemini/gemini_test.go
+++ b/internal/embeddingmodels/gemini/gemini_test.go
@@ -15,9 +15,9 @@
 package gemini_test
 
 import (
+	"context"
 	"testing"
 
-	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels/gemini"
@@ -34,15 +34,15 @@ func TestParseFromYamlGemini(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-            embeddingModels:
-                my-gemini-model:
-                    kind: gemini
-                    model: text-embedding-004
+			kind: embeddingModels
+			name: my-gemini-model
+			type: gemini
+			model: text-embedding-004
             `,
 			want: map[string]embeddingmodels.EmbeddingModelConfig{
 				"my-gemini-model": gemini.Config{
 					Name:  "my-gemini-model",
-					Kind:  gemini.EmbeddingModelKind,
+					Type:  gemini.EmbeddingModelType,
 					Model: "text-embedding-004",
 				},
 			},
@@ -50,17 +50,17 @@ func TestParseFromYamlGemini(t *testing.T) {
 		{
 			desc: "full example with optional fields",
 			in: `
-            embeddingModels:
-                complex-gemini:
-                    kind: gemini
-                    model: text-embedding-004
-                    apiKey: "test-api-key"
-                    dimension: 768
+            kind: embeddingModels
+            name: complex-gemini
+            type: gemini
+            model: text-embedding-004
+            apiKey: "test-api-key"
+            dimension: 768
             `,
 			want: map[string]embeddingmodels.EmbeddingModelConfig{
 				"complex-gemini": gemini.Config{
 					Name:      "complex-gemini",
-					Kind:      gemini.EmbeddingModelKind,
+					Type:      gemini.EmbeddingModelType,
 					Model:     "text-embedding-004",
 					ApiKey:    "test-api-key",
 					Dimension: 768,
@@ -70,16 +70,13 @@ func TestParseFromYamlGemini(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Models server.EmbeddingModelConfigs `yaml:"embeddingModels"`
-			}{}
 			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, got, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Models) {
-				t.Fatalf("incorrect parse: %v", cmp.Diff(tc.want, got.Models))
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: %v", cmp.Diff(tc.want, got))
 			}
 		})
 	}
@@ -93,32 +90,29 @@ func TestFailParseFromYamlGemini(t *testing.T) {
 		{
 			desc: "missing required model field",
 			in: `
-            embeddingModels:
-                bad-model:
-                    kind: gemini
+            kind: embeddingModels
+            name: bad-model
+            type: gemini
             `,
 			// Removed the specific model name from the prefix to match your output
-			err: "unable to parse as \"gemini\": Key: 'Config.Model' Error:Field validation for 'Model' failed on the 'required' tag",
+			err: "error unmarshaling embeddingModels: unable to parse as \"bad-model\": Key: 'Config.Model' Error:Field validation for 'Model' failed on the 'required' tag",
 		},
 		{
 			desc: "unknown field",
 			in: `
-            embeddingModels:
-                bad-field:
-                    kind: gemini
-                    model: text-embedding-004
-                    invalid_param: true
+            kind: embeddingModels
+            name: bad-field
+            type: gemini
+            model: text-embedding-004
+            invalid_param: true
             `,
 			// Updated to match the specific line-starting format of your error output
-			err: "unable to parse as \"gemini\": [1:1] unknown field \"invalid_param\"\n>  1 | invalid_param: true\n       ^\n   2 | kind: gemini\n   3 | model: text-embedding-004",
+			err: "error unmarshaling embeddingModels: unable to parse as \"bad-field\": [1:1] unknown field \"invalid_param\"\n>  1 | invalid_param: true\n       ^\n   2 | model: text-embedding-004\n   3 | name: bad-field\n   4 | type: gemini",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Models server.EmbeddingModelConfigs `yaml:"embeddingModels"`
-			}{}
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/log/log.go b/internal/log/log.go
index 2c9d1a9273..710dc2ee95 100644
--- a/internal/log/log.go
+++ b/internal/log/log.go
@@ -22,6 +22,18 @@ import (
 	"strings"
 )
 
+// NewLogger creates a new logger based on the provided format and level.
+func NewLogger(format, level string, out, err io.Writer) (Logger, error) {
+	switch strings.ToLower(format) {
+	case "json":
+		return NewStructuredLogger(out, err, level)
+	case "standard":
+		return NewStdLogger(out, err, level)
+	default:
+		return nil, fmt.Errorf("logging format invalid: %s", format)
+	}
+}
+
 // StdLogger is the standard logger
 type StdLogger struct {
 	outLogger *slog.Logger
diff --git a/internal/prebuiltconfigs/prebuiltconfigs_test.go b/internal/prebuiltconfigs/prebuiltconfigs_test.go
index 8bc6ef1e41..ce2e119bf6 100644
--- a/internal/prebuiltconfigs/prebuiltconfigs_test.go
+++ b/internal/prebuiltconfigs/prebuiltconfigs_test.go
@@ -21,6 +21,7 @@ import (
 )
 
 var expectedToolSources = []string{
+	"alloydb-omni",
 	"alloydb-postgres-admin",
 	"alloydb-postgres-observability",
 	"alloydb-postgres",
@@ -99,36 +100,40 @@ func TestLoadPrebuiltToolYAMLs(t *testing.T) {
 }
 
 func TestGetPrebuiltTool(t *testing.T) {
-	alloydb_admin_config, _ := Get("alloydb-postgres-admin")
-	alloydb_observability_config, _ := Get("alloydb-postgres-observability")
-	alloydb_config, _ := Get("alloydb-postgres")
-	bigquery_config, _ := Get("bigquery")
-	clickhouse_config, _ := Get("clickhouse")
-	cloudsqlpg_observability_config, _ := Get("cloud-sql-postgres-observability")
-	cloudsqlpg_config, _ := Get("cloud-sql-postgres")
-	cloudsqlpg_admin_config, _ := Get("cloud-sql-postgres-admin")
-	cloudsqlmysql_admin_config, _ := Get("cloud-sql-mysql-admin")
-	cloudsqlmssql_admin_config, _ := Get("cloud-sql-mssql-admin")
-	cloudsqlmysql_observability_config, _ := Get("cloud-sql-mysql-observability")
-	cloudsqlmysql_config, _ := Get("cloud-sql-mysql")
-	cloudsqlmssql_observability_config, _ := Get("cloud-sql-mssql-observability")
-	cloudsqlmssql_config, _ := Get("cloud-sql-mssql")
-	dataplex_config, _ := Get("dataplex")
-	firestoreconfig, _ := Get("firestore")
-	looker_config, _ := Get("looker")
-	lookerca_config, _ := Get("looker-conversational-analytics")
-	mysql_config, _ := Get("mysql")
-	mssql_config, _ := Get("mssql")
-	oceanbase_config, _ := Get("oceanbase")
-	postgresconfig, _ := Get("postgres")
-	singlestore_config, _ := Get("singlestore")
-	spanner_config, _ := Get("spanner")
-	spannerpg_config, _ := Get("spanner-postgres")
-	mindsdb_config, _ := Get("mindsdb")
-	sqlite_config, _ := Get("sqlite")
-	neo4jconfig, _ := Get("neo4j")
-	healthcare_config, _ := Get("cloud-healthcare")
-	snowflake_config, _ := Get("snowflake")
+	alloydb_omni_config := getOrFatal(t, "alloydb-omni")
+	alloydb_admin_config := getOrFatal(t, "alloydb-postgres-admin")
+	alloydb_observability_config := getOrFatal(t, "alloydb-postgres-observability")
+	alloydb_config := getOrFatal(t, "alloydb-postgres")
+	bigquery_config := getOrFatal(t, "bigquery")
+	clickhouse_config := getOrFatal(t, "clickhouse")
+	cloudsqlpg_observability_config := getOrFatal(t, "cloud-sql-postgres-observability")
+	cloudsqlpg_config := getOrFatal(t, "cloud-sql-postgres")
+	cloudsqlpg_admin_config := getOrFatal(t, "cloud-sql-postgres-admin")
+	cloudsqlmysql_admin_config := getOrFatal(t, "cloud-sql-mysql-admin")
+	cloudsqlmssql_admin_config := getOrFatal(t, "cloud-sql-mssql-admin")
+	cloudsqlmysql_observability_config := getOrFatal(t, "cloud-sql-mysql-observability")
+	cloudsqlmysql_config := getOrFatal(t, "cloud-sql-mysql")
+	cloudsqlmssql_observability_config := getOrFatal(t, "cloud-sql-mssql-observability")
+	cloudsqlmssql_config := getOrFatal(t, "cloud-sql-mssql")
+	dataplex_config := getOrFatal(t, "dataplex")
+	firestoreconfig := getOrFatal(t, "firestore")
+	looker_config := getOrFatal(t, "looker")
+	lookerca_config := getOrFatal(t, "looker-conversational-analytics")
+	mysql_config := getOrFatal(t, "mysql")
+	mssql_config := getOrFatal(t, "mssql")
+	oceanbase_config := getOrFatal(t, "oceanbase")
+	postgresconfig := getOrFatal(t, "postgres")
+	singlestore_config := getOrFatal(t, "singlestore")
+	spanner_config := getOrFatal(t, "spanner")
+	spannerpg_config := getOrFatal(t, "spanner-postgres")
+	mindsdb_config := getOrFatal(t, "mindsdb")
+	sqlite_config := getOrFatal(t, "sqlite")
+	neo4jconfig := getOrFatal(t, "neo4j")
+	healthcare_config := getOrFatal(t, "cloud-healthcare")
+	snowflake_config := getOrFatal(t, "snowflake")
+	if len(alloydb_omni_config) <= 0 {
+		t.Fatalf("unexpected error: could not fetch alloydb omni prebuilt tools yaml")
+	}
 	if len(alloydb_admin_config) <= 0 {
 		t.Fatalf("unexpected error: could not fetch alloydb admin prebuilt tools yaml")
 	}
@@ -233,3 +238,11 @@ func TestFailGetPrebuiltTool(t *testing.T) {
 		t.Fatalf("unexpected an error but got nil.")
 	}
 }
+
+func getOrFatal(t *testing.T, prebuiltSourceConfig string) []byte {
+	bytes, err := Get(prebuiltSourceConfig)
+	if err != nil {
+		t.Fatalf("Cannot get prebuilt config for %q, error %v", prebuiltSourceConfig, err)
+	}
+	return bytes
+}
diff --git a/internal/prebuiltconfigs/tools/alloydb-omni.yaml b/internal/prebuiltconfigs/tools/alloydb-omni.yaml
new file mode 100644
index 0000000000..9fac9a32e7
--- /dev/null
+++ b/internal/prebuiltconfigs/tools/alloydb-omni.yaml
@@ -0,0 +1,277 @@
+# Copyright 2026 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+sources:
+    alloydb-omni-source:
+        kind: postgres
+        host: ${ALLOYDB_OMNI_HOST:localhost}
+        port: ${ALLOYDB_OMNI_PORT:5432}
+        database: ${ALLOYDB_OMNI_DATABASE}
+        user: ${ALLOYDB_OMNI_USER}
+        password: ${ALLOYDB_OMNI_PASSWORD:}
+        queryParams: ${ALLOYDB_OMNI_QUERY_PARAMS:}
+
+tools:
+    execute_sql:
+        kind: postgres-execute-sql
+        source: alloydb-omni-source
+        description: Use this tool to execute sql.
+
+    list_tables:
+        kind: postgres-list-tables
+        source: alloydb-omni-source
+        description: "Lists detailed schema information (object type, columns, constraints, indexes, triggers, owner, comment) as JSON for user-created tables (ordinary or partitioned). Filters by a comma-separated list of names. If names are omitted, lists all tables in user schemas."
+
+    list_active_queries:
+        kind: postgres-list-active-queries
+        source: alloydb-omni-source
+        description: "List the top N (default 50) currently running queries (state='active') from pg_stat_activity, ordered by longest-running first. Returns pid, user, database, application_name, client_addr, state, wait_event_type/wait_event, backend/xact/query start times, computed query_duration, and the SQL text."
+
+    list_available_extensions:
+        kind: postgres-list-available-extensions
+        source: alloydb-omni-source
+        description: "Discover all PostgreSQL extensions available for installation on this server, returning name, default_version, and description."
+
+    list_installed_extensions:
+        kind: postgres-list-installed-extensions
+        source: alloydb-omni-source
+        description: "List all installed PostgreSQL extensions with their name, version, schema, owner, and description."
+
+    long_running_transactions:
+        kind: postgres-long-running-transactions
+        source: alloydb-omni-source
+
+    list_locks:
+        kind: postgres-list-locks
+        source: alloydb-omni-source
+
+    replication_stats:
+        kind: postgres-replication-stats
+        source: alloydb-omni-source
+
+    list_autovacuum_configurations:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "List PostgreSQL autovacuum-related configurations (name and current setting) from pg_settings."
+        statement: |
+            SELECT name,
+                setting
+            FROM   pg_settings
+            WHERE  category = 'Autovacuum';
+
+    list_columnar_configurations:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "List AlloyDB Omni columnar-related configurations (name and current setting) from pg_settings."
+        statement: |
+            SELECT name,
+                setting
+            FROM   pg_settings
+            WHERE  name like 'google_columnar_engine.%';
+
+    list_columnar_recommended_columns:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "Lists columns that AlloyDB Omni recommends adding to the columnar engine to improve query performance."
+        statement: select * from g_columnar_recommended_columns;
+
+    list_memory_configurations:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "List PostgreSQL memory-related configurations (name and current setting) from pg_settings."
+        statement: |
+            (
+                SELECT
+                name,
+                pg_size_pretty((setting::bigint * 1024)::bigint) setting
+                FROM pg_settings
+                WHERE name IN ('work_mem', 'maintenance_work_mem')
+            )
+            UNION ALL
+            (
+                SELECT
+                name,
+                pg_size_pretty((((setting::bigint) * 8) * 1024)::bigint)
+                FROM pg_settings
+                WHERE name IN ('shared_buffers', 'wal_buffers', 'effective_cache_size', 'temp_buffers')
+            )
+            ORDER BY 1 DESC;
+
+    list_top_bloated_tables:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: |
+            List the top tables by dead-tuple (approximate bloat signal), returning schema, table, live/dead tuples, percentage, and last vacuum/analyze times.
+        statement: |
+            SELECT
+                schemaname AS schema_name,
+                relname AS relation_name,
+                n_live_tup AS live_tuples,
+                n_dead_tup AS dead_tuples,
+                TRUNC((n_dead_tup::NUMERIC / NULLIF(n_live_tup + n_dead_tup, 0)) * 100, 2) AS dead_tuple_percentage,
+                last_vacuum,
+                last_autovacuum,
+                last_analyze,
+                last_autoanalyze
+            FROM pg_stat_user_tables
+            ORDER BY n_dead_tup DESC
+            LIMIT COALESCE($1::int, 50);
+        parameters:
+            - name: limit
+              description: "The maximum number of results to return."
+              type: integer
+              default: 50
+
+    list_replication_slots:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "List key details for all PostgreSQL replication slots (e.g., type, database, active status) and calculates the size of the outstanding WAL that is being prevented from removal by the slot."
+        statement: |
+            SELECT
+            slot_name,
+            slot_type,
+            plugin,
+            database,
+            temporary,
+            active,
+            restart_lsn,
+            confirmed_flush_lsn,
+            xmin,
+            catalog_xmin,
+            pg_size_pretty(pg_wal_lsn_diff(pg_current_wal_lsn(), restart_lsn)) AS retained_wal
+            FROM pg_replication_slots;
+
+    list_invalid_indexes:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "Lists all invalid PostgreSQL indexes which are taking up disk space but are unusable by the query planner. Typically created by failed CREATE INDEX CONCURRENTLY operations."
+        statement: |
+            SELECT
+                nspname AS schema_name,
+                indexrelid::regclass AS index_name,
+                indrelid::regclass AS table_name,
+                pg_size_pretty(pg_total_relation_size(indexrelid)) AS index_size,
+                indisready,
+                indisvalid,
+                pg_get_indexdef(pg_class.oid) AS index_def
+            FROM pg_index
+            JOIN pg_class ON pg_class.oid = pg_index.indexrelid
+            JOIN pg_namespace ON pg_namespace.oid = pg_class.relnamespace
+            WHERE indisvalid = FALSE;
+
+    get_query_plan:
+        kind: postgres-sql
+        source: alloydb-omni-source
+        description: "Generate a PostgreSQL EXPLAIN plan in JSON format for a single SQL statement—without executing it. This returns the optimizer's estimated plan, costs, and rows (no ANALYZE, no extra options). Use in production safely for plan inspection, regression checks, and query tuning workflows."
+        statement: |
+            EXPLAIN (FORMAT JSON) {{.query}};
+        templateParameters:
+            - name: query
+              type: string
+              description: "The SQL statement for which you want to generate plan (omit the EXPLAIN keyword)."
+              required: true
+
+    list_views:
+        kind: postgres-list-views
+        source: alloydb-omni-source
+
+    list_schemas:
+        kind: postgres-list-schemas
+        source: alloydb-omni-source
+
+    list_indexes:
+        kind: postgres-list-indexes
+        source: alloydb-omni-source
+
+    list_sequences:
+        kind: postgres-list-sequences
+        source: alloydb-omni-source
+
+    database_overview:
+        kind: postgres-database-overview
+        source: alloydb-omni-source
+
+    list_triggers:
+        kind: postgres-list-triggers
+        source: alloydb-omni-source
+
+    list_query_stats:
+        kind: postgres-list-query-stats
+        source: alloydb-omni-source
+
+    get_column_cardinality:
+        kind: postgres-get-column-cardinality
+        source: alloydb-omni-source
+
+    list_table_stats:
+        kind: postgres-list-table-stats
+        source: alloydb-omni-source
+
+    list_publication_tables:
+        kind: postgres-list-publication-tables
+        source: alloydb-omni-source
+
+    list_tablespaces:
+        kind: postgres-list-tablespaces
+        source: alloydb-omni-source
+
+    list_pg_settings:
+        kind: postgres-list-pg-settings
+        source: alloydb-omni-source
+
+    list_database_stats:
+        kind: postgres-list-database-stats
+        source: alloydb-omni-source
+
+    list_roles:
+        kind: postgres-list-roles
+        source: alloydb-omni-source
+
+    list_stored_procedure:
+        kind: postgres-list-stored-procedure
+        source: alloydb-omni-source
+
+toolsets:
+    alloydb_omni_database_tools:
+        - execute_sql
+        - list_tables
+        - list_active_queries
+        - list_available_extensions
+        - list_installed_extensions
+        - list_autovacuum_configurations
+        - list_columnar_configurations
+        - list_columnar_recommended_columns
+        - list_memory_configurations
+        - list_top_bloated_tables
+        - list_replication_slots
+        - list_invalid_indexes
+        - get_query_plan
+        - list_views
+        - list_schemas
+        - database_overview
+        - list_triggers
+        - list_indexes
+        - list_sequences
+        - long_running_transactions
+        - list_locks
+        - replication_stats
+        - list_query_stats
+        - get_column_cardinality
+        - list_publication_tables
+        - list_tablespaces
+        - list_pg_settings
+        - list_database_stats
+        - list_roles
+        - list_table_stats
+        - list_stored_procedure
diff --git a/internal/prebuiltconfigs/tools/looker.yaml b/internal/prebuiltconfigs/tools/looker.yaml
index 442cd11106..c6bbd51c56 100644
--- a/internal/prebuiltconfigs/tools/looker.yaml
+++ b/internal/prebuiltconfigs/tools/looker.yaml
@@ -959,6 +959,21 @@ tools:
           Output:
           A confirmation message upon successful file deletion.
 
+    validate_project:
+        kind: looker-validate-project
+        source: looker-source
+        description: |
+          This tool checks a LookML project for syntax errors.
+
+          Prerequisite: The Looker session must be in Development Mode. Use `dev_mode: true` first.
+
+          Parameters:
+          - project_id (required): The unique ID of the LookML project.
+
+          Output:
+          A list of error details including the file path and line number, and also a list of models
+          that are not currently valid due to LookML errors.
+
     get_connections:
         kind: looker-get-connections
         source: looker-source
@@ -1072,6 +1087,7 @@ toolsets:
         - create_project_file
         - update_project_file
         - delete_project_file
+        - validate_project
         - get_connections
         - get_connection_schemas
         - get_connection_databases
diff --git a/internal/prompts/custom/custom.go b/internal/prompts/custom/custom.go
index 312b53613c..4ed44c4651 100644
--- a/internal/prompts/custom/custom.go
+++ b/internal/prompts/custom/custom.go
@@ -25,12 +25,12 @@ import (
 
 type Message = prompts.Message
 
-const kind = "custom"
+const resourceType = "custom"
 
-// init registers this prompt kind with the prompt framework.
+// init registers this prompt type with the prompt framework.
 func init() {
-	if !prompts.Register(kind, newConfig) {
-		panic(fmt.Sprintf("prompt kind %q already registered", kind))
+	if !prompts.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("prompt type %q already registered", resourceType))
 	}
 }
 
@@ -56,8 +56,8 @@ type Config struct {
 var _ prompts.PromptConfig = Config{}
 var _ prompts.Prompt = Prompt{}
 
-func (c Config) PromptConfigKind() string {
-	return kind
+func (c Config) PromptConfigType() string {
+	return resourceType
 }
 
 func (c Config) Initialize() (prompts.Prompt, error) {
diff --git a/internal/prompts/custom/custom_test.go b/internal/prompts/custom/custom_test.go
index ff411c7b8b..4f9ad565e5 100644
--- a/internal/prompts/custom/custom_test.go
+++ b/internal/prompts/custom/custom_test.go
@@ -42,7 +42,7 @@ func TestConfig(t *testing.T) {
 		Arguments: testArgs,
 	}
 
-	// initialize and check kind
+	// initialize and check type
 	p, err := cfg.Initialize()
 	if err != nil {
 		t.Fatalf("Initialize() failed: %v", err)
@@ -50,8 +50,8 @@ func TestConfig(t *testing.T) {
 	if p == nil {
 		t.Fatal("Initialize() returned a nil prompt")
 	}
-	if cfg.PromptConfigKind() != "custom" {
-		t.Errorf("PromptConfigKind() = %q, want %q", cfg.PromptConfigKind(), "custom")
+	if cfg.PromptConfigType() != "custom" {
+		t.Errorf("PromptConfigType() = %q, want %q", cfg.PromptConfigType(), "custom")
 	}
 
 	t.Run("Manifest", func(t *testing.T) {
diff --git a/internal/prompts/prompts.go b/internal/prompts/prompts.go
index bac784c4c5..ae8312c49e 100644
--- a/internal/prompts/prompts.go
+++ b/internal/prompts/prompts.go
@@ -30,40 +30,40 @@ var promptRegistry = make(map[string]PromptConfigFactory)
 
 // Register allows individual prompt packages to register their configuration
 // factory function. This is typically called from an init() function in the
-// prompt's package. It associates a 'kind' string with a function that can
+// prompt's package. It associates a 'type' string with a function that can
 // produce the specific PromptConfig type. It returns true if the registration was
-// successful, and false if a prompt with the same kind was already registered.
-func Register(kind string, factory PromptConfigFactory) bool {
-	if _, exists := promptRegistry[kind]; exists {
-		// Prompt with this kind already exists, do not overwrite.
+// successful, and false if a prompt with the same type was already registered.
+func Register(resourceType string, factory PromptConfigFactory) bool {
+	if _, exists := promptRegistry[resourceType]; exists {
+		// Prompt with this type already exists, do not overwrite.
 		return false
 	}
-	promptRegistry[kind] = factory
+	promptRegistry[resourceType] = factory
 	return true
 }
 
-// DecodeConfig looks up the registered factory for the given kind and uses it
+// DecodeConfig looks up the registered factory for the given type and uses it
 // to decode the prompt configuration.
-func DecodeConfig(ctx context.Context, kind, name string, decoder *yaml.Decoder) (PromptConfig, error) {
-	factory, found := promptRegistry[kind]
-	if !found && kind == "" {
-		kind = "custom"
-		factory, found = promptRegistry[kind]
+func DecodeConfig(ctx context.Context, resourceType, name string, decoder *yaml.Decoder) (PromptConfig, error) {
+	factory, found := promptRegistry[resourceType]
+	if !found && resourceType == "" {
+		resourceType = "custom"
+		factory, found = promptRegistry[resourceType]
 	}
 
 	if !found {
-		return nil, fmt.Errorf("unknown prompt kind: %q", kind)
+		return nil, fmt.Errorf("unknown prompt type: %q", resourceType)
 	}
 
 	promptConfig, err := factory(ctx, name, decoder)
 	if err != nil {
-		return nil, fmt.Errorf("unable to parse prompt %q as kind %q: %w", name, kind, err)
+		return nil, fmt.Errorf("unable to parse prompt %q as resourceType %q: %w", name, resourceType, err)
 	}
 	return promptConfig, nil
 }
 
 type PromptConfig interface {
-	PromptConfigKind() string
+	PromptConfigType() string
 	Initialize() (Prompt, error)
 }
 
diff --git a/internal/prompts/prompts_test.go b/internal/prompts/prompts_test.go
index d0fe0a95f5..72fbe5c3ce 100644
--- a/internal/prompts/prompts_test.go
+++ b/internal/prompts/prompts_test.go
@@ -29,16 +29,16 @@ import (
 
 type mockPromptConfig struct {
 	name string
-	kind string
+	Type string
 }
 
-func (m *mockPromptConfig) PromptConfigKind() string            { return m.kind }
+func (m *mockPromptConfig) PromptConfigType() string            { return m.Type }
 func (m *mockPromptConfig) Initialize() (prompts.Prompt, error) { return nil, nil }
 
 var errMockFactory = errors.New("mock factory error")
 
 func mockFactory(ctx context.Context, name string, decoder *yaml.Decoder) (prompts.PromptConfig, error) {
-	return &mockPromptConfig{name: name, kind: "mockKind"}, nil
+	return &mockPromptConfig{name: name, Type: "mockType"}, nil
 }
 
 func mockErrorFactory(ctx context.Context, name string, decoder *yaml.Decoder) (prompts.PromptConfig, error) {
@@ -50,17 +50,17 @@ func TestRegistry(t *testing.T) {
 	ctx := context.Background()
 
 	t.Run("RegisterAndDecodeSuccess", func(t *testing.T) {
-		kind := "testKindSuccess"
-		if !prompts.Register(kind, mockFactory) {
+		resourceType := "testTypeSuccess"
+		if !prompts.Register(resourceType, mockFactory) {
 			t.Fatal("expected registration to succeed")
 		}
 		// This should fail because we are registering a duplicate
-		if prompts.Register(kind, mockFactory) {
+		if prompts.Register(resourceType, mockFactory) {
 			t.Fatal("expected duplicate registration to fail")
 		}
 
 		decoder := yaml.NewDecoder(strings.NewReader(""))
-		config, err := prompts.DecodeConfig(ctx, kind, "testPrompt", decoder)
+		config, err := prompts.DecodeConfig(ctx, resourceType, "testPrompt", decoder)
 		if err != nil {
 			t.Fatalf("expected DecodeConfig to succeed, but got error: %v", err)
 		}
@@ -69,25 +69,25 @@ func TestRegistry(t *testing.T) {
 		}
 	})
 
-	t.Run("DecodeUnknownKind", func(t *testing.T) {
+	t.Run("DecodeUnknownType", func(t *testing.T) {
 		decoder := yaml.NewDecoder(strings.NewReader(""))
-		_, err := prompts.DecodeConfig(ctx, "unregisteredKind", "testPrompt", decoder)
+		_, err := prompts.DecodeConfig(ctx, "unregisteredType", "testPrompt", decoder)
 		if err == nil {
-			t.Fatal("expected an error for unknown kind, but got nil")
+			t.Fatal("expected an error for unknown type, but got nil")
 		}
-		if !strings.Contains(err.Error(), "unknown prompt kind") {
-			t.Errorf("expected error to contain 'unknown prompt kind', but got: %v", err)
+		if !strings.Contains(err.Error(), "unknown prompt type") {
+			t.Errorf("expected error to contain 'unknown prompt type', but got: %v", err)
 		}
 	})
 
 	t.Run("FactoryReturnsError", func(t *testing.T) {
-		kind := "testKindError"
-		if !prompts.Register(kind, mockErrorFactory) {
+		resourceType := "testTypeError"
+		if !prompts.Register(resourceType, mockErrorFactory) {
 			t.Fatal("expected registration to succeed")
 		}
 
 		decoder := yaml.NewDecoder(strings.NewReader(""))
-		_, err := prompts.DecodeConfig(ctx, kind, "testPrompt", decoder)
+		_, err := prompts.DecodeConfig(ctx, resourceType, "testPrompt", decoder)
 		if err == nil {
 			t.Fatal("expected an error from the factory, but got nil")
 		}
@@ -100,13 +100,13 @@ func TestRegistry(t *testing.T) {
 		decoder := yaml.NewDecoder(strings.NewReader("description: A test prompt"))
 		config, err := prompts.DecodeConfig(ctx, "", "testDefaultPrompt", decoder)
 		if err != nil {
-			t.Fatalf("expected DecodeConfig with empty kind to succeed, but got error: %v", err)
+			t.Fatalf("expected DecodeConfig with empty type to succeed, but got error: %v", err)
 		}
 		if config == nil {
-			t.Fatal("expected a non-nil config for default kind")
+			t.Fatal("expected a non-nil config for default type")
 		}
-		if config.PromptConfigKind() != "custom" {
-			t.Errorf("expected default kind to be 'custom', but got %q", config.PromptConfigKind())
+		if config.PromptConfigType() != "custom" {
+			t.Errorf("expected default type to be 'custom', but got %q", config.PromptConfigType())
 		}
 	})
 }
diff --git a/internal/server/api.go b/internal/server/api.go
index 0396d1a58a..c992051269 100644
--- a/internal/server/api.go
+++ b/internal/server/api.go
@@ -19,13 +19,13 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/go-chi/render"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/metric"
@@ -215,7 +215,7 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 	// Check if any of the specified auth services is verified
 	isAuthorized := tool.Authorized(verifiedAuthServices)
 	if !isAuthorized {
-		err = fmt.Errorf("tool invocation not authorized. Please make sure your specify correct auth headers")
+		err = fmt.Errorf("tool invocation not authorized. Please make sure you specify correct auth headers")
 		s.logger.DebugContext(ctx, err.Error())
 		_ = render.Render(w, r, newErrResponse(err, http.StatusUnauthorized))
 		return
@@ -231,17 +231,30 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	params, err := tool.ParseParams(data, claimsFromAuth)
+	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
 	if err != nil {
-		// If auth error, return 401
-		if errors.Is(err, util.ErrUnauthorized) {
-			s.logger.DebugContext(ctx, fmt.Sprintf("error parsing authenticated parameters from ID token: %s", err))
+		var clientServerErr *util.ClientServerError
+
+		// Return 401 Authentication errors
+		if errors.As(err, &clientServerErr) && clientServerErr.Code == http.StatusUnauthorized {
+			s.logger.DebugContext(ctx, fmt.Sprintf("auth error: %v", 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))
+
+		var agentErr *util.AgentError
+		if errors.As(err, &agentErr) {
+			s.logger.DebugContext(ctx, fmt.Sprintf("agent validation error: %v", err))
+			errMap := map[string]string{"error": err.Error()}
+			errMarshal, _ := json.Marshal(errMap)
+
+			_ = render.Render(w, r, &resultResponse{Result: string(errMarshal)})
+			return
+		}
+
+		// Return 500 if it's a specific ClientServerError that isn't a 401, or any other unexpected error
+		s.logger.ErrorContext(ctx, fmt.Sprintf("internal server error: %v", err))
+		_ = render.Render(w, r, newErrResponse(err, http.StatusInternalServerError))
 		return
 	}
 	s.logger.DebugContext(ctx, fmt.Sprintf("invocation params: %s", params))
@@ -258,34 +271,50 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 
 	// Determine what error to return to the users.
 	if err != nil {
-		errStr := err.Error()
-		var statusCode int
+		var tbErr util.ToolboxError
 
-		// 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 errors.As(err, &tbErr) {
+			switch tbErr.Category() {
+			case util.CategoryAgent:
+				// Agent Errors -> 200 OK
+				s.logger.DebugContext(ctx, fmt.Sprintf("Tool invocation agent error: %v", err))
+				res = map[string]string{
+					"error": err.Error(),
+				}
 
-		if statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden {
-			if clientAuth {
-				// Propagate the original 401/403 error.
-				s.logger.DebugContext(ctx, fmt.Sprintf("error invoking tool. Client credentials lack authorization to the source: %v", err))
+			case util.CategoryServer:
+				// Server Errors -> Check the specific code inside
+				var clientServerErr *util.ClientServerError
+				statusCode := http.StatusInternalServerError // Default to 500
+
+				if errors.As(err, &clientServerErr) {
+					if clientServerErr.Code != 0 {
+						statusCode = clientServerErr.Code
+					}
+				}
+
+				// Process auth error
+				if statusCode == http.StatusUnauthorized || statusCode == http.StatusForbidden {
+					if clientAuth {
+						// Token error, pass through 401/403
+						s.logger.DebugContext(ctx, fmt.Sprintf("Client credentials lack authorization: %v", err))
+						_ = render.Render(w, r, newErrResponse(err, statusCode))
+						return
+					}
+					// ADC/Config error, return 500
+					statusCode = http.StatusInternalServerError
+				}
+
+				s.logger.ErrorContext(ctx, fmt.Sprintf("Tool invocation server error: %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))
+		} else {
+			// Unknown error -> 500
+			s.logger.ErrorContext(ctx, fmt.Sprintf("Tool invocation unknown error: %v", err))
+			_ = render.Render(w, r, newErrResponse(err, 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))
-		return
 	}
 
 	resMarshal, err := json.Marshal(res)
diff --git a/internal/server/common_test.go b/internal/server/common_test.go
index 39aca55be3..8944cfba20 100644
--- a/internal/server/common_test.go
+++ b/internal/server/common_test.go
@@ -24,7 +24,6 @@ import (
 	"testing"
 
 	"github.com/go-chi/chi/v5"
-	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prompts"
 	"github.com/googleapis/genai-toolbox/internal/server/resources"
@@ -41,136 +40,6 @@ var (
 	_ prompts.Prompt = MockPrompt{}
 )
 
-// MockTool is used to mock tools in tests
-type MockTool struct {
-	Name                         string
-	Description                  string
-	Params                       []parameters.Parameter
-	manifest                     tools.Manifest
-	unauthorized                 bool
-	requiresClientAuthrorization bool
-}
-
-func (t MockTool) Invoke(context.Context, tools.SourceProvider, parameters.ParamValues, tools.AccessToken) (any, error) {
-	mock := []any{t.Name}
-	return mock, nil
-}
-
-func (t MockTool) ToConfig() tools.ToolConfig {
-	return nil
-}
-
-// claims is a map of user info decoded from an auth token
-func (t MockTool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Params, data, claimsMap)
-}
-
-func (t MockTool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
-	return parameters.EmbedParams(ctx, t.Params, paramValues, embeddingModelsMap, nil)
-}
-
-func (t MockTool) Manifest() tools.Manifest {
-	pMs := make([]parameters.ParameterManifest, 0, len(t.Params))
-	for _, p := range t.Params {
-		pMs = append(pMs, p.Manifest())
-	}
-	return tools.Manifest{Description: t.Description, Parameters: pMs}
-}
-
-func (t MockTool) Authorized(verifiedAuthServices []string) bool {
-	// defaulted to true
-	return !t.unauthorized
-}
-
-func (t MockTool) RequiresClientAuthorization(tools.SourceProvider) (bool, error) {
-	// defaulted to false
-	return t.requiresClientAuthrorization, nil
-}
-
-func (t MockTool) McpManifest() tools.McpManifest {
-	properties := make(map[string]parameters.ParameterMcpManifest)
-	required := make([]string, 0)
-	authParams := make(map[string][]string)
-
-	for _, p := range t.Params {
-		name := p.GetName()
-		paramManifest, authParamList := p.McpManifest()
-		properties[name] = paramManifest
-		required = append(required, name)
-
-		if len(authParamList) > 0 {
-			authParams[name] = authParamList
-		}
-	}
-
-	toolsSchema := parameters.McpToolsSchema{
-		Type:       "object",
-		Properties: properties,
-		Required:   required,
-	}
-
-	mcpManifest := tools.McpManifest{
-		Name:        t.Name,
-		Description: t.Description,
-		InputSchema: toolsSchema,
-	}
-
-	if len(authParams) > 0 {
-		mcpManifest.Metadata = map[string]any{
-			"toolbox/authParams": authParams,
-		}
-	}
-
-	return mcpManifest
-}
-
-func (t MockTool) GetAuthTokenHeaderName(tools.SourceProvider) (string, error) {
-	return "Authorization", nil
-}
-
-// MockPrompt is used to mock prompts in tests
-type MockPrompt struct {
-	Name        string
-	Description string
-	Args        prompts.Arguments
-}
-
-func (p MockPrompt) SubstituteParams(vals parameters.ParamValues) (any, error) {
-	return []prompts.Message{
-		{
-			Role:    "user",
-			Content: fmt.Sprintf("substituted %s", p.Name),
-		},
-	}, nil
-}
-
-func (p MockPrompt) ParseArgs(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	var params parameters.Parameters
-	for _, arg := range p.Args {
-		params = append(params, arg.Parameter)
-	}
-	return parameters.ParseParams(params, data, claimsMap)
-}
-
-func (p MockPrompt) Manifest() prompts.Manifest {
-	var argManifests []parameters.ParameterManifest
-	for _, arg := range p.Args {
-		argManifests = append(argManifests, arg.Manifest())
-	}
-	return prompts.Manifest{
-		Description: p.Description,
-		Arguments:   argManifests,
-	}
-}
-
-func (p MockPrompt) McpManifest() prompts.McpManifest {
-	return prompts.GetMcpManifest(p.Name, p.Description, p.Args)
-}
-
-func (p MockPrompt) ToConfig() prompts.PromptConfig {
-	return nil
-}
-
 var tool1 = MockTool{
 	Name:   "no_params",
 	Params: []parameters.Parameter{},
diff --git a/internal/server/config.go b/internal/server/config.go
index 652e7547de..48f623b0ea 100644
--- a/internal/server/config.go
+++ b/internal/server/config.go
@@ -14,8 +14,10 @@
 package server
 
 import (
+	"bytes"
 	"context"
 	"fmt"
+	"io"
 	"regexp"
 	"strings"
 
@@ -127,315 +129,264 @@ func (s *StringLevel) Type() string {
 	return "stringLevel"
 }
 
-// SourceConfigs is a type used to allow unmarshal of the data source config map
 type SourceConfigs map[string]sources.SourceConfig
-
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &SourceConfigs{}
-
-func (c *SourceConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(SourceConfigs)
-	// Parse the 'kind' fields for each source
-	var raw map[string]util.DelayedUnmarshaler
-	if err := unmarshal(&raw); err != nil {
-		return err
-	}
-
-	for name, u := range raw {
-		// Unmarshal to a general type that ensure it capture all fields
-		var v map[string]any
-		if err := u.Unmarshal(&v); err != nil {
-			return fmt.Errorf("unable to unmarshal %q: %w", name, err)
-		}
-
-		kind, ok := v["kind"]
-		if !ok {
-			return fmt.Errorf("missing 'kind' field for source %q", name)
-		}
-		kindStr, ok := kind.(string)
-		if !ok {
-			return fmt.Errorf("invalid 'kind' field for source %q (must be a string)", name)
-		}
-
-		yamlDecoder, err := util.NewStrictDecoder(v)
-		if err != nil {
-			return fmt.Errorf("error creating YAML decoder for source %q: %w", name, err)
-		}
-
-		sourceConfig, err := sources.DecodeConfig(ctx, kindStr, name, yamlDecoder)
-		if err != nil {
-			return err
-		}
-		(*c)[name] = sourceConfig
-	}
-	return nil
-}
-
-// AuthServiceConfigs is a type used to allow unmarshal of the data authService config map
 type AuthServiceConfigs map[string]auth.AuthServiceConfig
-
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &AuthServiceConfigs{}
-
-func (c *AuthServiceConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(AuthServiceConfigs)
-	// Parse the 'kind' fields for each authService
-	var raw map[string]util.DelayedUnmarshaler
-	if err := unmarshal(&raw); err != nil {
-		return err
-	}
-
-	for name, u := range raw {
-		var v map[string]any
-		if err := u.Unmarshal(&v); err != nil {
-			return fmt.Errorf("unable to unmarshal %q: %w", name, err)
-		}
-
-		kind, ok := v["kind"]
-		if !ok {
-			return fmt.Errorf("missing 'kind' field for %q", name)
-		}
-
-		dec, err := util.NewStrictDecoder(v)
-		if err != nil {
-			return fmt.Errorf("error creating decoder: %w", err)
-		}
-		switch kind {
-		case google.AuthServiceKind:
-			actual := google.Config{Name: name}
-			if err := dec.DecodeContext(ctx, &actual); err != nil {
-				return fmt.Errorf("unable to parse as %q: %w", kind, err)
-			}
-			(*c)[name] = actual
-		default:
-			return fmt.Errorf("%q is not a valid kind of auth source", kind)
-		}
-	}
-	return nil
-}
-
-// EmbeddingModelConfigs is a type used to allow unmarshal of the embedding model config map
 type EmbeddingModelConfigs map[string]embeddingmodels.EmbeddingModelConfig
-
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &EmbeddingModelConfigs{}
-
-func (c *EmbeddingModelConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(EmbeddingModelConfigs)
-	// Parse the 'kind' fields for each embedding model
-	var raw map[string]util.DelayedUnmarshaler
-	if err := unmarshal(&raw); err != nil {
-		return err
-	}
-
-	for name, u := range raw {
-		// Unmarshal to a general type that ensure it capture all fields
-		var v map[string]any
-		if err := u.Unmarshal(&v); err != nil {
-			return fmt.Errorf("unable to unmarshal embedding model %q: %w", name, err)
-		}
-
-		kind, ok := v["kind"]
-		if !ok {
-			return fmt.Errorf("missing 'kind' field for embedding model %q", name)
-		}
-
-		dec, err := util.NewStrictDecoder(v)
-		if err != nil {
-			return fmt.Errorf("error creating decoder: %w", err)
-		}
-		switch kind {
-		case gemini.EmbeddingModelKind:
-			actual := gemini.Config{Name: name}
-			if err := dec.DecodeContext(ctx, &actual); err != nil {
-				return fmt.Errorf("unable to parse as %q: %w", kind, err)
-			}
-			(*c)[name] = actual
-		default:
-			return fmt.Errorf("%q is not a valid kind of auth source", kind)
-		}
-	}
-	return nil
-}
-
-// ToolConfigs is a type used to allow unmarshal of the tool configs
 type ToolConfigs map[string]tools.ToolConfig
-
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &ToolConfigs{}
-
-func (c *ToolConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(ToolConfigs)
-	// Parse the 'kind' fields for each source
-	var raw map[string]util.DelayedUnmarshaler
-	if err := unmarshal(&raw); err != nil {
-		return err
-	}
-
-	for name, u := range raw {
-		err := NameValidation(name)
-		if err != nil {
-			return err
-		}
-		var v map[string]any
-		if err := u.Unmarshal(&v); err != nil {
-			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{}
-		}
-
-		kindVal, ok := v["kind"]
-		if !ok {
-			return fmt.Errorf("missing 'kind' field for tool %q", name)
-		}
-		kindStr, ok := kindVal.(string)
-		if !ok {
-			return fmt.Errorf("invalid 'kind' field for tool %q (must be a string)", name)
-		}
-
-		// validify parameter references
-		if rawParams, ok := v["parameters"]; ok {
-			if paramsList, ok := rawParams.([]any); ok {
-				// Turn params into a map
-				validParamNames := make(map[string]bool)
-				for _, rawP := range paramsList {
-					if pMap, ok := rawP.(map[string]any); ok {
-						if pName, ok := pMap["name"].(string); ok && pName != "" {
-							validParamNames[pName] = true
-						}
-					}
-				}
-
-				// Validate references
-				for i, rawP := range paramsList {
-					pMap, ok := rawP.(map[string]any)
-					if !ok {
-						continue
-					}
-
-					pName, _ := pMap["name"].(string)
-					refName, _ := pMap["valueFromParam"].(string)
-
-					if refName != "" {
-						// Check if the referenced parameter exists
-						if !validParamNames[refName] {
-							return fmt.Errorf("tool %q config error: parameter %q (index %d) references '%q' in the 'valueFromParam' field, which is not a defined parameter", name, pName, i, refName)
-						}
-
-						// Check for self-reference
-						if refName == pName {
-							return fmt.Errorf("tool %q config error: parameter %q cannot copy value from itself", name, pName)
-						}
-					}
-				}
-			}
-		}
-		yamlDecoder, err := util.NewStrictDecoder(v)
-		if err != nil {
-			return fmt.Errorf("error creating YAML decoder for tool %q: %w", name, err)
-		}
-
-		toolCfg, err := tools.DecodeConfig(ctx, kindStr, name, yamlDecoder)
-		if err != nil {
-			return err
-		}
-		(*c)[name] = toolCfg
-	}
-	return nil
-}
-
-// ToolsetConfigs is a type used to allow unmarshal of the toolset configs
 type ToolsetConfigs map[string]tools.ToolsetConfig
-
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &ToolsetConfigs{}
-
-func (c *ToolsetConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(ToolsetConfigs)
-
-	var raw map[string][]string
-	if err := unmarshal(&raw); err != nil {
-		return err
-	}
-
-	for name, toolList := range raw {
-		(*c)[name] = tools.ToolsetConfig{Name: name, ToolNames: toolList}
-	}
-	return nil
-}
-
-// PromptConfigs is a type used to allow unmarshal of the prompt configs
 type PromptConfigs map[string]prompts.PromptConfig
-
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &PromptConfigs{}
-
-func (c *PromptConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(PromptConfigs)
-	var raw map[string]util.DelayedUnmarshaler
-	if err := unmarshal(&raw); err != nil {
-		return err
-	}
-
-	for name, u := range raw {
-		var v map[string]any
-		if err := u.Unmarshal(&v); err != nil {
-			return fmt.Errorf("unable to unmarshal prompt %q: %w", name, err)
-		}
-
-		// Look for the 'kind' field. If it's not present, kindStr will be an
-		// empty string, which prompts.DecodeConfig will correctly default to "custom".
-		var kindStr string
-		if kindVal, ok := v["kind"]; ok {
-			var isString bool
-			kindStr, isString = kindVal.(string)
-			if !isString {
-				return fmt.Errorf("invalid 'kind' field for prompt %q (must be a string)", name)
-			}
-		}
-
-		// Create a new, strict decoder for this specific prompt's data.
-		yamlDecoder, err := util.NewStrictDecoder(v)
-		if err != nil {
-			return fmt.Errorf("error creating YAML decoder for prompt %q: %w", name, err)
-		}
-
-		// Use the central registry to decode the prompt based on its kind.
-		promptCfg, err := prompts.DecodeConfig(ctx, kindStr, name, yamlDecoder)
-		if err != nil {
-			return err
-		}
-		(*c)[name] = promptCfg
-	}
-	return nil
-}
-
-// PromptsetConfigs is a type used to allow unmarshal of the PromptsetConfigs configs
 type PromptsetConfigs map[string]prompts.PromptsetConfig
 
-// validate interface
-var _ yaml.InterfaceUnmarshalerContext = &PromptsetConfigs{}
+func UnmarshalResourceConfig(ctx context.Context, raw []byte) (SourceConfigs, AuthServiceConfigs, EmbeddingModelConfigs, ToolConfigs, ToolsetConfigs, PromptConfigs, error) {
+	// prepare configs map
+	var sourceConfigs SourceConfigs
+	var authServiceConfigs AuthServiceConfigs
+	var embeddingModelConfigs EmbeddingModelConfigs
+	var toolConfigs ToolConfigs
+	var toolsetConfigs ToolsetConfigs
+	var promptConfigs PromptConfigs
+	// promptset configs is not yet supported
 
-func (c *PromptsetConfigs) UnmarshalYAML(ctx context.Context, unmarshal func(interface{}) error) error {
-	*c = make(PromptsetConfigs)
+	decoder := yaml.NewDecoder(bytes.NewReader(raw))
+	// for loop to unmarshal documents with the `---` separator
+	for {
+		var resource map[string]any
+		if err := decoder.DecodeContext(ctx, &resource); err != nil {
+			if err == io.EOF {
+				break
+			}
+			return nil, nil, nil, nil, nil, nil, fmt.Errorf("unable to decode YAML document: %w", err)
+		}
+		var kind, name string
+		var ok bool
+		if kind, ok = resource["kind"].(string); !ok {
+			return nil, nil, nil, nil, nil, nil, fmt.Errorf("missing 'kind' field or it is not a string: %v", resource)
+		}
+		if name, ok = resource["name"].(string); !ok {
+			return nil, nil, nil, nil, nil, nil, fmt.Errorf("missing 'name' field or it is not a string")
+		}
+		// remove 'kind' from map for strict unmarshaling
+		delete(resource, "kind")
 
+		switch kind {
+		case "sources":
+			c, err := UnmarshalYAMLSourceConfig(ctx, name, resource)
+			if err != nil {
+				return nil, nil, nil, nil, nil, nil, fmt.Errorf("error unmarshaling %s: %s", kind, err)
+			}
+			if sourceConfigs == nil {
+				sourceConfigs = make(SourceConfigs)
+			}
+			sourceConfigs[name] = c
+		case "authServices":
+			c, err := UnmarshalYAMLAuthServiceConfig(ctx, name, resource)
+			if err != nil {
+				return nil, nil, nil, nil, nil, nil, fmt.Errorf("error unmarshaling %s: %s", kind, err)
+			}
+			if authServiceConfigs == nil {
+				authServiceConfigs = make(AuthServiceConfigs)
+			}
+			authServiceConfigs[name] = c
+		case "tools":
+			c, err := UnmarshalYAMLToolConfig(ctx, name, resource)
+			if err != nil {
+				return nil, nil, nil, nil, nil, nil, fmt.Errorf("error unmarshaling %s: %s", kind, err)
+			}
+			if toolConfigs == nil {
+				toolConfigs = make(ToolConfigs)
+			}
+			toolConfigs[name] = c
+		case "toolsets":
+			c, err := UnmarshalYAMLToolsetConfig(ctx, name, resource)
+			if err != nil {
+				return nil, nil, nil, nil, nil, nil, fmt.Errorf("error unmarshaling %s: %s", kind, err)
+			}
+			if toolsetConfigs == nil {
+				toolsetConfigs = make(ToolsetConfigs)
+			}
+			toolsetConfigs[name] = c
+		case "embeddingModels":
+			c, err := UnmarshalYAMLEmbeddingModelConfig(ctx, name, resource)
+			if err != nil {
+				return nil, nil, nil, nil, nil, nil, fmt.Errorf("error unmarshaling %s: %s", kind, err)
+			}
+			if embeddingModelConfigs == nil {
+				embeddingModelConfigs = make(EmbeddingModelConfigs)
+			}
+			embeddingModelConfigs[name] = c
+		case "prompts":
+			c, err := UnmarshalYAMLPromptConfig(ctx, name, resource)
+			if err != nil {
+				return nil, nil, nil, nil, nil, nil, fmt.Errorf("error unmarshaling %s: %s", kind, err)
+			}
+			if promptConfigs == nil {
+				promptConfigs = make(PromptConfigs)
+			}
+			promptConfigs[name] = c
+		default:
+			return nil, nil, nil, nil, nil, nil, fmt.Errorf("invalid kind %s", kind)
+		}
+	}
+	return sourceConfigs, authServiceConfigs, embeddingModelConfigs, toolConfigs, toolsetConfigs, promptConfigs, nil
+}
+
+func UnmarshalYAMLSourceConfig(ctx context.Context, name string, r map[string]any) (sources.SourceConfig, error) {
+	resourceType, ok := r["type"].(string)
+	if !ok {
+		return nil, fmt.Errorf("missing 'type' field or it is not a string")
+	}
+	dec, err := util.NewStrictDecoder(r)
+	if err != nil {
+		return nil, fmt.Errorf("error creating decoder: %w", err)
+	}
+	sourceConfig, err := sources.DecodeConfig(ctx, resourceType, name, dec)
+	if err != nil {
+		return nil, err
+	}
+	return sourceConfig, nil
+}
+
+func UnmarshalYAMLAuthServiceConfig(ctx context.Context, name string, r map[string]any) (auth.AuthServiceConfig, error) {
+	resourceType, ok := r["type"].(string)
+	if !ok {
+		return nil, fmt.Errorf("missing 'type' field or it is not a string")
+	}
+	if resourceType != google.AuthServiceType {
+		return nil, fmt.Errorf("%s is not a valid type of auth service", resourceType)
+	}
+	dec, err := util.NewStrictDecoder(r)
+	if err != nil {
+		return nil, fmt.Errorf("error creating decoder: %s", err)
+	}
+	actual := google.Config{Name: name}
+	if err := dec.DecodeContext(ctx, &actual); err != nil {
+		return nil, fmt.Errorf("unable to parse as %s: %w", name, err)
+	}
+	return actual, nil
+}
+
+func UnmarshalYAMLEmbeddingModelConfig(ctx context.Context, name string, r map[string]any) (embeddingmodels.EmbeddingModelConfig, error) {
+	resourceType, ok := r["type"].(string)
+	if !ok {
+		return nil, fmt.Errorf("missing 'type' field or it is not a string")
+	}
+	if resourceType != gemini.EmbeddingModelType {
+		return nil, fmt.Errorf("%s is not a valid type of embedding model", resourceType)
+	}
+	dec, err := util.NewStrictDecoder(r)
+	if err != nil {
+		return nil, fmt.Errorf("error creating decoder: %s", err)
+	}
+	actual := gemini.Config{Name: name}
+	if err := dec.DecodeContext(ctx, &actual); err != nil {
+		return nil, fmt.Errorf("unable to parse as %q: %w", name, err)
+	}
+	return actual, nil
+}
+
+func UnmarshalYAMLToolConfig(ctx context.Context, name string, r map[string]any) (tools.ToolConfig, error) {
+	resourceType, ok := r["type"].(string)
+	if !ok {
+		return nil, fmt.Errorf("missing 'type' field or it is not a string")
+	}
+	// `authRequired` and `useClientOAuth` cannot be specified together
+	if r["authRequired"] != nil && r["useClientOAuth"] == true {
+		return nil, 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 r["authRequired"] == nil {
+		r["authRequired"] = []string{}
+	}
+
+	// validify parameter references
+	if rawParams, ok := r["parameters"]; ok {
+		if paramsList, ok := rawParams.([]any); ok {
+			// Turn params into a map
+			validParamNames := make(map[string]bool)
+			for _, rawP := range paramsList {
+				if pMap, ok := rawP.(map[string]any); ok {
+					if pName, ok := pMap["name"].(string); ok && pName != "" {
+						validParamNames[pName] = true
+					}
+				}
+			}
+
+			// Validate references
+			for i, rawP := range paramsList {
+				pMap, ok := rawP.(map[string]any)
+				if !ok {
+					continue
+				}
+
+				pName, _ := pMap["name"].(string)
+				refName, _ := pMap["valueFromParam"].(string)
+
+				if refName != "" {
+					// Check if the referenced parameter exists
+					if !validParamNames[refName] {
+						return nil, fmt.Errorf("tool %q config error: parameter %q (index %d) references '%q' in the 'valueFromParam' field, which is not a defined parameter", name, pName, i, refName)
+					}
+
+					// Check for self-reference
+					if refName == pName {
+						return nil, fmt.Errorf("tool %q config error: parameter %q cannot copy value from itself", name, pName)
+					}
+				}
+			}
+		}
+	}
+
+	dec, err := util.NewStrictDecoder(r)
+	if err != nil {
+		return nil, fmt.Errorf("error creating decoder: %s", err)
+	}
+	toolCfg, err := tools.DecodeConfig(ctx, resourceType, name, dec)
+	if err != nil {
+		return nil, err
+	}
+	return toolCfg, nil
+}
+
+func UnmarshalYAMLToolsetConfig(ctx context.Context, name string, r map[string]any) (tools.ToolsetConfig, error) {
+	var toolsetConfig tools.ToolsetConfig
+	toolList, ok := r["tools"].([]any)
+	if !ok {
+		return toolsetConfig, fmt.Errorf("tools is missing or not a list of strings: %v", r)
+	}
+	justTools := map[string]any{"tools": toolList}
+	dec, err := util.NewStrictDecoder(justTools)
+	if err != nil {
+		return toolsetConfig, fmt.Errorf("error creating decoder: %s", err)
+	}
 	var raw map[string][]string
-	if err := unmarshal(&raw); err != nil {
-		return err
+	if err := dec.DecodeContext(ctx, &raw); err != nil {
+		return toolsetConfig, fmt.Errorf("unable to unmarshal tools: %s", err)
+	}
+	return tools.ToolsetConfig{Name: name, ToolNames: raw["tools"]}, nil
+}
+
+func UnmarshalYAMLPromptConfig(ctx context.Context, name string, r map[string]any) (prompts.PromptConfig, error) {
+	// Look for the 'type' field. If it's not present, typeStr will be an
+	// empty string, which prompts.DecodeConfig will correctly default to "custom".
+	var resourceType string
+	if typeVal, ok := r["type"]; ok {
+		var isString bool
+		resourceType, isString = typeVal.(string)
+		if !isString {
+			return nil, fmt.Errorf("invalid 'type' field for prompt %q (must be a string)", name)
+		}
+	}
+	dec, err := util.NewStrictDecoder(r)
+	if err != nil {
+		return nil, fmt.Errorf("error creating decoder: %s", err)
 	}
 
-	for name, promptList := range raw {
-		(*c)[name] = prompts.PromptsetConfig{Name: name, PromptNames: promptList}
+	// Use the central registry to decode the prompt based on its type.
+	promptCfg, err := prompts.DecodeConfig(ctx, resourceType, name, dec)
+	if err != nil {
+		return nil, err
 	}
-	return nil
+	return promptCfg, nil
 }
 
 // Tools naming validation is added in the MCP v2025-11-25, but we'll be
diff --git a/internal/server/mcp.go b/internal/server/mcp.go
index aecd2454f2..65ace06d66 100644
--- a/internal/server/mcp.go
+++ b/internal/server/mcp.go
@@ -23,7 +23,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"strings"
 	"sync"
 	"time"
 
@@ -37,9 +36,11 @@ import (
 	v20241105 "github.com/googleapis/genai-toolbox/internal/server/mcp/v20241105"
 	v20250326 "github.com/googleapis/genai-toolbox/internal/server/mcp/v20250326"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/trace"
 )
 
 type sseSession struct {
@@ -117,6 +118,55 @@ type stdioSession struct {
 	writer   io.Writer
 }
 
+// traceContextCarrier implements propagation.TextMapCarrier for extracting trace context from _meta
+type traceContextCarrier map[string]string
+
+func (c traceContextCarrier) Get(key string) string {
+	return c[key]
+}
+
+func (c traceContextCarrier) Set(key, value string) {
+	c[key] = value
+}
+
+func (c traceContextCarrier) Keys() []string {
+	keys := make([]string, 0, len(c))
+	for k := range c {
+		keys = append(keys, k)
+	}
+	return keys
+}
+
+// extractTraceContext extracts W3C Trace Context from params._meta
+func extractTraceContext(ctx context.Context, body []byte) context.Context {
+	// Try to parse the request to extract _meta
+	var req struct {
+		Params struct {
+			Meta struct {
+				Traceparent string `json:"traceparent,omitempty"`
+				Tracestate  string `json:"tracestate,omitempty"`
+			} `json:"_meta,omitempty"`
+		} `json:"params,omitempty"`
+	}
+
+	if err := json.Unmarshal(body, &req); err != nil {
+		return ctx
+	}
+
+	// If traceparent is present, extract the context
+	if req.Params.Meta.Traceparent != "" {
+		carrier := traceContextCarrier{
+			"traceparent": req.Params.Meta.Traceparent,
+		}
+		if req.Params.Meta.Tracestate != "" {
+			carrier["tracestate"] = req.Params.Meta.Tracestate
+		}
+		return otel.GetTextMapPropagator().Extract(ctx, carrier)
+	}
+
+	return ctx
+}
+
 func NewStdioSession(s *Server, stdin io.Reader, stdout io.Writer) *stdioSession {
 	stdioSession := &stdioSession{
 		server: s,
@@ -143,18 +193,29 @@ func (s *stdioSession) readInputStream(ctx context.Context) error {
 			}
 			return err
 		}
-		v, res, err := processMcpMessage(ctx, []byte(line), s.server, s.protocol, "", "", nil)
+		// This ensures the transport span becomes a child of the client span
+		msgCtx := extractTraceContext(ctx, []byte(line))
+
+		// Create span for STDIO transport
+		msgCtx, span := s.server.instrumentation.Tracer.Start(msgCtx, "toolbox/server/mcp/stdio",
+			trace.WithSpanKind(trace.SpanKindServer),
+		)
+		defer span.End()
+
+		v, res, err := processMcpMessage(msgCtx, []byte(line), s.server, s.protocol, "", "", nil, "")
 		if err != nil {
 			// errors during the processing of message will generate a valid MCP Error response.
 			// server can continue to run.
-			s.server.logger.ErrorContext(ctx, err.Error())
+			s.server.logger.ErrorContext(msgCtx, err.Error())
+			span.SetStatus(codes.Error, err.Error())
 		}
+
 		if v != "" {
 			s.protocol = v
 		}
 		// no responses for notifications
 		if res != nil {
-			if err = s.write(ctx, res); err != nil {
+			if err = s.write(msgCtx, res); err != nil {
 				return err
 			}
 		}
@@ -240,7 +301,9 @@ func mcpRouter(s *Server) (chi.Router, error) {
 
 // sseHandler handles sse initialization and message.
 func sseHandler(s *Server, w http.ResponseWriter, r *http.Request) {
-	ctx, span := s.instrumentation.Tracer.Start(r.Context(), "toolbox/server/mcp/sse")
+	ctx, span := s.instrumentation.Tracer.Start(r.Context(), "toolbox/server/mcp/sse",
+		trace.WithSpanKind(trace.SpanKindServer),
+	)
 	r = r.WithContext(ctx)
 
 	sessionId := uuid.New().String()
@@ -336,9 +399,27 @@ func methodNotAllowed(s *Server, w http.ResponseWriter, r *http.Request) {
 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")
+	ctx := r.Context()
+	ctx = util.WithLogger(ctx, s.logger)
+
+	// Read body first so we can extract trace context
+	body, err := io.ReadAll(r.Body)
+	if err != nil {
+		// Generate a new uuid if unable to decode
+		id := uuid.New().String()
+		s.logger.DebugContext(ctx, err.Error())
+		render.JSON(w, r, jsonrpc.NewError(id, jsonrpc.PARSE_ERROR, err.Error(), nil))
+		return
+	}
+
+	// This ensures the transport span becomes a child of the client span
+	ctx = extractTraceContext(ctx, body)
+
+	// Create span for HTTP transport
+	ctx, span := s.instrumentation.Tracer.Start(ctx, "toolbox/server/mcp/http",
+		trace.WithSpanKind(trace.SpanKindServer),
+	)
 	r = r.WithContext(ctx)
-	ctx = util.WithLogger(r.Context(), s.logger)
 
 	var sessionId, protocolVersion string
 	var session *sseSession
@@ -380,7 +461,6 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 	s.logger.DebugContext(ctx, fmt.Sprintf("toolset name: %s", toolsetName))
 	span.SetAttributes(attribute.String("toolset_name", toolsetName))
 
-	var err error
 	defer func() {
 		if err != nil {
 			span.SetStatus(codes.Error, err.Error())
@@ -399,17 +479,9 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		)
 	}()
 
-	// Read and returns a body from io.Reader
-	body, err := io.ReadAll(r.Body)
-	if err != nil {
-		// Generate a new uuid if unable to decode
-		id := uuid.New().String()
-		s.logger.DebugContext(ctx, err.Error())
-		render.JSON(w, r, jsonrpc.NewError(id, jsonrpc.PARSE_ERROR, err.Error(), nil))
-		return
-	}
+	networkProtocolVersion := fmt.Sprintf("%d.%d", r.ProtoMajor, r.ProtoMinor)
 
-	v, res, err := processMcpMessage(ctx, body, s, protocolVersion, toolsetName, promptsetName, r.Header)
+	v, res, err := processMcpMessage(ctx, body, s, protocolVersion, toolsetName, promptsetName, r.Header, networkProtocolVersion)
 	if err != nil {
 		s.logger.DebugContext(ctx, fmt.Errorf("error processing message: %w", err).Error())
 	}
@@ -444,15 +516,12 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		code := rpcResponse.Error.Code
 		switch code {
 		case jsonrpc.INTERNAL_ERROR:
+			// Map Internal RPC Error (-32603) to HTTP 500
 			w.WriteHeader(http.StatusInternalServerError)
 		case jsonrpc.INVALID_REQUEST:
-			errStr := err.Error()
-			if errors.Is(err, util.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)
+			var clientServerErr *util.ClientServerError
+			if errors.As(err, &clientServerErr) {
+				w.WriteHeader(clientServerErr.Code)
 			}
 		}
 	}
@@ -462,7 +531,7 @@ func httpHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 }
 
 // processMcpMessage process the messages received from clients
-func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVersion string, toolsetName string, promptsetName string, header http.Header) (string, any, error) {
+func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVersion string, toolsetName string, promptsetName string, header http.Header, networkProtocolVersion string) (string, any, error) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
 		return "", jsonrpc.NewError("", jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
@@ -498,31 +567,95 @@ func processMcpMessage(ctx context.Context, body []byte, s *Server, protocolVers
 		return "", jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 	}
 
+	// Create method-specific span with semantic conventions
+	// Note: Trace context is already extracted and set in ctx by the caller
+	ctx, span := s.instrumentation.Tracer.Start(ctx, baseMessage.Method,
+		trace.WithSpanKind(trace.SpanKindServer),
+	)
+	defer span.End()
+
+	// Determine network transport and protocol based on header presence
+	networkTransport := "pipe" // default for stdio
+	networkProtocolName := "stdio"
+	if header != nil {
+		networkTransport = "tcp" // HTTP/SSE transport
+		networkProtocolName = "http"
+	}
+
+	// Set required semantic attributes for span according to OTEL MCP semcov
+	// ref: https://opentelemetry.io/docs/specs/semconv/gen-ai/mcp/#server
+	span.SetAttributes(
+		attribute.String("mcp.method.name", baseMessage.Method),
+		attribute.String("network.transport", networkTransport),
+		attribute.String("network.protocol.name", networkProtocolName),
+	)
+
+	// Set network protocol version if available
+	if networkProtocolVersion != "" {
+		span.SetAttributes(attribute.String("network.protocol.version", networkProtocolVersion))
+	}
+
+	// Set MCP protocol version if available
+	if protocolVersion != "" {
+		span.SetAttributes(attribute.String("mcp.protocol.version", protocolVersion))
+	}
+
+	// Set request ID
+	if baseMessage.Id != nil {
+		span.SetAttributes(attribute.String("jsonrpc.request.id", fmt.Sprintf("%v", baseMessage.Id)))
+	}
+
+	// Set toolset name
+	span.SetAttributes(attribute.String("toolset.name", toolsetName))
+
 	// Check if message is a notification
 	if baseMessage.Id == nil {
 		err := mcp.NotificationHandler(ctx, body)
+		if err != nil {
+			span.SetStatus(codes.Error, err.Error())
+		}
 		return "", nil, err
 	}
 
+	// Process the method
 	switch baseMessage.Method {
 	case mcputil.INITIALIZE:
-		res, v, err := mcp.InitializeResponse(ctx, baseMessage.Id, body, s.version)
+		result, version, err := mcp.InitializeResponse(ctx, baseMessage.Id, body, s.version)
 		if err != nil {
-			return "", res, err
+			span.SetStatus(codes.Error, err.Error())
+			if rpcErr, ok := result.(jsonrpc.JSONRPCError); ok {
+				span.SetAttributes(attribute.String("error.type", rpcErr.Error.String()))
+			}
+			return "", result, err
 		}
-		return v, res, err
+		span.SetAttributes(attribute.String("mcp.protocol.version", version))
+		return version, result, err
 	default:
 		toolset, ok := s.ResourceMgr.GetToolset(toolsetName)
 		if !ok {
-			err = fmt.Errorf("toolset does not exist")
-			return "", jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+			err := fmt.Errorf("toolset does not exist")
+			rpcErr := jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil)
+			span.SetStatus(codes.Error, err.Error())
+			span.SetAttributes(attribute.String("error.type", rpcErr.Error.String()))
+			return "", rpcErr, err
 		}
 		promptset, ok := s.ResourceMgr.GetPromptset(promptsetName)
 		if !ok {
-			err = fmt.Errorf("promptset does not exist")
-			return "", jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+			err := fmt.Errorf("promptset does not exist")
+			rpcErr := jsonrpc.NewError(baseMessage.Id, jsonrpc.INVALID_REQUEST, err.Error(), nil)
+			span.SetStatus(codes.Error, err.Error())
+			span.SetAttributes(attribute.String("error.type", rpcErr.Error.String()))
+			return "", rpcErr, err
 		}
-		res, err := mcp.ProcessMethod(ctx, protocolVersion, baseMessage.Id, baseMessage.Method, toolset, promptset, s.ResourceMgr, body, header)
-		return "", res, err
+		result, err := mcp.ProcessMethod(ctx, protocolVersion, baseMessage.Id, baseMessage.Method, toolset, promptset, s.ResourceMgr, body, header)
+		if err != nil {
+			span.SetStatus(codes.Error, err.Error())
+			// Set error.type based on JSON-RPC error code
+			if rpcErr, ok := result.(jsonrpc.JSONRPCError); ok {
+				span.SetAttributes(attribute.Int("jsonrpc.error.code", rpcErr.Error.Code))
+				span.SetAttributes(attribute.String("error.type", rpcErr.Error.String()))
+			}
+		}
+		return "", result, err
 	}
 }
diff --git a/internal/server/mcp/jsonrpc/jsonrpc.go b/internal/server/mcp/jsonrpc/jsonrpc.go
index 7099ea8a63..8a4aaaf15b 100644
--- a/internal/server/mcp/jsonrpc/jsonrpc.go
+++ b/internal/server/mcp/jsonrpc/jsonrpc.go
@@ -45,6 +45,9 @@ type Request struct {
 			// notifications. The receiver is not obligated to provide these
 			// notifications.
 			ProgressToken ProgressToken `json:"progressToken,omitempty"`
+			// W3C Trace Context fields for distributed tracing
+			Traceparent string `json:"traceparent,omitempty"`
+			Tracestate  string `json:"tracestate,omitempty"`
 		} `json:"_meta,omitempty"`
 	} `json:"params,omitempty"`
 }
@@ -97,6 +100,24 @@ type Error struct {
 	Data interface{} `json:"data,omitempty"`
 }
 
+// String returns the error type as a string based on the error code.
+func (e Error) String() string {
+	switch e.Code {
+	case METHOD_NOT_FOUND:
+		return "method_not_found"
+	case INVALID_PARAMS:
+		return "invalid_params"
+	case INTERNAL_ERROR:
+		return "internal_error"
+	case PARSE_ERROR:
+		return "parse_error"
+	case INVALID_REQUEST:
+		return "invalid_request"
+	default:
+		return "jsonrpc_error"
+	}
+}
+
 // JSONRPCError represents a non-successful (error) response to a request.
 type JSONRPCError struct {
 	Jsonrpc string    `json:"jsonrpc"`
diff --git a/internal/server/mcp/v20241105/method.go b/internal/server/mcp/v20241105/method.go
index d34d0074a4..4684f4687c 100644
--- a/internal/server/mcp/v20241105/method.go
+++ b/internal/server/mcp/v20241105/method.go
@@ -21,13 +21,15 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/googleapis/genai-toolbox/internal/prompts"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/server/resources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // ProcessMethod returns a response for the request.
@@ -101,6 +103,14 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", TOOLS_CALL, toolName))
+	span.SetAttributes(
+		attribute.String("gen_ai.tool.name", toolName),
+		attribute.String("gen_ai.operation.name", "execute_tool"),
+	)
 	tool, ok := resourceMgr.GetTool(toolName)
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
@@ -123,7 +133,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	if clientAuth {
 		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), util.ErrUnauthorized
+			err := util.NewClientServerError(
+				"missing access token in the 'Authorization' header",
+				http.StatusUnauthorized,
+				nil,
+			)
+			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 		}
 	}
 
@@ -171,12 +186,16 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// 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", util.ErrUnauthorized)
+		err = util.NewClientServerError(
+			"unauthorized Tool call: Please make sure you specify correct auth headers",
+			http.StatusUnauthorized,
+			nil,
+		)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := tool.ParseParams(data, claimsFromAuth)
+	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
@@ -193,30 +212,44 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, resourceMgr, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, util.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 clientAuth {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+		var tbErr util.ToolboxError
+
+		if errors.As(err, &tbErr) {
+			switch tbErr.Category() {
+			case util.CategoryAgent:
+				// MCP - Tool execution error
+				// Return SUCCESS but with IsError: true
+				text := TextContent{
+					Type: "text",
+					Text: err.Error(),
+				}
+				return jsonrpc.JSONRPCResponse{
+					Jsonrpc: jsonrpc.JSONRPC_VERSION,
+					Id:      id,
+					Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
+				}, nil
+
+			case util.CategoryServer:
+				// MCP Spec - Protocol error
+				// Return JSON-RPC ERROR
+				var clientServerErr *util.ClientServerError
+				rpcCode := jsonrpc.INTERNAL_ERROR // Default to Internal Error (-32603)
+
+				if errors.As(err, &clientServerErr) {
+					if clientServerErr.Code == http.StatusUnauthorized || clientServerErr.Code == http.StatusForbidden {
+						if clientAuth {
+							rpcCode = jsonrpc.INVALID_REQUEST
+						} else {
+							rpcCode = jsonrpc.INTERNAL_ERROR
+						}
+					}
+				}
+				return jsonrpc.NewError(id, rpcCode, err.Error(), nil), err
 			}
-			// Auth error with ADC should raise internal 500 error
+		} else {
+			// Unknown error -> 500
 			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 		}
-
-		text := TextContent{
-			Type: "text",
-			Text: err.Error(),
-		}
-		return jsonrpc.JSONRPCResponse{
-			Jsonrpc: jsonrpc.JSONRPC_VERSION,
-			Id:      id,
-			Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
-		}, nil
 	}
 
 	content := make([]TextContent, 0)
@@ -287,6 +320,11 @@ func promptsGetHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *r
 
 	promptName := req.Params.Name
 	logger.DebugContext(ctx, fmt.Sprintf("prompt name: %s", promptName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", PROMPTS_GET, promptName))
+	span.SetAttributes(attribute.String("gen_ai.prompt.name", promptName))
 	prompt, ok := resourceMgr.GetPrompt(promptName)
 	if !ok {
 		err := fmt.Errorf("prompt with name %q does not exist", promptName)
diff --git a/internal/server/mcp/v20250326/method.go b/internal/server/mcp/v20250326/method.go
index 86aa5d9e0b..24c61fd617 100644
--- a/internal/server/mcp/v20250326/method.go
+++ b/internal/server/mcp/v20250326/method.go
@@ -21,13 +21,15 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/googleapis/genai-toolbox/internal/prompts"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/server/resources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // ProcessMethod returns a response for the request.
@@ -101,6 +103,15 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", TOOLS_CALL, toolName))
+	span.SetAttributes(
+		attribute.String("gen_ai.tool.name", toolName),
+		attribute.String("gen_ai.operation.name", "execute_tool"),
+	)
+
 	tool, ok := resourceMgr.GetTool(toolName)
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
@@ -123,7 +134,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	if clientAuth {
 		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), util.ErrUnauthorized
+			err := util.NewClientServerError(
+				"missing access token in the 'Authorization' header",
+				http.StatusUnauthorized,
+				nil,
+			)
+			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 		}
 	}
 
@@ -171,12 +187,16 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// 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", util.ErrUnauthorized)
+		err = util.NewClientServerError(
+			"unauthorized Tool call: Please make sure you specify correct auth headers",
+			http.StatusUnauthorized,
+			nil,
+		)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := tool.ParseParams(data, claimsFromAuth)
+	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
@@ -193,31 +213,45 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, resourceMgr, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, util.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 clientAuth {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+		var tbErr util.ToolboxError
+
+		if errors.As(err, &tbErr) {
+			switch tbErr.Category() {
+			case util.CategoryAgent:
+				// MCP - Tool execution error
+				// Return SUCCESS but with IsError: true
+				text := TextContent{
+					Type: "text",
+					Text: err.Error(),
+				}
+				return jsonrpc.JSONRPCResponse{
+					Jsonrpc: jsonrpc.JSONRPC_VERSION,
+					Id:      id,
+					Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
+				}, nil
+
+			case util.CategoryServer:
+				// MCP Spec - Protocol error
+				// Return JSON-RPC ERROR
+				var clientServerErr *util.ClientServerError
+				rpcCode := jsonrpc.INTERNAL_ERROR // Default to Internal Error (-32603)
+
+				if errors.As(err, &clientServerErr) {
+					if clientServerErr.Code == http.StatusUnauthorized || clientServerErr.Code == http.StatusForbidden {
+						if clientAuth {
+							rpcCode = jsonrpc.INVALID_REQUEST
+						} else {
+							rpcCode = jsonrpc.INTERNAL_ERROR
+						}
+					}
+				}
+				return jsonrpc.NewError(id, rpcCode, err.Error(), nil), err
 			}
-			// Auth error with ADC should raise internal 500 error
+		} else {
+			// Unknown error -> 500
 			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 		}
-		text := TextContent{
-			Type: "text",
-			Text: err.Error(),
-		}
-		return jsonrpc.JSONRPCResponse{
-			Jsonrpc: jsonrpc.JSONRPC_VERSION,
-			Id:      id,
-			Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
-		}, nil
 	}
-
 	content := make([]TextContent, 0)
 
 	sliceRes, ok := results.([]any)
@@ -286,6 +320,12 @@ func promptsGetHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *r
 
 	promptName := req.Params.Name
 	logger.DebugContext(ctx, fmt.Sprintf("prompt name: %s", promptName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", PROMPTS_GET, promptName))
+	span.SetAttributes(attribute.String("gen_ai.prompt.name", promptName))
+
 	prompt, ok := resourceMgr.GetPrompt(promptName)
 	if !ok {
 		err := fmt.Errorf("prompt with name %q does not exist", promptName)
diff --git a/internal/server/mcp/v20250618/method.go b/internal/server/mcp/v20250618/method.go
index f8746d9d9d..b6cb45059b 100644
--- a/internal/server/mcp/v20250618/method.go
+++ b/internal/server/mcp/v20250618/method.go
@@ -21,13 +21,15 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/googleapis/genai-toolbox/internal/prompts"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/server/resources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // ProcessMethod returns a response for the request.
@@ -94,6 +96,15 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", TOOLS_CALL, toolName))
+	span.SetAttributes(
+		attribute.String("gen_ai.tool.name", toolName),
+		attribute.String("gen_ai.operation.name", "execute_tool"),
+	)
+
 	tool, ok := resourceMgr.GetTool(toolName)
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
@@ -116,7 +127,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	if clientAuth {
 		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), util.ErrUnauthorized
+			err := util.NewClientServerError(
+				"missing access token in the 'Authorization' header",
+				http.StatusUnauthorized,
+				nil,
+			)
+			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 		}
 	}
 
@@ -164,12 +180,16 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// 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", util.ErrUnauthorized)
+		err = util.NewClientServerError(
+			"unauthorized Tool call: Please make sure you specify correct auth headers",
+			http.StatusUnauthorized,
+			nil,
+		)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := tool.ParseParams(data, claimsFromAuth)
+	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
@@ -186,29 +206,44 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, resourceMgr, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, util.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 clientAuth {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+		var tbErr util.ToolboxError
+
+		if errors.As(err, &tbErr) {
+			switch tbErr.Category() {
+			case util.CategoryAgent:
+				// MCP - Tool execution error
+				// Return SUCCESS but with IsError: true
+				text := TextContent{
+					Type: "text",
+					Text: err.Error(),
+				}
+				return jsonrpc.JSONRPCResponse{
+					Jsonrpc: jsonrpc.JSONRPC_VERSION,
+					Id:      id,
+					Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
+				}, nil
+
+			case util.CategoryServer:
+				// MCP Spec - Protocol error
+				// Return JSON-RPC ERROR
+				var clientServerErr *util.ClientServerError
+				rpcCode := jsonrpc.INTERNAL_ERROR // Default to Internal Error (-32603)
+
+				if errors.As(err, &clientServerErr) {
+					if clientServerErr.Code == http.StatusUnauthorized || clientServerErr.Code == http.StatusForbidden {
+						if clientAuth {
+							rpcCode = jsonrpc.INVALID_REQUEST
+						} else {
+							rpcCode = jsonrpc.INTERNAL_ERROR
+						}
+					}
+				}
+				return jsonrpc.NewError(id, rpcCode, err.Error(), nil), err
 			}
-			// Auth error with ADC should raise internal 500 error
+		} else {
+			// Unknown error -> 500
 			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 		}
-		text := TextContent{
-			Type: "text",
-			Text: err.Error(),
-		}
-		return jsonrpc.JSONRPCResponse{
-			Jsonrpc: jsonrpc.JSONRPC_VERSION,
-			Id:      id,
-			Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
-		}, nil
 	}
 
 	content := make([]TextContent, 0)
@@ -279,6 +314,12 @@ func promptsGetHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *r
 
 	promptName := req.Params.Name
 	logger.DebugContext(ctx, fmt.Sprintf("prompt name: %s", promptName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", PROMPTS_GET, promptName))
+	span.SetAttributes(attribute.String("gen_ai.prompt.name", promptName))
+
 	prompt, ok := resourceMgr.GetPrompt(promptName)
 	if !ok {
 		err := fmt.Errorf("prompt with name %q does not exist", promptName)
diff --git a/internal/server/mcp/v20251125/method.go b/internal/server/mcp/v20251125/method.go
index f67bfb5468..2d59554c55 100644
--- a/internal/server/mcp/v20251125/method.go
+++ b/internal/server/mcp/v20251125/method.go
@@ -21,13 +21,15 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"strings"
 
 	"github.com/googleapis/genai-toolbox/internal/prompts"
 	"github.com/googleapis/genai-toolbox/internal/server/mcp/jsonrpc"
 	"github.com/googleapis/genai-toolbox/internal/server/resources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/trace"
 )
 
 // ProcessMethod returns a response for the request.
@@ -94,6 +96,15 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	toolName := req.Params.Name
 	toolArgument := req.Params.Arguments
 	logger.DebugContext(ctx, fmt.Sprintf("tool name: %s", toolName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", TOOLS_CALL, toolName))
+	span.SetAttributes(
+		attribute.String("gen_ai.tool.name", toolName),
+		attribute.String("gen_ai.operation.name", "execute_tool"),
+	)
+
 	tool, ok := resourceMgr.GetTool(toolName)
 	if !ok {
 		err = fmt.Errorf("invalid tool name: tool with name %q does not exist", toolName)
@@ -116,7 +127,12 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	if clientAuth {
 		if accessToken == "" {
-			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, "missing access token in the 'Authorization' header", nil), util.ErrUnauthorized
+			err := util.NewClientServerError(
+				"missing access token in the 'Authorization' header",
+				http.StatusUnauthorized,
+				nil,
+			)
+			return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 		}
 	}
 
@@ -164,12 +180,16 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// 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", util.ErrUnauthorized)
+		err = util.NewClientServerError(
+			"unauthorized Tool call: Please make sure you specify correct auth headers",
+			http.StatusUnauthorized,
+			nil,
+		)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := tool.ParseParams(data, claimsFromAuth)
+	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
 	if err != nil {
 		err = fmt.Errorf("provided parameters were invalid: %w", err)
 		return jsonrpc.NewError(id, jsonrpc.INVALID_PARAMS, err.Error(), nil), err
@@ -186,29 +206,44 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	// run tool invocation and generate response.
 	results, err := tool.Invoke(ctx, resourceMgr, params, accessToken)
 	if err != nil {
-		errStr := err.Error()
-		// Missing authService tokens.
-		if errors.Is(err, util.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 clientAuth {
-				// Error with client credentials should pass down to the client
-				return jsonrpc.NewError(id, jsonrpc.INVALID_REQUEST, err.Error(), nil), err
+		var tbErr util.ToolboxError
+
+		if errors.As(err, &tbErr) {
+			switch tbErr.Category() {
+			case util.CategoryAgent:
+				// MCP - Tool execution error
+				// Return SUCCESS but with IsError: true
+				text := TextContent{
+					Type: "text",
+					Text: err.Error(),
+				}
+				return jsonrpc.JSONRPCResponse{
+					Jsonrpc: jsonrpc.JSONRPC_VERSION,
+					Id:      id,
+					Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
+				}, nil
+
+			case util.CategoryServer:
+				// MCP Spec - Protocol error
+				// Return JSON-RPC ERROR
+				var clientServerErr *util.ClientServerError
+				rpcCode := jsonrpc.INTERNAL_ERROR // Default to Internal Error (-32603)
+
+				if errors.As(err, &clientServerErr) {
+					if clientServerErr.Code == http.StatusUnauthorized || clientServerErr.Code == http.StatusForbidden {
+						if clientAuth {
+							rpcCode = jsonrpc.INVALID_REQUEST
+						} else {
+							rpcCode = jsonrpc.INTERNAL_ERROR
+						}
+					}
+				}
+				return jsonrpc.NewError(id, rpcCode, err.Error(), nil), err
 			}
-			// Auth error with ADC should raise internal 500 error
+		} else {
+			// Unknown error -> 500
 			return jsonrpc.NewError(id, jsonrpc.INTERNAL_ERROR, err.Error(), nil), err
 		}
-		text := TextContent{
-			Type: "text",
-			Text: err.Error(),
-		}
-		return jsonrpc.JSONRPCResponse{
-			Jsonrpc: jsonrpc.JSONRPC_VERSION,
-			Id:      id,
-			Result:  CallToolResult{Content: []TextContent{text}, IsError: true},
-		}, nil
 	}
 
 	content := make([]TextContent, 0)
@@ -279,6 +314,12 @@ func promptsGetHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *r
 
 	promptName := req.Params.Name
 	logger.DebugContext(ctx, fmt.Sprintf("prompt name: %s", promptName))
+
+	// Update span name and set gen_ai attributes
+	span := trace.SpanFromContext(ctx)
+	span.SetName(fmt.Sprintf("%s %s", PROMPTS_GET, promptName))
+	span.SetAttributes(attribute.String("gen_ai.prompt.name", promptName))
+
 	prompt, ok := resourceMgr.GetPrompt(promptName)
 	if !ok {
 		err := fmt.Errorf("prompt with name %q does not exist", promptName)
diff --git a/internal/server/mcp_test.go b/internal/server/mcp_test.go
index 0d50af2b24..bbfce7ad41 100644
--- a/internal/server/mcp_test.go
+++ b/internal/server/mcp_test.go
@@ -231,7 +231,7 @@ func TestMcpEndpointWithoutInitialized(t *testing.T) {
 				"id":      "tools-call-tool4",
 				"error": map[string]any{
 					"code":    -32600.0,
-					"message": "unauthorized Tool call: Please make sure your specify correct auth headers: unauthorized",
+					"message": "unauthorized Tool call: Please make sure you specify correct auth headers",
 				},
 			},
 		},
@@ -320,7 +320,7 @@ func TestMcpEndpointWithoutInitialized(t *testing.T) {
 				Params: map[string]any{
 					"name": "prompt2",
 					"arguments": map[string]any{
-						"arg1": 42, // prompt2 expects a string, we send a number
+						"arg1": 42,
 					},
 				},
 			},
@@ -834,7 +834,7 @@ func TestMcpEndpoint(t *testing.T) {
 						"id":      "tools-call-tool4",
 						"error": map[string]any{
 							"code":    -32600.0,
-							"message": "unauthorized Tool call: Please make sure your specify correct auth headers: unauthorized",
+							"message": "unauthorized Tool call: Please make sure you specify correct auth headers",
 						},
 					},
 				},
diff --git a/internal/server/mocks.go b/internal/server/mocks.go
new file mode 100644
index 0000000000..56e458110b
--- /dev/null
+++ b/internal/server/mocks.go
@@ -0,0 +1,160 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package server
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/prompts"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+// MockTool is used to mock tools in tests
+type MockTool struct {
+	Name                         string
+	Description                  string
+	Params                       []parameters.Parameter
+	manifest                     tools.Manifest
+	unauthorized                 bool
+	requiresClientAuthrorization bool
+}
+
+func (t MockTool) Invoke(context.Context, tools.SourceProvider, parameters.ParamValues, tools.AccessToken) (any, util.ToolboxError) {
+	mock := []any{t.Name}
+	return mock, nil
+}
+
+func (t MockTool) ToConfig() tools.ToolConfig {
+	return nil
+}
+
+// claims is a map of user info decoded from an auth token
+func (t MockTool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
+	return parameters.ParseParams(t.Params, data, claimsMap)
+}
+
+func (t MockTool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return parameters.EmbedParams(ctx, t.Params, paramValues, embeddingModelsMap, nil)
+}
+
+func (t MockTool) Manifest() tools.Manifest {
+	pMs := make([]parameters.ParameterManifest, 0, len(t.Params))
+	for _, p := range t.Params {
+		pMs = append(pMs, p.Manifest())
+	}
+	return tools.Manifest{Description: t.Description, Parameters: pMs}
+}
+
+func (t MockTool) Authorized(verifiedAuthServices []string) bool {
+	// defaulted to true
+	return !t.unauthorized
+}
+
+func (t MockTool) RequiresClientAuthorization(tools.SourceProvider) (bool, error) {
+	// defaulted to false
+	return t.requiresClientAuthrorization, nil
+}
+
+func (t MockTool) GetParameters() parameters.Parameters {
+	return t.Params
+}
+
+func (t MockTool) McpManifest() tools.McpManifest {
+	properties := make(map[string]parameters.ParameterMcpManifest)
+	required := make([]string, 0)
+	authParams := make(map[string][]string)
+
+	for _, p := range t.Params {
+		name := p.GetName()
+		paramManifest, authParamList := p.McpManifest()
+		properties[name] = paramManifest
+		required = append(required, name)
+
+		if len(authParamList) > 0 {
+			authParams[name] = authParamList
+		}
+	}
+
+	toolsSchema := parameters.McpToolsSchema{
+		Type:       "object",
+		Properties: properties,
+		Required:   required,
+	}
+
+	mcpManifest := tools.McpManifest{
+		Name:        t.Name,
+		Description: t.Description,
+		InputSchema: toolsSchema,
+	}
+
+	if len(authParams) > 0 {
+		mcpManifest.Metadata = map[string]any{
+			"toolbox/authParams": authParams,
+		}
+	}
+
+	return mcpManifest
+}
+
+func (t MockTool) GetAuthTokenHeaderName(tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+// MockPrompt is used to mock prompts in tests
+type MockPrompt struct {
+	Name        string
+	Description string
+	Args        prompts.Arguments
+}
+
+func (p MockPrompt) SubstituteParams(vals parameters.ParamValues) (any, error) {
+	return []prompts.Message{
+		{
+			Role:    "user",
+			Content: fmt.Sprintf("substituted %s", p.Name),
+		},
+	}, nil
+}
+
+func (p MockPrompt) ParseArgs(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
+	var params parameters.Parameters
+	for _, arg := range p.Args {
+		params = append(params, arg.Parameter)
+	}
+	return parameters.ParseParams(params, data, claimsMap)
+}
+
+func (p MockPrompt) Manifest() prompts.Manifest {
+	var argManifests []parameters.ParameterManifest
+	for _, arg := range p.Args {
+		argManifests = append(argManifests, arg.Manifest())
+	}
+	return prompts.Manifest{
+		Description: p.Description,
+		Arguments:   argManifests,
+	}
+}
+
+func (p MockPrompt) McpManifest() prompts.McpManifest {
+	return prompts.GetMcpManifest(p.Name, p.Description, p.Args)
+}
+
+func (p MockPrompt) ToConfig() prompts.PromptConfig {
+	return nil
+}
diff --git a/internal/server/resources/resources_test.go b/internal/server/resources/resources_test.go
index ad4bfdd326..e0682a27a9 100644
--- a/internal/server/resources/resources_test.go
+++ b/internal/server/resources/resources_test.go
@@ -32,7 +32,7 @@ func TestUpdateServer(t *testing.T) {
 		"example-source": &alloydbpg.Source{
 			Config: alloydbpg.Config{
 				Name: "example-alloydb-source",
-				Kind: "alloydb-postgres",
+				Type: "alloydb-postgres",
 			},
 		},
 	}
@@ -92,7 +92,7 @@ func TestUpdateServer(t *testing.T) {
 		"example-source2": &alloydbpg.Source{
 			Config: alloydbpg.Config{
 				Name: "example-alloydb-source2",
-				Kind: "alloydb-postgres",
+				Type: "alloydb-postgres",
 			},
 		},
 	}
diff --git a/internal/server/server.go b/internal/server/server.go
index 961ffc48a3..f77c504113 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -86,7 +86,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			childCtx, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/source/init",
-				trace.WithAttributes(attribute.String("source_kind", sc.SourceConfigKind())),
+				trace.WithAttributes(attribute.String("source_type", sc.SourceConfigType())),
 				trace.WithAttributes(attribute.String("source_name", name)),
 			)
 			defer span.End()
@@ -114,7 +114,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/auth/init",
-				trace.WithAttributes(attribute.String("auth_kind", sc.AuthServiceConfigKind())),
+				trace.WithAttributes(attribute.String("auth_type", sc.AuthServiceConfigType())),
 				trace.WithAttributes(attribute.String("auth_name", name)),
 			)
 			defer span.End()
@@ -142,7 +142,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/embeddingmodel/init",
-				trace.WithAttributes(attribute.String("model_kind", ec.EmbeddingModelConfigKind())),
+				trace.WithAttributes(attribute.String("model_type", ec.EmbeddingModelConfigType())),
 				trace.WithAttributes(attribute.String("model_name", name)),
 			)
 			defer span.End()
@@ -170,7 +170,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/tool/init",
-				trace.WithAttributes(attribute.String("tool_kind", tc.ToolConfigKind())),
+				trace.WithAttributes(attribute.String("tool_type", tc.ToolConfigType())),
 				trace.WithAttributes(attribute.String("tool_name", name)),
 			)
 			defer span.End()
@@ -239,7 +239,7 @@ func InitializeConfigs(ctx context.Context, cfg ServerConfig) (
 			_, span := instrumentation.Tracer.Start(
 				ctx,
 				"toolbox/server/prompt/init",
-				trace.WithAttributes(attribute.String("prompt_kind", pc.PromptConfigKind())),
+				trace.WithAttributes(attribute.String("prompt_type", pc.PromptConfigType())),
 				trace.WithAttributes(attribute.String("prompt_name", name)),
 			)
 			defer span.End()
diff --git a/internal/server/server_test.go b/internal/server/server_test.go
index c13df83be4..ab809fc579 100644
--- a/internal/server/server_test.go
+++ b/internal/server/server_test.go
@@ -141,7 +141,7 @@ func TestUpdateServer(t *testing.T) {
 		"example-source": &alloydbpg.Source{
 			Config: alloydbpg.Config{
 				Name: "example-alloydb-source",
-				Kind: "alloydb-postgres",
+				Type: "alloydb-postgres",
 			},
 		},
 	}
diff --git a/internal/server/static/js/auth.js b/internal/server/static/js/auth.js
index 25ff16c736..c805617c48 100644
--- a/internal/server/static/js/auth.js
+++ b/internal/server/static/js/auth.js
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+import { escapeHtml } from './sanitize.js';
+
 /**
  * Renders the Google Sign-In button using the GIS library.
  * @param {string} toolId The ID of the tool.
@@ -112,13 +114,14 @@ function handleCredentialResponse(response, toolId, authProfileName) {
 
 // creates the Google Auth method dropdown
 export function createGoogleAuthMethodItem(toolId, authProfileName) { 
+    const safeProfileName = escapeHtml(authProfileName);
     const UNIQUE_ID_BASE = `${toolId}-${authProfileName}`;
     const item = document.createElement('div');
 
     item.className = 'auth-method-item';
     item.innerHTML = `
         <div class="auth-method-header">
-            <span class="auth-method-label">Google ID Token (${authProfileName})</span>
+            <span class="auth-method-label">Google ID Token (${safeProfileName})</span>
             <button class="toggle-details-tab">Auto Setup</button>
         </div>
         <div class="auth-method-details" id="google-auth-details-${UNIQUE_ID_BASE}" style="display: none;">
diff --git a/internal/server/static/js/loadTools.js b/internal/server/static/js/loadTools.js
index 8bb81703dc..b4ea0734af 100644
--- a/internal/server/static/js/loadTools.js
+++ b/internal/server/static/js/loadTools.js
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { renderToolInterface } from "./toolDisplay.js";
+import { escapeHtml } from "./sanitize.js";
 
 let toolDetailsAbortController = null;
 
@@ -34,7 +35,7 @@ export async function loadTools(secondNavContent, toolDisplayArea, toolsetName)
         renderToolList(apiResponse, secondNavContent, toolDisplayArea);
     } catch (error) {
         console.error('Failed to load tools:', error);
-        secondNavContent.innerHTML = `<p class="error">Failed to load tools: <pre><code>${error}</code></pre></p>`;
+        secondNavContent.innerHTML = `<p class="error">Failed to load tools: <pre><code>${escapeHtml(String(error))}</code></pre></p>`;
     }
 }
 
@@ -168,7 +169,7 @@ async function fetchToolDetails(toolName, toolDisplayArea) {
             console.debug("Previous fetch was aborted, expected behavior.");
         } else {
             console.error(`Failed to load details for tool "${toolName}":`, error);
-            toolDisplayArea.innerHTML = `<p class="error">Failed to load details for ${toolName}. ${error.message}</p>`;
+            toolDisplayArea.innerHTML = `<p class="error">Failed to load details for ${escapeHtml(toolName)}. ${escapeHtml(error.message)}</p>`;
         }
     }
 }
\ No newline at end of file
diff --git a/internal/server/static/js/sanitize.js b/internal/server/static/js/sanitize.js
new file mode 100644
index 0000000000..405878ac56
--- /dev/null
+++ b/internal/server/static/js/sanitize.js
@@ -0,0 +1,43 @@
+// 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.
+
+/**
+ * Escapes special characters for safe rendering in HTML text contexts.
+ *
+ * This utility encodes user-controlled values to avoid unintended script
+ * execution when rendering content as HTML. It is intended as a defensive
+ * measure and does not perform HTML sanitization.
+ *
+ * @param {*} input The value to escape.
+ * @return {string} The escaped string safe for HTML rendering.
+ */
+const htmlEscapes = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;',
+    '`': '&#x60;'
+};
+
+const escapeCharsRegex = /[&<>"'`]/g;
+
+export function escapeHtml(input) {
+    if (input === null || input === undefined) {
+        return '';
+    }
+
+    const str = String(input);
+    return str.replace(escapeCharsRegex, (char) => htmlEscapes[char]);
+}
diff --git a/internal/server/static/js/toolDisplay.js b/internal/server/static/js/toolDisplay.js
index f750d73d64..12bdb2f4e4 100644
--- a/internal/server/static/js/toolDisplay.js
+++ b/internal/server/static/js/toolDisplay.js
@@ -14,6 +14,7 @@
 
 import { handleRunTool, displayResults } from './runTool.js';
 import { createGoogleAuthMethodItem } from './auth.js'
+import { escapeHtml } from './sanitize.js'
 
 /**
  * Helper function to create form inputs for parameters.
@@ -357,9 +358,9 @@ export function renderToolInterface(tool, containerElement) {
     const descBox = document.createElement('div');
 
     nameBox.className = 'tool-box tool-name';
-    nameBox.innerHTML = `<h5>Name:</h5><p>${tool.name}</p>`;
+    nameBox.innerHTML = `<h5>Name:</h5><p>${escapeHtml(tool.name)}</p>`;
     descBox.className = 'tool-box tool-description';
-    descBox.innerHTML = `<h5>Description:</h5><p>${tool.description}</p>`;
+    descBox.innerHTML = `<h5>Description:</h5><p>${escapeHtml(tool.description)}</p>`;
 
     toolInfoContainer.className = 'tool-info';
     toolInfoContainer.appendChild(nameBox);
diff --git a/internal/sources/alloydbadmin/alloydbadmin.go b/internal/sources/alloydbadmin/alloydbadmin.go
index 633c7eb73e..2761d96644 100644
--- a/internal/sources/alloydbadmin/alloydbadmin.go
+++ b/internal/sources/alloydbadmin/alloydbadmin.go
@@ -32,14 +32,14 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceKind string = "alloydb-admin"
+const SourceType string = "alloydb-admin"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -53,13 +53,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"`
+	Type           string `yaml:"type" validate:"required"`
 	DefaultProject string `yaml:"defaultProject"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -106,8 +106,8 @@ type Source struct {
 	Service *alloydbrestapi.Service
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -361,7 +361,11 @@ func (s *Source) GetOperations(ctx context.Context, project, location, operation
 				}
 			}
 
-			return string(opBytes), nil
+			var result any
+			if err := json.Unmarshal(opBytes, &result); err != nil {
+				return nil, fmt.Errorf("failed to unmarshal operation bytes: %w", err)
+			}
+			return result, nil
 		}
 		logger.DebugContext(ctx, fmt.Sprintf("Operation not complete, retrying in %v\n", delay))
 	}
diff --git a/internal/sources/alloydbadmin/alloydbadmin_test.go b/internal/sources/alloydbadmin/alloydbadmin_test.go
index b8af21c386..ae4fd9b5e1 100644
--- a/internal/sources/alloydbadmin/alloydbadmin_test.go
+++ b/internal/sources/alloydbadmin/alloydbadmin_test.go
@@ -15,9 +15,9 @@
 package alloydbadmin_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,14 +34,14 @@ func TestParseFromYamlAlloyDBAdmin(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-alloydb-admin-instance:
-					kind: alloydb-admin
+			kind: sources
+			name: my-alloydb-admin-instance
+			type: alloydb-admin
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-alloydb-admin-instance": alloydbadmin.Config{
 					Name:           "my-alloydb-admin-instance",
-					Kind:           alloydbadmin.SourceKind,
+					Type:           alloydbadmin.SourceType,
 					UseClientOAuth: false,
 				},
 			},
@@ -49,15 +49,15 @@ func TestParseFromYamlAlloyDBAdmin(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-alloydb-admin-instance:
-					kind: alloydb-admin
-					useClientOAuth: true
+			kind: sources
+			name: my-alloydb-admin-instance
+			type: alloydb-admin
+			useClientOAuth: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-alloydb-admin-instance": alloydbadmin.Config{
 					Name:           "my-alloydb-admin-instance",
-					Kind:           alloydbadmin.SourceKind,
+					Type:           alloydbadmin.SourceType,
 					UseClientOAuth: true,
 				},
 			},
@@ -65,16 +65,13 @@ func TestParseFromYamlAlloyDBAdmin(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
 			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -89,30 +86,27 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-alloydb-admin-instance:
-					kind: alloydb-admin
-					project: test-project
+			kind: sources
+			name: my-alloydb-admin-instance
+			type: alloydb-admin
+			project: test-project
 			`,
-			err: "unable to parse source \"my-alloydb-admin-instance\" as \"alloydb-admin\": [2:1] unknown field \"project\"\n   1 | kind: alloydb-admin\n>  2 | project: test-project\n       ^\n",
+			err: "error unmarshaling sources: unable to parse source \"my-alloydb-admin-instance\" as \"alloydb-admin\": [2:1] unknown field \"project\"\n   1 | name: my-alloydb-admin-instance\n>  2 | project: test-project\n       ^\n   3 | type: alloydb-admin",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-alloydb-admin-instance:
-					useClientOAuth: true
+			kind: sources
+			name: my-alloydb-admin-instance
+			useClientOAuth: true
 			`,
-			err: "missing 'kind' field for source \"my-alloydb-admin-instance\"",
+			err: "error unmarshaling sources: missing 'type' field or it is not a string",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
 			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/alloydbpg/alloydb_pg.go b/internal/sources/alloydbpg/alloydb_pg.go
index 58d8600ebd..74c4eb3a26 100644
--- a/internal/sources/alloydbpg/alloydb_pg.go
+++ b/internal/sources/alloydbpg/alloydb_pg.go
@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "alloydb-postgres"
+const SourceType string = "alloydb-postgres"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -50,7 +50,7 @@ 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"`
+	Type     string         `yaml:"type" validate:"required"`
 	Project  string         `yaml:"project" validate:"required"`
 	Region   string         `yaml:"region" validate:"required"`
 	Cluster  string         `yaml:"cluster" validate:"required"`
@@ -61,8 +61,8 @@ type Config struct {
 	Database string         `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -90,8 +90,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -183,7 +183,7 @@ func getConnectionConfig(ctx context.Context, user, pass, dbname string) (string
 
 func initAlloyDBPgConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, cluster, instance, ipType, user, pass, dbname string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	dsn, useIAM, err := getConnectionConfig(ctx, user, pass, dbname)
diff --git a/internal/sources/alloydbpg/alloydb_pg_test.go b/internal/sources/alloydbpg/alloydb_pg_test.go
index f0ddc57ef9..b1b374b6a4 100644
--- a/internal/sources/alloydbpg/alloydb_pg_test.go
+++ b/internal/sources/alloydbpg/alloydb_pg_test.go
@@ -15,9 +15,9 @@
 package alloydbpg_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,21 +34,21 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: alloydb-postgres
-					project: my-project
-					region: my-region
-					cluster: my-cluster
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: alloydb-postgres
+			project: my-project
+			region: my-region
+			cluster: my-cluster
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-pg-instance": alloydbpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     alloydbpg.SourceKind,
+					Type:     alloydbpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Cluster:  "my-cluster",
@@ -63,22 +63,22 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 		{
 			desc: "public ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: alloydb-postgres
-					project: my-project
-					region: my-region
-					cluster: my-cluster
-					instance: my-instance
-					ipType: Public
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: alloydb-postgres
+			project: my-project
+			region: my-region
+			cluster: my-cluster
+			instance: my-instance
+			ipType: Public
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-pg-instance": alloydbpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     alloydbpg.SourceKind,
+					Type:     alloydbpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Cluster:  "my-cluster",
@@ -93,22 +93,22 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 		{
 			desc: "private ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: alloydb-postgres
-					project: my-project
-					region: my-region
-					cluster: my-cluster
-					instance: my-instance
-					ipType: private
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: alloydb-postgres
+			project: my-project
+			region: my-region
+			cluster: my-cluster
+			instance: my-instance
+			ipType: private
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-pg-instance": alloydbpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     alloydbpg.SourceKind,
+					Type:     alloydbpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Cluster:  "my-cluster",
@@ -123,16 +123,13 @@ func TestParseFromYamlAlloyDBPg(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
 			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -147,60 +144,56 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: alloydb-postgres
-					project: my-project
-					region: my-region
-					cluster: my-cluster
-					instance: my-instance
-					ipType: fail 
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: alloydb-postgres
+			project: my-project
+			region: my-region
+			cluster: my-cluster
+			instance: my-instance
+			ipType: fail 
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"alloydb-postgres\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"alloydb-postgres\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: alloydb-postgres
-					project: my-project
-					region: my-region
-					cluster: my-cluster
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-pg-instance
+			type: alloydb-postgres
+			project: my-project
+			region: my-region
+			cluster: my-cluster
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"alloydb-postgres\": [3:1] unknown field \"foo\"\n   1 | cluster: my-cluster\n   2 | database: my_db\n>  3 | foo: bar\n       ^\n   4 | instance: my-instance\n   5 | kind: alloydb-postgres\n   6 | password: my_pass\n   7 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"alloydb-postgres\": [3:1] unknown field \"foo\"\n   1 | cluster: my-cluster\n   2 | database: my_db\n>  3 | foo: bar\n       ^\n   4 | instance: my-instance\n   5 | name: my-pg-instance\n   6 | password: my_pass\n   7 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: alloydb-postgres
-					region: my-region
-					cluster: my-cluster
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: alloydb-postgres
+			region: my-region
+			cluster: my-cluster
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"alloydb-postgres\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"alloydb-postgres\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/bigquery/bigquery.go b/internal/sources/bigquery/bigquery.go
index b24378c858..edd63111ab 100644
--- a/internal/sources/bigquery/bigquery.go
+++ b/internal/sources/bigquery/bigquery.go
@@ -41,7 +41,7 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceKind string = "bigquery"
+const SourceType string = "bigquery"
 
 // CloudPlatformScope is a broad scope for Google Cloud Platform services.
 const CloudPlatformScope = "https://www.googleapis.com/auth/cloud-platform"
@@ -65,8 +65,8 @@ type BigQuerySessionProvider func(ctx context.Context) (*Session, error)
 type DataplexClientCreator func(tokenString string) (*dataplexapi.CatalogClient, error)
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -81,7 +81,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// BigQuery configs
 	Name                      string              `yaml:"name" validate:"required"`
-	Kind                      string              `yaml:"kind" validate:"required"`
+	Type                      string              `yaml:"type" validate:"required"`
 	Project                   string              `yaml:"project" validate:"required"`
 	Location                  string              `yaml:"location"`
 	WriteMode                 string              `yaml:"writeMode"`
@@ -119,9 +119,9 @@ func (s *StringOrStringSlice) UnmarshalYAML(unmarshal func(any) error) error {
 	return fmt.Errorf("cannot unmarshal %T into StringOrStringSlice", v)
 }
 
-func (r Config) SourceConfigKind() string {
-	// Returns BigQuery source kind
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	// Returns BigQuery source type
+	return SourceType
 }
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
 	if r.WriteMode == "" {
@@ -236,9 +236,9 @@ func setupClientCaching(s *Source, baseCreator BigqueryClientCreator) {
 	}
 
 	// Initialize caches
-	s.bqClientCache = NewCache(onBqEvict)
-	s.bqRestCache = NewCache(nil)
-	s.dataplexCache = NewCache(onDataplexEvict)
+	s.bqClientCache = sources.NewCache(onBqEvict)
+	s.bqRestCache = sources.NewCache(nil)
+	s.dataplexCache = sources.NewCache(onDataplexEvict)
 
 	// Create the caching wrapper for the client creator
 	s.ClientCreator = func(tokenString string, wantRestService bool) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
@@ -289,9 +289,9 @@ type Source struct {
 	Session                   *Session
 
 	// Caches for OAuth clients
-	bqClientCache *Cache
-	bqRestCache   *Cache
-	dataplexCache *Cache
+	bqClientCache *sources.Cache
+	bqRestCache   *sources.Cache
+	dataplexCache *sources.Cache
 }
 
 type Session struct {
@@ -302,9 +302,9 @@ type Session struct {
 	LastUsed     time.Time
 }
 
-func (s *Source) SourceKind() string {
-	// Returns BigQuery Google SQL source kind
-	return SourceKind
+func (s *Source) SourceType() string {
+	// Returns BigQuery Google SQL source type
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -665,7 +665,7 @@ func initBigQueryConnection(
 	impersonateServiceAccount string,
 	scopes []string,
 ) (*bigqueryapi.Client, *bigqueryrestapi.Service, oauth2.TokenSource, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
@@ -741,7 +741,7 @@ func initBigQueryConnectionWithOAuthToken(
 	tokenString string,
 	wantRestService bool,
 ) (*bigqueryapi.Client, *bigqueryrestapi.Service, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 	// Construct token source
 	token := &oauth2.Token{
@@ -801,7 +801,7 @@ func initDataplexConnection(
 	var clientCreator DataplexClientCreator
 	var err error
 
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
diff --git a/internal/sources/bigquery/bigquery_test.go b/internal/sources/bigquery/bigquery_test.go
index a23f1b47bd..d2883a94f7 100644
--- a/internal/sources/bigquery/bigquery_test.go
+++ b/internal/sources/bigquery/bigquery_test.go
@@ -15,18 +15,18 @@
 package bigquery_test
 
 import (
+	"context"
 	"math/big"
 	"reflect"
 	"testing"
 
-	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
-	"go.opentelemetry.io/otel/trace/noop"
-
 	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/internal/util"
+	"go.opentelemetry.io/otel/trace/noop"
 )
 
 func TestParseFromYamlBigQuery(t *testing.T) {
@@ -38,15 +38,15 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:      "my-instance",
-					Kind:      bigquery.SourceKind,
+					Type:      bigquery.SourceType,
 					Project:   "my-project",
 					Location:  "",
 					WriteMode: "",
@@ -56,17 +56,17 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "all fields specified",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: asia
-					writeMode: blocked
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: asia
+			writeMode: blocked
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:           "my-instance",
-					Kind:           bigquery.SourceKind,
+					Type:           bigquery.SourceType,
 					Project:        "my-project",
 					Location:       "asia",
 					WriteMode:      "blocked",
@@ -77,17 +77,17 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: us
-					useClientOAuth: true
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: us
+			useClientOAuth: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:           "my-instance",
-					Kind:           bigquery.SourceKind,
+					Type:           bigquery.SourceType,
 					Project:        "my-project",
 					Location:       "us",
 					UseClientOAuth: true,
@@ -97,18 +97,18 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "with allowed datasets example",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: us
-					allowedDatasets:
-						- my_dataset
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: us
+			allowedDatasets:
+			- my_dataset
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:            "my-instance",
-					Kind:            bigquery.SourceKind,
+					Type:            bigquery.SourceType,
 					Project:         "my-project",
 					Location:        "us",
 					AllowedDatasets: []string{"my_dataset"},
@@ -118,17 +118,17 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "with service account impersonation example",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: us
-					impersonateServiceAccount: service-account@my-project.iam.gserviceaccount.com
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: us
+			impersonateServiceAccount: service-account@my-project.iam.gserviceaccount.com
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:                      "my-instance",
-					Kind:                      bigquery.SourceKind,
+					Type:                      bigquery.SourceType,
 					Project:                   "my-project",
 					Location:                  "us",
 					ImpersonateServiceAccount: "service-account@my-project.iam.gserviceaccount.com",
@@ -138,19 +138,19 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "with custom scopes example",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: us
-					scopes:
-						- https://www.googleapis.com/auth/bigquery
-						- https://www.googleapis.com/auth/cloud-platform
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: us
+			scopes:
+			- https://www.googleapis.com/auth/bigquery
+			- https://www.googleapis.com/auth/cloud-platform
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:     "my-instance",
-					Kind:     bigquery.SourceKind,
+					Type:     bigquery.SourceType,
 					Project:  "my-project",
 					Location: "us",
 					Scopes:   []string{"https://www.googleapis.com/auth/bigquery", "https://www.googleapis.com/auth/cloud-platform"},
@@ -160,17 +160,17 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "with max query result rows example",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: us
-					maxQueryResultRows: 10
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: us
+			maxQueryResultRows: 10
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": bigquery.Config{
 					Name:               "my-instance",
-					Kind:               bigquery.SourceKind,
+					Type:               bigquery.SourceType,
 					Project:            "my-project",
 					Location:           "us",
 					MaxQueryResultRows: 10,
@@ -180,20 +180,15 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse (-want +got):\n%s", diff)
 			}
 		})
 	}
-
 }
 
 func TestFailParseFromYaml(t *testing.T) {
@@ -205,33 +200,29 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					project: my-project
-					location: us
-					foo: bar
+			kind: sources
+			name: my-instance
+			type: bigquery
+			project: my-project
+			location: us
+			foo: bar
 			`,
-			err: "unable to parse source \"my-instance\" as \"bigquery\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | kind: bigquery\n   3 | location: us\n   4 | project: my-project",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"bigquery\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | location: us\n   3 | name: my-instance\n   4 | project: my-project\n   5 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-instance:
-					kind: bigquery
-					location: us
+			kind: sources
+			name: my-instance
+			type: bigquery
+			location: us
 			`,
-			err: "unable to parse source \"my-instance\" as \"bigquery\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"bigquery\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
@@ -260,7 +251,7 @@ func TestInitialize_MaxQueryResultRows(t *testing.T) {
 			desc: "default value",
 			cfg: bigquery.Config{
 				Name:           "test-default",
-				Kind:           bigquery.SourceKind,
+				Type:           bigquery.SourceType,
 				Project:        "test-project",
 				UseClientOAuth: true,
 			},
@@ -270,7 +261,7 @@ func TestInitialize_MaxQueryResultRows(t *testing.T) {
 			desc: "configured value",
 			cfg: bigquery.Config{
 				Name:               "test-configured",
-				Kind:               bigquery.SourceKind,
+				Type:               bigquery.SourceType,
 				Project:            "test-project",
 				UseClientOAuth:     true,
 				MaxQueryResultRows: 100,
diff --git a/internal/sources/bigtable/bigtable.go b/internal/sources/bigtable/bigtable.go
index 22daf64c37..16b5f30651 100644
--- a/internal/sources/bigtable/bigtable.go
+++ b/internal/sources/bigtable/bigtable.go
@@ -27,14 +27,14 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceKind string = "bigtable"
+const SourceType string = "bigtable"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -48,13 +48,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"`
+	Type     string `yaml:"type" validate:"required"`
 	Project  string `yaml:"project" validate:"required"`
 	Instance string `yaml:"instance" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -77,8 +77,8 @@ type Source struct {
 	Client *bigtable.Client
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -179,7 +179,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, configParam param
 
 func initBigtableClient(ctx context.Context, tracer trace.Tracer, name, project, instance string) (*bigtable.Client, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Set up Bigtable data operations client.
diff --git a/internal/sources/bigtable/bigtable_test.go b/internal/sources/bigtable/bigtable_test.go
index c3f2a7d3dc..253f6e14ff 100644
--- a/internal/sources/bigtable/bigtable_test.go
+++ b/internal/sources/bigtable/bigtable_test.go
@@ -15,9 +15,9 @@
 package bigtable_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,16 +34,16 @@ func TestParseFromYamlBigtableDb(t *testing.T) {
 		{
 			desc: "can configure with a bigtable table",
 			in: `
-			sources:
-				my-bigtable-instance:
-					kind: bigtable
-					project: my-project
-					instance: my-instance
+			kind: sources
+			name: my-bigtable-instance
+			type: bigtable
+			project: my-project
+			instance: my-instance
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-bigtable-instance": bigtable.Config{
 					Name:     "my-bigtable-instance",
-					Kind:     bigtable.SourceKind,
+					Type:     bigtable.SourceType,
 					Project:  "my-project",
 					Instance: "my-instance",
 				},
@@ -52,16 +52,12 @@ func TestParseFromYamlBigtableDb(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -77,33 +73,29 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-bigtable-instance:
-					kind: bigtable
-					project: my-project
-					instance: my-instance
-					foo: bar
+			kind: sources
+			name: my-bigtable-instance
+			type: bigtable
+			project: my-project
+			instance: my-instance
+			foo: bar
 			`,
-			err: "unable to parse source \"my-bigtable-instance\" as \"bigtable\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | instance: my-instance\n   3 | kind: bigtable\n   4 | project: my-project",
+			err: "error unmarshaling sources: unable to parse source \"my-bigtable-instance\" as \"bigtable\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | instance: my-instance\n   3 | name: my-bigtable-instance\n   4 | project: my-project\n   5 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-bigtable-instance:
-					kind: bigtable
-					project: my-project
+			kind: sources
+			name: my-bigtable-instance
+			type: bigtable
+			project: my-project
 			`,
-			err: "unable to parse source \"my-bigtable-instance\" as \"bigtable\": Key: 'Config.Instance' Error:Field validation for 'Instance' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-bigtable-instance\" as \"bigtable\": Key: 'Config.Instance' Error:Field validation for 'Instance' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/bigquery/cache.go b/internal/sources/cache.go
similarity index 99%
rename from internal/sources/bigquery/cache.go
rename to internal/sources/cache.go
index 947c82238f..80e6a2f890 100644
--- a/internal/sources/bigquery/cache.go
+++ b/internal/sources/cache.go
@@ -11,7 +11,7 @@
 // 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 bigquery
+package sources
 
 import (
 	"sync"
diff --git a/internal/sources/cassandra/cassandra.go b/internal/sources/cassandra/cassandra.go
index 49c070bf06..44d8b362bc 100644
--- a/internal/sources/cassandra/cassandra.go
+++ b/internal/sources/cassandra/cassandra.go
@@ -25,11 +25,11 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "cassandra"
+const SourceType string = "cassandra"
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -43,7 +43,7 @@ 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"`
+	Type                   string   `yaml:"type" validate:"required"`
 	Hosts                  []string `yaml:"hosts" validate:"required"`
 	Keyspace               string   `yaml:"keyspace"`
 	ProtoVersion           int      `yaml:"protoVersion"`
@@ -68,9 +68,9 @@ func (c Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 	return s, nil
 }
 
-// SourceConfigKind implements sources.SourceConfig.
-func (c Config) SourceConfigKind() string {
-	return SourceKind
+// SourceConfigType implements sources.SourceConfig.
+func (c Config) SourceConfigType() string {
+	return SourceType
 }
 
 var _ sources.SourceConfig = Config{}
@@ -89,9 +89,9 @@ func (s *Source) ToConfig() sources.SourceConfig {
 	return s.Config
 }
 
-// SourceKind implements sources.Source.
-func (s *Source) SourceKind() string {
-	return SourceKind
+// SourceType implements sources.Source.
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) RunSQL(ctx context.Context, statement string, params parameters.ParamValues) (any, error) {
@@ -120,7 +120,7 @@ var _ sources.Source = &Source{}
 
 func initCassandraSession(ctx context.Context, tracer trace.Tracer, c Config) (*gocql.Session, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, c.Name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, c.Name)
 	defer span.End()
 
 	// Validate authentication configuration
diff --git a/internal/sources/cassandra/cassandra_test.go b/internal/sources/cassandra/cassandra_test.go
index ddcbb3debe..e37e9c846e 100644
--- a/internal/sources/cassandra/cassandra_test.go
+++ b/internal/sources/cassandra/cassandra_test.go
@@ -15,11 +15,12 @@
 package cassandra_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/cassandra"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,17 +34,17 @@ func TestParseFromYamlCassandra(t *testing.T) {
 		{
 			desc: "basic example (without optional fields)",
 			in: `
-			sources:
-				my-cassandra-instance:
-					kind: cassandra
-					hosts:
-						- "my-host1"
-						- "my-host2"
+			kind: sources
+			name: my-cassandra-instance
+			type: cassandra
+			hosts:
+				- "my-host1"
+				- "my-host2"
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-cassandra-instance": cassandra.Config{
 					Name:                   "my-cassandra-instance",
-					Kind:                   cassandra.SourceKind,
+					Type:                   cassandra.SourceType,
 					Hosts:                  []string{"my-host1", "my-host2"},
 					Username:               "",
 					Password:               "",
@@ -59,25 +60,25 @@ func TestParseFromYamlCassandra(t *testing.T) {
 		{
 			desc: "with optional fields",
 			in: `
-			sources:
-				my-cassandra-instance:
-					kind: cassandra
-					hosts:
-						- "my-host1"
-						- "my-host2"
-					username: "user"
-					password: "pass"
-					keyspace: "example_keyspace"
-					protoVersion: 4
-					caPath: "path/to/ca.crt"
-					certPath: "path/to/cert"
-					keyPath: "path/to/key"
-					enableHostVerification: true
+			kind: sources
+			name: my-cassandra-instance
+			type: cassandra
+			hosts:
+				- "my-host1"
+				- "my-host2"
+			username: "user"
+			password: "pass"
+			keyspace: "example_keyspace"
+			protoVersion: 4
+			caPath: "path/to/ca.crt"
+			certPath: "path/to/cert"
+			keyPath: "path/to/key"
+			enableHostVerification: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-cassandra-instance": cassandra.Config{
 					Name:                   "my-cassandra-instance",
-					Kind:                   cassandra.SourceKind,
+					Type:                   cassandra.SourceType,
 					Hosts:                  []string{"my-host1", "my-host2"},
 					Username:               "user",
 					Password:               "pass",
@@ -93,16 +94,12 @@ func TestParseFromYamlCassandra(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -118,33 +115,29 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-cassandra-instance:
-					kind: cassandra
-					hosts:
-						- "my-host"
-					foo: bar
+			kind: sources
+			name: my-cassandra-instance
+			type: cassandra
+			hosts:
+				- "my-host"
+			foo: bar
 			`,
-			err: "unable to parse source \"my-cassandra-instance\" as \"cassandra\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | hosts:\n   3 | - my-host\n   4 | kind: cassandra",
+			err: "error unmarshaling sources: unable to parse source \"my-cassandra-instance\" as \"cassandra\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | hosts:\n   3 | - my-host\n   4 | name: my-cassandra-instance\n   5 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-cassandra-instance:
-					kind: cassandra
+			kind: sources
+			name: my-cassandra-instance
+			type: cassandra
 			`,
-			err: "unable to parse source \"my-cassandra-instance\" as \"cassandra\": Key: 'Config.Hosts' Error:Field validation for 'Hosts' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-cassandra-instance\" as \"cassandra\": Key: 'Config.Hosts' Error:Field validation for 'Hosts' failed on the 'required' tag",
 		},
 	}
 
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/clickhouse/clickhouse.go b/internal/sources/clickhouse/clickhouse.go
index 3f0b6f961b..599522ec1b 100644
--- a/internal/sources/clickhouse/clickhouse.go
+++ b/internal/sources/clickhouse/clickhouse.go
@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "clickhouse"
+const SourceType string = "clickhouse"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -49,7 +49,7 @@ 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"`
+	Type     string `yaml:"type" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	Database string `yaml:"database" validate:"required"`
@@ -59,8 +59,8 @@ type Config struct {
 	Secure   bool   `yaml:"secure"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -88,8 +88,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -174,7 +174,7 @@ func validateConfig(protocol string) error {
 
 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)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	if protocol == "" {
diff --git a/internal/sources/clickhouse/clickhouse_test.go b/internal/sources/clickhouse/clickhouse_test.go
index 7a1bd321eb..59830d107b 100644
--- a/internal/sources/clickhouse/clickhouse_test.go
+++ b/internal/sources/clickhouse/clickhouse_test.go
@@ -21,137 +21,113 @@ import (
 
 	"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/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 TestParseFromYamlClickhouse(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		want server.SourceConfigs
+	}{
+		{
+			desc: "all fields specified",
+			in: `
+			kind: sources
+			name: test-clickhouse
+			type: clickhouse
+			host: localhost
+			port: "8443"
+			user: default
+			password: "mypass"
+			database: mydb
+			protocol: https
+			secure: true
+			`,
+			want: map[string]sources.SourceConfig{
+				"test-clickhouse": Config{
+					Name:     "test-clickhouse",
+					Type:     "clickhouse",
+					Host:     "localhost",
+					Port:     "8443",
+					User:     "default",
+					Password: "mypass",
+					Database: "mydb",
+					Protocol: "https",
+					Secure:   true,
+				},
+			},
+		},
+		{
+			desc: "minimal configuration with defaults",
+			in: `
+			kind: sources
+			name: minimal-clickhouse
+			type: clickhouse
+			host: 127.0.0.1
+			port: "8123"
+			user: testuser
+			database: testdb
+			`,
+			want: map[string]sources.SourceConfig{
+				"minimal-clickhouse": Config{
+					Name:     "minimal-clickhouse",
+					Type:     "clickhouse",
+					Host:     "127.0.0.1",
+					Port:     "8123",
+					User:     "testuser",
+					Password: "",
+					Database: "testdb",
+					Protocol: "",
+					Secure:   false,
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
+			}
+		})
 	}
 }
 
-func TestNewConfig(t *testing.T) {
-	tests := []struct {
-		name     string
-		yaml     string
-		expected Config
+func TestFailParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
 	}{
 		{
-			name: "all fields specified",
-			yaml: `
-				name: test-clickhouse
-				kind: clickhouse
-				host: localhost
-				port: "8443"
-				user: default
-				password: "mypass"
-				database: mydb
-				protocol: https
-				secure: true
+			desc: "extra field",
+			in: `
+			kind: sources
+			name: test-clickhouse
+			type: clickhouse
+			host: localhost
+			foo: bar
 			`,
-			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,
-			},
+			err: "error unmarshaling sources: unable to parse source \"test-clickhouse\" as \"clickhouse\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | host: localhost\n   3 | name: test-clickhouse\n   4 | type: clickhouse",
 		},
 	}
 
-	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)
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
 			}
-
-			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)
+			errStr := err.Error()
+			if errStr != tc.err {
+				t.Fatalf("unexpected error: got %q, want %q", errStr, tc.err)
 			}
 		})
 	}
@@ -167,19 +143,11 @@ func TestNewConfigInvalidYAML(t *testing.T) {
 			name: "invalid yaml syntax",
 			yaml: `
 				name: test-clickhouse
-				kind: clickhouse
+				type: clickhouse
 				host: [invalid
 			`,
 			expectError: true,
 		},
-		{
-			name: "missing required fields",
-			yaml: `
-				name: test-clickhouse
-				kind: clickhouse
-			`,
-			expectError: false,
-		},
 	}
 
 	for _, tt := range tests {
@@ -196,10 +164,10 @@ func TestNewConfigInvalidYAML(t *testing.T) {
 	}
 }
 
-func TestSource_SourceKind(t *testing.T) {
+func TestSource_SourceType(t *testing.T) {
 	source := &Source{}
-	if source.SourceKind() != SourceKind {
-		t.Errorf("Expected %s, got %s", SourceKind, source.SourceKind())
+	if source.SourceType() != SourceType {
+		t.Errorf("Expected %s, got %s", SourceType, source.SourceType())
 	}
 }
 
diff --git a/internal/sources/cloudgda/cloud_gda.go b/internal/sources/cloudgda/cloud_gda.go
index 5743991647..80e8df431c 100644
--- a/internal/sources/cloudgda/cloud_gda.go
+++ b/internal/sources/cloudgda/cloud_gda.go
@@ -29,15 +29,15 @@ import (
 	"golang.org/x/oauth2/google"
 )
 
-const SourceKind string = "cloud-gemini-data-analytics"
+const SourceType string = "cloud-gemini-data-analytics"
 const Endpoint string = "https://geminidataanalytics.googleapis.com"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -51,13 +51,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"`
+	Type           string `yaml:"type" validate:"required"`
 	ProjectID      string `yaml:"projectId" validate:"required"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize initializes a Gemini Data Analytics Source instance.
@@ -102,8 +102,8 @@ type Source struct {
 	userAgent string
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/cloudgda/cloud_gda_test.go b/internal/sources/cloudgda/cloud_gda_test.go
index 30b977729d..6ec771f601 100644
--- a/internal/sources/cloudgda/cloud_gda_test.go
+++ b/internal/sources/cloudgda/cloud_gda_test.go
@@ -20,7 +20,6 @@ import (
 	"path/filepath"
 	"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/sources"
@@ -39,15 +38,15 @@ func TestParseFromYamlCloudGDA(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-		            sources:
-		                my-gda-instance:
-		                    kind: cloud-gemini-data-analytics
-		                    projectId: test-project-id
-		            `,
+			kind: sources
+			name: my-gda-instance
+			type: cloud-gemini-data-analytics
+			projectId: test-project-id
+			`,
 			want: map[string]sources.SourceConfig{
 				"my-gda-instance": cloudgda.Config{
 					Name:           "my-gda-instance",
-					Kind:           cloudgda.SourceKind,
+					Type:           cloudgda.SourceType,
 					ProjectID:      "test-project-id",
 					UseClientOAuth: false,
 				},
@@ -56,16 +55,16 @@ func TestParseFromYamlCloudGDA(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-gda-instance:
-					kind: cloud-gemini-data-analytics
-					projectId: another-project
-					useClientOAuth: true
+			kind: sources
+			name: my-gda-instance
+			type: cloud-gemini-data-analytics
+			projectId: another-project
+			useClientOAuth: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-gda-instance": cloudgda.Config{
 					Name:           "my-gda-instance",
-					Kind:           cloudgda.SourceKind,
+					Type:           cloudgda.SourceType,
 					ProjectID:      "another-project",
 					UseClientOAuth: true,
 				},
@@ -76,16 +75,12 @@ func TestParseFromYamlCloudGDA(t *testing.T) {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -101,22 +96,18 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "missing projectId",
 			in: `
-			sources:
-				my-gda-instance:
-					kind: cloud-gemini-data-analytics
+			kind: sources
+			name: my-gda-instance
+			type: cloud-gemini-data-analytics
 			`,
-			err: "unable to parse source \"my-gda-instance\" as \"cloud-gemini-data-analytics\": Key: 'Config.ProjectID' Error:Field validation for 'ProjectID' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-gda-instance\" as \"cloud-gemini-data-analytics\": Key: 'Config.ProjectID' Error:Field validation for 'ProjectID' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
@@ -153,12 +144,12 @@ func TestInitialize(t *testing.T) {
 	}{
 		{
 			desc:            "initialize with ADC",
-			cfg:             cloudgda.Config{Name: "test-gda", Kind: cloudgda.SourceKind, ProjectID: "test-proj"},
+			cfg:             cloudgda.Config{Name: "test-gda", Type: cloudgda.SourceType, ProjectID: "test-proj"},
 			wantClientOAuth: false,
 		},
 		{
 			desc:            "initialize with client OAuth",
-			cfg:             cloudgda.Config{Name: "test-gda-oauth", Kind: cloudgda.SourceKind, ProjectID: "test-proj", UseClientOAuth: true},
+			cfg:             cloudgda.Config{Name: "test-gda-oauth", Type: cloudgda.SourceType, ProjectID: "test-proj", UseClientOAuth: true},
 			wantClientOAuth: true,
 		},
 	}
diff --git a/internal/sources/cloudhealthcare/cloud_healthcare.go b/internal/sources/cloudhealthcare/cloud_healthcare.go
index 82cfbd583e..b3c5e3ede8 100644
--- a/internal/sources/cloudhealthcare/cloud_healthcare.go
+++ b/internal/sources/cloudhealthcare/cloud_healthcare.go
@@ -34,7 +34,7 @@ import (
 	"google.golang.org/api/option"
 )
 
-const SourceKind string = "cloud-healthcare"
+const SourceType string = "cloud-healthcare"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
@@ -42,8 +42,8 @@ var _ sources.SourceConfig = Config{}
 type HealthcareServiceCreator func(tokenString string) (*healthcare.Service, error)
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -58,7 +58,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Healthcare configs
 	Name               string   `yaml:"name" validate:"required"`
-	Kind               string   `yaml:"kind" validate:"required"`
+	Type               string   `yaml:"type" validate:"required"`
 	Project            string   `yaml:"project" validate:"required"`
 	Region             string   `yaml:"region" validate:"required"`
 	Dataset            string   `yaml:"dataset" validate:"required"`
@@ -67,8 +67,8 @@ type Config struct {
 	UseClientOAuth     bool     `yaml:"useClientOAuth"`
 }
 
-func (c Config) SourceConfigKind() string {
-	return SourceKind
+func (c Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (c Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -144,7 +144,7 @@ func newHealthcareServiceCreator(ctx context.Context, tracer trace.Tracer, name
 }
 
 func initHealthcareConnectionWithOAuthToken(ctx context.Context, tracer trace.Tracer, name string, userAgent string, tokenString string) (*healthcare.Service, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 	// Construct token source
 	token := &oauth2.Token{
@@ -162,7 +162,7 @@ func initHealthcareConnectionWithOAuthToken(ctx context.Context, tracer trace.Tr
 }
 
 func initHealthcareConnection(ctx context.Context, tracer trace.Tracer, name string) (*healthcare.Service, oauth2.TokenSource, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	cred, err := google.FindDefaultCredentials(ctx, healthcare.CloudHealthcareScope)
@@ -194,8 +194,8 @@ type Source struct {
 	allowedDICOMStores map[string]struct{}
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -517,14 +517,14 @@ func (s *Source) RetrieveRenderedDICOMInstance(storeID, study, series, sop strin
 	return base64String, nil
 }
 
-func (s *Source) SearchDICOM(toolKind, storeID, dicomWebPath, tokenStr string, opts []googleapi.CallOption) (any, error) {
+func (s *Source) SearchDICOM(toolType, storeID, dicomWebPath, tokenStr string, opts []googleapi.CallOption) (any, error) {
 	svc, err := s.getService(tokenStr)
 	if err != nil {
 		return nil, err
 	}
 	name := fmt.Sprintf("projects/%s/locations/%s/datasets/%s/dicomStores/%s", s.Project(), s.Region(), s.DatasetID(), storeID)
 	var resp *http.Response
-	switch toolKind {
+	switch toolType {
 	case "cloud-healthcare-search-dicom-instances":
 		resp, err = svc.Projects.Locations.Datasets.DicomStores.SearchForInstances(name, dicomWebPath).Do(opts...)
 	case "cloud-healthcare-search-dicom-series":
@@ -532,7 +532,7 @@ func (s *Source) SearchDICOM(toolKind, storeID, dicomWebPath, tokenStr string, o
 	case "cloud-healthcare-search-dicom-studies":
 		resp, err = svc.Projects.Locations.Datasets.DicomStores.SearchForStudies(name, dicomWebPath).Do(opts...)
 	default:
-		return nil, fmt.Errorf("incompatible tool kind: %s", toolKind)
+		return nil, fmt.Errorf("incompatible tool type: %s", toolType)
 	}
 	if err != nil {
 		return nil, fmt.Errorf("failed to search dicom series: %w", err)
diff --git a/internal/sources/cloudhealthcare/cloud_healthcare_test.go b/internal/sources/cloudhealthcare/cloud_healthcare_test.go
index 688a701cba..4d4e75c9aa 100644
--- a/internal/sources/cloudhealthcare/cloud_healthcare_test.go
+++ b/internal/sources/cloudhealthcare/cloud_healthcare_test.go
@@ -15,11 +15,12 @@
 package cloudhealthcare_test
 
 import (
+	"context"
 	"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/cloudhealthcare"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,17 +34,17 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-				sources:
-					my-instance:
-						kind: cloud-healthcare
-						project: my-project
-						region: us-central1
-						dataset: my-dataset
+			kind: sources
+			name: my-instance
+			type: cloud-healthcare
+			project: my-project
+			region: us-central1
+			dataset: my-dataset
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": cloudhealthcare.Config{
 					Name:           "my-instance",
-					Kind:           cloudhealthcare.SourceKind,
+					Type:           cloudhealthcare.SourceType,
 					Project:        "my-project",
 					Region:         "us-central1",
 					Dataset:        "my-dataset",
@@ -54,18 +55,18 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-healthcare
-					project: my-project
-					region: us
-					dataset: my-dataset
-					useClientOAuth: true
+			kind: sources
+			name: my-instance
+			type: cloud-healthcare
+			project: my-project
+			region: us
+			dataset: my-dataset
+			useClientOAuth: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": cloudhealthcare.Config{
 					Name:           "my-instance",
-					Kind:           cloudhealthcare.SourceKind,
+					Type:           cloudhealthcare.SourceType,
 					Project:        "my-project",
 					Region:         "us",
 					Dataset:        "my-dataset",
@@ -76,22 +77,22 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 		{
 			desc: "with allowed stores example",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-healthcare
-					project: my-project
-					region: us
-					dataset: my-dataset
-					allowedFhirStores:
-						- my-fhir-store
-					allowedDicomStores:
-						- my-dicom-store1
-						- my-dicom-store2
+			kind: sources
+			name: my-instance
+			type: cloud-healthcare
+			project: my-project
+			region: us
+			dataset: my-dataset
+			allowedFhirStores:
+				- my-fhir-store
+			allowedDicomStores:
+				- my-dicom-store1
+				- my-dicom-store2
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": cloudhealthcare.Config{
 					Name:               "my-instance",
-					Kind:               cloudhealthcare.SourceKind,
+					Type:               cloudhealthcare.SourceType,
 					Project:            "my-project",
 					Region:             "us",
 					Dataset:            "my-dataset",
@@ -103,16 +104,12 @@ func TestParseFromYamlCloudHealthcare(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -127,35 +124,31 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-healthcare
-					project: my-project
-					region: us-central1
-					dataset: my-dataset
-					foo: bar
+			kind: sources
+			name: my-instance
+			type: cloud-healthcare
+			project: my-project
+			region: us-central1
+			dataset: my-dataset
+			foo: bar
 			`,
-			err: "unable to parse source \"my-instance\" as \"cloud-healthcare\": [2:1] unknown field \"foo\"\n   1 | dataset: my-dataset\n>  2 | foo: bar\n       ^\n   3 | kind: cloud-healthcare\n   4 | project: my-project\n   5 | region: us-central1",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-healthcare\": [2:1] unknown field \"foo\"\n   1 | dataset: my-dataset\n>  2 | foo: bar\n       ^\n   3 | name: my-instance\n   4 | project: my-project\n   5 | region: us-central1\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-healthcare
-					project: my-project
-					region: us-central1
+			kind: sources
+			name: my-instance
+			type: cloud-healthcare
+			project: my-project
+			region: us-central1
 			`,
-			err: `unable to parse source "my-instance" as "cloud-healthcare": Key: 'Config.Dataset' Error:Field validation for 'Dataset' failed on the 'required' tag`,
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-healthcare\": Key: 'Config.Dataset' Error:Field validation for 'Dataset' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/cloudloggingadmin/cloud_logging_admin.go b/internal/sources/cloudloggingadmin/cloud_logging_admin.go
new file mode 100644
index 0000000000..289914a144
--- /dev/null
+++ b/internal/sources/cloudloggingadmin/cloud_logging_admin.go
@@ -0,0 +1,439 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadmin
+
+import (
+	"context"
+	"fmt"
+	"slices"
+	"strings"
+	"time"
+
+	"cloud.google.com/go/logging"
+	"cloud.google.com/go/logging/logadmin"
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"go.opentelemetry.io/otel/trace"
+	"golang.org/x/oauth2"
+	"golang.org/x/oauth2/google"
+	"google.golang.org/api/impersonate"
+	"google.golang.org/api/iterator"
+	"google.golang.org/api/option"
+)
+
+const SourceType string = "cloud-logging-admin"
+
+var _ sources.SourceConfig = Config{}
+
+func init() {
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	}
+}
+
+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"`
+	Type                      string `yaml:"type" validate:"required"`
+	Project                   string `yaml:"project" validate:"required"`
+	UseClientOAuth            bool   `yaml:"useClientOAuth"`
+	ImpersonateServiceAccount string `yaml:"impersonateServiceAccount"`
+}
+
+func (r Config) SourceConfigType() string {
+	return SourceType
+}
+
+func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
+
+	if r.UseClientOAuth && r.ImpersonateServiceAccount != "" {
+		return nil, fmt.Errorf("useClientOAuth cannot be used with impersonateServiceAccount")
+	}
+
+	var client *logadmin.Client
+	var tokenSource oauth2.TokenSource
+	var clientCreator LogAdminClientCreator
+	var err error
+
+	s := &Source{
+		Config:        r,
+		Client:        client,
+		TokenSource:   tokenSource,
+		ClientCreator: clientCreator,
+	}
+
+	if r.UseClientOAuth {
+		// use client OAuth
+		baseClientCreator, err := newLogAdminClientCreator(ctx, tracer, r.Project, r.Name)
+		if err != nil {
+			return nil, fmt.Errorf("error constructing client creator: %w", err)
+		}
+		setupClientCaching(s, baseClientCreator)
+	} else {
+		client, tokenSource, err = initLogAdminConnection(ctx, tracer, r.Name, r.Project, r.ImpersonateServiceAccount)
+		if err != nil {
+			return nil, fmt.Errorf("error creating client from ADC %w", err)
+		}
+		s.Client = client
+		s.TokenSource = tokenSource
+	}
+	return s, nil
+}
+
+var _ sources.Source = &Source{}
+
+type LogAdminClientCreator func(tokenString string) (*logadmin.Client, error)
+
+type Source struct {
+	Config
+	Client        *logadmin.Client
+	TokenSource   oauth2.TokenSource
+	ClientCreator LogAdminClientCreator
+
+	// Caches for OAuth clients
+	logadminClientCache *sources.Cache
+}
+
+func (s *Source) SourceType() string {
+	// Returns logadmin source type
+	return SourceType
+}
+
+func (s *Source) ToConfig() sources.SourceConfig {
+	return s.Config
+}
+
+func (s *Source) UseClientAuthorization() bool {
+	return s.UseClientOAuth
+}
+
+func (s *Source) LogAdminClient() *logadmin.Client {
+	return s.Client
+}
+
+func (s *Source) LogAdminTokenSource() oauth2.TokenSource {
+	return s.TokenSource
+}
+
+func (s *Source) LogAdminClientCreator() LogAdminClientCreator {
+	return s.ClientCreator
+}
+
+func (s *Source) GetProject() string {
+	return s.Project
+}
+
+// getClient returns the appropriate client based on authentication mode
+func (s *Source) getClient(accessToken string) (*logadmin.Client, error) {
+	if s.UseClientOAuth {
+		if s.ClientCreator == nil {
+			return nil, fmt.Errorf("client creator is not initialized")
+		}
+		return s.ClientCreator(accessToken)
+	}
+	if s.Client == nil {
+		return nil, fmt.Errorf("source client is not initialized")
+	}
+	return s.Client, nil
+}
+
+// ListLogNames lists all log names in the project
+func (s *Source) ListLogNames(ctx context.Context, limit int, accessToken string) ([]string, error) {
+	client, err := s.getClient(accessToken)
+	if err != nil {
+		return nil, err
+	}
+
+	it := client.Logs(ctx)
+	var logNames []string
+	for len(logNames) < limit {
+		logName, err := it.Next()
+		if err == iterator.Done {
+			break
+		}
+		if err != nil {
+			return nil, err
+		}
+		logNames = append(logNames, logName)
+	}
+	return logNames, nil
+}
+
+// ListResourceTypes lists all resource types in the project
+func (s *Source) ListResourceTypes(ctx context.Context, accessToken string) ([]string, error) {
+	client, err := s.getClient(accessToken)
+	if err != nil {
+		return nil, err
+	}
+
+	it := client.ResourceDescriptors(ctx)
+	var types []string
+	for {
+		desc, err := it.Next()
+		if err == iterator.Done {
+			break
+		}
+		if err != nil {
+			return nil, fmt.Errorf("failed to list resource descriptors: %w", err)
+		}
+		types = append(types, desc.Type)
+	}
+	slices.Sort(types)
+	return types, nil
+}
+
+// QueryLogsParams contains the parameters for querying logs
+type QueryLogsParams struct {
+	Filter      string
+	NewestFirst bool
+	StartTime   string
+	EndTime     string
+	Verbose     bool
+	Limit       int
+}
+
+// QueryLogs queries log entries based on the provided parameters
+func (s *Source) QueryLogs(ctx context.Context, params QueryLogsParams, accessToken string) ([]map[string]any, error) {
+	client, err := s.getClient(accessToken)
+	if err != nil {
+		return nil, err
+	}
+
+	// Build filter
+	var filterParts []string
+	if params.Filter != "" {
+		filterParts = append(filterParts, params.Filter)
+	}
+
+	// Add timestamp filter
+	startTime := params.StartTime
+	if startTime != "" {
+		filterParts = append(filterParts, fmt.Sprintf(`timestamp>="%s"`, startTime))
+	}
+
+	if params.EndTime != "" {
+		filterParts = append(filterParts, fmt.Sprintf(`timestamp<="%s"`, params.EndTime))
+	}
+
+	combinedFilter := strings.Join(filterParts, " AND ")
+
+	// Add opts
+	opts := []logadmin.EntriesOption{
+		logadmin.Filter(combinedFilter),
+	}
+
+	// Set order
+	if params.NewestFirst {
+		opts = append(opts, logadmin.NewestFirst())
+	}
+
+	// Set up iterator
+	it := client.Entries(ctx, opts...)
+
+	var results []map[string]any
+	for len(results) < params.Limit {
+		entry, err := it.Next()
+		if err == iterator.Done {
+			break
+		}
+		if err != nil {
+			return nil, fmt.Errorf("failed to iterate entries: %w", err)
+		}
+
+		result := map[string]any{
+			"logName":   entry.LogName,
+			"timestamp": entry.Timestamp.Format(time.RFC3339),
+			"severity":  entry.Severity.String(),
+			"resource": map[string]any{
+				"type":   entry.Resource.Type,
+				"labels": entry.Resource.Labels,
+			},
+		}
+
+		if entry.Payload != nil {
+			result["payload"] = entry.Payload
+		}
+
+		if params.Verbose {
+			result["insertId"] = entry.InsertID
+
+			if len(entry.Labels) > 0 {
+				result["labels"] = entry.Labels
+			}
+
+			if entry.HTTPRequest != nil {
+				httpRequestMap := map[string]any{
+					"status":   entry.HTTPRequest.Status,
+					"latency":  entry.HTTPRequest.Latency.String(),
+					"remoteIp": entry.HTTPRequest.RemoteIP,
+				}
+				if req := entry.HTTPRequest.Request; req != nil {
+					httpRequestMap["requestMethod"] = req.Method
+					httpRequestMap["requestUrl"] = req.URL.String()
+					httpRequestMap["userAgent"] = req.UserAgent()
+				}
+				result["httpRequest"] = httpRequestMap
+			}
+
+			if entry.Trace != "" {
+				result["trace"] = entry.Trace
+			}
+
+			if entry.SpanID != "" {
+				result["spanId"] = entry.SpanID
+			}
+
+			if entry.Operation != nil {
+				result["operation"] = map[string]any{
+					"id":       entry.Operation.Id,
+					"producer": entry.Operation.Producer,
+					"first":    entry.Operation.First,
+					"last":     entry.Operation.Last,
+				}
+			}
+
+			if entry.SourceLocation != nil {
+				result["sourceLocation"] = map[string]any{
+					"file":     entry.SourceLocation.File,
+					"line":     entry.SourceLocation.Line,
+					"function": entry.SourceLocation.Function,
+				}
+			}
+		}
+		results = append(results, result)
+	}
+	return results, nil
+}
+
+func setupClientCaching(s *Source, baseCreator LogAdminClientCreator) {
+	onEvict := func(key string, value interface{}) {
+		if client, ok := value.(*logadmin.Client); ok && client != nil {
+			client.Close()
+		}
+	}
+
+	s.logadminClientCache = sources.NewCache(onEvict)
+
+	s.ClientCreator = func(tokenString string) (*logadmin.Client, error) {
+		if val, found := s.logadminClientCache.Get(tokenString); found {
+			return val.(*logadmin.Client), nil
+		}
+
+		client, err := baseCreator(tokenString)
+		if err != nil {
+			return nil, err
+		}
+		s.logadminClientCache.Set(tokenString, client)
+		return client, nil
+	}
+}
+
+func initLogAdminConnection(
+	ctx context.Context,
+	tracer trace.Tracer,
+	name string,
+	project string,
+	impersonateServiceAccount string,
+) (*logadmin.Client, oauth2.TokenSource, error) {
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	defer span.End()
+
+	userAgent, err := util.UserAgentFromContext(ctx)
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var tokenSource oauth2.TokenSource
+	var opts []option.ClientOption
+
+	if impersonateServiceAccount != "" {
+		// Create impersonated credentials token source with cloud-platform scope
+		// This broader scope is needed for tools like conversational analytics
+		cloudPlatformTokenSource, err := impersonate.CredentialsTokenSource(ctx, impersonate.CredentialsConfig{
+			TargetPrincipal: impersonateServiceAccount,
+			Scopes:          []string{"https://www.googleapis.com/auth/cloud-platform"},
+		})
+
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to create impersonated credentials for %q: %w", impersonateServiceAccount, err)
+		}
+
+		tokenSource = cloudPlatformTokenSource
+		opts = []option.ClientOption{
+			option.WithUserAgent(userAgent),
+			option.WithTokenSource(cloudPlatformTokenSource),
+		}
+	} else {
+		// Use default credentials
+		cred, err := google.FindDefaultCredentials(ctx, logging.AdminScope)
+		if err != nil {
+			return nil, nil, fmt.Errorf("failed to find default Google Cloud credentials with scope %q: %w", logging.AdminScope, err)
+		}
+		tokenSource = cred.TokenSource
+		opts = []option.ClientOption{
+			option.WithUserAgent(userAgent),
+			option.WithCredentials(cred),
+		}
+	}
+
+	client, err := logadmin.NewClient(ctx, project, opts...)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to create Cloud Logging Admin client for project %q: %w", project, err)
+	}
+	return client, tokenSource, nil
+}
+
+func initLogAdminConnectionWithOAuthToken(
+	ctx context.Context,
+	tracer trace.Tracer,
+	project, name, userAgent, tokenString string,
+) (*logadmin.Client, error) {
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	defer span.End()
+
+	token := &oauth2.Token{
+		AccessToken: string(tokenString),
+	}
+	ts := oauth2.StaticTokenSource(token)
+
+	// Initialize the logadmin client with tokenSource
+	client, err := logadmin.NewClient(ctx, project, option.WithUserAgent(userAgent), option.WithTokenSource(ts))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create logadmin client for project %q: %w", project, err)
+	}
+	return client, nil
+}
+
+func newLogAdminClientCreator(
+	ctx context.Context,
+	tracer trace.Tracer,
+	project, name string,
+) (LogAdminClientCreator, error) {
+	userAgent, err := util.UserAgentFromContext(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	return func(tokenString string) (*logadmin.Client, error) {
+		return initLogAdminConnectionWithOAuthToken(ctx, tracer, project, name, userAgent, tokenString)
+	}, nil
+}
diff --git a/internal/sources/cloudloggingadmin/cloud_logging_admin_test.go b/internal/sources/cloudloggingadmin/cloud_logging_admin_test.go
new file mode 100644
index 0000000000..3792237659
--- /dev/null
+++ b/internal/sources/cloudloggingadmin/cloud_logging_admin_test.go
@@ -0,0 +1,137 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadmin_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/sources/cloudloggingadmin"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+)
+
+func TestParseFromYamlCloudLoggingAdmin(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		want server.SourceConfigs
+	}{
+		{
+			desc: "basic example",
+			in: `
+			kind: sources
+			name: my-instance
+			type: cloud-logging-admin
+			project: my-project
+			`,
+			want: server.SourceConfigs{
+				"my-instance": cloudloggingadmin.Config{
+					Name:    "my-instance",
+					Type:    cloudloggingadmin.SourceType,
+					Project: "my-project",
+				},
+			},
+		},
+		{
+			desc: "with client oauth",
+			in: `
+			kind: sources
+			name: my-instance
+			type: cloud-logging-admin
+			project: my-project
+			useClientOAuth: true
+			`,
+			want: server.SourceConfigs{
+				"my-instance": cloudloggingadmin.Config{
+					Name:           "my-instance",
+					Type:           cloudloggingadmin.SourceType,
+					Project:        "my-project",
+					UseClientOAuth: true,
+				},
+			},
+		},
+		{
+			desc: "with service account impersonation",
+			in: `
+			kind: sources
+			name: my-instance
+			type: cloud-logging-admin
+			project: my-project
+			impersonateServiceAccount: service-account@my-project.iam.gserviceaccount.com
+			`,
+			want: server.SourceConfigs{
+				"my-instance": cloudloggingadmin.Config{
+					Name:                      "my-instance",
+					Type:                      cloudloggingadmin.SourceType,
+					Project:                   "my-project",
+					ImpersonateServiceAccount: "service-account@my-project.iam.gserviceaccount.com",
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
+			}
+		})
+	}
+}
+
+func TestFailParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "extra field",
+			in: `
+			kind: sources
+			name: my-instance
+			type: cloud-logging-admin
+			project: my-project
+			foo: bar
+			`,
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-logging-admin\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | name: my-instance\n   3 | project: my-project\n   4 | type: cloud-logging-admin",
+		},
+		{
+			desc: "missing required field",
+			in: `
+			kind: sources
+			name: my-instance
+			type: cloud-logging-admin
+			`,
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-logging-admin\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if errStr != tc.err {
+				t.Fatalf("unexpected error: got %q, want %q", errStr, tc.err)
+			}
+		})
+	}
+}
diff --git a/internal/sources/cloudmonitoring/cloud_monitoring.go b/internal/sources/cloudmonitoring/cloud_monitoring.go
index eb478dce24..e59204a7b6 100644
--- a/internal/sources/cloudmonitoring/cloud_monitoring.go
+++ b/internal/sources/cloudmonitoring/cloud_monitoring.go
@@ -29,14 +29,14 @@ import (
 	monitoring "google.golang.org/api/monitoring/v3"
 )
 
-const SourceKind string = "cloud-monitoring"
+const SourceType string = "cloud-monitoring"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -50,12 +50,12 @@ 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"`
+	Type           string `yaml:"type" validate:"required"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize initializes a Cloud Monitoring Source instance.
@@ -99,8 +99,8 @@ type Source struct {
 	userAgent string
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/cloudmonitoring/cloud_monitoring_test.go b/internal/sources/cloudmonitoring/cloud_monitoring_test.go
index 329af6a2a4..cd9533929f 100644
--- a/internal/sources/cloudmonitoring/cloud_monitoring_test.go
+++ b/internal/sources/cloudmonitoring/cloud_monitoring_test.go
@@ -15,9 +15,9 @@
 package cloudmonitoring_test
 
 import (
+	"context"
 	"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/sources"
@@ -35,14 +35,14 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-cloud-monitoring-instance:
-					kind: cloud-monitoring
+			kind: sources
+			name: my-cloud-monitoring-instance
+			type: cloud-monitoring
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-cloud-monitoring-instance": cloudmonitoring.Config{
 					Name:           "my-cloud-monitoring-instance",
-					Kind:           cloudmonitoring.SourceKind,
+					Type:           cloudmonitoring.SourceType,
 					UseClientOAuth: false,
 				},
 			},
@@ -50,15 +50,15 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-cloud-monitoring-instance:
-					kind: cloud-monitoring
-					useClientOAuth: true
+			kind: sources
+			name: my-cloud-monitoring-instance
+			type: cloud-monitoring
+			useClientOAuth: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-cloud-monitoring-instance": cloudmonitoring.Config{
 					Name:           "my-cloud-monitoring-instance",
-					Kind:           cloudmonitoring.SourceKind,
+					Type:           cloudmonitoring.SourceType,
 					UseClientOAuth: true,
 				},
 			},
@@ -68,16 +68,12 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -93,36 +89,28 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-cloud-monitoring-instance:
-					kind: cloud-monitoring
-					project: test-project
+			kind: sources
+			name: my-cloud-monitoring-instance
+			type: cloud-monitoring
+			project: test-project
 			`,
-			err: `unable to parse source "my-cloud-monitoring-instance" as "cloud-monitoring": [2:1] unknown field "project"
-   1 | kind: cloud-monitoring
->  2 | project: test-project
-       ^
-`,
+			err: "error unmarshaling sources: unable to parse source \"my-cloud-monitoring-instance\" as \"cloud-monitoring\": [2:1] unknown field \"project\"\n   1 | name: my-cloud-monitoring-instance\n>  2 | project: test-project\n       ^\n   3 | type: cloud-monitoring",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-cloud-monitoring-instance:
-					useClientOAuth: true
+			kind: sources
+			name: my-cloud-monitoring-instance
+			useClientOAuth: true
 			`,
-			err: "missing 'kind' field for source \"my-cloud-monitoring-instance\"",
+			err: "error unmarshaling sources: missing 'type' field or it is not a string",
 		},
 	}
 	for _, tc := range tcs {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/cloudsqladmin/cloud_sql_admin.go b/internal/sources/cloudsqladmin/cloud_sql_admin.go
index 9e22f56aa1..9f8ea53e30 100644
--- a/internal/sources/cloudsqladmin/cloud_sql_admin.go
+++ b/internal/sources/cloudsqladmin/cloud_sql_admin.go
@@ -35,7 +35,7 @@ import (
 	sqladmin "google.golang.org/api/sqladmin/v1"
 )
 
-const SourceKind string = "cloud-sql-admin"
+const SourceType string = "cloud-sql-admin"
 
 var (
 	targetLinkRegex = regexp.MustCompile(`/projects/([^/]+)/instances/([^/]+)/databases/([^/]+)`)
@@ -46,8 +46,8 @@ var (
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -61,13 +61,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"`
+	Type           string `yaml:"type" validate:"required"`
 	DefaultProject string `yaml:"defaultProject"`
 	UseClientOAuth bool   `yaml:"useClientOAuth"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize initializes a CloudSQL Admin Source instance.
@@ -114,8 +114,8 @@ type Source struct {
 	Service *sqladmin.Service
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/cloudsqladmin/cloud_sql_admin_test.go b/internal/sources/cloudsqladmin/cloud_sql_admin_test.go
index 4138a0a7c4..f597de6c37 100644
--- a/internal/sources/cloudsqladmin/cloud_sql_admin_test.go
+++ b/internal/sources/cloudsqladmin/cloud_sql_admin_test.go
@@ -15,9 +15,9 @@
 package cloudsqladmin_test
 
 import (
+	"context"
 	"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/sources"
@@ -35,14 +35,14 @@ func TestParseFromYamlCloudSQLAdmin(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-cloud-sql-admin-instance:
-					kind: cloud-sql-admin
+			kind: sources
+			name: my-cloud-sql-admin-instance
+			type: cloud-sql-admin
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-cloud-sql-admin-instance": cloudsqladmin.Config{
 					Name:           "my-cloud-sql-admin-instance",
-					Kind:           cloudsqladmin.SourceKind,
+					Type:           cloudsqladmin.SourceType,
 					UseClientOAuth: false,
 				},
 			},
@@ -50,15 +50,15 @@ func TestParseFromYamlCloudSQLAdmin(t *testing.T) {
 		{
 			desc: "use client auth example",
 			in: `
-			sources:
-				my-cloud-sql-admin-instance:
-					kind: cloud-sql-admin
-					useClientOAuth: true
+			kind: sources
+			name: my-cloud-sql-admin-instance
+			type: cloud-sql-admin
+			useClientOAuth: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-cloud-sql-admin-instance": cloudsqladmin.Config{
 					Name:           "my-cloud-sql-admin-instance",
-					Kind:           cloudsqladmin.SourceKind,
+					Type:           cloudsqladmin.SourceType,
 					UseClientOAuth: true,
 				},
 			},
@@ -68,16 +68,12 @@ func TestParseFromYamlCloudSQLAdmin(t *testing.T) {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -93,36 +89,28 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-cloud-sql-admin-instance:
-					kind: cloud-sql-admin
-					project: test-project
+			kind: sources
+			name: my-cloud-sql-admin-instance
+			type: cloud-sql-admin
+			project: test-project
 			`,
-			err: `unable to parse source "my-cloud-sql-admin-instance" as "cloud-sql-admin": [2:1] unknown field "project"
-   1 | kind: cloud-sql-admin
->  2 | project: test-project
-       ^
-`,
+			err: "error unmarshaling sources: unable to parse source \"my-cloud-sql-admin-instance\" as \"cloud-sql-admin\": [2:1] unknown field \"project\"\n   1 | name: my-cloud-sql-admin-instance\n>  2 | project: test-project\n       ^\n   3 | type: cloud-sql-admin",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-cloud-sql-admin-instance:
-					useClientOAuth: true
+			kind: sources
+			name: my-cloud-sql-admin-instance
+			useClientOAuth: true
 			`,
-			err: "missing 'kind' field for source \"my-cloud-sql-admin-instance\"",
+			err: "error unmarshaling sources: missing 'type' field or it is not a string",
 		},
 	}
 	for _, tc := range tcs {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/cloudsqlmssql/cloud_sql_mssql.go b/internal/sources/cloudsqlmssql/cloud_sql_mssql.go
index 02480df326..9ea632b1bb 100644
--- a/internal/sources/cloudsqlmssql/cloud_sql_mssql.go
+++ b/internal/sources/cloudsqlmssql/cloud_sql_mssql.go
@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "cloud-sql-mssql"
+const SourceType string = "cloud-sql-mssql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -51,7 +51,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Cloud SQL MSSQL configs
 	Name      string         `yaml:"name" validate:"required"`
-	Kind      string         `yaml:"kind" validate:"required"`
+	Type      string         `yaml:"type" validate:"required"`
 	Project   string         `yaml:"project" validate:"required"`
 	Region    string         `yaml:"region" validate:"required"`
 	Instance  string         `yaml:"instance" validate:"required"`
@@ -62,9 +62,9 @@ type Config struct {
 	Database  string         `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	// Returns Cloud SQL MSSQL source kind
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	// Returns Cloud SQL MSSQL source type
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -94,9 +94,9 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	// Returns Cloud SQL MSSQL source kind
-	return SourceKind
+func (s *Source) SourceType() string {
+	// Returns Cloud SQL MSSQL source type
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -152,7 +152,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initCloudSQLMssqlConnection(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
diff --git a/internal/sources/cloudsqlmssql/cloud_sql_mssql_test.go b/internal/sources/cloudsqlmssql/cloud_sql_mssql_test.go
index 4af46d63ca..3f7b975d38 100644
--- a/internal/sources/cloudsqlmssql/cloud_sql_mssql_test.go
+++ b/internal/sources/cloudsqlmssql/cloud_sql_mssql_test.go
@@ -15,11 +15,12 @@
 package cloudsqlmssql_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,20 +34,20 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-sql-mssql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-instance
+			type: cloud-sql-mssql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": cloudsqlmssql.Config{
 					Name:     "my-instance",
-					Kind:     cloudsqlmssql.SourceKind,
+					Type:     cloudsqlmssql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -60,21 +61,21 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 		{
 			desc: "psc ipType",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-sql-mssql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-					ipType: psc
+			kind: sources
+			name: my-instance
+			type: cloud-sql-mssql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+			ipType: psc
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": cloudsqlmssql.Config{
 					Name:     "my-instance",
-					Kind:     cloudsqlmssql.SourceKind,
+					Type:     cloudsqlmssql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -88,21 +89,21 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 		{
 			desc: "with deprecated ipAddress",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-sql-mssql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipAddress: random
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-instance
+			type: cloud-sql-mssql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipAddress: random
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": cloudsqlmssql.Config{
 					Name:      "my-instance",
-					Kind:      cloudsqlmssql.SourceKind,
+					Type:      cloudsqlmssql.SourceType,
 					Project:   "my-project",
 					Region:    "my-region",
 					Instance:  "my-instance",
@@ -117,16 +118,12 @@ func TestParseFromYamlCloudSQLMssql(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect psarse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect psarse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -142,57 +139,53 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid ipType",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-sql-mssql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: fail
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-instance
+			type: cloud-sql-mssql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: fail
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-instance\" as \"cloud-sql-mssql\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-sql-mssql\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-sql-mssql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-instance
+			type: cloud-sql-mssql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-instance\" as \"cloud-sql-mssql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | kind: cloud-sql-mssql\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-sql-mssql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | name: my-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-instance:
-					kind: cloud-sql-mssql
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-instance
+			type: cloud-sql-mssql
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-instance\" as \"cloud-sql-mssql\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"cloud-sql-mssql\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/cloudsqlmysql/cloud_sql_mysql.go b/internal/sources/cloudsqlmysql/cloud_sql_mysql.go
index 759f00af7d..648f817de4 100644
--- a/internal/sources/cloudsqlmysql/cloud_sql_mysql.go
+++ b/internal/sources/cloudsqlmysql/cloud_sql_mysql.go
@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "cloud-sql-mysql"
+const SourceType string = "cloud-sql-mysql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -51,7 +51,7 @@ 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"`
+	Type     string         `yaml:"type" validate:"required"`
 	Project  string         `yaml:"project" validate:"required"`
 	Region   string         `yaml:"region" validate:"required"`
 	Instance string         `yaml:"instance" validate:"required"`
@@ -61,8 +61,8 @@ type Config struct {
 	Database string         `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -90,8 +90,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -184,7 +184,7 @@ func getConnectionConfig(ctx context.Context, user, pass string) (string, string
 
 func initCloudSQLMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database
diff --git a/internal/sources/cloudsqlmysql/cloud_sql_mysql_test.go b/internal/sources/cloudsqlmysql/cloud_sql_mysql_test.go
index 74e9d9dd82..9946abab09 100644
--- a/internal/sources/cloudsqlmysql/cloud_sql_mysql_test.go
+++ b/internal/sources/cloudsqlmysql/cloud_sql_mysql_test.go
@@ -15,11 +15,12 @@
 package cloudsqlmysql_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmysql"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,20 +34,20 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -60,21 +61,21 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "public ipType",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: Public
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: Public
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -88,21 +89,21 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "private ipType",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: private 
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: private
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -116,21 +117,21 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "psc ipType",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: psc
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: psc
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -144,16 +145,12 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -169,57 +166,53 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid ipType",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: fail 
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: fail
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-mysql-instance\" as \"cloud-sql-mysql\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
+			err: "error unmarshaling sources: unable to parse source \"my-mysql-instance\" as \"cloud-sql-mysql\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-mysql-instance\" as \"cloud-sql-mysql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | kind: cloud-sql-mysql\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-mysql-instance\" as \"cloud-sql-mysql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | name: my-mysql-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-mysql-instance\" as \"cloud-sql-mysql\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-mysql-instance\" as \"cloud-sql-mysql\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/cloudsqlpg/cloud_sql_pg.go b/internal/sources/cloudsqlpg/cloud_sql_pg.go
index dc7e59be3d..3309768892 100644
--- a/internal/sources/cloudsqlpg/cloud_sql_pg.go
+++ b/internal/sources/cloudsqlpg/cloud_sql_pg.go
@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "cloud-sql-postgres"
+const SourceType string = "cloud-sql-postgres"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -49,7 +49,7 @@ 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"`
+	Type     string         `yaml:"type" validate:"required"`
 	Project  string         `yaml:"project" validate:"required"`
 	Region   string         `yaml:"region" validate:"required"`
 	Instance string         `yaml:"instance" validate:"required"`
@@ -59,8 +59,8 @@ type Config struct {
 	Password string         `yaml:"password"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -88,8 +88,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -162,7 +162,7 @@ func getConnectionConfig(ctx context.Context, user, pass, dbname string) (string
 
 func initCloudSQLPgConnectionPool(ctx context.Context, tracer trace.Tracer, name, project, region, instance, ipType, user, pass, dbname string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database
diff --git a/internal/sources/cloudsqlpg/cloud_sql_pg_test.go b/internal/sources/cloudsqlpg/cloud_sql_pg_test.go
index 0b833a94e0..2f0f0118d2 100644
--- a/internal/sources/cloudsqlpg/cloud_sql_pg_test.go
+++ b/internal/sources/cloudsqlpg/cloud_sql_pg_test.go
@@ -15,11 +15,12 @@
 package cloudsqlpg_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,20 +34,20 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     cloudsqlpg.SourceKind,
+					Type:     cloudsqlpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -60,21 +61,21 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 		{
 			desc: "public ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: Public
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: Public
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     cloudsqlpg.SourceKind,
+					Type:     cloudsqlpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -88,21 +89,21 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 		{
 			desc: "private ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: private 
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: private 
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     cloudsqlpg.SourceKind,
+					Type:     cloudsqlpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -116,21 +117,21 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 		{
 			desc: "psc ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: psc 
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: psc 
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-pg-instance": cloudsqlpg.Config{
 					Name:     "my-pg-instance",
-					Kind:     cloudsqlpg.SourceKind,
+					Type:     cloudsqlpg.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -144,16 +145,12 @@ func TestParseFromYamlCloudSQLPg(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -169,57 +166,53 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid ipType",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: fail 
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: fail 
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"cloud-sql-postgres\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"cloud-sql-postgres\": ipType invalid: must be one of \"public\", \"private\", or \"psc\"",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"cloud-sql-postgres\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | kind: cloud-sql-postgres\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"cloud-sql-postgres\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | name: my-pg-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: cloud-sql-postgres
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: cloud-sql-postgres
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"cloud-sql-postgres\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"cloud-sql-postgres\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/cockroachdb/cockroachdb.go b/internal/sources/cockroachdb/cockroachdb.go
new file mode 100644
index 0000000000..3fab54605a
--- /dev/null
+++ b/internal/sources/cockroachdb/cockroachdb.go
@@ -0,0 +1,421 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdb
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"log/slog"
+	"math"
+	"net/url"
+	"regexp"
+	"strings"
+	"time"
+
+	crdbpgx "github.com/cockroachdb/cockroach-go/v2/crdb/crdbpgxv5"
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/jackc/pgx/v5"
+	"github.com/jackc/pgx/v5/pgxpool"
+	"go.opentelemetry.io/otel/trace"
+)
+
+const SourceType string = "cockroachdb"
+
+var _ sources.SourceConfig = Config{}
+
+func init() {
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
+	}
+}
+
+func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources.SourceConfig, error) {
+	// MCP compliance: Read-only by default, require explicit opt-in for writes
+	actual := Config{
+		Name:             name,
+		MaxRetries:       5,
+		RetryBaseDelay:   "500ms",
+		ReadOnlyMode:     true,  // MCP requirement: read-only by default
+		EnableWriteMode:  false, // Must be explicitly enabled
+		MaxRowLimit:      1000,  // MCP requirement: limit query results
+		QueryTimeoutSec:  30,    // MCP requirement: prevent long-running queries
+		EnableTelemetry:  true,  // MCP requirement: observability
+		TelemetryVerbose: false,
+	}
+	if err := decoder.DecodeContext(ctx, &actual); err != nil {
+		return nil, err
+	}
+
+	// Security validation: If EnableWriteMode is true, ReadOnlyMode should be false
+	if actual.EnableWriteMode {
+		actual.ReadOnlyMode = false
+	}
+
+	return actual, nil
+}
+
+type Config struct {
+	Name           string            `yaml:"name" validate:"required"`
+	Type           string            `yaml:"type" validate:"required"`
+	Host           string            `yaml:"host" validate:"required"`
+	Port           string            `yaml:"port" validate:"required"`
+	User           string            `yaml:"user" validate:"required"`
+	Password       string            `yaml:"password"`
+	Database       string            `yaml:"database" validate:"required"`
+	QueryParams    map[string]string `yaml:"queryParams"`
+	MaxRetries     int               `yaml:"maxRetries"`
+	RetryBaseDelay string            `yaml:"retryBaseDelay"`
+
+	// MCP Security Features
+	ReadOnlyMode    bool `yaml:"readOnlyMode"`    // Default: true (enforced in Initialize)
+	EnableWriteMode bool `yaml:"enableWriteMode"` // Explicit opt-in for write operations
+	MaxRowLimit     int  `yaml:"maxRowLimit"`     // Default: 1000
+	QueryTimeoutSec int  `yaml:"queryTimeoutSec"` // Default: 30
+
+	// Observability
+	EnableTelemetry  bool   `yaml:"enableTelemetry"`  // Default: true
+	TelemetryVerbose bool   `yaml:"telemetryVerbose"` // Default: false
+	ClusterID        string `yaml:"clusterID"`        // Optional cluster identifier for telemetry
+}
+
+func (r Config) SourceConfigType() string {
+	return SourceType
+}
+
+func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
+	retryBaseDelay, err := time.ParseDuration(r.RetryBaseDelay)
+	if err != nil {
+		return nil, fmt.Errorf("invalid retryBaseDelay: %w", err)
+	}
+
+	pool, err := initCockroachDBConnectionPoolWithRetry(ctx, tracer, r.Name, r.Host, r.Port, r.User, r.Password, r.Database, r.QueryParams, r.MaxRetries, retryBaseDelay)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create pool: %w", err)
+	}
+
+	s := &Source{
+		Config: r,
+		Pool:   pool,
+	}
+	return s, nil
+}
+
+var _ sources.Source = &Source{}
+
+type Source struct {
+	Config
+	Pool *pgxpool.Pool
+}
+
+func (s *Source) SourceType() string {
+	return SourceType
+}
+
+func (s *Source) ToConfig() sources.SourceConfig {
+	return s.Config
+}
+
+func (s *Source) CockroachDBPool() *pgxpool.Pool {
+	return s.Pool
+}
+
+func (s *Source) PostgresPool() *pgxpool.Pool {
+	return s.Pool
+}
+
+// ExecuteTxWithRetry executes a function within a transaction with automatic retry logic
+// using the official CockroachDB retry mechanism from cockroach-go/v2
+func (s *Source) ExecuteTxWithRetry(ctx context.Context, fn func(pgx.Tx) error) error {
+	return crdbpgx.ExecuteTx(ctx, s.Pool, pgx.TxOptions{}, fn)
+}
+
+// Query executes a query using the connection pool with MCP security enforcement.
+// For read-only queries, connection-level retry is sufficient.
+// For write operations requiring transaction retry, use ExecuteTxWithRetry directly.
+// Note: Callers should manage context timeouts as needed.
+func (s *Source) Query(ctx context.Context, sql string, args ...interface{}) (pgx.Rows, error) {
+	// MCP Security Check 1: Enforce write operation restrictions
+	if err := s.CanExecuteWrite(sql); err != nil {
+		return nil, err
+	}
+
+	// MCP Security Check 2: Apply query limits (row limit)
+	modifiedSQL, err := s.ApplyQueryLimits(sql)
+	if err != nil {
+		return nil, err
+	}
+
+	return s.Pool.Query(ctx, modifiedSQL, args...)
+}
+
+// ============================================================================
+// MCP Security & Observability Features
+// ============================================================================
+
+// TelemetryEvent represents a structured telemetry event for MCP tool calls
+type TelemetryEvent struct {
+	Timestamp    time.Time         `json:"timestamp"`
+	ToolName     string            `json:"tool_name"`
+	ClusterID    string            `json:"cluster_id"`
+	Database     string            `json:"database"`
+	User         string            `json:"user"`
+	SQLRedacted  string            `json:"sql_redacted"` // Query with values redacted
+	Status       string            `json:"status"`       // "success" | "failure"
+	ErrorCode    string            `json:"error_code,omitempty"`
+	ErrorMsg     string            `json:"error_msg,omitempty"`
+	LatencyMs    int64             `json:"latency_ms"`
+	RowsAffected int64             `json:"rows_affected,omitempty"`
+	Metadata     map[string]string `json:"metadata,omitempty"`
+}
+
+// StructuredError represents an MCP-compliant error with error codes
+type StructuredError struct {
+	Code    string         `json:"error_code"`
+	Message string         `json:"message"`
+	Details map[string]any `json:"details,omitempty"`
+}
+
+func (e *StructuredError) Error() string {
+	return fmt.Sprintf("[%s] %s", e.Code, e.Message)
+}
+
+// MCP Error Codes
+const (
+	ErrCodeUnauthorized         = "CRDB_UNAUTHORIZED"
+	ErrCodeReadOnlyViolation    = "CRDB_READONLY_VIOLATION"
+	ErrCodeQueryTimeout         = "CRDB_QUERY_TIMEOUT"
+	ErrCodeRowLimitExceeded     = "CRDB_ROW_LIMIT_EXCEEDED"
+	ErrCodeInvalidSQL           = "CRDB_INVALID_SQL"
+	ErrCodeConnectionFailed     = "CRDB_CONNECTION_FAILED"
+	ErrCodeWriteModeRequired    = "CRDB_WRITE_MODE_REQUIRED"
+	ErrCodeQueryExecutionFailed = "CRDB_QUERY_EXECUTION_FAILED"
+)
+
+// SQLStatementType represents the type of SQL statement
+type SQLStatementType int
+
+const (
+	SQLTypeUnknown SQLStatementType = iota
+	SQLTypeSelect
+	SQLTypeInsert
+	SQLTypeUpdate
+	SQLTypeDelete
+	SQLTypeDDL // CREATE, ALTER, DROP
+	SQLTypeTruncate
+	SQLTypeExplain
+	SQLTypeShow
+	SQLTypeSet
+)
+
+// ClassifySQL analyzes a SQL statement and returns its type
+func ClassifySQL(sql string) SQLStatementType {
+	// Normalize: trim and convert to uppercase for analysis
+	normalized := strings.TrimSpace(strings.ToUpper(sql))
+
+	if normalized == "" {
+		return SQLTypeUnknown
+	}
+
+	// Remove comments
+	normalized = regexp.MustCompile(`--.*`).ReplaceAllString(normalized, "")
+	normalized = regexp.MustCompile(`/\*.*?\*/`).ReplaceAllString(normalized, "")
+	normalized = strings.TrimSpace(normalized)
+
+	// Check statement type
+	switch {
+	case strings.HasPrefix(normalized, "SELECT"):
+		return SQLTypeSelect
+	case strings.HasPrefix(normalized, "INSERT"):
+		return SQLTypeInsert
+	case strings.HasPrefix(normalized, "UPDATE"):
+		return SQLTypeUpdate
+	case strings.HasPrefix(normalized, "DELETE"):
+		return SQLTypeDelete
+	case strings.HasPrefix(normalized, "TRUNCATE"):
+		return SQLTypeTruncate
+	case strings.HasPrefix(normalized, "CREATE"):
+		return SQLTypeDDL
+	case strings.HasPrefix(normalized, "ALTER"):
+		return SQLTypeDDL
+	case strings.HasPrefix(normalized, "DROP"):
+		return SQLTypeDDL
+	case strings.HasPrefix(normalized, "EXPLAIN"):
+		return SQLTypeExplain
+	case strings.HasPrefix(normalized, "SHOW"):
+		return SQLTypeShow
+	case strings.HasPrefix(normalized, "SET"):
+		return SQLTypeSet
+	default:
+		return SQLTypeUnknown
+	}
+}
+
+// IsWriteOperation returns true if the SQL statement modifies data
+func IsWriteOperation(sqlType SQLStatementType) bool {
+	switch sqlType {
+	case SQLTypeInsert, SQLTypeUpdate, SQLTypeDelete, SQLTypeTruncate, SQLTypeDDL:
+		return true
+	default:
+		return false
+	}
+}
+
+// IsReadOnlyMode returns whether the source is in read-only mode
+func (s *Source) IsReadOnlyMode() bool {
+	return s.ReadOnlyMode && !s.EnableWriteMode
+}
+
+// CanExecuteWrite checks if a write operation is allowed
+func (s *Source) CanExecuteWrite(sql string) error {
+	sqlType := ClassifySQL(sql)
+
+	if IsWriteOperation(sqlType) && s.IsReadOnlyMode() {
+		return &StructuredError{
+			Code:    ErrCodeReadOnlyViolation,
+			Message: "Write operations are not allowed in read-only mode. Set enableWriteMode: true to allow writes.",
+			Details: map[string]any{
+				"sql_type":          sqlType,
+				"read_only_mode":    s.ReadOnlyMode,
+				"enable_write_mode": s.EnableWriteMode,
+			},
+		}
+	}
+
+	return nil
+}
+
+// ApplyQueryLimits applies row limits to a SQL query for MCP security compliance.
+// Context timeout management is the responsibility of the caller (following Go best practices).
+// Returns potentially modified SQL with LIMIT clause for SELECT queries.
+func (s *Source) ApplyQueryLimits(sql string) (string, error) {
+	sqlType := ClassifySQL(sql)
+
+	// Apply row limit only to SELECT queries
+	if sqlType == SQLTypeSelect && s.MaxRowLimit > 0 {
+		// Check if query already has LIMIT clause
+		normalized := strings.ToUpper(sql)
+		if !strings.Contains(normalized, " LIMIT ") {
+			// Add LIMIT clause - trim trailing whitespace and semicolon
+			sql = strings.TrimSpace(sql)
+			sql = strings.TrimSuffix(sql, ";")
+			sql = fmt.Sprintf("%s LIMIT %d", sql, s.MaxRowLimit)
+		}
+	}
+
+	return sql, nil
+}
+
+// RedactSQL redacts sensitive values from SQL for telemetry
+func RedactSQL(sql string) string {
+	// Redact string literals
+	sql = regexp.MustCompile(`'[^']*'`).ReplaceAllString(sql, "'***'")
+
+	// Redact numbers that might be sensitive
+	sql = regexp.MustCompile(`\b\d{10,}\b`).ReplaceAllString(sql, "***")
+
+	return sql
+}
+
+// EmitTelemetry logs a telemetry event in structured JSON format
+func (s *Source) EmitTelemetry(ctx context.Context, event TelemetryEvent) {
+	if !s.EnableTelemetry {
+		return
+	}
+
+	// Set cluster ID if not already set
+	if event.ClusterID == "" {
+		event.ClusterID = s.ClusterID
+		if event.ClusterID == "" {
+			event.ClusterID = s.Database // Fallback to database name
+		}
+	}
+
+	// Set database and user
+	if event.Database == "" {
+		event.Database = s.Database
+	}
+	if event.User == "" {
+		event.User = s.User
+	}
+
+	// Log as structured JSON
+	if s.TelemetryVerbose {
+		jsonBytes, _ := json.Marshal(event)
+		slog.Info("CockroachDB MCP Telemetry", "event", string(jsonBytes))
+	} else {
+		// Minimal logging
+		slog.Info("CockroachDB MCP",
+			"tool", event.ToolName,
+			"status", event.Status,
+			"latency_ms", event.LatencyMs,
+			"error_code", event.ErrorCode,
+		)
+	}
+}
+
+func initCockroachDBConnectionPoolWithRetry(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string, queryParams map[string]string, maxRetries int, baseDelay time.Duration) (*pgxpool.Pool, error) {
+	//nolint:all
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
+	defer span.End()
+
+	userAgent, err := util.UserAgentFromContext(ctx)
+	if err != nil {
+		userAgent = "genai-toolbox"
+	}
+	if queryParams == nil {
+		queryParams = make(map[string]string)
+	}
+	if _, ok := queryParams["application_name"]; !ok {
+		queryParams["application_name"] = userAgent
+	}
+
+	connURL := &url.URL{
+		Scheme:   "postgres",
+		User:     url.UserPassword(user, pass),
+		Host:     fmt.Sprintf("%s:%s", host, port),
+		Path:     dbname,
+		RawQuery: ConvertParamMapToRawQuery(queryParams),
+	}
+
+	var pool *pgxpool.Pool
+	for attempt := 0; attempt <= maxRetries; attempt++ {
+		pool, err = pgxpool.New(ctx, connURL.String())
+		if err == nil {
+			err = pool.Ping(ctx)
+		}
+
+		if err == nil {
+			return pool, nil
+		}
+
+		if attempt < maxRetries {
+			backoff := baseDelay * time.Duration(math.Pow(2, float64(attempt)))
+			time.Sleep(backoff)
+		}
+	}
+
+	return nil, fmt.Errorf("failed to connect to CockroachDB after %d retries: %w", maxRetries, err)
+}
+
+func ConvertParamMapToRawQuery(queryParams map[string]string) string {
+	values := url.Values{}
+	for k, v := range queryParams {
+		values.Add(k, v)
+	}
+	return values.Encode()
+}
diff --git a/internal/sources/cockroachdb/cockroachdb_test.go b/internal/sources/cockroachdb/cockroachdb_test.go
new file mode 100644
index 0000000000..db14542c13
--- /dev/null
+++ b/internal/sources/cockroachdb/cockroachdb_test.go
@@ -0,0 +1,224 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdb
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/goccy/go-yaml"
+)
+
+func TestCockroachDBSourceConfig(t *testing.T) {
+	tests := []struct {
+		name string
+		yaml string
+	}{
+		{
+			name: "valid config",
+			yaml: `
+name: test-cockroachdb
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+password: ""
+database: defaultdb
+maxRetries: 5
+retryBaseDelay: 500ms
+queryParams:
+  sslmode: disable
+`,
+		},
+		{
+			name: "with optional queryParams",
+			yaml: `
+name: test-cockroachdb
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+password: testpass
+database: testdb
+queryParams:
+  sslmode: require
+  sslcert: /path/to/cert
+`,
+		},
+		{
+			name: "with custom retry settings",
+			yaml: `
+name: test-cockroachdb
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+password: ""
+database: defaultdb
+maxRetries: 10
+retryBaseDelay: 1s
+`,
+		},
+		{
+			name: "without password (insecure mode)",
+			yaml: `
+name: test-cockroachdb
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+database: defaultdb
+`,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			decoder := yaml.NewDecoder(strings.NewReader(tt.yaml))
+			cfg, err := newConfig(context.Background(), "test", decoder)
+
+			if err != nil {
+				t.Fatalf("unexpected error: %v", err)
+			}
+
+			if cfg == nil {
+				t.Fatal("expected config but got nil")
+			}
+
+			// Verify it's the right type
+			cockroachCfg, ok := cfg.(Config)
+			if !ok {
+				t.Fatalf("expected Config type, got %T", cfg)
+			}
+
+			// Verify SourceConfigType
+			if cockroachCfg.SourceConfigType() != SourceType {
+				t.Errorf("expected SourceConfigType %q, got %q", SourceType, cockroachCfg.SourceConfigType())
+			}
+
+			t.Logf("✅ Config parsed successfully: %+v", cockroachCfg)
+		})
+	}
+}
+
+func TestCockroachDBSourceType(t *testing.T) {
+	yamlContent := `
+name: test-cockroachdb
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+password: ""
+database: defaultdb
+`
+	decoder := yaml.NewDecoder(strings.NewReader(yamlContent))
+	cfg, err := newConfig(context.Background(), "test", decoder)
+	if err != nil {
+		t.Fatalf("failed to create config: %v", err)
+	}
+
+	if cfg.SourceConfigType() != "cockroachdb" {
+		t.Errorf("expected SourceConfigType 'cockroachdb', got %q", cfg.SourceConfigType())
+	}
+}
+
+func TestCockroachDBDefaultValues(t *testing.T) {
+	yamlContent := `
+name: test-cockroachdb
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+password: ""
+database: defaultdb
+`
+	decoder := yaml.NewDecoder(strings.NewReader(yamlContent))
+	cfg, err := newConfig(context.Background(), "test", decoder)
+	if err != nil {
+		t.Fatalf("failed to create config: %v", err)
+	}
+
+	cockroachCfg, ok := cfg.(Config)
+	if !ok {
+		t.Fatalf("expected Config type")
+	}
+
+	// Check default values
+	if cockroachCfg.MaxRetries != 5 {
+		t.Errorf("expected default MaxRetries 5, got %d", cockroachCfg.MaxRetries)
+	}
+
+	if cockroachCfg.RetryBaseDelay != "500ms" {
+		t.Errorf("expected default RetryBaseDelay '500ms', got %q", cockroachCfg.RetryBaseDelay)
+	}
+
+	t.Logf("✅ Default values set correctly")
+}
+
+func TestConvertParamMapToRawQuery(t *testing.T) {
+	tests := []struct {
+		name   string
+		params map[string]string
+		want   []string // Expected substrings in any order
+	}{
+		{
+			name:   "empty params",
+			params: map[string]string{},
+			want:   []string{},
+		},
+		{
+			name: "single param",
+			params: map[string]string{
+				"sslmode": "disable",
+			},
+			want: []string{"sslmode=disable"},
+		},
+		{
+			name: "multiple params",
+			params: map[string]string{
+				"sslmode":          "require",
+				"application_name": "test-app",
+			},
+			want: []string{"sslmode=require", "application_name=test-app"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := ConvertParamMapToRawQuery(tt.params)
+
+			if len(tt.want) == 0 {
+				if result != "" {
+					t.Errorf("expected empty string, got %q", result)
+				}
+				return
+			}
+
+			// Check that all expected substrings are in the result
+			for _, want := range tt.want {
+				if !contains(result, want) {
+					t.Errorf("expected result to contain %q, got %q", want, result)
+				}
+			}
+
+			t.Logf("✅ Query string: %s", result)
+		})
+	}
+}
+
+func contains(s, substr string) bool {
+	return strings.Contains(s, substr)
+}
diff --git a/internal/sources/cockroachdb/security_test.go b/internal/sources/cockroachdb/security_test.go
new file mode 100644
index 0000000000..c80ad5b36e
--- /dev/null
+++ b/internal/sources/cockroachdb/security_test.go
@@ -0,0 +1,455 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdb
+
+import (
+	"context"
+	"strings"
+	"testing"
+	"time"
+
+	yaml "github.com/goccy/go-yaml"
+)
+
+// TestClassifySQL tests SQL statement classification
+func TestClassifySQL(t *testing.T) {
+	tests := []struct {
+		name     string
+		sql      string
+		expected SQLStatementType
+	}{
+		{"SELECT", "SELECT * FROM users", SQLTypeSelect},
+		{"SELECT with spaces", "  SELECT * FROM users  ", SQLTypeSelect},
+		{"SELECT with comment", "-- comment\nSELECT * FROM users", SQLTypeSelect},
+		{"INSERT", "INSERT INTO users (name) VALUES ('alice')", SQLTypeInsert},
+		{"UPDATE", "UPDATE users SET name='bob' WHERE id=1", SQLTypeUpdate},
+		{"DELETE", "DELETE FROM users WHERE id=1", SQLTypeDelete},
+		{"CREATE TABLE", "CREATE TABLE users (id UUID PRIMARY KEY)", SQLTypeDDL},
+		{"ALTER TABLE", "ALTER TABLE users ADD COLUMN email STRING", SQLTypeDDL},
+		{"DROP TABLE", "DROP TABLE users", SQLTypeDDL},
+		{"TRUNCATE", "TRUNCATE TABLE users", SQLTypeTruncate},
+		{"EXPLAIN", "EXPLAIN SELECT * FROM users", SQLTypeExplain},
+		{"SHOW", "SHOW TABLES", SQLTypeShow},
+		{"SET", "SET application_name = 'myapp'", SQLTypeSet},
+		{"Empty", "", SQLTypeUnknown},
+		{"Lowercase select", "select * from users", SQLTypeSelect},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := ClassifySQL(tt.sql)
+			if result != tt.expected {
+				t.Errorf("ClassifySQL(%q) = %v, want %v", tt.sql, result, tt.expected)
+			}
+		})
+	}
+}
+
+// TestIsWriteOperation tests write operation detection
+func TestIsWriteOperation(t *testing.T) {
+	tests := []struct {
+		sqlType  SQLStatementType
+		expected bool
+	}{
+		{SQLTypeSelect, false},
+		{SQLTypeInsert, true},
+		{SQLTypeUpdate, true},
+		{SQLTypeDelete, true},
+		{SQLTypeTruncate, true},
+		{SQLTypeDDL, true},
+		{SQLTypeExplain, false},
+		{SQLTypeShow, false},
+		{SQLTypeSet, false},
+		{SQLTypeUnknown, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.sqlType.String(), func(t *testing.T) {
+			result := IsWriteOperation(tt.sqlType)
+			if result != tt.expected {
+				t.Errorf("IsWriteOperation(%v) = %v, want %v", tt.sqlType, result, tt.expected)
+			}
+		})
+	}
+}
+
+// Helper for SQLStatementType to string
+func (s SQLStatementType) String() string {
+	switch s {
+	case SQLTypeSelect:
+		return "SELECT"
+	case SQLTypeInsert:
+		return "INSERT"
+	case SQLTypeUpdate:
+		return "UPDATE"
+	case SQLTypeDelete:
+		return "DELETE"
+	case SQLTypeDDL:
+		return "DDL"
+	case SQLTypeTruncate:
+		return "TRUNCATE"
+	case SQLTypeExplain:
+		return "EXPLAIN"
+	case SQLTypeShow:
+		return "SHOW"
+	case SQLTypeSet:
+		return "SET"
+	default:
+		return "UNKNOWN"
+	}
+}
+
+// TestCanExecuteWrite tests write operation enforcement
+func TestCanExecuteWrite(t *testing.T) {
+	tests := []struct {
+		name            string
+		readOnlyMode    bool
+		enableWriteMode bool
+		sql             string
+		expectError     bool
+		errorCode       string
+	}{
+		{
+			name:            "SELECT in read-only mode",
+			readOnlyMode:    true,
+			enableWriteMode: false,
+			sql:             "SELECT * FROM users",
+			expectError:     false,
+		},
+		{
+			name:            "INSERT in read-only mode",
+			readOnlyMode:    true,
+			enableWriteMode: false,
+			sql:             "INSERT INTO users (name) VALUES ('alice')",
+			expectError:     true,
+			errorCode:       ErrCodeReadOnlyViolation,
+		},
+		{
+			name:            "INSERT with write mode enabled",
+			readOnlyMode:    false,
+			enableWriteMode: true,
+			sql:             "INSERT INTO users (name) VALUES ('alice')",
+			expectError:     false,
+		},
+		{
+			name:            "CREATE TABLE in read-only mode",
+			readOnlyMode:    true,
+			enableWriteMode: false,
+			sql:             "CREATE TABLE test (id UUID PRIMARY KEY)",
+			expectError:     true,
+			errorCode:       ErrCodeReadOnlyViolation,
+		},
+		{
+			name:            "CREATE TABLE with write mode enabled",
+			readOnlyMode:    false,
+			enableWriteMode: true,
+			sql:             "CREATE TABLE test (id UUID PRIMARY KEY)",
+			expectError:     false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			source := &Source{
+				Config: Config{
+					ReadOnlyMode:    tt.readOnlyMode,
+					EnableWriteMode: tt.enableWriteMode,
+				},
+			}
+
+			err := source.CanExecuteWrite(tt.sql)
+
+			if tt.expectError {
+				if err == nil {
+					t.Errorf("Expected error but got nil")
+					return
+				}
+
+				structErr, ok := err.(*StructuredError)
+				if !ok {
+					t.Errorf("Expected StructuredError but got %T", err)
+					return
+				}
+
+				if structErr.Code != tt.errorCode {
+					t.Errorf("Expected error code %s but got %s", tt.errorCode, structErr.Code)
+				}
+			} else {
+				if err != nil {
+					t.Errorf("Expected no error but got: %v", err)
+				}
+			}
+		})
+	}
+}
+
+// TestApplyQueryLimits tests query limit application
+func TestApplyQueryLimits(t *testing.T) {
+	tests := []struct {
+		name           string
+		sql            string
+		maxRowLimit    int
+		expectedSQL    string
+		shouldAddLimit bool
+	}{
+		{
+			name:           "SELECT without LIMIT",
+			sql:            "SELECT * FROM users",
+			maxRowLimit:    100,
+			expectedSQL:    "SELECT * FROM users LIMIT 100",
+			shouldAddLimit: true,
+		},
+		{
+			name:           "SELECT with existing LIMIT",
+			sql:            "SELECT * FROM users LIMIT 50",
+			maxRowLimit:    100,
+			expectedSQL:    "SELECT * FROM users LIMIT 50",
+			shouldAddLimit: false,
+		},
+		{
+			name:           "SELECT without LIMIT and semicolon",
+			sql:            "SELECT * FROM users;",
+			maxRowLimit:    100,
+			expectedSQL:    "SELECT * FROM users LIMIT 100",
+			shouldAddLimit: true,
+		},
+		{
+			name:           "SELECT with trailing newline and semicolon",
+			sql:            "SELECT * FROM users;\n",
+			maxRowLimit:    100,
+			expectedSQL:    "SELECT * FROM users LIMIT 100",
+			shouldAddLimit: true,
+		},
+		{
+			name:           "SELECT with multiline and semicolon",
+			sql:            "\n\tSELECT *\n\tFROM users\n\tORDER BY id;\n",
+			maxRowLimit:    100,
+			expectedSQL:    "SELECT *\n\tFROM users\n\tORDER BY id LIMIT 100",
+			shouldAddLimit: true,
+		},
+		{
+			name:           "INSERT should not have LIMIT added",
+			sql:            "INSERT INTO users (name) VALUES ('alice')",
+			maxRowLimit:    100,
+			expectedSQL:    "INSERT INTO users (name) VALUES ('alice')",
+			shouldAddLimit: false,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			source := &Source{
+				Config: Config{
+					MaxRowLimit:     tt.maxRowLimit,
+					QueryTimeoutSec: 0, // Timeout now managed by caller
+				},
+			}
+
+			modifiedSQL, err := source.ApplyQueryLimits(tt.sql)
+
+			if err != nil {
+				t.Errorf("Unexpected error: %v", err)
+				return
+			}
+
+			if modifiedSQL != tt.expectedSQL {
+				t.Errorf("Expected SQL:\n%s\nGot:\n%s", tt.expectedSQL, modifiedSQL)
+			}
+		})
+	}
+}
+
+// TestApplyQueryTimeout tests that timeout is managed by caller (not source)
+func TestApplyQueryTimeout(t *testing.T) {
+	source := &Source{
+		Config: Config{
+			QueryTimeoutSec: 5, // Documented recommended timeout
+			MaxRowLimit:     0, // Don't add LIMIT
+		},
+	}
+
+	// Caller creates timeout context (following Go best practices)
+	ctx := context.Background()
+	ctx, cancel := context.WithTimeout(ctx, time.Duration(source.QueryTimeoutSec)*time.Second)
+	defer cancel()
+
+	// Apply query limits (doesn't modify context anymore)
+	modifiedSQL, err := source.ApplyQueryLimits("SELECT * FROM users")
+	if err != nil {
+		t.Errorf("Unexpected error: %v", err)
+		return
+	}
+
+	// Verify context has deadline (managed by caller)
+	deadline, ok := ctx.Deadline()
+	if !ok {
+		t.Error("Expected deadline to be set but it wasn't")
+		return
+	}
+
+	// Verify deadline is approximately 5 seconds from now
+	expectedDeadline := time.Now().Add(5 * time.Second)
+	diff := deadline.Sub(expectedDeadline)
+	if diff < 0 {
+		diff = -diff
+	}
+
+	// Allow 1 second tolerance
+	if diff > time.Second {
+		t.Errorf("Deadline diff too large: %v", diff)
+	}
+
+	// Verify SQL is unchanged (LIMIT not added since MaxRowLimit=0)
+	if modifiedSQL != "SELECT * FROM users" {
+		t.Errorf("Expected SQL unchanged, got: %s", modifiedSQL)
+	}
+}
+
+// TestRedactSQL tests SQL redaction for telemetry
+func TestRedactSQL(t *testing.T) {
+	tests := []struct {
+		name     string
+		sql      string
+		expected string
+	}{
+		{
+			name:     "String literal redaction",
+			sql:      "SELECT * FROM users WHERE name='alice' AND email='alice@example.com'",
+			expected: "SELECT * FROM users WHERE name='***' AND email='***'",
+		},
+		{
+			name:     "Long number redaction",
+			sql:      "SELECT * FROM users WHERE ssn=1234567890123",
+			expected: "SELECT * FROM users WHERE ssn=***",
+		},
+		{
+			name:     "Short numbers not redacted",
+			sql:      "SELECT * FROM users WHERE age=25",
+			expected: "SELECT * FROM users WHERE age=25",
+		},
+		{
+			name:     "Multiple sensitive values",
+			sql:      "INSERT INTO users (name, email, phone) VALUES ('bob', 'bob@example.com', '5551234567')",
+			expected: "INSERT INTO users (name, email, phone) VALUES ('***', '***', '***')",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := RedactSQL(tt.sql)
+			if result != tt.expected {
+				t.Errorf("RedactSQL:\nGot:      %s\nExpected: %s", result, tt.expected)
+			}
+		})
+	}
+}
+
+// TestIsReadOnlyMode tests read-only mode detection
+func TestIsReadOnlyMode(t *testing.T) {
+	tests := []struct {
+		name            string
+		readOnlyMode    bool
+		enableWriteMode bool
+		expected        bool
+	}{
+		{"Read-only by default", true, false, true},
+		{"Write mode enabled", false, true, false},
+		{"Both false", false, false, false},
+		{"Read-only overridden by write mode", true, true, false},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			source := &Source{
+				Config: Config{
+					ReadOnlyMode:    tt.readOnlyMode,
+					EnableWriteMode: tt.enableWriteMode,
+				},
+			}
+
+			result := source.IsReadOnlyMode()
+			if result != tt.expected {
+				t.Errorf("IsReadOnlyMode() = %v, want %v", result, tt.expected)
+			}
+		})
+	}
+}
+
+// TestStructuredError tests error formatting
+func TestStructuredError(t *testing.T) {
+	err := &StructuredError{
+		Code:    ErrCodeReadOnlyViolation,
+		Message: "Write operations not allowed",
+		Details: map[string]any{
+			"sql_type": "INSERT",
+		},
+	}
+
+	errorStr := err.Error()
+	if !strings.Contains(errorStr, ErrCodeReadOnlyViolation) {
+		t.Errorf("Error string should contain error code: %s", errorStr)
+	}
+	if !strings.Contains(errorStr, "Write operations not allowed") {
+		t.Errorf("Error string should contain message: %s", errorStr)
+	}
+}
+
+// TestDefaultSecuritySettings tests that security defaults are correct
+func TestDefaultSecuritySettings(t *testing.T) {
+	ctx := context.Background()
+
+	// Create a minimal YAML config
+	yamlData := `name: test
+type: cockroachdb
+host: localhost
+port: "26257"
+user: root
+database: defaultdb
+`
+
+	var cfg Config
+	if err := yaml.Unmarshal([]byte(yamlData), &cfg); err != nil {
+		t.Fatalf("Failed to unmarshal YAML: %v", err)
+	}
+
+	// Apply defaults through newConfig logic manually
+	cfg.MaxRetries = 5
+	cfg.RetryBaseDelay = "500ms"
+	cfg.ReadOnlyMode = true
+	cfg.EnableWriteMode = false
+	cfg.MaxRowLimit = 1000
+	cfg.QueryTimeoutSec = 30
+	cfg.EnableTelemetry = true
+	cfg.TelemetryVerbose = false
+
+	_ = ctx // prevent unused
+
+	// Verify MCP security defaults
+	if !cfg.ReadOnlyMode {
+		t.Error("ReadOnlyMode should be true by default")
+	}
+	if cfg.EnableWriteMode {
+		t.Error("EnableWriteMode should be false by default")
+	}
+	if cfg.MaxRowLimit != 1000 {
+		t.Errorf("MaxRowLimit should be 1000, got %d", cfg.MaxRowLimit)
+	}
+	if cfg.QueryTimeoutSec != 30 {
+		t.Errorf("QueryTimeoutSec should be 30, got %d", cfg.QueryTimeoutSec)
+	}
+	if !cfg.EnableTelemetry {
+		t.Error("EnableTelemetry should be true by default")
+	}
+}
diff --git a/internal/sources/couchbase/couchbase.go b/internal/sources/couchbase/couchbase.go
index c273a47ec0..222acb0f5b 100644
--- a/internal/sources/couchbase/couchbase.go
+++ b/internal/sources/couchbase/couchbase.go
@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "couchbase"
+const SourceType string = "couchbase"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -50,7 +50,7 @@ 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"`
+	Type                 string `yaml:"type" validate:"required"`
 	ConnectionString     string `yaml:"connectionString" validate:"required"`
 	Bucket               string `yaml:"bucket" validate:"required"`
 	Scope                string `yaml:"scope" validate:"required"`
@@ -66,8 +66,8 @@ type Config struct {
 	QueryScanConsistency uint   `yaml:"queryScanConsistency"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -96,8 +96,8 @@ type Source struct {
 	Scope *gocb.Scope
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/couchbase/couchbase_test.go b/internal/sources/couchbase/couchbase_test.go
index 43677333c4..3fb8efc034 100644
--- a/internal/sources/couchbase/couchbase_test.go
+++ b/internal/sources/couchbase/couchbase_test.go
@@ -15,11 +15,12 @@
 package couchbase_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/couchbase"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlCouchbase(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-couchbase-instance:
-					kind: couchbase
-					connectionString: localhost
-					username: Administrator
-					password: password
-					bucket: travel-sample
-					scope: inventory
+			kind: sources
+			name: my-couchbase-instance
+			type: couchbase
+			connectionString: localhost
+			username: Administrator
+			password: password
+			bucket: travel-sample
+			scope: inventory
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-couchbase-instance": couchbase.Config{
 					Name:             "my-couchbase-instance",
-					Kind:             couchbase.SourceKind,
+					Type:             couchbase.SourceType,
 					ConnectionString: "localhost",
 					Username:         "Administrator",
 					Password:         "password",
@@ -57,24 +58,24 @@ func TestParseFromYamlCouchbase(t *testing.T) {
 		{
 			desc: "with TLS configuration",
 			in: `
-			sources:
-				my-couchbase-instance:
-					kind: couchbase
-					connectionString: couchbases://localhost
-					bucket: travel-sample
-					scope: inventory
-					clientCert: /path/to/cert.pem
-					clientKey: /path/to/key.pem
-					clientCertPassword: password
-					clientKeyPassword: password
-					caCert: /path/to/ca.pem
-					noSslVerify: false
-					queryScanConsistency: 2
+			kind: sources
+			name: my-couchbase-instance
+			type: couchbase
+			connectionString: couchbases://localhost
+			bucket: travel-sample
+			scope: inventory
+			clientCert: /path/to/cert.pem
+			clientKey: /path/to/key.pem
+			clientCertPassword: password
+			clientKeyPassword: password
+			caCert: /path/to/ca.pem
+			noSslVerify: false
+			queryScanConsistency: 2
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-couchbase-instance": couchbase.Config{
 					Name:                 "my-couchbase-instance",
-					Kind:                 couchbase.SourceKind,
+					Type:                 couchbase.SourceType,
 					ConnectionString:     "couchbases://localhost",
 					Bucket:               "travel-sample",
 					Scope:                "inventory",
@@ -91,16 +92,12 @@ func TestParseFromYamlCouchbase(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -115,39 +112,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-couchbase-instance:
-					kind: couchbase
-					connectionString: localhost
-					username: Administrator
-					password: password
-					bucket: travel-sample
-					scope: inventory
-					foo: bar
+			kind: sources
+			name: my-couchbase-instance
+			type: couchbase
+			connectionString: localhost
+			username: Administrator
+			password: password
+			bucket: travel-sample
+			scope: inventory
+			foo: bar
 			`,
-			err: "unable to parse source \"my-couchbase-instance\" as \"couchbase\": [3:1] unknown field \"foo\"\n   1 | bucket: travel-sample\n   2 | connectionString: localhost\n>  3 | foo: bar\n       ^\n   4 | kind: couchbase\n   5 | password: password\n   6 | scope: inventory\n   7 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-couchbase-instance\" as \"couchbase\": [3:1] unknown field \"foo\"\n   1 | bucket: travel-sample\n   2 | connectionString: localhost\n>  3 | foo: bar\n       ^\n   4 | name: my-couchbase-instance\n   5 | password: password\n   6 | scope: inventory\n   7 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-couchbase-instance:
-					kind: couchbase
-					username: Administrator
-					password: password
-					bucket: travel-sample
-					scope: inventory
+			kind: sources
+			name: my-couchbase-instance
+			type: couchbase
+			username: Administrator
+			password: password
+			bucket: travel-sample
+			scope: inventory
 			`,
-			err: "unable to parse source \"my-couchbase-instance\" as \"couchbase\": Key: 'Config.ConnectionString' Error:Field validation for 'ConnectionString' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-couchbase-instance\" as \"couchbase\": Key: 'Config.ConnectionString' Error:Field validation for 'ConnectionString' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/dataplex/dataplex.go b/internal/sources/dataplex/dataplex.go
index 52d64b194d..3ddeb2ec9f 100644
--- a/internal/sources/dataplex/dataplex.go
+++ b/internal/sources/dataplex/dataplex.go
@@ -31,14 +31,14 @@ import (
 	grpcstatus "google.golang.org/grpc/status"
 )
 
-const SourceKind string = "dataplex"
+const SourceType string = "dataplex"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -53,13 +53,13 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Dataplex configs
 	Name    string `yaml:"name" validate:"required"`
-	Kind    string `yaml:"kind" validate:"required"`
+	Type    string `yaml:"type" validate:"required"`
 	Project string `yaml:"project" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	// Returns Dataplex source kind
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	// Returns Dataplex source type
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -83,9 +83,9 @@ type Source struct {
 	Client *dataplexapi.CatalogClient
 }
 
-func (s *Source) SourceKind() string {
-	// Returns Dataplex source kind
-	return SourceKind
+func (s *Source) SourceType() string {
+	// Returns Dataplex source type
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -106,7 +106,7 @@ func initDataplexConnection(
 	name string,
 	project string,
 ) (*dataplexapi.CatalogClient, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	cred, err := google.FindDefaultCredentials(ctx)
diff --git a/internal/sources/dataplex/dataplex_test.go b/internal/sources/dataplex/dataplex_test.go
index 0379eba5b4..10b9641c6b 100644
--- a/internal/sources/dataplex/dataplex_test.go
+++ b/internal/sources/dataplex/dataplex_test.go
@@ -15,11 +15,12 @@
 package dataplex_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/dataplex"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,15 +34,15 @@ func TestParseFromYamlDataplex(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-instance:
-					kind: dataplex
-					project: my-project
+			kind: sources
+			name: my-instance
+			type: dataplex
+			project: my-project
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": dataplex.Config{
 					Name:    "my-instance",
-					Kind:    dataplex.SourceKind,
+					Type:    dataplex.SourceType,
 					Project: "my-project",
 				},
 			},
@@ -49,16 +50,12 @@ func TestParseFromYamlDataplex(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -74,31 +71,27 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-instance:
-					kind: dataplex
-					project: my-project
-					foo: bar
+			kind: sources
+			name: my-instance
+			type: dataplex
+			project: my-project
+			foo: bar
 			`,
-			err: "unable to parse source \"my-instance\" as \"dataplex\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | kind: dataplex\n   3 | project: my-project",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"dataplex\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | name: my-instance\n   3 | project: my-project\n   4 | type: dataplex",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-instance:
-					kind: dataplex
+			kind: sources
+			name: my-instance
+			type: dataplex
 			`,
-			err: "unable to parse source \"my-instance\" as \"dataplex\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"dataplex\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/dgraph/dgraph.go b/internal/sources/dgraph/dgraph.go
index 317779db38..db2bc88d1f 100644
--- a/internal/sources/dgraph/dgraph.go
+++ b/internal/sources/dgraph/dgraph.go
@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "dgraph"
+const SourceType string = "dgraph"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -67,7 +67,7 @@ type DgraphClient struct {
 
 type Config struct {
 	Name      string `yaml:"name" validate:"required"`
-	Kind      string `yaml:"kind" validate:"required"`
+	Type      string `yaml:"type" validate:"required"`
 	DgraphUrl string `yaml:"dgraphUrl" validate:"required"`
 	User      string `yaml:"user"`
 	Password  string `yaml:"password"`
@@ -75,8 +75,8 @@ type Config struct {
 	ApiKey    string `yaml:"apiKey"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -103,8 +103,8 @@ type Source struct {
 	Client *DgraphClient `yaml:"client"`
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -139,7 +139,7 @@ func (s *Source) RunSQL(statement string, params parameters.ParamValues, isQuery
 
 func initDgraphHttpClient(ctx context.Context, tracer trace.Tracer, r Config) (*DgraphClient, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, r.Name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, r.Name)
 	defer span.End()
 
 	if r.DgraphUrl == "" {
diff --git a/internal/sources/dgraph/dgraph_test.go b/internal/sources/dgraph/dgraph_test.go
index d2db006683..4681c0278e 100644
--- a/internal/sources/dgraph/dgraph_test.go
+++ b/internal/sources/dgraph/dgraph_test.go
@@ -15,11 +15,12 @@
 package dgraph_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/dgraph"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlDgraph(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-dgraph-instance:
-					kind: dgraph
-					dgraphUrl: https://localhost:8080
-					apiKey: abc123
-					password: pass@123
-					namespace: 0
-					user: user123
+			kind: sources
+			name: my-dgraph-instance
+			type: dgraph
+			dgraphUrl: https://localhost:8080
+			apiKey: abc123
+			password: pass@123
+			namespace: 0
+			user: user123
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-dgraph-instance": dgraph.Config{
 					Name:      "my-dgraph-instance",
-					Kind:      dgraph.SourceKind,
+					Type:      dgraph.SourceType,
 					DgraphUrl: "https://localhost:8080",
 					ApiKey:    "abc123",
 					Password:  "pass@123",
@@ -57,15 +58,15 @@ func TestParseFromYamlDgraph(t *testing.T) {
 		{
 			desc: "basic example minimal field",
 			in: `
-			sources:
-				my-dgraph-instance:
-					kind: dgraph
-					dgraphUrl: https://localhost:8080
+			kind: sources
+			name: my-dgraph-instance
+			type: dgraph
+			dgraphUrl: https://localhost:8080
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-dgraph-instance": dgraph.Config{
 					Name:      "my-dgraph-instance",
-					Kind:      dgraph.SourceKind,
+					Type:      dgraph.SourceType,
 					DgraphUrl: "https://localhost:8080",
 				},
 			},
@@ -74,16 +75,12 @@ func TestParseFromYamlDgraph(t *testing.T) {
 
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
 
-			if diff := cmp.Diff(tc.want, got.Sources); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -100,31 +97,27 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-dgraph-instance:
-					kind: dgraph
-					dgraphUrl: https://localhost:8080
-					foo: bar
+			kind: sources
+			name: my-dgraph-instance
+			type: dgraph
+			dgraphUrl: https://localhost:8080
+			foo: bar
 			`,
-			err: "unable to parse source \"my-dgraph-instance\" as \"dgraph\": [2:1] unknown field \"foo\"\n   1 | dgraphUrl: https://localhost:8080\n>  2 | foo: bar\n       ^\n   3 | kind: dgraph",
+			err: "error unmarshaling sources: unable to parse source \"my-dgraph-instance\" as \"dgraph\": [2:1] unknown field \"foo\"\n   1 | dgraphUrl: https://localhost:8080\n>  2 | foo: bar\n       ^\n   3 | name: my-dgraph-instance\n   4 | type: dgraph",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-dgraph-instance:
-					kind: dgraph
+			kind: sources
+			name: my-dgraph-instance
+			type: dgraph
 			`,
-			err: "unable to parse source \"my-dgraph-instance\" as \"dgraph\": Key: 'Config.DgraphUrl' Error:Field validation for 'DgraphUrl' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-dgraph-instance\" as \"dgraph\": Key: 'Config.DgraphUrl' Error:Field validation for 'DgraphUrl' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/elasticsearch/elasticsearch.go b/internal/sources/elasticsearch/elasticsearch.go
index b5ec915c18..42dd835b23 100644
--- a/internal/sources/elasticsearch/elasticsearch.go
+++ b/internal/sources/elasticsearch/elasticsearch.go
@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "elasticsearch"
+const SourceType string = "elasticsearch"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -51,15 +51,15 @@ 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"`
+	Type      string   `yaml:"type" validate:"required"`
 	Addresses []string `yaml:"addresses" validate:"required"`
 	Username  string   `yaml:"username"`
 	Password  string   `yaml:"password"`
 	APIKey    string   `yaml:"apikey"`
 }
 
-func (c Config) SourceConfigKind() string {
-	return SourceKind
+func (c Config) SourceConfigType() string {
+	return SourceType
 }
 
 type EsClient interface {
@@ -139,9 +139,9 @@ func (c Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.So
 	return s, nil
 }
 
-// SourceKind returns the kind string for this source.
-func (s *Source) SourceKind() string {
-	return SourceKind
+// SourceType returns the resourceType string for this source.
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/elasticsearch/elasticsearch_test.go b/internal/sources/elasticsearch/elasticsearch_test.go
index 95d941edc4..d3170741f6 100644
--- a/internal/sources/elasticsearch/elasticsearch_test.go
+++ b/internal/sources/elasticsearch/elasticsearch_test.go
@@ -15,13 +15,15 @@
 package elasticsearch_test
 
 import (
+	"context"
 	"reflect"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/elasticsearch"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
 
 func TestParseFromYamlElasticsearch(t *testing.T) {
@@ -33,17 +35,17 @@ func TestParseFromYamlElasticsearch(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-            sources:
-              my-es-instance:
-                kind: elasticsearch
-                addresses:
-                  - http://localhost:9200
-                apikey: somekey
-            `,
-			want: server.SourceConfigs{
+			kind: sources
+			name: my-es-instance
+			type: elasticsearch
+			addresses:
+				- http://localhost:9200
+			apikey: somekey
+			`,
+			want: map[string]sources.SourceConfig{
 				"my-es-instance": elasticsearch.Config{
 					Name:      "my-es-instance",
-					Kind:      elasticsearch.SourceKind,
+					Type:      elasticsearch.SourceType,
 					Addresses: []string{"http://localhost:9200"},
 					APIKey:    "somekey",
 				},
@@ -52,20 +54,50 @@ func TestParseFromYamlElasticsearch(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			err := yaml.Unmarshal([]byte(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("failed to parse yaml: %v", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Sources); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Errorf("unexpected config diff (-want +got):\n%s", diff)
 			}
 		})
 	}
 }
 
+func TestFailParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "extra field",
+			in: `
+			kind: sources
+			name: my-es-instance
+			type: elasticsearch
+			addresses:
+				- http://localhost:9200
+			foo: bar
+			`,
+			err: "error unmarshaling sources: unable to parse source \"my-es-instance\" as \"elasticsearch\": [3:1] unknown field \"foo\"\n   1 | addresses:\n   2 | - http://localhost:9200\n>  3 | foo: bar\n       ^\n   4 | name: my-es-instance\n   5 | type: elasticsearch",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if errStr != tc.err {
+				t.Fatalf("unexpected error: got %q, want %q", errStr, tc.err)
+			}
+		})
+	}
+}
+
 func TestTool_esqlToMap(t1 *testing.T) {
 	tests := []struct {
 		name   string
diff --git a/internal/sources/firebird/firebird.go b/internal/sources/firebird/firebird.go
index 4be3d20cac..1d3f224227 100644
--- a/internal/sources/firebird/firebird.go
+++ b/internal/sources/firebird/firebird.go
@@ -27,13 +27,13 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 )
 
-const SourceKind string = "firebird"
+const SourceType string = "firebird"
 
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -47,7 +47,7 @@ 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"`
+	Type     string `yaml:"type" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
@@ -55,8 +55,8 @@ type Config struct {
 	Database string `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -84,8 +84,8 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -144,7 +144,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 }
 
 func initFirebirdConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string) (*sql.DB, error) {
-	_, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	_, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// urlExample := "user:password@host:port/path/to/database.fdb"
diff --git a/internal/sources/firebird/firebird_test.go b/internal/sources/firebird/firebird_test.go
index 0a7e72f66c..71353517a8 100644
--- a/internal/sources/firebird/firebird_test.go
+++ b/internal/sources/firebird/firebird_test.go
@@ -15,11 +15,12 @@
 package firebird_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/firebird"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlFirebird(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-fdb-instance:
-					kind: firebird
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-fdb-instance
+			type: firebird
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-fdb-instance": firebird.Config{
 					Name:     "my-fdb-instance",
-					Kind:     firebird.SourceKind,
+					Type:     firebird.SourceType,
 					Host:     "my-host",
 					Port:     "my-port",
 					Database: "my_db",
@@ -57,16 +58,12 @@ func TestParseFromYamlFirebird(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -82,39 +79,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-fdb-instance:
-					kind: firebird
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-fdb-instance
+			type: firebird
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-fdb-instance\" as \"firebird\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: my-host\n   4 | kind: firebird\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-fdb-instance\" as \"firebird\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: my-host\n   4 | name: my-fdb-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-fdb-instance:
-					kind: firebird
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
+			kind: sources
+			name: my-fdb-instance
+			type: firebird
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
 			`,
-			err: "unable to parse source \"my-fdb-instance\" as \"firebird\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-fdb-instance\" as \"firebird\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/firestore/firestore.go b/internal/sources/firestore/firestore.go
index be9f7aa94f..0756f146a2 100644
--- a/internal/sources/firestore/firestore.go
+++ b/internal/sources/firestore/firestore.go
@@ -31,14 +31,14 @@ import (
 	"google.golang.org/genproto/googleapis/type/latlng"
 )
 
-const SourceKind string = "firestore"
+const SourceType string = "firestore"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -53,14 +53,14 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Firestore configs
 	Name     string `yaml:"name" validate:"required"`
-	Kind     string `yaml:"kind" validate:"required"`
+	Type     string `yaml:"type" validate:"required"`
 	Project  string `yaml:"project" validate:"required"`
 	Database string `yaml:"database"` // Optional, defaults to "(default)"
 }
 
-func (r Config) SourceConfigKind() string {
-	// Returns Firestore source kind
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	// Returns Firestore source type
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -92,9 +92,9 @@ type Source struct {
 	RulesClient *firebaserules.Service
 }
 
-func (s *Source) SourceKind() string {
-	// Returns Firestore source kind
-	return SourceKind
+func (s *Source) SourceType() string {
+	// Returns Firestore source type
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -594,7 +594,7 @@ func initFirestoreConnection(
 	project string,
 	database string,
 ) (*firestore.Client, error) {
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
diff --git a/internal/sources/firestore/firestore_test.go b/internal/sources/firestore/firestore_test.go
index 3f15440f13..b65926bda3 100644
--- a/internal/sources/firestore/firestore_test.go
+++ b/internal/sources/firestore/firestore_test.go
@@ -15,12 +15,13 @@
 package firestore_test
 
 import (
+	"context"
 	"testing"
 	"time"
 
-	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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/firestore"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -34,15 +35,15 @@ func TestParseFromYamlFirestore(t *testing.T) {
 		{
 			desc: "basic example with default database",
 			in: `
-			sources:
-				my-firestore:
-					kind: firestore
-					project: my-project
+			kind: sources
+			name: my-firestore
+			type: firestore
+			project: my-project
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-firestore": firestore.Config{
 					Name:     "my-firestore",
-					Kind:     firestore.SourceKind,
+					Type:     firestore.SourceType,
 					Project:  "my-project",
 					Database: "",
 				},
@@ -51,16 +52,16 @@ func TestParseFromYamlFirestore(t *testing.T) {
 		{
 			desc: "with custom database",
 			in: `
-			sources:
-				my-firestore:
-					kind: firestore
-					project: my-project
-					database: my-database
+			kind: sources
+			name: my-firestore
+			type: firestore
+			project: my-project
+			database: my-database
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-firestore": firestore.Config{
 					Name:     "my-firestore",
-					Kind:     firestore.SourceKind,
+					Type:     firestore.SourceType,
 					Project:  "my-project",
 					Database: "my-database",
 				},
@@ -69,22 +70,18 @@ func TestParseFromYamlFirestore(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
 }
 
-func TestFailParseFromYamlFirestore(t *testing.T) {
+func TestFailParseFromYaml(t *testing.T) {
 	tcs := []struct {
 		desc string
 		in   string
@@ -93,32 +90,27 @@ func TestFailParseFromYamlFirestore(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-firestore:
-					kind: firestore
-					project: my-project
-					foo: bar
+			kind: sources
+			name: my-firestore
+			type: firestore
+			project: my-project
+			foo: bar
 			`,
-			err: "unable to parse source \"my-firestore\" as \"firestore\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | kind: firestore\n   3 | project: my-project",
+			err: "error unmarshaling sources: unable to parse source \"my-firestore\" as \"firestore\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | name: my-firestore\n   3 | project: my-project\n   4 | type: firestore",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-firestore:
-					kind: firestore
-					database: my-database
+			kind: sources
+			name: my-firestore
+			type: firestore
 			`,
-			err: "unable to parse source \"my-firestore\" as \"firestore\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-firestore\" as \"firestore\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/http/http.go b/internal/sources/http/http.go
index 238c19b607..8a6d58a619 100644
--- a/internal/sources/http/http.go
+++ b/internal/sources/http/http.go
@@ -29,14 +29,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "http"
+const SourceType string = "http"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -50,7 +50,7 @@ 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"`
+	Type                   string            `yaml:"type" validate:"required"`
 	BaseURL                string            `yaml:"baseUrl"`
 	Timeout                string            `yaml:"timeout"`
 	DefaultHeaders         map[string]string `yaml:"headers"`
@@ -58,8 +58,8 @@ type Config struct {
 	DisableSslVerification bool              `yaml:"disableSslVerification"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize initializes an HTTP Source instance.
@@ -122,8 +122,8 @@ type Source struct {
 	client *http.Client
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/http/http_test.go b/internal/sources/http/http_test.go
index 02d8fc6b4d..4332b24fca 100644
--- a/internal/sources/http/http_test.go
+++ b/internal/sources/http/http_test.go
@@ -15,9 +15,9 @@
 package http_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,15 +34,15 @@ func TestParseFromYamlHttp(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-http-instance:
-					kind: http
-					baseUrl: http://test_server/
+			kind: sources
+			name: my-http-instance
+			type: http
+			baseUrl: http://test_server/
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-http-instance": http.Config{
 					Name:                   "my-http-instance",
-					Kind:                   http.SourceKind,
+					Type:                   http.SourceType,
 					BaseURL:                "http://test_server/",
 					Timeout:                "30s",
 					DisableSslVerification: false,
@@ -52,23 +52,23 @@ func TestParseFromYamlHttp(t *testing.T) {
 		{
 			desc: "advanced example",
 			in: `
-			sources:
-				my-http-instance:
-					kind: http
-					baseUrl: http://test_server/
-					timeout: 10s
-					headers:
-						Authorization: test_header
-						Custom-Header: custom
-					queryParams:
-						api-key: test_api_key
-						param: param-value
-					disableSslVerification: true
+			kind: sources
+			name: my-http-instance
+			type: http
+			baseUrl: http://test_server/
+			timeout: 10s
+			headers:
+				Authorization: test_header
+				Custom-Header: custom
+			queryParams:
+				api-key: test_api_key
+				param: param-value
+			disableSslVerification: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-http-instance": http.Config{
 					Name:                   "my-http-instance",
-					Kind:                   http.SourceKind,
+					Type:                   http.SourceType,
 					BaseURL:                "http://test_server/",
 					Timeout:                "10s",
 					DefaultHeaders:         map[string]string{"Authorization": "test_header", "Custom-Header": "custom"},
@@ -80,16 +80,12 @@ func TestParseFromYamlHttp(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -104,36 +100,32 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-http-instance:
-					kind: http
-					baseUrl: http://test_server/
-					timeout: 10s
-					headers:
-						Authorization: test_header
-					queryParams:
-						api-key: test_api_key
-					project: test-project
+			kind: sources
+			name: my-http-instance
+			type: http
+			baseUrl: http://test_server/
+			timeout: 10s
+			headers:
+				Authorization: test_header
+			queryParams:
+				api-key: test_api_key
+			project: test-project
 			`,
-			err: "unable to parse source \"my-http-instance\" as \"http\": [5:1] unknown field \"project\"\n   2 | headers:\n   3 |   Authorization: test_header\n   4 | kind: http\n>  5 | project: test-project\n       ^\n   6 | queryParams:\n   7 |   api-key: test_api_key\n   8 | timeout: 10s",
+			err: "error unmarshaling sources: unable to parse source \"my-http-instance\" as \"http\": [5:1] unknown field \"project\"\n   2 | headers:\n   3 |   Authorization: test_header\n   4 | name: my-http-instance\n>  5 | project: test-project\n       ^\n   6 | queryParams:\n   7 |   api-key: test_api_key\n   8 | timeout: 10s\n   9 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-http-instance:
-					baseUrl: http://test_server/
+			kind: sources
+			name: my-http-instance
+			baseUrl: http://test_server/
 			`,
-			err: "missing 'kind' field for source \"my-http-instance\"",
+			err: "error unmarshaling sources: missing 'type' field or it is not a string",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/looker/looker.go b/internal/sources/looker/looker.go
index c7b401b080..e20ec2107d 100644
--- a/internal/sources/looker/looker.go
+++ b/internal/sources/looker/looker.go
@@ -33,14 +33,14 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const SourceKind string = "looker"
+const SourceType string = "looker"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -64,7 +64,7 @@ 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"`
+	Type               string `yaml:"type" validate:"required"`
 	BaseURL            string `yaml:"base_url" validate:"required"`
 	ClientId           string `yaml:"client_id"`
 	ClientSecret       string `yaml:"client_secret"`
@@ -79,8 +79,8 @@ type Config struct {
 	SessionLength      int64  `yaml:"sessionLength"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize initializes a Looker Source instance.
@@ -154,8 +154,8 @@ type Source struct {
 	AuthTokenHeaderName string
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/looker/looker_test.go b/internal/sources/looker/looker_test.go
index bd470f0130..95fbf442f3 100644
--- a/internal/sources/looker/looker_test.go
+++ b/internal/sources/looker/looker_test.go
@@ -15,9 +15,9 @@
 package looker_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,17 +34,17 @@ func TestParseFromYamlLooker(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-looker-instance:
-					kind: looker
-					base_url: http://example.looker.com/
-					client_id: jasdl;k;tjl
-					client_secret: sdakl;jgflkasdfkfg
+			kind: sources
+			name: my-looker-instance
+			type: looker
+			base_url: http://example.looker.com/
+			client_id: jasdl;k;tjl
+			client_secret: sdakl;jgflkasdfkfg
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-looker-instance": looker.Config{
 					Name:               "my-looker-instance",
-					Kind:               looker.SourceKind,
+					Type:               looker.SourceType,
 					BaseURL:            "http://example.looker.com/",
 					ClientId:           "jasdl;k;tjl",
 					ClientSecret:       "sdakl;jgflkasdfkfg",
@@ -62,22 +62,18 @@ func TestParseFromYamlLooker(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
 }
 
-func TestFailParseFromYamlLooker(t *testing.T) {
+func TestFailParseFromYaml(t *testing.T) {
 	tcs := []struct {
 		desc string
 		in   string
@@ -86,34 +82,30 @@ func TestFailParseFromYamlLooker(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-looker-instance:
-					kind: looker
-					base_url: http://example.looker.com/
-					client_id: jasdl;k;tjl
-					client_secret: sdakl;jgflkasdfkfg
-					schema: test-schema
+			kind: sources
+			name: my-looker-instance
+			type: looker
+			base_url: http://example.looker.com/
+			client_id: jasdl;k;tjl
+			client_secret: sdakl;jgflkasdfkfg
+			schema: test-schema
 			`,
-			err: "unable to parse source \"my-looker-instance\" as \"looker\": [5:1] unknown field \"schema\"\n   2 | client_id: jasdl;k;tjl\n   3 | client_secret: sdakl;jgflkasdfkfg\n   4 | kind: looker\n>  5 | schema: test-schema\n       ^\n",
+			err: "error unmarshaling sources: unable to parse source \"my-looker-instance\" as \"looker\": [5:1] unknown field \"schema\"\n   2 | client_id: jasdl;k;tjl\n   3 | client_secret: sdakl;jgflkasdfkfg\n   4 | name: my-looker-instance\n>  5 | schema: test-schema\n       ^\n   6 | type: looker",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-looker-instance:
-					kind: looker
-					client_id: jasdl;k;tjl
+			kind: sources
+			name: my-looker-instance
+			type: looker
+			client_id: jasdl;k;tjl
 			`,
-			err: "unable to parse source \"my-looker-instance\" as \"looker\": Key: 'Config.BaseURL' Error:Field validation for 'BaseURL' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-looker-instance\" as \"looker\": Key: 'Config.BaseURL' Error:Field validation for 'BaseURL' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/mindsdb/mindsdb.go b/internal/sources/mindsdb/mindsdb.go
index 4bb5daac1c..8fde3b6222 100644
--- a/internal/sources/mindsdb/mindsdb.go
+++ b/internal/sources/mindsdb/mindsdb.go
@@ -27,14 +27,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "mindsdb"
+const SourceType string = "mindsdb"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -48,7 +48,7 @@ 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"`
+	Type         string `yaml:"type" validate:"required"`
 	Host         string `yaml:"host" validate:"required"`
 	Port         string `yaml:"port" validate:"required"`
 	User         string `yaml:"user" validate:"required"`
@@ -57,8 +57,8 @@ type Config struct {
 	QueryTimeout string `yaml:"queryTimeout"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -86,8 +86,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -159,7 +159,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initMindsDBConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database
diff --git a/internal/sources/mindsdb/mindsdb_test.go b/internal/sources/mindsdb/mindsdb_test.go
index b80f0bc5a6..9195aa0c1f 100644
--- a/internal/sources/mindsdb/mindsdb_test.go
+++ b/internal/sources/mindsdb/mindsdb_test.go
@@ -15,11 +15,12 @@
 package mindsdb_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/mindsdb"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlMindsDB(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-mindsdb-instance:
-					kind: mindsdb
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mindsdb-instance
+			type: mindsdb
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mindsdb-instance": mindsdb.Config{
 					Name:     "my-mindsdb-instance",
-					Kind:     mindsdb.SourceKind,
+					Type:     mindsdb.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -57,20 +58,20 @@ func TestParseFromYamlMindsDB(t *testing.T) {
 		{
 			desc: "with query timeout",
 			in: `
-			sources:
-				my-mindsdb-instance:
-					kind: mindsdb
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryTimeout: 45s
+			kind: sources
+			name: my-mindsdb-instance
+			type: mindsdb
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			queryTimeout: 45s
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mindsdb-instance": mindsdb.Config{
 					Name:         "my-mindsdb-instance",
-					Kind:         mindsdb.SourceKind,
+					Type:         mindsdb.SourceType,
 					Host:         "0.0.0.0",
 					Port:         "my-port",
 					Database:     "my_db",
@@ -83,16 +84,12 @@ func TestParseFromYamlMindsDB(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -108,39 +105,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-mindsdb-instance:
-					kind: mindsdb
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-mindsdb-instance
+			type: mindsdb
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-mindsdb-instance\" as \"mindsdb\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | kind: mindsdb\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-mindsdb-instance\" as \"mindsdb\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | name: my-mindsdb-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-mindsdb-instance:
-					kind: mindsdb
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mindsdb-instance
+			type: mindsdb
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-mindsdb-instance\" as \"mindsdb\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-mindsdb-instance\" as \"mindsdb\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/mongodb/mongodb.go b/internal/sources/mongodb/mongodb.go
index 533e5005d5..611744186b 100644
--- a/internal/sources/mongodb/mongodb.go
+++ b/internal/sources/mongodb/mongodb.go
@@ -23,20 +23,20 @@ import (
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/util"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "mongodb"
+const SourceType string = "mongodb"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -50,12 +50,12 @@ 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"`
+	Type string `yaml:"type" validate:"required"`
 	Uri  string `yaml:"uri" validate:"required"` // MongoDB Atlas connection URI
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -84,8 +84,8 @@ type Source struct {
 	Client *mongo.Client
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -148,7 +148,7 @@ func (s *Source) Aggregate(ctx context.Context, pipelineString string, canonical
 	return res, err
 }
 
-func (s *Source) Find(ctx context.Context, filterString, database, collection string, opts *options.FindOptions) ([]any, error) {
+func (s *Source) Find(ctx context.Context, filterString, database, collection string, opts *options.FindOptionsBuilder) ([]any, error) {
 	var filter = bson.D{}
 	err := bson.UnmarshalExtJSON([]byte(filterString), false, &filter)
 	if err != nil {
@@ -163,7 +163,7 @@ func (s *Source) Find(ctx context.Context, filterString, database, collection st
 	return parseData(ctx, cur)
 }
 
-func (s *Source) FindOne(ctx context.Context, filterString, database, collection string, opts *options.FindOneOptions) ([]any, error) {
+func (s *Source) FindOne(ctx context.Context, filterString, database, collection string, opts *options.FindOneOptionsBuilder) ([]any, error) {
 	var filter = bson.D{}
 	err := bson.UnmarshalExtJSON([]byte(filterString), false, &filter)
 	if err != nil {
@@ -233,7 +233,7 @@ func (s *Source) UpdateMany(ctx context.Context, filterString string, canonical
 		return nil, fmt.Errorf("unable to unmarshal update string: %w", err)
 	}
 
-	res, err := s.MongoClient().Database(database).Collection(collection).UpdateMany(ctx, filter, update, options.Update().SetUpsert(upsert))
+	res, err := s.MongoClient().Database(database).Collection(collection).UpdateMany(ctx, filter, update, options.UpdateMany().SetUpsert(upsert))
 	if err != nil {
 		return nil, fmt.Errorf("error updating collection: %w", err)
 	}
@@ -252,7 +252,7 @@ func (s *Source) UpdateOne(ctx context.Context, filterString string, canonical b
 		return nil, fmt.Errorf("unable to unmarshal update string: %w", err)
 	}
 
-	res, err := s.MongoClient().Database(database).Collection(collection).UpdateOne(ctx, filter, update, options.Update().SetUpsert(upsert))
+	res, err := s.MongoClient().Database(database).Collection(collection).UpdateOne(ctx, filter, update, options.UpdateOne().SetUpsert(upsert))
 	if err != nil {
 		return nil, fmt.Errorf("error updating collection: %w", err)
 	}
@@ -266,7 +266,7 @@ func (s *Source) DeleteMany(ctx context.Context, filterString, database, collect
 		return nil, err
 	}
 
-	res, err := s.MongoClient().Database(database).Collection(collection).DeleteMany(ctx, filter, options.Delete())
+	res, err := s.MongoClient().Database(database).Collection(collection).DeleteMany(ctx, filter, options.DeleteMany())
 	if err != nil {
 		return nil, err
 	}
@@ -284,7 +284,7 @@ func (s *Source) DeleteOne(ctx context.Context, filterString, database, collecti
 		return nil, err
 	}
 
-	res, err := s.MongoClient().Database(database).Collection(collection).DeleteOne(ctx, filter, options.Delete())
+	res, err := s.MongoClient().Database(database).Collection(collection).DeleteOne(ctx, filter, options.DeleteOne())
 	if err != nil {
 		return nil, err
 	}
@@ -293,7 +293,7 @@ func (s *Source) DeleteOne(ctx context.Context, filterString, database, collecti
 
 func initMongoDBClient(ctx context.Context, tracer trace.Tracer, name, uri string) (*mongo.Client, error) {
 	// Start a tracing span
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
@@ -303,7 +303,7 @@ func initMongoDBClient(ctx context.Context, tracer trace.Tracer, name, uri strin
 
 	// Create a new MongoDB client
 	clientOpts := options.Client().ApplyURI(uri).SetAppName(userAgent)
-	client, err := mongo.Connect(ctx, clientOpts)
+	client, err := mongo.Connect(clientOpts)
 	if err != nil {
 		return nil, fmt.Errorf("unable to create MongoDB client: %w", err)
 	}
diff --git a/internal/sources/mongodb/mongodb_test.go b/internal/sources/mongodb/mongodb_test.go
index 0c882899a4..9fec7ecc74 100644
--- a/internal/sources/mongodb/mongodb_test.go
+++ b/internal/sources/mongodb/mongodb_test.go
@@ -15,11 +15,12 @@
 package mongodb_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/mongodb"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,15 +34,15 @@ func TestParseFromYamlMongoDB(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				mongo-db:
-					kind: "mongodb"
-					uri: "mongodb+srv://username:password@host/dbname"
+			kind: sources
+			name: mongo-db
+			type: "mongodb"
+			uri: "mongodb+srv://username:password@host/dbname"
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"mongo-db": mongodb.Config{
 					Name: "mongo-db",
-					Kind: mongodb.SourceKind,
+					Type: mongodb.SourceType,
 					Uri:  "mongodb+srv://username:password@host/dbname",
 				},
 			},
@@ -49,16 +50,12 @@ func TestParseFromYamlMongoDB(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -74,31 +71,27 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				mongo-db:
-					kind: mongodb
-					uri: "mongodb+srv://username:password@host/dbname"
-					foo: bar
+			kind: sources
+			name: mongo-db
+			type: mongodb
+			uri: "mongodb+srv://username:password@host/dbname"
+			foo: bar
 			`,
-			err: "unable to parse source \"mongo-db\" as \"mongodb\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | kind: mongodb\n   3 | uri: mongodb+srv://username:password@host/dbname",
+			err: "error unmarshaling sources: unable to parse source \"mongo-db\" as \"mongodb\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | name: mongo-db\n   3 | type: mongodb\n   4 | uri: mongodb+srv://username:password@host/dbname",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				mongo-db:
-					kind: mongodb
+			kind: sources
+			name: mongo-db
+			type: mongodb
 			`,
-			err: "unable to parse source \"mongo-db\" as \"mongodb\": Key: 'Config.Uri' Error:Field validation for 'Uri' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"mongo-db\" as \"mongodb\": Key: 'Config.Uri' Error:Field validation for 'Uri' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/mssql/mssql.go b/internal/sources/mssql/mssql.go
index 688ccf18c4..e8dd7e824c 100644
--- a/internal/sources/mssql/mssql.go
+++ b/internal/sources/mssql/mssql.go
@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "mssql"
+const SourceType string = "mssql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -50,7 +50,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 type Config struct {
 	// Cloud SQL MSSQL configs
 	Name     string `yaml:"name" validate:"required"`
-	Kind     string `yaml:"kind" validate:"required"`
+	Type     string `yaml:"type" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
@@ -59,9 +59,9 @@ type Config struct {
 	Encrypt  string `yaml:"encrypt"`
 }
 
-func (r Config) SourceConfigKind() string {
-	// Returns Cloud SQL MSSQL source kind
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	// Returns Cloud SQL MSSQL source type
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -91,9 +91,9 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	// Returns Cloud SQL MSSQL source kind
-	return SourceKind
+func (s *Source) SourceType() string {
+	// Returns Cloud SQL MSSQL source type
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -156,7 +156,7 @@ func initMssqlConnection(
 	error,
 ) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	userAgent, err := util.UserAgentFromContext(ctx)
diff --git a/internal/sources/mssql/mssql_test.go b/internal/sources/mssql/mssql_test.go
index b1fa552b46..26b682fafa 100644
--- a/internal/sources/mssql/mssql_test.go
+++ b/internal/sources/mssql/mssql_test.go
@@ -15,11 +15,12 @@
 package mssql_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/mssql"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlMssql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-mssql-instance:
-					kind: mssql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mssql-instance
+			type: mssql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mssql-instance": mssql.Config{
 					Name:     "my-mssql-instance",
-					Kind:     mssql.SourceKind,
+					Type:     mssql.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -57,20 +58,20 @@ func TestParseFromYamlMssql(t *testing.T) {
 		{
 			desc: "with encrypt field",
 			in: `
-			sources:
-				my-mssql-instance:
-					kind: mssql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					encrypt: strict
+			kind: sources
+			name: my-mssql-instance
+			type: mssql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			encrypt: strict
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mssql-instance": mssql.Config{
 					Name:     "my-mssql-instance",
-					Kind:     mssql.SourceKind,
+					Type:     mssql.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -83,16 +84,12 @@ func TestParseFromYamlMssql(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect psarse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect psarse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -107,39 +104,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-mssql-instance:
-					kind: mssql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-mssql-instance
+			type: mssql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-mssql-instance\" as \"mssql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | kind: mssql\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-mssql-instance\" as \"mssql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | name: my-mssql-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-mssql-instance:
-					kind: mssql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
+			kind: sources
+			name: my-mssql-instance
+			type: mssql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
 			`,
-			err: "unable to parse source \"my-mssql-instance\" as \"mssql\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-mssql-instance\" as \"mssql\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/mysql/mysql.go b/internal/sources/mysql/mysql.go
index b456ec9a3f..626e72c817 100644
--- a/internal/sources/mysql/mysql.go
+++ b/internal/sources/mysql/mysql.go
@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "mysql"
+const SourceType string = "mysql"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -51,7 +51,7 @@ 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"`
+	Type         string            `yaml:"type" validate:"required"`
 	Host         string            `yaml:"host" validate:"required"`
 	Port         string            `yaml:"port" validate:"required"`
 	User         string            `yaml:"user" validate:"required"`
@@ -61,8 +61,8 @@ type Config struct {
 	QueryParams  map[string]string `yaml:"queryParams"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -90,8 +90,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -158,7 +158,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initMySQLConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string, queryParams map[string]string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Build query parameters via url.Values for deterministic order and proper escaping.
diff --git a/internal/sources/mysql/mysql_test.go b/internal/sources/mysql/mysql_test.go
index 2cbce3bc50..fc6dd348c7 100644
--- a/internal/sources/mysql/mysql_test.go
+++ b/internal/sources/mysql/mysql_test.go
@@ -19,12 +19,12 @@ import (
 	"strings"
 	"testing"
 
-	yaml "github.com/goccy/go-yaml"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"go.opentelemetry.io/otel/trace/noop"
 
 	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/mysql"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -38,19 +38,19 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: mysql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": mysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     mysql.SourceKind,
+					Type:     mysql.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -62,20 +62,20 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "with query timeout",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryTimeout: 45s
+			kind: sources
+			name: my-mysql-instance
+			type: mysql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			queryTimeout: 45s
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": mysql.Config{
 					Name:         "my-mysql-instance",
-					Kind:         mysql.SourceKind,
+					Type:         mysql.SourceType,
 					Host:         "0.0.0.0",
 					Port:         "my-port",
 					Database:     "my_db",
@@ -88,22 +88,22 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 		{
 			desc: "with query params",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryParams:
-						tls: preferred
-						charset: utf8mb4
+			kind: sources
+			name: my-mysql-instance
+			type: mysql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			queryParams:
+				tls: preferred
+				charset: utf8mb4
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-mysql-instance": mysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     mysql.SourceKind,
+					Type:     mysql.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -120,15 +120,11 @@ func TestParseFromYamlCloudSQLMySQL(t *testing.T) {
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Sources, cmpopts.EquateEmpty()); diff != "" {
+			if diff := cmp.Diff(tc.want, got, cmpopts.EquateEmpty()); diff != "" {
 				t.Fatalf("mismatch (-want +got):\n%s", diff)
 			}
 		})
@@ -145,55 +141,51 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-mysql-instance
+			type: mysql
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unknown field \"foo\"",
+			err: "error unmarshaling sources: unable to parse source \"my-mysql-instance\" as \"mysql\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | name: my-mysql-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: mysql
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "Field validation for 'Host' failed",
+			err: "error unmarshaling sources: unable to parse source \"my-mysql-instance\" as \"mysql\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 		{
 			desc: "invalid query params type",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: mysql
-					host: 0.0.0.0
-					port: 3306
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryParams: not-a-map
+			kind: sources
+			name: my-mysql-instance
+			type: mysql
+			host: 0.0.0.0
+			port: 3306
+			database: my_db
+			user: my_user
+			password: my_pass
+			queryParams: not-a-map
 			`,
-			err: "string was used where mapping is expected",
+			err: "error unmarshaling sources: unable to parse source \"my-mysql-instance\" as \"mysql\": [6:14] string was used where mapping is expected\n   3 | name: my-mysql-instance\n   4 | password: my_pass\n   5 | port: 3306\n>  6 | queryParams: not-a-map\n                    ^\n   7 | type: mysql\n   8 | user: my_user",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
@@ -211,7 +203,7 @@ func TestFailInitialization(t *testing.T) {
 
 	cfg := mysql.Config{
 		Name:         "instance",
-		Kind:         "mysql",
+		Type:         "mysql",
 		Host:         "localhost",
 		Port:         "3306",
 		Database:     "db",
diff --git a/internal/sources/neo4j/neo4j.go b/internal/sources/neo4j/neo4j.go
index 70cc21ae14..79af308cbf 100644
--- a/internal/sources/neo4j/neo4j.go
+++ b/internal/sources/neo4j/neo4j.go
@@ -29,7 +29,7 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "neo4j"
+const SourceType string = "neo4j"
 
 var sourceClassifier *classifier.QueryClassifier = classifier.NewQueryClassifier()
 
@@ -37,8 +37,8 @@ var sourceClassifier *classifier.QueryClassifier = classifier.NewQueryClassifier
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -52,15 +52,15 @@ 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"`
+	Type     string `yaml:"type" validate:"required"`
 	Uri      string `yaml:"uri" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
 	Password string `yaml:"password" validate:"required"`
 	Database string `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -91,8 +91,8 @@ type Source struct {
 	Driver neo4j.DriverWithContext
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -182,7 +182,7 @@ func addPlanChildren(p neo4j.Plan) []map[string]any {
 
 func initNeo4jDriver(ctx context.Context, tracer trace.Tracer, uri, user, password, name string) (neo4j.DriverWithContext, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	auth := neo4j.BasicAuth(user, password, "")
diff --git a/internal/sources/neo4j/neo4j_test.go b/internal/sources/neo4j/neo4j_test.go
index 2ac8aab534..35e3e87d50 100644
--- a/internal/sources/neo4j/neo4j_test.go
+++ b/internal/sources/neo4j/neo4j_test.go
@@ -15,11 +15,12 @@
 package neo4j_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/neo4j"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,18 +34,18 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-neo4j-instance:
-					kind: neo4j
-					uri: neo4j+s://my-host:7687
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-neo4j-instance
+			type: neo4j
+			uri: neo4j+s://my-host:7687
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-neo4j-instance": neo4j.Config{
 					Name:     "my-neo4j-instance",
-					Kind:     neo4j.SourceKind,
+					Type:     neo4j.SourceType,
 					Uri:      "neo4j+s://my-host:7687",
 					Database: "my_db",
 					User:     "my_user",
@@ -55,16 +56,12 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -80,37 +77,33 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-neo4j-instance:
-					kind: neo4j
-					uri: neo4j+s://my-host:7687
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-neo4j-instance
+			type: neo4j
+			uri: neo4j+s://my-host:7687
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-neo4j-instance\" as \"neo4j\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | kind: neo4j\n   4 | password: my_pass\n   5 | uri: neo4j+s://my-host:7687\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-neo4j-instance\" as \"neo4j\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | name: my-neo4j-instance\n   4 | password: my_pass\n   5 | type: neo4j\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-neo4j-instance:
-					kind: neo4j
-					uri: neo4j+s://my-host:7687
-					database: my_db
-					user: my_user
+			kind: sources
+			name: my-neo4j-instance
+			type: neo4j
+			uri: neo4j+s://my-host:7687
+			database: my_db
+			user: my_user
 			`,
-			err: "unable to parse source \"my-neo4j-instance\" as \"neo4j\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-neo4j-instance\" as \"neo4j\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/oceanbase/oceanbase.go b/internal/sources/oceanbase/oceanbase.go
index 27a989ae3d..0138838f64 100644
--- a/internal/sources/oceanbase/oceanbase.go
+++ b/internal/sources/oceanbase/oceanbase.go
@@ -27,14 +27,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "oceanbase"
+const SourceType string = "oceanbase"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -48,7 +48,7 @@ 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"`
+	Type         string `yaml:"type" validate:"required"`
 	Host         string `yaml:"host" validate:"required"`
 	Port         string `yaml:"port" validate:"required"`
 	User         string `yaml:"user" validate:"required"`
@@ -57,8 +57,8 @@ type Config struct {
 	QueryTimeout string `yaml:"queryTimeout"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -86,8 +86,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -153,7 +153,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 }
 
 func initOceanBaseConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
-	_, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	_, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	dsn := fmt.Sprintf("%s:%s@tcp(%s:%s)/%s?parseTime=true", user, pass, host, port, dbname)
diff --git a/internal/sources/oceanbase/oceanbase_test.go b/internal/sources/oceanbase/oceanbase_test.go
index a21a5e0655..bfde68da95 100644
--- a/internal/sources/oceanbase/oceanbase_test.go
+++ b/internal/sources/oceanbase/oceanbase_test.go
@@ -15,11 +15,12 @@
 package oceanbase_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/oceanbase"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -34,19 +35,19 @@ func TestParseFromYamlOceanBase(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-oceanbase-instance:
-					kind: oceanbase
-					host: 0.0.0.0
-					port: 2881
-					database: ob_db
-					user: ob_user
-					password: ob_pass
+			kind: sources
+			name: my-oceanbase-instance
+			type: oceanbase
+			host: 0.0.0.0
+			port: 2881
+			database: ob_db
+			user: ob_user
+			password: ob_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-oceanbase-instance": oceanbase.Config{
 					Name:     "my-oceanbase-instance",
-					Kind:     oceanbase.SourceKind,
+					Type:     oceanbase.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "2881",
 					Database: "ob_db",
@@ -58,20 +59,20 @@ func TestParseFromYamlOceanBase(t *testing.T) {
 		{
 			desc: "with query timeout",
 			in: `
-			sources:
-				my-oceanbase-instance:
-					kind: oceanbase
-					host: 0.0.0.0
-					port: 2881
-					database: ob_db
-					user: ob_user
-					password: ob_pass
-					queryTimeout: 30s
+			kind: sources
+			name: my-oceanbase-instance
+			type: oceanbase
+			host: 0.0.0.0
+			port: 2881
+			database: ob_db
+			user: ob_user
+			password: ob_pass
+			queryTimeout: 30s
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-oceanbase-instance": oceanbase.Config{
 					Name:         "my-oceanbase-instance",
-					Kind:         oceanbase.SourceKind,
+					Type:         oceanbase.SourceType,
 					Host:         "0.0.0.0",
 					Port:         "2881",
 					Database:     "ob_db",
@@ -84,16 +85,12 @@ func TestParseFromYamlOceanBase(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -109,39 +106,35 @@ func TestFailParseFromYamlOceanBase(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-oceanbase-instance:
-					kind: oceanbase
-					host: 0.0.0.0
-					port: 2881
-					database: ob_db
-					user: ob_user
-					password: ob_pass
-					foo: bar
+			kind: sources
+			name: my-oceanbase-instance
+			type: oceanbase
+			host: 0.0.0.0
+			port: 2881
+			database: ob_db
+			user: ob_user
+			password: ob_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-oceanbase-instance\" as \"oceanbase\": [2:1] unknown field \"foo\"\n   1 | database: ob_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | kind: oceanbase\n   5 | password: ob_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-oceanbase-instance\" as \"oceanbase\": [2:1] unknown field \"foo\"\n   1 | database: ob_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | name: my-oceanbase-instance\n   5 | password: ob_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-oceanbase-instance:
-					kind: oceanbase
-					port: 2881
-					database: ob_db
-					user: ob_user
-					password: ob_pass
+			kind: sources
+			name: my-oceanbase-instance
+			type: oceanbase
+			port: 2881
+			database: ob_db
+			user: ob_user
+			password: ob_pass
 			`,
-			err: "unable to parse source \"my-oceanbase-instance\" as \"oceanbase\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-oceanbase-instance\" as \"oceanbase\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/oracle/oracle.go b/internal/sources/oracle/oracle.go
index 29d78cc706..f9202323ce 100644
--- a/internal/sources/oracle/oracle.go
+++ b/internal/sources/oracle/oracle.go
@@ -18,14 +18,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "oracle"
+const SourceType string = "oracle"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -45,7 +45,7 @@ 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"`
+	Type             string `yaml:"type" validate:"required"`
 	ConnectionString string `yaml:"connectionString,omitempty"`
 	TnsAlias         string `yaml:"tnsAlias,omitempty"`
 	TnsAdmin         string `yaml:"tnsAdmin,omitempty"`
@@ -95,8 +95,8 @@ func (c Config) validate() error {
 	return nil
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -124,8 +124,8 @@ type Source struct {
 	DB *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -239,7 +239,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initOracleConnection(ctx context.Context, tracer trace.Tracer, config Config) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, config.Name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, config.Name)
 	defer span.End()
 
 	logger, err := util.LoggerFromContext(ctx)
diff --git a/internal/sources/oracle/oracle_test.go b/internal/sources/oracle/oracle_test.go
index 3d8f4c7ba5..dc9875341b 100644
--- a/internal/sources/oracle/oracle_test.go
+++ b/internal/sources/oracle/oracle_test.go
@@ -3,12 +3,13 @@
 package oracle_test
 
 import (
+	"context"
 	"strings"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/oracle"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -22,18 +23,18 @@ func TestParseFromYamlOracle(t *testing.T) {
 		{
 			desc: "connection string and useOCI=true",
 			in: `
-            sources:
-                my-oracle-cs:
-                    kind: oracle
-                    connectionString: "my-host:1521/XEPDB1"
-                    user: my_user
-                    password: my_pass
-                    useOCI: true
-            `,
-			want: server.SourceConfigs{
+			kind: sources
+			name: my-oracle-cs
+			type: oracle
+			connectionString: "my-host:1521/XEPDB1"
+			user: my_user
+			password: my_pass
+			useOCI: true
+			`,
+			want: map[string]sources.SourceConfig{
 				"my-oracle-cs": oracle.Config{
 					Name:             "my-oracle-cs",
-					Kind:             oracle.SourceKind,
+					Type:             oracle.SourceType,
 					ConnectionString: "my-host:1521/XEPDB1",
 					User:             "my_user",
 					Password:         "my_pass",
@@ -44,19 +45,19 @@ func TestParseFromYamlOracle(t *testing.T) {
 		{
 			desc: "host/port/serviceName and default useOCI=false",
 			in: `
-            sources:
-                my-oracle-host:
-                    kind: oracle
-                    host: my-host
-                    port: 1521
-                    serviceName: ORCLPDB
-                    user: my_user
-                    password: my_pass
-            `,
-			want: server.SourceConfigs{
+			kind: sources
+			name: my-oracle-host
+			type: oracle
+			host: my-host
+			port: 1521
+			serviceName: ORCLPDB
+			user: my_user
+			password: my_pass
+			`,
+			want: map[string]sources.SourceConfig{
 				"my-oracle-host": oracle.Config{
 					Name:        "my-oracle-host",
-					Kind:        oracle.SourceKind,
+					Type:        oracle.SourceType,
 					Host:        "my-host",
 					Port:        1521,
 					ServiceName: "ORCLPDB",
@@ -69,19 +70,19 @@ func TestParseFromYamlOracle(t *testing.T) {
 		{
 			desc: "tnsAlias and TnsAdmin specified with explicit useOCI=true",
 			in: `
-            sources:
-                my-oracle-tns-oci:
-                    kind: oracle
-                    tnsAlias: FINANCE_DB
-                    tnsAdmin: /opt/oracle/network/admin
-                    user: my_user
-                    password: my_pass
-                    useOCI: true 
-            `,
-			want: server.SourceConfigs{
+			kind: sources
+			name: my-oracle-tns-oci
+			type: oracle
+			tnsAlias: FINANCE_DB
+			tnsAdmin: /opt/oracle/network/admin
+			user: my_user
+			password: my_pass
+			useOCI: true 
+			`,
+			want: map[string]sources.SourceConfig{
 				"my-oracle-tns-oci": oracle.Config{
 					Name:     "my-oracle-tns-oci",
-					Kind:     oracle.SourceKind,
+					Type:     oracle.SourceType,
 					TnsAlias: "FINANCE_DB",
 					TnsAdmin: "/opt/oracle/network/admin",
 					User:     "my_user",
@@ -93,22 +94,18 @@ func TestParseFromYamlOracle(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse:\nwant: %v\ngot:  %v\ndiff: %s", tc.want, got.Sources, cmp.Diff(tc.want, got.Sources))
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse:\nwant: %v\ngot:  %v\ndiff: %s", tc.want, got, cmp.Diff(tc.want, got))
 			}
 		})
 	}
 }
 
-func TestFailParseFromYamlOracle(t *testing.T) {
+func TestFailParseFromYaml(t *testing.T) {
 	tcs := []struct {
 		desc string
 		in   string
@@ -117,76 +114,72 @@ func TestFailParseFromYamlOracle(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-oracle-instance:
-					kind: oracle
-					host: my-host
-					serviceName: ORCL
-					user: my_user
-					password: my_pass
-					extraField: value
+			kind: sources
+			name: my-oracle-instance
+			type: oracle
+			host: my-host
+			serviceName: ORCL
+			user: my_user
+			password: my_pass
+			extraField: value
 			`,
-			err: "unable to parse source \"my-oracle-instance\" as \"oracle\": [1:1] unknown field \"extraField\"\n>  1 | extraField: value\n       ^\n   2 | host: my-host\n   3 | kind: oracle\n   4 | password: my_pass\n   5 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-oracle-instance\" as \"oracle\": [1:1] unknown field \"extraField\"\n>  1 | extraField: value\n       ^\n   2 | host: my-host\n   3 | name: my-oracle-instance\n   4 | password: my_pass\n   5 | ",
 		},
 		{
 			desc: "missing required password field",
 			in: `
-            sources:
-                my-oracle-instance:
-                    kind: oracle
-                    host: my-host
-                    serviceName: ORCL
-                    user: my_user
-            `,
-			err: "unable to parse source \"my-oracle-instance\" as \"oracle\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
+			kind: sources
+			name: my-oracle-instance
+			type: oracle
+			host: my-host
+			serviceName: ORCL
+			user: my_user
+			`,
+			err: "error unmarshaling sources: unable to parse source \"my-oracle-instance\" as \"oracle\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
 		},
 		{
 			desc: "missing connection method fields (validate fails)",
 			in: `
-            sources:
-                my-oracle-instance:
-                    kind: oracle
-                    user: my_user
-                    password: my_pass
-            `,
-			err: "unable to parse source \"my-oracle-instance\" as \"oracle\": invalid Oracle configuration: must provide one of: 'tns_alias', 'connection_string', or both 'host' and 'service_name'",
+			kind: sources
+			name: my-oracle-instance
+			type: oracle
+			user: my_user
+			password: my_pass
+			`,
+			err: "error unmarshaling sources: unable to parse source \"my-oracle-instance\" as \"oracle\": invalid Oracle configuration: must provide one of: 'tns_alias', 'connection_string', or both 'host' and 'service_name'",
 		},
 		{
 			desc: "multiple connection methods provided (validate fails)",
 			in: `
-            sources:
-                my-oracle-instance:
-                    kind: oracle
-                    host: my-host
-                    serviceName: ORCL
-                    connectionString: "my-host:1521/XEPDB1"
-                    user: my_user
-                    password: my_pass
-            `,
-			err: "unable to parse source \"my-oracle-instance\" as \"oracle\": invalid Oracle configuration: provide only one connection method: 'tns_alias', 'connection_string', or 'host'+'service_name'",
+			kind: sources
+			name: my-oracle-instance
+			type: oracle
+			host: my-host
+			serviceName: ORCL
+			connectionString: "my-host:1521/XEPDB1"
+			user: my_user
+			password: my_pass
+			`,
+			err: "error unmarshaling sources: unable to parse source \"my-oracle-instance\" as \"oracle\": invalid Oracle configuration: provide only one connection method: 'tns_alias', 'connection_string', or 'host'+'service_name'",
 		},
 		{
 			desc: "fail on tnsAdmin with useOCI=false",
 			in: `
-			sources:
-				my-oracle-fail:
-					kind: oracle
-					tnsAlias: FINANCE_DB
-					tnsAdmin: /opt/oracle/network/admin
-					user: my_user
-					password: my_pass
-					useOCI: false
+			kind: sources
+			name: my-oracle-fail
+			type: oracle
+			tnsAlias: FINANCE_DB
+			tnsAdmin: /opt/oracle/network/admin
+			user: my_user
+			password: my_pass
+			useOCI: false
 			`,
-			err: "unable to parse source \"my-oracle-fail\" as \"oracle\": invalid Oracle configuration: `tnsAdmin` can only be used when `UseOCI` is true, or use `walletLocation` instead",
+			err: "error unmarshaling sources: unable to parse source \"my-oracle-fail\" as \"oracle\": invalid Oracle configuration: `tnsAdmin` can only be used when `UseOCI` is true, or use `walletLocation` instead",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/postgres/postgres.go b/internal/sources/postgres/postgres.go
index d23721fc06..65d7a17b75 100644
--- a/internal/sources/postgres/postgres.go
+++ b/internal/sources/postgres/postgres.go
@@ -28,14 +28,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "postgres"
+const SourceType string = "postgres"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -49,7 +49,7 @@ 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"`
+	Type        string            `yaml:"type" validate:"required"`
 	Host        string            `yaml:"host" validate:"required"`
 	Port        string            `yaml:"port" validate:"required"`
 	User        string            `yaml:"user" validate:"required"`
@@ -58,8 +58,8 @@ type Config struct {
 	QueryParams map[string]string `yaml:"queryParams"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -87,8 +87,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -128,7 +128,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initPostgresConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string, queryParams map[string]string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 	userAgent, err := util.UserAgentFromContext(ctx)
 	if err != nil {
diff --git a/internal/sources/postgres/postgres_test.go b/internal/sources/postgres/postgres_test.go
index b9d8872c3a..4bcde0420e 100644
--- a/internal/sources/postgres/postgres_test.go
+++ b/internal/sources/postgres/postgres_test.go
@@ -1,4 +1,4 @@
-// Copyright 2024 Google LLC
+// 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.
@@ -15,13 +15,14 @@
 package postgres_test
 
 import (
+	"context"
 	"sort"
 	"strings"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/postgres"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -35,19 +36,19 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: postgres
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-pg-instance
+			type: postgres
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-pg-instance": postgres.Config{
 					Name:     "my-pg-instance",
-					Kind:     postgres.SourceKind,
+					Type:     postgres.SourceType,
 					Host:     "my-host",
 					Port:     "my-port",
 					Database: "my_db",
@@ -59,22 +60,22 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "example with query params",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: postgres
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryParams:
-						sslmode: verify-full
-						sslrootcert: /tmp/ca.crt
+			kind: sources
+			name: my-pg-instance
+			type: postgres
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			queryParams:
+				sslmode: verify-full
+				sslrootcert: /tmp/ca.crt
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-pg-instance": postgres.Config{
 					Name:     "my-pg-instance",
-					Kind:     postgres.SourceKind,
+					Type:     postgres.SourceType,
 					Host:     "my-host",
 					Port:     "my-port",
 					Database: "my_db",
@@ -90,16 +91,12 @@ func TestParseFromYamlPostgres(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -115,39 +112,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: postgres
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-pg-instance
+			type: postgres
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"postgres\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: my-host\n   4 | kind: postgres\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"postgres\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: my-host\n   4 | name: my-pg-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-pg-instance:
-					kind: postgres
-					host: my-host
-					port: my-port
-					database: my_db
-					user: my_user
+			kind: sources
+			name: my-pg-instance
+			type: postgres
+			host: my-host
+			port: my-port
+			database: my_db
+			user: my_user
 			`,
-			err: "unable to parse source \"my-pg-instance\" as \"postgres\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-pg-instance\" as \"postgres\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/redis/redis.go b/internal/sources/redis/redis.go
index f8e4bfa40e..e2a28c52a7 100644
--- a/internal/sources/redis/redis.go
+++ b/internal/sources/redis/redis.go
@@ -24,14 +24,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "redis"
+const SourceType string = "redis"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -45,7 +45,7 @@ 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"`
+	Type           string   `yaml:"type" validate:"required"`
 	Address        []string `yaml:"address" validate:"required"`
 	Username       string   `yaml:"username"`
 	Password       string   `yaml:"password"`
@@ -54,8 +54,8 @@ type Config struct {
 	ClusterEnabled bool     `yaml:"clusterEnabled"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // RedisClient is an interface for `redis.Client` and `redis.ClusterClient
@@ -141,8 +141,8 @@ type Source struct {
 	Client RedisClient
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/redis/redis_test.go b/internal/sources/redis/redis_test.go
index 4fe944b924..63e2d01bee 100644
--- a/internal/sources/redis/redis_test.go
+++ b/internal/sources/redis/redis_test.go
@@ -15,12 +15,13 @@
 package redis_test
 
 import (
+	"context"
 	"strings"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/redis"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -34,16 +35,16 @@ func TestParseFromYamlRedis(t *testing.T) {
 		{
 			desc: "default setting",
 			in: `
-			sources:
-				my-redis-instance:
-					kind: redis
-					address:
-					  - 127.0.0.1
+			kind: sources
+			name: my-redis-instance
+			type: redis
+			address:
+			  - 127.0.0.1
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-redis-instance": redis.Config{
 					Name:           "my-redis-instance",
-					Kind:           redis.SourceKind,
+					Type:           redis.SourceType,
 					Address:        []string{"127.0.0.1"},
 					ClusterEnabled: false,
 					UseGCPIAM:      false,
@@ -53,20 +54,20 @@ func TestParseFromYamlRedis(t *testing.T) {
 		{
 			desc: "advanced example",
 			in: `
-			sources:
-				my-redis-instance:
-					kind: redis
-					address:
-					  - 127.0.0.1
-					password: my-pass
-					database: 1
-					useGCPIAM: true
-					clusterEnabled: true
+			kind: sources
+			name: my-redis-instance
+			type: redis
+			address:
+			  - 127.0.0.1
+			password: my-pass
+			database: 1
+			useGCPIAM: true
+			clusterEnabled: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-redis-instance": redis.Config{
 					Name:           "my-redis-instance",
-					Kind:           redis.SourceKind,
+					Type:           redis.SourceType,
 					Address:        []string{"127.0.0.1"},
 					Password:       "my-pass",
 					Database:       1,
@@ -78,16 +79,12 @@ func TestParseFromYamlRedis(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -103,48 +100,43 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid database",
 			in: `
-			sources:
-				my-redis-instance:
-					kind: redis
-					project: my-project
-					address:
-					  - 127.0.0.1
-					password: my-pass
-					database: data
+			kind: sources
+			name: my-redis-instance
+			type: redis
+			address:
+			- 127.0.0.1
+			password: my-pass
+			database: data
 			`,
-			err: "cannot unmarshal string into Go struct field .Sources of type int",
+			err: "error unmarshaling sources: unable to parse source \"my-redis-instance\" as \"redis\": [3:11] cannot unmarshal string into Go struct field Config.Database of type int\n   1 | address:\n   2 | - 127.0.0.1\n>  3 | database: data\n                 ^\n   4 | name: my-redis-instance\n   5 | password: my-pass\n   6 | type: redis",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-redis-instance:
-					kind: redis
-					project: my-project
-					address:
-					  - 127.0.0.1
-					password: my-pass
-					database: 1
+			kind: sources
+			name: my-redis-instance
+			type: redis
+			project: my-project
+			address:
+			- 127.0.0.1
+			password: my-pass
+			database: 1
 			`,
-			err: "unable to parse source \"my-redis-instance\" as \"redis\": [6:1] unknown field \"project\"",
+			err: "error unmarshaling sources: unable to parse source \"my-redis-instance\" as \"redis\": [6:1] unknown field \"project\"\n   3 | database: 1\n   4 | name: my-redis-instance\n   5 | password: my-pass\n>  6 | project: my-project\n       ^\n   7 | type: redis",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-redis-instance:
-					kind: redis
+			kind: sources
+			name: my-redis-instance
+			type: redis
 			`,
-			err: "unable to parse source \"my-redis-instance\" as \"redis\": Key: 'Config.Address' Error:Field validation for 'Address' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-redis-instance\" as \"redis\": Key: 'Config.Address' Error:Field validation for 'Address' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/serverlessspark/serverlessspark.go b/internal/sources/serverlessspark/serverlessspark.go
index f6968f9bae..a6edb82a48 100644
--- a/internal/sources/serverlessspark/serverlessspark.go
+++ b/internal/sources/serverlessspark/serverlessspark.go
@@ -33,14 +33,14 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 )
 
-const SourceKind string = "serverless-spark"
+const SourceType string = "serverless-spark"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -54,13 +54,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"`
+	Type     string `yaml:"type" validate:"required"`
 	Project  string `yaml:"project" validate:"required"`
 	Location string `yaml:"location" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -94,8 +94,8 @@ type Source struct {
 	OpsClient *longrunning.OperationsClient
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/serverlessspark/serverlessspark_test.go b/internal/sources/serverlessspark/serverlessspark_test.go
index 3162f259ef..7e81449905 100644
--- a/internal/sources/serverlessspark/serverlessspark_test.go
+++ b/internal/sources/serverlessspark/serverlessspark_test.go
@@ -15,11 +15,12 @@
 package serverlessspark_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/serverlessspark"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,16 +34,16 @@ func TestParseFromYamlServerlessSpark(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-				sources:
-					my-instance:
-						kind: serverless-spark
-						project: my-project
-						location: my-location
+				kind: sources
+				name: my-instance
+				type: serverless-spark
+				project: my-project
+				location: my-location
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-instance": serverlessspark.Config{
 					Name:     "my-instance",
-					Kind:     serverlessspark.SourceKind,
+					Type:     serverlessspark.SourceType,
 					Project:  "my-project",
 					Location: "my-location",
 				},
@@ -51,16 +52,12 @@ func TestParseFromYamlServerlessSpark(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -76,43 +73,39 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-				sources:
-					my-instance:
-						kind: serverless-spark
-						project: my-project
-						location: my-location
-						foo: bar
+				kind: sources
+				name: my-instance
+				type: serverless-spark
+				project: my-project
+				location: my-location
+				foo: bar
 			`,
-			err: "unable to parse source \"my-instance\" as \"serverless-spark\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | kind: serverless-spark\n   3 | location: my-location\n   4 | project: my-project",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"serverless-spark\": [1:1] unknown field \"foo\"\n>  1 | foo: bar\n       ^\n   2 | location: my-location\n   3 | name: my-instance\n   4 | project: my-project\n   5 | ",
 		},
 		{
 			desc: "missing required field project",
 			in: `
-				sources:
-					my-instance:
-						kind: serverless-spark
-						location: my-location
+				kind: sources
+				name: my-instance
+				type: serverless-spark
+				location: my-location
 			`,
-			err: "unable to parse source \"my-instance\" as \"serverless-spark\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"serverless-spark\": Key: 'Config.Project' Error:Field validation for 'Project' failed on the 'required' tag",
 		},
 		{
 			desc: "missing required field location",
 			in: `
-				sources:
-					my-instance:
-						kind: serverless-spark
-						project: my-project
+				kind: sources
+				name: my-instance
+				type: serverless-spark
+				project: my-project
 			`,
-			err: "unable to parse source \"my-instance\" as \"serverless-spark\": Key: 'Config.Location' Error:Field validation for 'Location' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-instance\" as \"serverless-spark\": Key: 'Config.Location' Error:Field validation for 'Location' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/singlestore/singlestore.go b/internal/sources/singlestore/singlestore.go
index ebcede392e..2d6f1c7807 100644
--- a/internal/sources/singlestore/singlestore.go
+++ b/internal/sources/singlestore/singlestore.go
@@ -29,15 +29,15 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-// SourceKind for SingleStore source
-const SourceKind string = "singlestore"
+// SourceType for SingleStore source
+const SourceType string = "singlestore"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -52,7 +52,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (sources
 // Config holds the configuration parameters for connecting to a SingleStore database.
 type Config struct {
 	Name         string `yaml:"name" validate:"required"`
-	Kind         string `yaml:"kind" validate:"required"`
+	Type         string `yaml:"type" validate:"required"`
 	Host         string `yaml:"host" validate:"required"`
 	Port         string `yaml:"port" validate:"required"`
 	User         string `yaml:"user" validate:"required"`
@@ -61,9 +61,9 @@ type Config struct {
 	QueryTimeout string `yaml:"queryTimeout"`
 }
 
-// SourceConfigKind returns the kind of the source configuration.
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+// SourceConfigType returns the type of the source configuration.
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 // Initialize sets up the SingleStore connection pool and returns a Source.
@@ -93,9 +93,9 @@ type Source struct {
 	Pool *sql.DB
 }
 
-// SourceKind returns the kind of the source configuration.
-func (s *Source) SourceKind() string {
-	return SourceKind
+// SourceType returns the type of the source configuration.
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -162,7 +162,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initSingleStoreConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, queryTimeout string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database
diff --git a/internal/sources/singlestore/singlestore_test.go b/internal/sources/singlestore/singlestore_test.go
index 101df5300a..f996921db0 100644
--- a/internal/sources/singlestore/singlestore_test.go
+++ b/internal/sources/singlestore/singlestore_test.go
@@ -1,5 +1,3 @@
-package singlestore_test
-
 // Copyright 2025 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,12 +12,15 @@ package singlestore_test
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package singlestore_test
+
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/singlestore"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-s2-instance:
-					kind: singlestore
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-s2-instance
+			type: singlestore
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-s2-instance": singlestore.Config{
 					Name:     "my-s2-instance",
-					Kind:     singlestore.SourceKind,
+					Type:     singlestore.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -57,20 +58,20 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with query timeout",
 			in: `
-			sources:
-				my-s2-instance:
-					kind: singlestore
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					queryTimeout: 45s
+			kind: sources
+			name: my-s2-instance
+			type: singlestore
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			queryTimeout: 45s
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-s2-instance": singlestore.Config{
 					Name:         "my-s2-instance",
-					Kind:         singlestore.SourceKind,
+					Type:         singlestore.SourceType,
 					Host:         "0.0.0.0",
 					Port:         "my-port",
 					Database:     "my_db",
@@ -83,16 +84,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -108,39 +105,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-s2-instance:
-					kind: singlestore
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					foo: bar
+			kind: sources
+			name: my-s2-instance
+			type: singlestore
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-s2-instance\" as \"singlestore\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | kind: singlestore\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-s2-instance\" as \"singlestore\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | name: my-s2-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-s2-instance:
-					kind: singlestore
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-s2-instance
+			type: singlestore
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			err: "unable to parse source \"my-s2-instance\" as \"singlestore\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-s2-instance\" as \"singlestore\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/snowflake/snowflake.go b/internal/sources/snowflake/snowflake.go
index af44eb2ece..b08f0580b3 100644
--- a/internal/sources/snowflake/snowflake.go
+++ b/internal/sources/snowflake/snowflake.go
@@ -25,14 +25,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "snowflake"
+const SourceType string = "snowflake"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -46,7 +46,7 @@ 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"`
+	Type      string `yaml:"type" validate:"required"`
 	Account   string `yaml:"account" validate:"required"`
 	User      string `yaml:"user" validate:"required"`
 	Password  string `yaml:"password" validate:"required"`
@@ -56,8 +56,8 @@ type Config struct {
 	Role      string `yaml:"role"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -85,8 +85,8 @@ type Source struct {
 	DB *sqlx.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -137,7 +137,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initSnowflakeConnection(ctx context.Context, tracer trace.Tracer, name, account, user, password, database, schema, warehouse, role string) (*sqlx.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Set defaults for optional parameters
diff --git a/internal/sources/snowflake/snowflake_test.go b/internal/sources/snowflake/snowflake_test.go
index 54d7114849..f9437ec49c 100644
--- a/internal/sources/snowflake/snowflake_test.go
+++ b/internal/sources/snowflake/snowflake_test.go
@@ -15,11 +15,12 @@
 package snowflake_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/snowflake"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlSnowflake(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-				sources:
-					my-snowflake-instance:
-						kind: snowflake
-						account: my-account
-						user: my_user
-						password: my_pass
-						database: my_db
-						schema: my_schema
+				kind: sources
+				name: my-snowflake-instance
+				type: snowflake
+				account: my-account
+				user: my_user
+				password: my_pass
+				database: my_db
+				schema: my_schema
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-snowflake-instance": snowflake.Config{
 					Name:      "my-snowflake-instance",
-					Kind:      snowflake.SourceKind,
+					Type:      snowflake.SourceType,
 					Account:   "my-account",
 					User:      "my_user",
 					Password:  "my_pass",
@@ -59,16 +60,12 @@ func TestParseFromYamlSnowflake(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -84,39 +81,35 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-				sources:
-					my-snowflake-instance:
-						kind: snowflake
-						account: my-account
-						user: my_user
-						password: my_pass
-						database: my_db
-						schema: my_schema
-						foo: bar
+				kind: sources
+				name: my-snowflake-instance
+				type: snowflake
+				account: my-account
+				user: my_user
+				password: my_pass
+				database: my_db
+				schema: my_schema
+				foo: bar
 			`,
-			err: "unable to parse source \"my-snowflake-instance\" as \"snowflake\": [3:1] unknown field \"foo\"\n   1 | account: my-account\n   2 | database: my_db\n>  3 | foo: bar\n       ^\n   4 | kind: snowflake\n   5 | password: my_pass\n   6 | schema: my_schema\n   7 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-snowflake-instance\" as \"snowflake\": [3:1] unknown field \"foo\"\n   1 | account: my-account\n   2 | database: my_db\n>  3 | foo: bar\n       ^\n   4 | name: my-snowflake-instance\n   5 | password: my_pass\n   6 | schema: my_schema\n   7 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-				sources:
-					my-snowflake-instance:
-						kind: snowflake
-						account: my-account
-						user: my_user
-						password: my_pass
-						database: my_db
+				kind: sources
+				name: my-snowflake-instance
+				type: snowflake
+				account: my-account
+				user: my_user
+				password: my_pass
+				database: my_db
 			`,
-			err: "unable to parse source \"my-snowflake-instance\" as \"snowflake\": Key: 'Config.Schema' Error:Field validation for 'Schema' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-snowflake-instance\" as \"snowflake\": Key: 'Config.Schema' Error:Field validation for 'Schema' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/sources.go b/internal/sources/sources.go
index 10e6d57e17..93ae0233b1 100644
--- a/internal/sources/sources.go
+++ b/internal/sources/sources.go
@@ -29,48 +29,48 @@ type SourceConfigFactory func(ctx context.Context, name string, decoder *yaml.De
 
 var sourceRegistry = make(map[string]SourceConfigFactory)
 
-// Register registers a new source kind with its factory.
-// It returns false if the kind is already registered.
-func Register(kind string, factory SourceConfigFactory) bool {
-	if _, exists := sourceRegistry[kind]; exists {
-		// Source with this kind already exists, do not overwrite.
+// Register registers a new source type with its factory.
+// It returns false if the type is already registered.
+func Register(sourceType string, factory SourceConfigFactory) bool {
+	if _, exists := sourceRegistry[sourceType]; exists {
+		// Source with this type already exists, do not overwrite.
 		return false
 	}
-	sourceRegistry[kind] = factory
+	sourceRegistry[sourceType] = factory
 	return true
 }
 
-// DecodeConfig decodes a source configuration using the registered factory for the given kind.
-func DecodeConfig(ctx context.Context, kind string, name string, decoder *yaml.Decoder) (SourceConfig, error) {
-	factory, found := sourceRegistry[kind]
+// DecodeConfig decodes a source configuration using the registered factory for the given type.
+func DecodeConfig(ctx context.Context, sourceType string, name string, decoder *yaml.Decoder) (SourceConfig, error) {
+	factory, found := sourceRegistry[sourceType]
 	if !found {
-		return nil, fmt.Errorf("unknown source kind: %q", kind)
+		return nil, fmt.Errorf("unknown source type: %q", sourceType)
 	}
 	sourceConfig, err := factory(ctx, name, decoder)
 	if err != nil {
-		return nil, fmt.Errorf("unable to parse source %q as %q: %w", name, kind, err)
+		return nil, fmt.Errorf("unable to parse source %q as %q: %w", name, sourceType, err)
 	}
 	return sourceConfig, err
 }
 
 // SourceConfig is the interface for configuring a source.
 type SourceConfig interface {
-	SourceConfigKind() string
+	SourceConfigType() string
 	Initialize(ctx context.Context, tracer trace.Tracer) (Source, error)
 }
 
 // Source is the interface for the source itself.
 type Source interface {
-	SourceKind() string
+	SourceType() string
 	ToConfig() SourceConfig
 }
 
 // InitConnectionSpan adds a span for database pool connection initialization
-func InitConnectionSpan(ctx context.Context, tracer trace.Tracer, sourceKind, sourceName string) (context.Context, trace.Span) {
+func InitConnectionSpan(ctx context.Context, tracer trace.Tracer, sourceType, sourceName string) (context.Context, trace.Span) {
 	ctx, span := tracer.Start(
 		ctx,
 		"toolbox/server/source/connect",
-		trace.WithAttributes(attribute.String("source_kind", sourceKind)),
+		trace.WithAttributes(attribute.String("source_type", sourceType)),
 		trace.WithAttributes(attribute.String("source_name", sourceName)),
 	)
 	return ctx, span
diff --git a/internal/sources/spanner/spanner.go b/internal/sources/spanner/spanner.go
index d6a6967e12..7c2f3c1464 100644
--- a/internal/sources/spanner/spanner.go
+++ b/internal/sources/spanner/spanner.go
@@ -28,14 +28,14 @@ import (
 	"google.golang.org/api/iterator"
 )
 
-const SourceKind string = "spanner"
+const SourceType string = "spanner"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -49,15 +49,15 @@ 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"`
+	Type     string          `yaml:"type" validate:"required"`
 	Project  string          `yaml:"project" validate:"required"`
 	Instance string          `yaml:"instance" validate:"required"`
 	Dialect  sources.Dialect `yaml:"dialect" validate:"required"`
 	Database string          `yaml:"database" validate:"required"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -80,8 +80,8 @@ type Source struct {
 	Client *spanner.Client
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -171,7 +171,7 @@ func (s *Source) RunSQL(ctx context.Context, readOnly bool, statement string, pa
 
 func initSpannerClient(ctx context.Context, tracer trace.Tracer, name, project, instance, dbname string) (*spanner.Client, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Configure the connection to the database
diff --git a/internal/sources/spanner/spanner_test.go b/internal/sources/spanner/spanner_test.go
index af0ac6a9fe..788a3fcccd 100644
--- a/internal/sources/spanner/spanner_test.go
+++ b/internal/sources/spanner/spanner_test.go
@@ -15,9 +15,9 @@
 package spanner_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,17 +34,17 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-spanner-instance:
-					kind: spanner
-					project: my-project
-					instance: my-instance
-					database: my_db
+			kind: sources
+			name: my-spanner-instance
+			type: spanner
+			project: my-project
+			instance: my-instance
+			database: my_db
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-spanner-instance": spanner.Config{
 					Name:     "my-spanner-instance",
-					Kind:     spanner.SourceKind,
+					Type:     spanner.SourceType,
 					Project:  "my-project",
 					Instance: "my-instance",
 					Dialect:  "googlesql",
@@ -55,18 +55,18 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 		{
 			desc: "gsql dialect",
 			in: `
-			sources:
-				my-spanner-instance:
-					kind: spanner
-					project: my-project
-					instance: my-instance
-					dialect: Googlesql 
-					database: my_db
+			kind: sources
+			name: my-spanner-instance
+			type: spanner
+			project: my-project
+			instance: my-instance
+			dialect: Googlesql 
+			database: my_db
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-spanner-instance": spanner.Config{
 					Name:     "my-spanner-instance",
-					Kind:     spanner.SourceKind,
+					Type:     spanner.SourceType,
 					Project:  "my-project",
 					Instance: "my-instance",
 					Dialect:  "googlesql",
@@ -77,18 +77,18 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 		{
 			desc: "postgresql dialect",
 			in: `
-			sources:
-				my-spanner-instance:
-					kind: spanner
-					project: my-project
-					instance: my-instance
-					dialect: postgresql
-					database: my_db
+			kind: sources
+			name: my-spanner-instance
+			type: spanner
+			project: my-project
+			instance: my-instance
+			dialect: postgresql
+			database: my_db
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-spanner-instance": spanner.Config{
 					Name:     "my-spanner-instance",
-					Kind:     spanner.SourceKind,
+					Type:     spanner.SourceType,
 					Project:  "my-project",
 					Instance: "my-instance",
 					Dialect:  "postgresql",
@@ -99,16 +99,12 @@ func TestParseFromYamlSpannerDb(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -124,48 +120,44 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid dialect",
 			in: `
-			sources:
-				my-spanner-instance:
-					kind: spanner
-					project: my-project
-					instance: my-instance
-					dialect: fail
-					database: my_db
+			kind: sources
+			name: my-spanner-instance
+			type: spanner
+			project: my-project
+			instance: my-instance
+			dialect: fail
+			database: my_db
 			`,
-			err: "unable to parse source \"my-spanner-instance\" as \"spanner\": dialect invalid: must be one of \"googlesql\", or \"postgresql\"",
+			err: "error unmarshaling sources: unable to parse source \"my-spanner-instance\" as \"spanner\": dialect invalid: must be one of \"googlesql\", or \"postgresql\"",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-spanner-instance:
-					kind: spanner
-					project: my-project
-					instance: my-instance
-					database: my_db
-					foo: bar
+			kind: sources
+			name: my-spanner-instance
+			type: spanner
+			project: my-project
+			instance: my-instance
+			database: my_db
+			foo: bar
 			`,
-			err: "unable to parse source \"my-spanner-instance\" as \"spanner\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | kind: spanner\n   5 | project: my-project",
+			err: "error unmarshaling sources: unable to parse source \"my-spanner-instance\" as \"spanner\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | instance: my-instance\n   4 | name: my-spanner-instance\n   5 | project: my-project\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-spanner-instance:
-					kind: spanner
-					project: my-project
-					instance: my-instance
+			kind: sources
+			name: my-spanner-instance
+			type: spanner
+			project: my-project
+			instance: my-instance
 			`,
-			err: "unable to parse source \"my-spanner-instance\" as \"spanner\": Key: 'Config.Database' Error:Field validation for 'Database' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-spanner-instance\" as \"spanner\": Key: 'Config.Database' Error:Field validation for 'Database' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/sqlite/sqlite.go b/internal/sources/sqlite/sqlite.go
index f2afc57f9c..c90b932dea 100644
--- a/internal/sources/sqlite/sqlite.go
+++ b/internal/sources/sqlite/sqlite.go
@@ -27,14 +27,14 @@ import (
 	_ "modernc.org/sqlite" // Pure Go SQLite driver
 )
 
-const SourceKind string = "sqlite"
+const SourceType string = "sqlite"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -48,12 +48,12 @@ 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"`
+	Type     string `yaml:"type" validate:"required"`
 	Database string `yaml:"database" validate:"required"` // Path to SQLite database file
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -81,8 +81,8 @@ type Source struct {
 	Db *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -155,7 +155,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initSQLiteConnection(ctx context.Context, tracer trace.Tracer, name, dbPath string) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Open database connection
diff --git a/internal/sources/sqlite/sqlite_test.go b/internal/sources/sqlite/sqlite_test.go
index 0367679063..7ccf10a0f1 100644
--- a/internal/sources/sqlite/sqlite_test.go
+++ b/internal/sources/sqlite/sqlite_test.go
@@ -15,9 +15,9 @@
 package sqlite_test
 
 import (
+	"context"
 	"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/sources"
@@ -34,15 +34,15 @@ func TestParseFromYamlSQLite(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-            sources:
-                my-sqlite-db:
-                    kind: sqlite
-                    database: /path/to/database.db
+            kind: sources
+            name: my-sqlite-db
+            type: sqlite
+            database: /path/to/database.db
             `,
 			want: map[string]sources.SourceConfig{
 				"my-sqlite-db": sqlite.Config{
 					Name:     "my-sqlite-db",
-					Kind:     sqlite.SourceKind,
+					Type:     sqlite.SourceType,
 					Database: "/path/to/database.db",
 				},
 			},
@@ -50,16 +50,53 @@ func TestParseFromYamlSQLite(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
+			}
+		})
+	}
+}
+
+func TestFailParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "extra field",
+			in: `
+            kind: sources
+            name: my-sqlite-db
+            type: sqlite
+            database: /path/to/database.db
+            foo: bar
+            `,
+			err: "error unmarshaling sources: unable to parse source \"my-sqlite-db\" as \"sqlite\": [2:1] unknown field \"foo\"\n   1 | database: /path/to/database.db\n>  2 | foo: bar\n       ^\n   3 | name: my-sqlite-db\n   4 | type: sqlite",
+		},
+		{
+			desc: "missing required field",
+			in: `
+            kind: sources
+            name: my-sqlite-db
+            type: sqlite
+            `,
+			err: "error unmarshaling sources: unable to parse source \"my-sqlite-db\" as \"sqlite\": Key: 'Config.Database' Error:Field validation for 'Database' failed on the 'required' tag",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if errStr != tc.err {
+				t.Fatalf("unexpected error: got %q, want %q", errStr, tc.err)
 			}
 		})
 	}
diff --git a/internal/sources/tidb/tidb.go b/internal/sources/tidb/tidb.go
index 617da6969d..006e999e93 100644
--- a/internal/sources/tidb/tidb.go
+++ b/internal/sources/tidb/tidb.go
@@ -27,15 +27,15 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "tidb"
+const SourceType string = "tidb"
 const TiDBCloudHostPattern string = `gateway\d{2}\.(.+)\.(prod|dev|staging)\.(.+)\.tidbcloud\.com`
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -55,7 +55,7 @@ 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"`
+	Type     string `yaml:"type" validate:"required"`
 	Host     string `yaml:"host" validate:"required"`
 	Port     string `yaml:"port" validate:"required"`
 	User     string `yaml:"user" validate:"required"`
@@ -64,8 +64,8 @@ type Config struct {
 	UseSSL   bool   `yaml:"ssl"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -93,8 +93,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -189,7 +189,7 @@ func IsTiDBCloudHost(host string) bool {
 
 func initTiDBConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname string, useSSL bool) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Configure the driver to connect to the database
diff --git a/internal/sources/tidb/tidb_test.go b/internal/sources/tidb/tidb_test.go
index f9b8b8ffd1..9b18f52b06 100644
--- a/internal/sources/tidb/tidb_test.go
+++ b/internal/sources/tidb/tidb_test.go
@@ -15,11 +15,12 @@
 package tidb_test
 
 import (
+	"context"
 	"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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/tidb"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -33,19 +34,19 @@ func TestParseFromYamlTiDB(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-tidb-instance:
-					kind: tidb
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-tidb-instance
+			type: tidb
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-tidb-instance": tidb.Config{
 					Name:     "my-tidb-instance",
-					Kind:     tidb.SourceKind,
+					Type:     tidb.SourceType,
 					Host:     "0.0.0.0",
 					Port:     "my-port",
 					Database: "my_db",
@@ -58,20 +59,20 @@ func TestParseFromYamlTiDB(t *testing.T) {
 		{
 			desc: "with SSL enabled",
 			in: `
-			sources:
-				my-tidb-cloud:
-					kind: tidb
-					host: gateway01.us-west-2.prod.aws.tidbcloud.com
-					port: 4000
-					database: test_db
-					user: cloud_user
-					password: cloud_pass
-					ssl: true
+			kind: sources
+			name: my-tidb-cloud
+			type: tidb
+			host: gateway01.us-west-2.prod.aws.tidbcloud.com
+			port: 4000
+			database: test_db
+			user: cloud_user
+			password: cloud_pass
+			ssl: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-tidb-cloud": tidb.Config{
 					Name:     "my-tidb-cloud",
-					Kind:     tidb.SourceKind,
+					Type:     tidb.SourceType,
 					Host:     "gateway01.us-west-2.prod.aws.tidbcloud.com",
 					Port:     "4000",
 					Database: "test_db",
@@ -84,19 +85,19 @@ func TestParseFromYamlTiDB(t *testing.T) {
 		{
 			desc: "Change SSL enabled due to TiDB Cloud host",
 			in: `
-			sources:
-				my-tidb-cloud:
-					kind: tidb
-					host: gateway01.us-west-2.prod.aws.tidbcloud.com
-					port: 4000
-					database: test_db
-					user: cloud_user
-					password: cloud_pass
+			kind: sources
+			name: my-tidb-cloud
+			type: tidb
+			host: gateway01.us-west-2.prod.aws.tidbcloud.com
+			port: 4000
+			database: test_db
+			user: cloud_user
+			password: cloud_pass
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-tidb-cloud": tidb.Config{
 					Name:     "my-tidb-cloud",
-					Kind:     tidb.SourceKind,
+					Type:     tidb.SourceType,
 					Host:     "gateway01.us-west-2.prod.aws.tidbcloud.com",
 					Port:     "4000",
 					Database: "test_db",
@@ -109,16 +110,12 @@ func TestParseFromYamlTiDB(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -134,41 +131,37 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-tidb-instance:
-					kind: tidb
-					host: 0.0.0.0
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					ssl: false
-					foo: bar
+			kind: sources
+			name: my-tidb-instance
+			type: tidb
+			host: 0.0.0.0
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			ssl: false
+			foo: bar
 			`,
-			err: "unable to parse source \"my-tidb-instance\" as \"tidb\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | kind: tidb\n   5 | password: my_pass\n   6 | ",
+			err: "error unmarshaling sources: unable to parse source \"my-tidb-instance\" as \"tidb\": [2:1] unknown field \"foo\"\n   1 | database: my_db\n>  2 | foo: bar\n       ^\n   3 | host: 0.0.0.0\n   4 | name: my-tidb-instance\n   5 | password: my_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-tidb-instance:
-					kind: tidb
-					port: my-port
-					database: my_db
-					user: my_user
-					password: my_pass
-					ssl: false
+			kind: sources
+			name: my-tidb-instance
+			type: tidb
+			port: my-port
+			database: my_db
+			user: my_user
+			password: my_pass
+			ssl: false
 			`,
-			err: "unable to parse source \"my-tidb-instance\" as \"tidb\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-tidb-instance\" as \"tidb\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/trino/trino.go b/internal/sources/trino/trino.go
index ed99dc3c19..6d468a27e8 100644
--- a/internal/sources/trino/trino.go
+++ b/internal/sources/trino/trino.go
@@ -30,14 +30,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "trino"
+const SourceType string = "trino"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -51,7 +51,7 @@ 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"`
+	Type                   string `yaml:"type" validate:"required"`
 	Host                   string `yaml:"host" validate:"required"`
 	Port                   string `yaml:"port" validate:"required"`
 	User                   string `yaml:"user"`
@@ -67,8 +67,8 @@ type Config struct {
 	DisableSslVerification bool   `yaml:"disableSslVerification"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -96,8 +96,8 @@ type Source struct {
 	Pool *sql.DB
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -160,7 +160,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initTrinoConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, password, catalog, schema, queryTimeout, accessToken string, kerberosEnabled, sslEnabled bool, sslCertPath, sslCert string, disableSslVerification bool) (*sql.DB, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 
 	// Build Trino DSN
diff --git a/internal/sources/trino/trino_test.go b/internal/sources/trino/trino_test.go
index f59679c86b..236ad68fe2 100644
--- a/internal/sources/trino/trino_test.go
+++ b/internal/sources/trino/trino_test.go
@@ -15,11 +15,12 @@
 package trino
 
 import (
+	"context"
 	"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/testutils"
 )
 
@@ -153,19 +154,19 @@ func TestParseFromYamlTrino(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			sources:
-				my-trino-instance:
-					kind: trino
-					host: localhost
-					port: "8080"
-					user: testuser
-					catalog: hive
-					schema: default
+			kind: sources
+			name: my-trino-instance
+			type: trino
+			host: localhost
+			port: "8080"
+			user: testuser
+			catalog: hive
+			schema: default
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-trino-instance": Config{
 					Name:    "my-trino-instance",
-					Kind:    SourceKind,
+					Type:    SourceType,
 					Host:    "localhost",
 					Port:    "8080",
 					User:    "testuser",
@@ -177,24 +178,24 @@ func TestParseFromYamlTrino(t *testing.T) {
 		{
 			desc: "example with optional fields",
 			in: `
-			sources:
-				my-trino-instance:
-					kind: trino
-					host: localhost
-					port: "8443"
-					user: testuser
-					password: testpass
-					catalog: hive
-					schema: default
-					queryTimeout: "30m"
-					accessToken: "jwt-token-here"
-					kerberosEnabled: true
-					sslEnabled: true
+			kind: sources
+			name: my-trino-instance
+			type: trino
+			host: localhost
+			port: "8443"
+			user: testuser
+			password: testpass
+			catalog: hive
+			schema: default
+			queryTimeout: "30m"
+			accessToken: "jwt-token-here"
+			kerberosEnabled: true
+			sslEnabled: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-trino-instance": Config{
 					Name:            "my-trino-instance",
-					Kind:            SourceKind,
+					Type:            SourceType,
 					Host:            "localhost",
 					Port:            "8443",
 					User:            "testuser",
@@ -211,18 +212,18 @@ func TestParseFromYamlTrino(t *testing.T) {
 		{
 			desc: "anonymous access without user",
 			in: `
-			sources:
-				my-trino-anonymous:
-					kind: trino
-					host: localhost
-					port: "8080"
-					catalog: hive
-					schema: default
+			kind: sources
+			name: my-trino-anonymous
+			type: trino
+			host: localhost
+			port: "8080"
+			catalog: hive
+			schema: default
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-trino-anonymous": Config{
 					Name:    "my-trino-anonymous",
-					Kind:    SourceKind,
+					Type:    SourceType,
 					Host:    "localhost",
 					Port:    "8080",
 					Catalog: "hive",
@@ -233,26 +234,26 @@ func TestParseFromYamlTrino(t *testing.T) {
 		{
 			desc: "example with SSL cert path and cert",
 			in: `
-			sources:
-				my-trino-ssl-cert:
-					kind: trino
-					host: localhost
-					port: "8443"
-					user: testuser
-					catalog: hive
-					schema: default
-					sslEnabled: true
-					sslCertPath: /path/to/cert.pem
-					sslCert: |-
+			kind: sources
+			name: my-trino-ssl-cert
+			type: trino
+			host: localhost
+			port: "8443"
+			user: testuser
+			catalog: hive
+			schema: default
+			sslEnabled: true
+			sslCertPath: /path/to/cert.pem
+			sslCert: |-
 						-----BEGIN CERTIFICATE-----
 						...
 						-----END CERTIFICATE-----
-					disableSslVerification: true
+			disableSslVerification: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-trino-ssl-cert": Config{
 					Name:                   "my-trino-ssl-cert",
-					Kind:                   SourceKind,
+					Type:                   SourceType,
 					Host:                   "localhost",
 					Port:                   "8443",
 					User:                   "testuser",
@@ -268,16 +269,12 @@ func TestParseFromYamlTrino(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
diff --git a/internal/sources/valkey/valkey.go b/internal/sources/valkey/valkey.go
index 58ed2356d3..fe56c3f5d2 100644
--- a/internal/sources/valkey/valkey.go
+++ b/internal/sources/valkey/valkey.go
@@ -24,14 +24,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "valkey"
+const SourceType string = "valkey"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -45,7 +45,7 @@ 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"`
+	Type         string   `yaml:"type" validate:"required"`
 	Address      []string `yaml:"address" validate:"required"`
 	Username     string   `yaml:"username"`
 	Password     string   `yaml:"password"`
@@ -54,8 +54,8 @@ type Config struct {
 	DisableCache bool     `yaml:"disableCache"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -114,8 +114,8 @@ type Source struct {
 	Client valkey.Client
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
diff --git a/internal/sources/valkey/valkey_test.go b/internal/sources/valkey/valkey_test.go
index 58a0cc0017..7e9ba2f396 100644
--- a/internal/sources/valkey/valkey_test.go
+++ b/internal/sources/valkey/valkey_test.go
@@ -15,10 +15,10 @@
 package valkey_test
 
 import (
+	"context"
 	"strings"
 	"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/sources"
@@ -35,16 +35,16 @@ func TestParseFromYamlValkey(t *testing.T) {
 		{
 			desc: "default setting",
 			in: `
-			sources:
-				my-valkey-instance:
-					kind: valkey
-					address:
-					  - 127.0.0.1
+			kind: sources
+			name: my-valkey-instance
+			type: valkey
+			address:
+			  - 127.0.0.1
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-valkey-instance": valkey.Config{
 					Name:         "my-valkey-instance",
-					Kind:         valkey.SourceKind,
+					Type:         valkey.SourceType,
 					Address:      []string{"127.0.0.1"},
 					Username:     "",
 					Password:     "",
@@ -57,21 +57,21 @@ func TestParseFromYamlValkey(t *testing.T) {
 		{
 			desc: "advanced example",
 			in: `
-			sources:
-				my-valkey-instance:
-					kind: valkey
-					address:
-					  - 127.0.0.1
-					database: 1
-					username: user
-					password: pass
-					useGCPIAM: true
-					disableCache: true
+			kind: sources
+			name: my-valkey-instance
+			type: valkey
+			address:
+			  - 127.0.0.1
+			database: 1
+			username: user
+			password: pass
+			useGCPIAM: true
+			disableCache: true
 			`,
 			want: map[string]sources.SourceConfig{
 				"my-valkey-instance": valkey.Config{
 					Name:         "my-valkey-instance",
-					Kind:         valkey.SourceKind,
+					Type:         valkey.SourceType,
 					Address:      []string{"127.0.0.1"},
 					Username:     "user",
 					Password:     "pass",
@@ -84,16 +84,12 @@ func TestParseFromYamlValkey(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Sources)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -109,47 +105,42 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "invalid database",
 			in: `
-			sources:
-				my-valkey-instance:
-					kind: valkey
-					project: my-project
-					address:
-					  - 127.0.0.1
-					database: my-db
-					useGCPIAM: false
+			kind: sources
+			name: my-valkey-instance
+			type: valkey
+			address:
+			  - 127.0.0.1
+			database: my-db
+			useGCPIAM: false
 			`,
-			err: "cannot unmarshal string into Go struct field .Sources of type int",
+			err: "error unmarshaling sources: unable to parse source \"my-valkey-instance\" as \"valkey\": [3:11] cannot unmarshal string into Go struct field Config.Database of type int\n   1 | address:\n   2 | - 127.0.0.1\n>  3 | database: my-db\n                 ^\n   4 | name: my-valkey-instance\n   5 | type: valkey\n   6 | useGCPIAM: false",
 		},
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-valkey-instance:
-					kind: valkey
-					address:
-					  - 127.0.0.1
-					project: proj
-					database: 1
+			kind: sources
+			name: my-valkey-instance
+			type: valkey
+			address:
+			  - 127.0.0.1
+			project: proj
+			database: 1
 			`,
-			err: "unable to parse source \"my-valkey-instance\" as \"valkey\": [5:1] unknown field \"project\"",
+			err: "error unmarshaling sources: unable to parse source \"my-valkey-instance\" as \"valkey\": [5:1] unknown field \"project\"\n   2 | - 127.0.0.1\n   3 | database: 1\n   4 | name: my-valkey-instance\n>  5 | project: proj\n       ^\n   6 | type: valkey",
 		},
 		{
 			desc: "missing required field",
 			in: `
-			sources:
-				my-valkey-instance:
-					kind: valkey
+			kind: sources
+			name: my-valkey-instance
+			type: valkey
 			`,
-			err: "unable to parse source \"my-valkey-instance\" as \"valkey\": Key: 'Config.Address' Error:Field validation for 'Address' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-valkey-instance\" as \"valkey\": Key: 'Config.Address' Error:Field validation for 'Address' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/sources/yugabytedb/yugabytedb.go b/internal/sources/yugabytedb/yugabytedb.go
index 830e3ae7fe..8c5b1144c4 100644
--- a/internal/sources/yugabytedb/yugabytedb.go
+++ b/internal/sources/yugabytedb/yugabytedb.go
@@ -24,14 +24,14 @@ import (
 	"go.opentelemetry.io/otel/trace"
 )
 
-const SourceKind string = "yugabytedb"
+const SourceType string = "yugabytedb"
 
 // validate interface
 var _ sources.SourceConfig = Config{}
 
 func init() {
-	if !sources.Register(SourceKind, newConfig) {
-		panic(fmt.Sprintf("source kind %q already registered", SourceKind))
+	if !sources.Register(SourceType, newConfig) {
+		panic(fmt.Sprintf("source type %q already registered", SourceType))
 	}
 }
 
@@ -45,7 +45,7 @@ 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"`
+	Type                            string `yaml:"type" validate:"required"`
 	Host                            string `yaml:"host" validate:"required"`
 	Port                            string `yaml:"port" validate:"required"`
 	User                            string `yaml:"user" validate:"required"`
@@ -58,8 +58,8 @@ type Config struct {
 	FailedHostReconnectDelaySeconds string `yaml:"failedHostReconnectDelaySecs"`
 }
 
-func (r Config) SourceConfigKind() string {
-	return SourceKind
+func (r Config) SourceConfigType() string {
+	return SourceType
 }
 
 func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
@@ -87,8 +87,8 @@ type Source struct {
 	Pool *pgxpool.Pool
 }
 
-func (s *Source) SourceKind() string {
-	return SourceKind
+func (s *Source) SourceType() string {
+	return SourceType
 }
 
 func (s *Source) ToConfig() sources.SourceConfig {
@@ -130,7 +130,7 @@ func (s *Source) RunSQL(ctx context.Context, statement string, params []any) (an
 
 func initYugabyteDBConnectionPool(ctx context.Context, tracer trace.Tracer, name, host, port, user, pass, dbname, loadBalance, topologyKeys, refreshInterval, explicitFallback, failedHostTTL string) (*pgxpool.Pool, error) {
 	//nolint:all // Reassigned ctx
-	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceKind, name)
+	ctx, span := sources.InitConnectionSpan(ctx, tracer, SourceType, name)
 	defer span.End()
 	// urlExample := "postgres://username:password@localhost:5433/database_name"
 	i := fmt.Sprintf("postgres://%s:%s@%s:%s/%s", user, pass, host, port, dbname)
diff --git a/internal/sources/yugabytedb/yugabytedb_test.go b/internal/sources/yugabytedb/yugabytedb_test.go
index 32eda8b642..4a14e53d93 100644
--- a/internal/sources/yugabytedb/yugabytedb_test.go
+++ b/internal/sources/yugabytedb/yugabytedb_test.go
@@ -15,13 +15,14 @@
 package yugabytedb_test
 
 import (
+	"context"
 	"testing"
 
 	"strings"
 
-	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/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/yugabytedb"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
@@ -36,20 +37,19 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "only required fields",
 			in: `
-			sources:
-				my-yb-instance:
-					kind: yugabytedb
-					name: my-yb-instance
-					host: yb-host
-					port: yb-port
-					user: yb_user
-					password: yb_pass
-					database: yb_db
+			kind: sources
+			name: my-yb-instance
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			user: yb_user
+			password: yb_pass
+			database: yb_db
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-yb-instance": yugabytedb.Config{
 					Name:     "my-yb-instance",
-					Kind:     "yugabytedb",
+					Type:     "yugabytedb",
 					Host:     "yb-host",
 					Port:     "yb-port",
 					User:     "yb_user",
@@ -61,21 +61,20 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "with loadBalance only",
 			in: `
-			sources:
-				my-yb-instance:
-					kind: yugabytedb
-					name: my-yb-instance
-					host: yb-host
-					port: yb-port
-					user: yb_user
-					password: yb_pass
-					database: yb_db
-					loadBalance: true
+			kind: sources
+			name: my-yb-instance
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			user: yb_user
+			password: yb_pass
+			database: yb_db
+			loadBalance: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-yb-instance": yugabytedb.Config{
 					Name:        "my-yb-instance",
-					Kind:        "yugabytedb",
+					Type:        "yugabytedb",
 					Host:        "yb-host",
 					Port:        "yb-port",
 					User:        "yb_user",
@@ -88,22 +87,21 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "loadBalance with topologyKeys",
 			in: `
-			sources:
-				my-yb-instance:
-					kind: yugabytedb
-					name: my-yb-instance
-					host: yb-host
-					port: yb-port
-					user: yb_user
-					password: yb_pass
-					database: yb_db
-					loadBalance: true
-					topologyKeys: zone1,zone2
+			kind: sources
+			name: my-yb-instance
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			user: yb_user
+			password: yb_pass
+			database: yb_db
+			loadBalance: true
+			topologyKeys: zone1,zone2
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-yb-instance": yugabytedb.Config{
 					Name:         "my-yb-instance",
-					Kind:         "yugabytedb",
+					Type:         "yugabytedb",
 					Host:         "yb-host",
 					Port:         "yb-port",
 					User:         "yb_user",
@@ -117,23 +115,22 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "with fallback only",
 			in: `
-			sources:
-				my-yb-instance:
-					kind: yugabytedb
-					name: my-yb-instance
-					host: yb-host
-					port: yb-port
-					user: yb_user
-					password: yb_pass
-					database: yb_db
-					loadBalance: true
-					topologyKeys: zone1
-					fallbackToTopologyKeysOnly: true
+			kind: sources
+			name: my-yb-instance
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			user: yb_user
+			password: yb_pass
+			database: yb_db
+			loadBalance: true
+			topologyKeys: zone1
+			fallbackToTopologyKeysOnly: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-yb-instance": yugabytedb.Config{
 					Name:                       "my-yb-instance",
-					Kind:                       "yugabytedb",
+					Type:                       "yugabytedb",
 					Host:                       "yb-host",
 					Port:                       "yb-port",
 					User:                       "yb_user",
@@ -148,23 +145,22 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "with refresh interval and reconnect delay",
 			in: `
-			sources:
-				my-yb-instance:
-					kind: yugabytedb
-					name: my-yb-instance
-					host: yb-host
-					port: yb-port
-					user: yb_user
-					password: yb_pass
-					database: yb_db
-					loadBalance: true
-					ybServersRefreshInterval: 20
-					failedHostReconnectDelaySecs: 5
+			kind: sources
+			name: my-yb-instance
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			user: yb_user
+			password: yb_pass
+			database: yb_db
+			loadBalance: true
+			ybServersRefreshInterval: 20
+			failedHostReconnectDelaySecs: 5
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-yb-instance": yugabytedb.Config{
 					Name:                            "my-yb-instance",
-					Kind:                            "yugabytedb",
+					Type:                            "yugabytedb",
 					Host:                            "yb-host",
 					Port:                            "yb-port",
 					User:                            "yb_user",
@@ -179,25 +175,24 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "all fields set",
 			in: `
-			sources:
-				my-yb-instance:
-					kind: yugabytedb
-					name: my-yb-instance
-					host: yb-host
-					port: yb-port
-					user: yb_user
-					password: yb_pass
-					database: yb_db
-					loadBalance: true
-					topologyKeys: zone1,zone2
-					fallbackToTopologyKeysOnly: true
-					ybServersRefreshInterval: 30
-					failedHostReconnectDelaySecs: 10
+			kind: sources
+			name: my-yb-instance
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			user: yb_user
+			password: yb_pass
+			database: yb_db
+			loadBalance: true
+			topologyKeys: zone1,zone2
+			fallbackToTopologyKeysOnly: true
+			ybServersRefreshInterval: 30
+			failedHostReconnectDelaySecs: 10
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
 				"my-yb-instance": yugabytedb.Config{
 					Name:                            "my-yb-instance",
-					Kind:                            "yugabytedb",
+					Type:                            "yugabytedb",
 					Host:                            "yb-host",
 					Port:                            "yb-port",
 					User:                            "yb_user",
@@ -215,16 +210,12 @@ func TestParseFromYamlYugabyteDB(t *testing.T) {
 
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse (-want +got):\n%s", cmp.Diff(tc.want, got.Sources))
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse (-want +got):\n%s", cmp.Diff(tc.want, got))
 			}
 		})
 	}
@@ -239,54 +230,48 @@ func TestFailParseFromYamlYugabyteDB(t *testing.T) {
 		{
 			desc: "extra field",
 			in: `
-			sources:
-				my-yb-source:
-					kind: yugabytedb
-					name: my-yb-source
-					host: yb-host
-					port: yb-port
-					database: yb_db
-					user: yb_user
-					password: yb_pass
-					foo: bar
+			kind: sources
+			name: my-yb-source
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			database: yb_db
+			user: yb_user
+			password: yb_pass
+			foo: bar
 			`,
-			err: "unable to parse source \"my-yb-source\" as \"yugabytedb\": [2:1] unknown field \"foo\"",
+			err: "error unmarshaling sources: unable to parse source \"my-yb-source\" as \"yugabytedb\": [2:1] unknown field \"foo\"\n   1 | database: yb_db\n>  2 | foo: bar\n       ^\n   3 | host: yb-host\n   4 | name: my-yb-source\n   5 | password: yb_pass\n   6 | ",
 		},
 		{
 			desc: "missing required field (password)",
 			in: `
-			sources:
-				my-yb-source:
-					kind: yugabytedb
-					name: my-yb-source
-					host: yb-host
-					port: yb-port
-					database: yb_db
-					user: yb_user
+			kind: sources
+			name: my-yb-source
+			type: yugabytedb
+			host: yb-host
+			port: yb-port
+			database: yb_db
+			user: yb_user
 			`,
-			err: "unable to parse source \"my-yb-source\" as \"yugabytedb\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-yb-source\" as \"yugabytedb\": Key: 'Config.Password' Error:Field validation for 'Password' failed on the 'required' tag",
 		},
 		{
 			desc: "missing required field (host)",
 			in: `
-			sources:
-				my-yb-source:
-					kind: yugabytedb
-					name: my-yb-source
-					port: yb-port
-					database: yb_db
-					user: yb_user
-					password: yb_pass
+			kind: sources
+			name: my-yb-source
+			type: yugabytedb
+			port: yb-port
+			database: yb_db
+			user: yb_user
+			password: yb_pass
 			`,
-			err: "unable to parse source \"my-yb-source\" as \"yugabytedb\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
+			err: "error unmarshaling sources: unable to parse source \"my-yb-source\" as \"yugabytedb\": Key: 'Config.Host' Error:Field validation for 'Host' failed on the 'required' tag",
 		},
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expected parsing to fail")
 			}
diff --git a/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go b/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go
index 5996fc69a3..875d21aca5 100644
--- a/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go
+++ b/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go
@@ -17,19 +17,21 @@ package alloydbcreatecluster
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-create-cluster"
+const resourceType string = "alloydb-create-cluster"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the create-cluster tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -73,7 +75,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -122,49 +124,49 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	project, ok := paramsMap["project"].(string)
 	if !ok || project == "" {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string", nil)
 	}
 
 	location, ok := paramsMap["location"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'location' parameter; expected a string", nil)
 	}
 
 	clusterID, ok := paramsMap["cluster"].(string)
 	if !ok || clusterID == "" {
-		return nil, fmt.Errorf("invalid or missing 'cluster' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string", nil)
 	}
 
 	password, ok := paramsMap["password"].(string)
 	if !ok || password == "" {
-		return nil, fmt.Errorf("invalid or missing 'password' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'password' parameter; expected a non-empty string", nil)
 	}
 
 	network, ok := paramsMap["network"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'network' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'network' parameter; expected a string", nil)
 	}
 
 	user, ok := paramsMap["user"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'user' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'user' parameter; expected a string", nil)
+	}
+	resp, err := source.CreateCluster(ctx, project, location, network, user, password, clusterID, string(accessToken))
+
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
 	}
 
-	return source.CreateCluster(ctx, project, location, network, user, password, clusterID, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -187,7 +189,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -198,3 +200,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster_test.go b/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster_test.go
index b97dc8487e..2daed2e625 100644
--- a/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster_test.go
+++ b/internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster_test.go
@@ -17,7 +17,6 @@ package alloydbcreatecluster_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-            tools:
-                create-my-cluster:
-                    kind: alloydb-create-cluster
-                    source: my-alloydb-admin-source
-                    description: some description
+            kind: tools
+            name: create-my-cluster
+            type: alloydb-create-cluster
+            source: my-alloydb-admin-source
+            description: some description
             `,
 			want: server.ToolConfigs{
 				"create-my-cluster": alloydbcreatecluster.Config{
 					Name:         "create-my-cluster",
-					Kind:         "alloydb-create-cluster",
+					Type:         "alloydb-create-cluster",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-            tools:
-                create-my-cluster-auth:
-                    kind: alloydb-create-cluster
-                    source: my-alloydb-admin-source
-                    description: some description
-                    authRequired: 
-                        - my-google-auth-service
-                        - other-auth-service
+            kind: tools
+            name: create-my-cluster-auth
+            type: alloydb-create-cluster
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired: 
+            - my-google-auth-service
+            - other-auth-service
             `,
 			want: server.ToolConfigs{
 				"create-my-cluster-auth": alloydbcreatecluster.Config{
 					Name:         "create-my-cluster-auth",
-					Kind:         "alloydb-create-cluster",
+					Type:         "alloydb-create-cluster",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance.go b/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance.go
index 058567fea5..ce98dbe44d 100644
--- a/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance.go
+++ b/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance.go
@@ -17,19 +17,21 @@ package alloydbcreateinstance
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-create-instance"
+const resourceType string = "alloydb-create-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the create-instance tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -73,7 +75,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -123,36 +125,36 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	project, ok := paramsMap["project"].(string)
 	if !ok || project == "" {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string", nil)
 	}
 
 	location, ok := paramsMap["location"].(string)
 	if !ok || location == "" {
-		return nil, fmt.Errorf("invalid or missing 'location' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a non-empty string", nil)
 	}
 
 	cluster, ok := paramsMap["cluster"].(string)
 	if !ok || cluster == "" {
-		return nil, fmt.Errorf("invalid or missing 'cluster' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string", nil)
 	}
 
 	instanceID, ok := paramsMap["instance"].(string)
 	if !ok || instanceID == "" {
-		return nil, fmt.Errorf("invalid or missing 'instance' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'instance' parameter; expected a non-empty string", nil)
 	}
 
 	instanceType, ok := paramsMap["instanceType"].(string)
 	if !ok || (instanceType != "READ_POOL" && instanceType != "PRIMARY") {
-		return nil, fmt.Errorf("invalid 'instanceType' parameter; expected 'PRIMARY' or 'READ_POOL'")
+		return nil, util.NewAgentError("invalid 'instanceType' parameter; expected 'PRIMARY' or 'READ_POOL'", nil)
 	}
 
 	displayName, _ := paramsMap["displayName"].(string)
@@ -161,16 +163,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if instanceType == "READ_POOL" {
 		nodeCount, ok = paramsMap["nodeCount"].(int)
 		if !ok {
-			return nil, fmt.Errorf("invalid 'nodeCount' parameter; expected an integer for READ_POOL")
+			return nil, util.NewAgentError("invalid 'nodeCount' parameter; expected an integer for READ_POOL", nil)
 		}
 	}
 
-	return source.CreateInstance(ctx, project, location, cluster, instanceID, instanceType, displayName, nodeCount, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateInstance(ctx, project, location, cluster, instanceID, instanceType, displayName, nodeCount, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -193,7 +194,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -204,3 +205,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance_test.go b/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance_test.go
index 499a23c051..820492d825 100644
--- a/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance_test.go
+++ b/internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance_test.go
@@ -17,7 +17,6 @@ package alloydbcreateinstance_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-            tools:
-                create-my-instance:
-                    kind: alloydb-create-instance
-                    source: my-alloydb-admin-source
-                    description: some description
+            kind: tools
+            name: create-my-instance
+            type: alloydb-create-instance
+            source: my-alloydb-admin-source
+            description: some description
             `,
 			want: server.ToolConfigs{
 				"create-my-instance": alloydbcreateinstance.Config{
 					Name:         "create-my-instance",
-					Kind:         "alloydb-create-instance",
+					Type:         "alloydb-create-instance",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-            tools:
-                create-my-instance-auth:
-                    kind: alloydb-create-instance
-                    source: my-alloydb-admin-source
-                    description: some description
-                    authRequired: 
-                        - my-google-auth-service
-                        - other-auth-service
+            kind: tools
+            name: create-my-instance-auth
+            type: alloydb-create-instance
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired: 
+            - my-google-auth-service
+            - other-auth-service
             `,
 			want: server.ToolConfigs{
 				"create-my-instance-auth": alloydbcreateinstance.Config{
 					Name:         "create-my-instance-auth",
-					Kind:         "alloydb-create-instance",
+					Type:         "alloydb-create-instance",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go b/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go
index a5cb258554..4d59c1fcfc 100644
--- a/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go
+++ b/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go
@@ -17,19 +17,21 @@ package alloydbcreateuser
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-create-user"
+const resourceType string = "alloydb-create-user"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the create-user tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -73,7 +75,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -122,43 +124,43 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	project, ok := paramsMap["project"].(string)
 	if !ok || project == "" {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a non-empty string", nil)
 	}
 
 	location, ok := paramsMap["location"].(string)
 	if !ok || location == "" {
-		return nil, fmt.Errorf("invalid or missing'location' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing'location' parameter; expected a non-empty string", nil)
 	}
 
 	cluster, ok := paramsMap["cluster"].(string)
 	if !ok || cluster == "" {
-		return nil, fmt.Errorf("invalid or missing 'cluster' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a non-empty string", nil)
 	}
 
 	userID, ok := paramsMap["user"].(string)
 	if !ok || userID == "" {
-		return nil, fmt.Errorf("invalid or missing 'user' parameter; expected a non-empty string")
+		return nil, util.NewAgentError("invalid or missing 'user' parameter; expected a non-empty string", nil)
 	}
 
 	userType, ok := paramsMap["userType"].(string)
 	if !ok || (userType != "ALLOYDB_BUILT_IN" && userType != "ALLOYDB_IAM_USER") {
-		return nil, fmt.Errorf("invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'")
+		return nil, util.NewAgentError("invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'", nil)
 	}
 	var password string
 
 	if userType == "ALLOYDB_BUILT_IN" {
 		password, ok = paramsMap["password"].(string)
 		if !ok || password == "" {
-			return nil, fmt.Errorf("password is required when userType is ALLOYDB_BUILT_IN")
+			return nil, util.NewAgentError("password is required when userType is ALLOYDB_BUILT_IN", nil)
 		}
 	}
 
@@ -170,12 +172,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			}
 		}
 	}
-	return source.CreateUser(ctx, userType, password, roles, string(accessToken), project, location, cluster, userID)
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateUser(ctx, userType, password, roles, string(accessToken), project, location, cluster, userID)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -198,7 +199,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -209,3 +210,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser_test.go b/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser_test.go
index 1a35b3093e..234a9d35b8 100644
--- a/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser_test.go
+++ b/internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser_test.go
@@ -17,7 +17,6 @@ package alloydbcreateuser_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-            tools:
-                create-my-user:
-                    kind: alloydb-create-user
-                    source: my-alloydb-admin-source
-                    description: some description
+            kind: tools
+            name: create-my-user
+            type: alloydb-create-user
+            source: my-alloydb-admin-source
+            description: some description
             `,
 			want: server.ToolConfigs{
 				"create-my-user": alloydbcreateuser.Config{
 					Name:         "create-my-user",
-					Kind:         "alloydb-create-user",
+					Type:         "alloydb-create-user",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-            tools:
-                create-my-user-auth:
-                    kind: alloydb-create-user
-                    source: my-alloydb-admin-source
-                    description: some description
-                    authRequired: 
-                        - my-google-auth-service
-                        - other-auth-service
+            kind: tools
+            name: create-my-user-auth
+            type: alloydb-create-user
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired: 
+            - my-google-auth-service
+            - other-auth-service
             `,
 			want: server.ToolConfigs{
 				"create-my-user-auth": alloydbcreateuser.Config{
 					Name:         "create-my-user-auth",
-					Kind:         "alloydb-create-user",
+					Type:         "alloydb-create-user",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go b/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go
index 392edeff3e..a0875fbe3e 100644
--- a/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go
+++ b/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go
@@ -17,19 +17,21 @@ package alloydbgetcluster
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-get-cluster"
+const resourceType string = "alloydb-get-cluster"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the get-cluster tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -120,33 +122,32 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a string")
+	if !ok || project == "" {
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil)
 	}
 	location, ok := paramsMap["location"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+	if !ok || location == "" {
+		return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil)
 	}
 	cluster, ok := paramsMap["cluster"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'cluster' parameter; expected a string")
+	if !ok || cluster == "" {
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil)
 	}
 
-	return source.GetCluster(ctx, project, location, cluster, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.GetCluster(ctx, project, location, cluster, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -169,7 +170,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -180,3 +181,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster_test.go b/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster_test.go
index d30a335cd0..7ae2d11fee 100644
--- a/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster_test.go
+++ b/internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster_test.go
@@ -17,7 +17,6 @@ package alloydbgetcluster_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				get-my-cluster:
-					kind: alloydb-get-cluster
-					source: my-alloydb-admin-source
-					description: some description
-			`,
+            kind: tools
+            name: get-my-cluster
+            type: alloydb-get-cluster
+            source: my-alloydb-admin-source
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"get-my-cluster": alloydbgetcluster.Config{
 					Name:         "get-my-cluster",
-					Kind:         "alloydb-get-cluster",
+					Type:         "alloydb-get-cluster",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				get-my-cluster-auth:
-					kind: alloydb-get-cluster
-					source: my-alloydb-admin-source
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-			`,
+            kind: tools
+            name: get-my-cluster-auth
+            type: alloydb-get-cluster
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired: 
+            - my-google-auth-service
+            - other-auth-service
+            `,
 			want: server.ToolConfigs{
 				"get-my-cluster-auth": alloydbgetcluster.Config{
 					Name:         "get-my-cluster-auth",
-					Kind:         "alloydb-get-cluster",
+					Type:         "alloydb-get-cluster",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go b/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go
index eeff94721c..e0ceb1ab6c 100644
--- a/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go
+++ b/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go
@@ -17,19 +17,21 @@ package alloydbgetinstance
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-get-instance"
+const resourceType string = "alloydb-get-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the get-instance tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -120,37 +122,36 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a string")
+	if !ok || project == "" {
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil)
 	}
 	location, ok := paramsMap["location"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+	if !ok || location == "" {
+		return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil)
 	}
 	cluster, ok := paramsMap["cluster"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'cluster' parameter; expected a string")
+	if !ok || cluster == "" {
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil)
 	}
 	instance, ok := paramsMap["instance"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'instance' parameter; expected a string")
+	if !ok || instance == "" {
+		return nil, util.NewAgentError("invalid or missing 'instance' parameter; expected a string", nil)
 	}
 
-	return source.GetInstance(ctx, project, location, cluster, instance, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.GetInstance(ctx, project, location, cluster, instance, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -173,7 +174,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -184,3 +185,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance_test.go b/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance_test.go
index 62e9339222..498934fdfd 100644
--- a/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance_test.go
+++ b/internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance_test.go
@@ -17,7 +17,6 @@ package alloydbgetinstance_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				get-my-instance:
-					kind: alloydb-get-instance
-					source: my-alloydb-admin-source
-					description: some description
-			`,
+            kind: tools
+            name: get-my-instance
+            type: alloydb-get-instance
+            source: my-alloydb-admin-source
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"get-my-instance": alloydbgetinstance.Config{
 					Name:         "get-my-instance",
-					Kind:         "alloydb-get-instance",
+					Type:         "alloydb-get-instance",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				get-my-instance-auth:
-					kind: alloydb-get-instance
-					source: my-alloydb-admin-source
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-			`,
+            kind: tools
+            name: get-my-instance-auth
+            type: alloydb-get-instance
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired: 
+            - my-google-auth-service
+            - other-auth-service
+            `,
 			want: server.ToolConfigs{
 				"get-my-instance-auth": alloydbgetinstance.Config{
 					Name:         "get-my-instance-auth",
-					Kind:         "alloydb-get-instance",
+					Type:         "alloydb-get-instance",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go b/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go
index 31d2222f62..ae7986a846 100644
--- a/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go
+++ b/internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go
@@ -17,19 +17,21 @@ package alloydbgetuser
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-get-user"
+const resourceType string = "alloydb-get-user"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the get-user tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -120,37 +122,36 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a string")
+	if !ok || project == "" {
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil)
 	}
 	location, ok := paramsMap["location"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+	if !ok || location == "" {
+		return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil)
 	}
 	cluster, ok := paramsMap["cluster"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'cluster' parameter; expected a string")
+	if !ok || cluster == "" {
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil)
 	}
 	user, ok := paramsMap["user"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'user' parameter; expected a string")
+	if !ok || user == "" {
+		return nil, util.NewAgentError("invalid or missing 'user' parameter; expected a string", nil)
 	}
 
-	return source.GetUsers(ctx, project, location, cluster, user, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.GetUsers(ctx, project, location, cluster, user, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -173,7 +174,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -184,3 +185,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbgetuser/alloydbgetuser_test.go b/internal/tools/alloydb/alloydbgetuser/alloydbgetuser_test.go
index 0d20ea3259..f601dc30d2 100644
--- a/internal/tools/alloydb/alloydbgetuser/alloydbgetuser_test.go
+++ b/internal/tools/alloydb/alloydbgetuser/alloydbgetuser_test.go
@@ -17,7 +17,6 @@ package alloydbgetuser_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				get-my-user:
-					kind: alloydb-get-user
-					source: my-alloydb-admin-source
-					description: some description
-			`,
+            kind: tools
+            name: get-my-user
+            type: alloydb-get-user
+            source: my-alloydb-admin-source
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"get-my-user": alloydbgetuser.Config{
 					Name:         "get-my-user",
-					Kind:         "alloydb-get-user",
+					Type:         "alloydb-get-user",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				get-my-user-auth:
-					kind: alloydb-get-user
-					source: my-alloydb-admin-source
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-			`,
+            kind: tools
+            name: get-my-user-auth
+            type: alloydb-get-user
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired: 
+            - my-google-auth-service
+            - other-auth-service
+            `,
 			want: server.ToolConfigs{
 				"get-my-user-auth": alloydbgetuser.Config{
 					Name:         "get-my-user-auth",
-					Kind:         "alloydb-get-user",
+					Type:         "alloydb-get-user",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go b/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go
index 2e06cb062a..ee624f039f 100644
--- a/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go
+++ b/internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go
@@ -17,19 +17,21 @@ package alloydblistclusters
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-list-clusters"
+const resourceType string = "alloydb-list-clusters"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the list-clusters tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -118,29 +120,28 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a string")
+	if !ok || project == "" {
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil)
 	}
 	location, ok := paramsMap["location"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'location' parameter; expected a string", nil)
 	}
 
-	return source.ListCluster(ctx, project, location, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.ListCluster(ctx, project, location, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -163,7 +164,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -174,3 +175,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydblistclusters/alloydblistclusters_test.go b/internal/tools/alloydb/alloydblistclusters/alloydblistclusters_test.go
index b60a11db20..17429df5de 100644
--- a/internal/tools/alloydb/alloydblistclusters/alloydblistclusters_test.go
+++ b/internal/tools/alloydb/alloydblistclusters/alloydblistclusters_test.go
@@ -17,7 +17,6 @@ package alloydblistclusters_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				list-my-clusters:
-					kind: alloydb-list-clusters
-					source: my-alloydb-admin-source
-					description: some description
-			`,
+            kind: tools
+            name: list-my-clusters
+            type: alloydb-list-clusters
+            source: my-alloydb-admin-source
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"list-my-clusters": alloydblistclusters.Config{
 					Name:         "list-my-clusters",
-					Kind:         "alloydb-list-clusters",
+					Type:         "alloydb-list-clusters",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				list-my-clusters-auth:
-					kind: alloydb-list-clusters
-					source: my-alloydb-admin-source
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-			`,
+            kind: tools
+            name: list-my-clusters-auth
+            type: alloydb-list-clusters
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired:
+            - my-google-auth-service
+            - other-auth-service
+            `,
 			want: server.ToolConfigs{
 				"list-my-clusters-auth": alloydblistclusters.Config{
 					Name:         "list-my-clusters-auth",
-					Kind:         "alloydb-list-clusters",
+					Type:         "alloydb-list-clusters",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go b/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go
index b7d4e05b35..86f0b3b21a 100644
--- a/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go
+++ b/internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go
@@ -17,19 +17,21 @@ package alloydblistinstances
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-list-instances"
+const resourceType string = "alloydb-list-instances"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the list-instances tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -119,33 +121,32 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a string")
+	if !ok || project == "" {
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil)
 	}
 	location, ok := paramsMap["location"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'location' parameter; expected a string", nil)
 	}
 	cluster, ok := paramsMap["cluster"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'cluster' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'cluster' parameter; expected a string", nil)
 	}
 
-	return source.ListInstance(ctx, project, location, cluster, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.ListInstance(ctx, project, location, cluster, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -168,7 +169,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -179,3 +180,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydblistinstances/alloydblistinstances_test.go b/internal/tools/alloydb/alloydblistinstances/alloydblistinstances_test.go
index aa667d9563..c1f95b964a 100644
--- a/internal/tools/alloydb/alloydblistinstances/alloydblistinstances_test.go
+++ b/internal/tools/alloydb/alloydblistinstances/alloydblistinstances_test.go
@@ -17,7 +17,6 @@ package alloydblistinstances_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				list-my-instances:
-					kind: alloydb-list-instances
-					source: my-alloydb-admin-source
-					description: some description
-			`,
+            kind: tools
+            name: list-my-instances
+            type: alloydb-list-instances
+            source: my-alloydb-admin-source
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"list-my-instances": alloydblistinstances.Config{
 					Name:         "list-my-instances",
-					Kind:         "alloydb-list-instances",
+					Type:         "alloydb-list-instances",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				list-my-instances-auth:
-					kind: alloydb-list-instances
-					source: my-alloydb-admin-source
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-			`,
+            kind: tools
+            name: list-my-instances-auth
+            type: alloydb-list-instances
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired:
+            - my-google-auth-service
+            - other-auth-service
+            `,
 			want: server.ToolConfigs{
 				"list-my-instances-auth": alloydblistinstances.Config{
 					Name:         "list-my-instances-auth",
-					Kind:         "alloydb-list-instances",
+					Type:         "alloydb-list-instances",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydblistusers/alloydblistusers.go b/internal/tools/alloydb/alloydblistusers/alloydblistusers.go
index 3551a373a9..6987b6e82e 100644
--- a/internal/tools/alloydb/alloydblistusers/alloydblistusers.go
+++ b/internal/tools/alloydb/alloydblistusers/alloydblistusers.go
@@ -17,19 +17,21 @@ package alloydblistusers
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-list-users"
+const resourceType string = "alloydb-list-users"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Configuration for the list-users tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -119,33 +121,32 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid or missing 'project' parameter; expected a string")
+	if !ok || project == "" {
+		return nil, util.NewAgentError("invalid or missing 'project' parameter; expected a string", nil)
 	}
 	location, ok := paramsMap["location"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'location' parameter; expected a string")
+	if !ok || location == "" {
+		return nil, util.NewAgentError("invalid or missing 'location' parameter; expected a string", nil)
 	}
 	cluster, ok := paramsMap["cluster"].(string)
-	if !ok {
-		return nil, fmt.Errorf("invalid 'cluster' parameter; expected a string")
+	if !ok || cluster == "" {
+		return nil, util.NewAgentError("invalid or missing 'cluster' parameter; expected a string", nil)
 	}
 
-	return source.ListUsers(ctx, project, location, cluster, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.ListUsers(ctx, project, location, cluster, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -168,7 +169,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -179,3 +180,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydblistusers/alloydblistusers_test.go b/internal/tools/alloydb/alloydblistusers/alloydblistusers_test.go
index d2d0672684..6c92fcab53 100644
--- a/internal/tools/alloydb/alloydblistusers/alloydblistusers_test.go
+++ b/internal/tools/alloydb/alloydblistusers/alloydblistusers_test.go
@@ -17,7 +17,6 @@ package alloydblistusers_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				list-my-users:
-					kind: alloydb-list-users
-					source: my-alloydb-admin-source
-					description: some description
-			`,
+            kind: tools
+            name: list-my-users
+            type: alloydb-list-users
+            source: my-alloydb-admin-source
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"list-my-users": alloydblistusers.Config{
 					Name:         "list-my-users",
-					Kind:         "alloydb-list-users",
+					Type:         "alloydb-list-users",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				list-my-users-auth:
-					kind: alloydb-list-users
-					source: my-alloydb-admin-source
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-			`,
+            kind: tools
+            name: list-my-users-auth
+            type: alloydb-list-users
+            source: my-alloydb-admin-source
+            description: some description
+            authRequired:
+            - my-google-auth-service
+            - other-auth-service
+            `,
 			want: server.ToolConfigs{
 				"list-my-users-auth": alloydblistusers.Config{
 					Name:         "list-my-users-auth",
-					Kind:         "alloydb-list-users",
+					Type:         "alloydb-list-users",
 					Source:       "my-alloydb-admin-source",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -78,15 +77,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go b/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go
index b1996fc0ee..05ca8b7780 100644
--- a/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go
+++ b/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go
@@ -24,10 +24,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "alloydb-wait-for-operation"
+const resourceType string = "alloydb-wait-for-operation"
 
 var alloyDBConnectionMessageTemplate = `Your AlloyDB resource is ready.
 
@@ -73,8 +74,8 @@ Please refer to the official documentation for guidance on deploying the toolbox
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -95,7 +96,7 @@ type compatibleSource interface {
 // Config defines the configuration for the wait-for-operation tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -110,9 +111,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -124,7 +125,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -213,25 +214,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	location, ok := paramsMap["location"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'location' parameter")
+		return nil, util.NewAgentError("missing 'location' parameter", nil)
 	}
 	operation, ok := paramsMap["operation"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'operation' parameter")
+		return nil, util.NewAgentError("missing 'operation' parameter", nil)
 	}
 
 	ctx, cancel := context.WithTimeout(ctx, 30*time.Minute)
@@ -246,14 +247,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	for retries < maxRetries {
 		select {
 		case <-ctx.Done():
-			return nil, fmt.Errorf("timed out waiting for operation: %w", ctx.Err())
+			return nil, util.NewAgentError("timed out waiting for operation", ctx.Err())
 		default:
 		}
 
 		op, err := source.GetOperations(ctx, project, location, operation, alloyDBConnectionMessageTemplate, delay, string(accessToken))
 		if err != nil {
-			return nil, err
-		} else if op != nil {
+			return nil, util.ProcessGeneralError(err)
+		}
+		if op != nil {
 			return op, nil
 		}
 
@@ -264,12 +266,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		}
 		retries++
 	}
-	return nil, fmt.Errorf("exceeded max retries waiting for operation")
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	return nil, util.NewAgentError("exceeded max retries waiting for operation", nil)
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -292,7 +289,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -303,3 +300,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation_test.go b/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation_test.go
index 68f92d39d6..ad9961f1b6 100644
--- a/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation_test.go
+++ b/internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation_test.go
@@ -17,7 +17,6 @@ package alloydbwaitforoperation_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"
@@ -37,20 +36,20 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				wait-for-thing:
-					kind: alloydb-wait-for-operation
-					source: some-source
-					description: some description
-					delay: 1s
-					maxDelay: 5s
-					multiplier: 1.5
-					maxRetries: 5
-			`,
+            kind: tools
+            name: wait-for-thing
+            type: alloydb-wait-for-operation
+            source: some-source
+            description: some description
+            delay: 1s
+            maxDelay: 5s
+            multiplier: 1.5
+            maxRetries: 5
+            `,
 			want: server.ToolConfigs{
 				"wait-for-thing": alloydbwaitforoperation.Config{
 					Name:         "wait-for-thing",
-					Kind:         "alloydb-wait-for-operation",
+					Type:         "alloydb-wait-for-operation",
 					Source:       "some-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -64,15 +63,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/alloydbainl/alloydbainl.go b/internal/tools/alloydbainl/alloydbainl.go
index 117abd2ad5..98cf20870b 100644
--- a/internal/tools/alloydbainl/alloydbainl.go
+++ b/internal/tools/alloydbainl/alloydbainl.go
@@ -17,21 +17,23 @@ package alloydbainl
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "alloydb-ai-nl"
+const resourceType string = "alloydb-ai-nl"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	NLConfig           string                `yaml:"nlConfig" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -127,10 +129,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	sliceParams := params.AsSlice()
@@ -143,15 +145,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	resp, err := source.RunSQL(ctx, t.Statement, allParamValues)
 	if err != nil {
-		return nil, fmt.Errorf("%w. Query: %v , Values: %v. Toolbox v0.19.0+ is only compatible with AlloyDB AI NL v1.0.3+. Please ensure that you are using the latest AlloyDB AI NL extension", err, t.Statement, allParamValues)
+		return nil, util.NewClientServerError(fmt.Sprintf("error running SQL query: %v. Query: %v , Values: %v. Toolbox v0.19.0+ is only compatible with AlloyDB AI NL v1.0.3+. Please ensure that you are using the latest AlloyDB AI NL extension", err, t.Statement, allParamValues), http.StatusBadRequest, err)
 	}
 	return resp, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -175,3 +173,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/alloydbainl/alloydbainl_test.go b/internal/tools/alloydbainl/alloydbainl_test.go
index 2e618e66cc..42dc54fa2f 100644
--- a/internal/tools/alloydbainl/alloydbainl_test.go
+++ b/internal/tools/alloydbainl/alloydbainl_test.go
@@ -17,7 +17,6 @@ package alloydbainl_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"
@@ -38,26 +37,26 @@ func TestParseFromYamlAlloyDBNLA(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: alloydb-ai-nl
-					source: my-alloydb-instance
-					description: AlloyDB natural language query tool
-					nlConfig: 'my_nl_config'
-					authRequired:
-						- my-google-auth-service
-					nlConfigParameters:
-						- name: user_id
-						  type: string
-						  description: user_id to use
-						  authServices:
-							- name: my-google-auth-service
-							  field: sub
-			`,
+            kind: tools
+            name: example_tool
+            type: alloydb-ai-nl
+            source: my-alloydb-instance
+            description: AlloyDB natural language query tool
+            nlConfig: 'my_nl_config'
+            authRequired:
+            - my-google-auth-service
+            nlConfigParameters:
+            - name: user_id
+              type: string
+              description: user_id to use
+              authServices:
+                - name: my-google-auth-service
+                  field: sub
+            `,
 			want: server.ToolConfigs{
 				"example_tool": alloydbainl.Config{
 					Name:         "example_tool",
-					Kind:         "alloydb-ai-nl",
+					Type:         "alloydb-ai-nl",
 					Source:       "my-alloydb-instance",
 					Description:  "AlloyDB natural language query tool",
 					NLConfig:     "my_nl_config",
@@ -72,33 +71,33 @@ func TestParseFromYamlAlloyDBNLA(t *testing.T) {
 		{
 			desc: "with multiple parameters",
 			in: `
-			tools:
-				complex_tool:
-					kind: alloydb-ai-nl
-					source: my-alloydb-instance
-					description: AlloyDB natural language query tool with multiple parameters
-					nlConfig: 'complex_nl_config'
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					nlConfigParameters:
-						- name: user_id
-						  type: string
-						  description: user_id to use
-						  authServices:
-							- name: my-google-auth-service
-							  field: sub
-						- name: user_email
-						  type: string
-						  description: user_email to use
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_email
-			`,
+            kind: tools
+            name: complex_tool
+            type: alloydb-ai-nl
+            source: my-alloydb-instance
+            description: AlloyDB natural language query tool with multiple parameters
+            nlConfig: 'complex_nl_config'
+            authRequired:
+            - my-google-auth-service
+            - other-auth-service
+            nlConfigParameters:
+            - name: user_id
+              type: string
+              description: user_id to use
+              authServices:
+                - name: my-google-auth-service
+                  field: sub
+            - name: user_email
+              type: string
+              description: user_email to use
+              authServices:
+                - name: my-google-auth-service
+                  field: user_email
+            `,
 			want: server.ToolConfigs{
 				"complex_tool": alloydbainl.Config{
 					Name:         "complex_tool",
-					Kind:         "alloydb-ai-nl",
+					Type:         "alloydb-ai-nl",
 					Source:       "my-alloydb-instance",
 					Description:  "AlloyDB natural language query tool with multiple parameters",
 					NLConfig:     "complex_nl_config",
@@ -115,15 +114,12 @@ func TestParseFromYamlAlloyDBNLA(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution.go b/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution.go
index 7f50803b0a..f8d453039b 100644
--- a/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution.go
+++ b/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution.go
@@ -17,6 +17,7 @@ package bigqueryanalyzecontribution
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
@@ -27,15 +28,16 @@ import (
 	bigqueryds "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	bqutil "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerycommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 )
 
-const kind string = "bigquery-analyze-contribution"
+const resourceType string = "bigquery-analyze-contribution"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,7 +61,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -68,8 +70,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -82,7 +84,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	allowedDatasets := s.BigQueryAllowedDatasets()
@@ -154,21 +156,21 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke runs the contribution analysis.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	inputData, ok := paramsMap["input_data"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast input_data parameter %s", paramsMap["input_data"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast input_data parameter %s", paramsMap["input_data"]), nil)
 	}
 
 	bqClient, restService, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	modelID := fmt.Sprintf("contribution_analysis_model_%s", strings.ReplaceAll(uuid.New().String(), "-", ""))
@@ -186,7 +188,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			}
 			options = append(options, fmt.Sprintf("DIMENSION_ID_COLS = [%s]", strings.Join(strCols, ", ")))
 		} else {
-			return nil, fmt.Errorf("unable to cast dimension_id_cols parameter %s", paramsMap["dimension_id_cols"])
+			return nil, util.NewAgentError(fmt.Sprintf("unable to cast dimension_id_cols parameter %s", paramsMap["dimension_id_cols"]), nil)
 		}
 	}
 	if val, ok := paramsMap["top_k_insights_by_apriori_support"]; ok {
@@ -195,7 +197,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if val, ok := paramsMap["pruning_method"].(string); ok {
 		upperVal := strings.ToUpper(val)
 		if upperVal != "NO_PRUNING" && upperVal != "PRUNE_REDUNDANT_INSIGHTS" {
-			return nil, fmt.Errorf("invalid pruning_method: %s", val)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid pruning_method: %s", val), nil)
 		}
 		options = append(options, fmt.Sprintf("PRUNING_METHOD = '%s'", upperVal))
 	}
@@ -207,7 +209,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			var connProps []*bigqueryapi.ConnectionProperty
 			session, err := source.BigQuerySession()(ctx)
 			if err != nil {
-				return nil, fmt.Errorf("failed to get BigQuery session: %w", err)
+				return nil, util.NewClientServerError("failed to get BigQuery session", http.StatusInternalServerError, err)
 			}
 			if session != nil {
 				connProps = []*bigqueryapi.ConnectionProperty{
@@ -216,22 +218,22 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			}
 			dryRunJob, err := bqutil.DryRunQuery(ctx, restService, source.BigQueryClient().Project(), source.BigQueryClient().Location, inputData, nil, connProps)
 			if err != nil {
-				return nil, fmt.Errorf("query validation failed: %w", err)
+				return nil, util.ProcessGcpError(err)
 			}
 			statementType := dryRunJob.Statistics.Query.StatementType
 			if statementType != "SELECT" {
-				return nil, fmt.Errorf("the 'input_data' parameter only supports a table ID or a SELECT query. The provided query has statement type '%s'", statementType)
+				return nil, util.NewAgentError(fmt.Sprintf("the 'input_data' parameter only supports a table ID or a SELECT query. The provided query has statement type '%s'", statementType), nil)
 			}
 
 			queryStats := dryRunJob.Statistics.Query
 			if queryStats != nil {
 				for _, tableRef := range queryStats.ReferencedTables {
 					if !source.IsDatasetAllowed(tableRef.ProjectId, tableRef.DatasetId) {
-						return nil, fmt.Errorf("query in input_data accesses dataset '%s.%s', which is not in the allowed list", tableRef.ProjectId, tableRef.DatasetId)
+						return nil, util.NewAgentError(fmt.Sprintf("query in input_data accesses dataset '%s.%s', which is not in the allowed list", tableRef.ProjectId, tableRef.DatasetId), nil)
 					}
 				}
 			} else {
-				return nil, fmt.Errorf("could not analyze query in input_data to validate against allowed datasets")
+				return nil, util.NewAgentError("could not analyze query in input_data to validate against allowed datasets", nil)
 			}
 		}
 		inputDataSource = fmt.Sprintf("(%s)", inputData)
@@ -245,10 +247,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			case 2: // dataset.table
 				projectID, datasetID = source.BigQueryClient().Project(), parts[0]
 			default:
-				return nil, fmt.Errorf("invalid table ID format for 'input_data': %q. Expected 'dataset.table' or 'project.dataset.table'", inputData)
+				return nil, util.NewAgentError(fmt.Sprintf("invalid table ID format for 'input_data': %q. Expected 'dataset.table' or 'project.dataset.table'", inputData), nil)
 			}
 			if !source.IsDatasetAllowed(projectID, datasetID) {
-				return nil, fmt.Errorf("access to dataset '%s.%s' (from table '%s') is not allowed", projectID, datasetID, inputData)
+				return nil, util.NewAgentError(fmt.Sprintf("access to dataset '%s.%s' (from table '%s') is not allowed", projectID, datasetID, inputData), nil)
 			}
 		}
 		inputDataSource = fmt.Sprintf("SELECT * FROM `%s`", inputData)
@@ -268,7 +270,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Otherwise, a new session will be created by the first query.
 	session, err := source.BigQuerySession()(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get BigQuery session: %w", err)
+		return nil, util.NewClientServerError("failed to get BigQuery session", http.StatusInternalServerError, err)
 	}
 
 	if session != nil {
@@ -281,15 +283,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	createModelJob, err := createModelQuery.Run(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to start create model job: %w", err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	status, err := createModelJob.Wait(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to wait for create model job: %w", err)
+		return nil, util.ProcessGcpError(err)
 	}
 	if err := status.Err(); err != nil {
-		return nil, fmt.Errorf("create model job failed: %w", err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	// Determine the session ID to use for subsequent queries.
@@ -300,16 +302,17 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	} else if status.Statistics != nil && status.Statistics.SessionInfo != nil {
 		sessionID = status.Statistics.SessionInfo.SessionID
 	} else {
-		return nil, fmt.Errorf("failed to get or create a BigQuery session ID")
+		return nil, util.NewClientServerError("failed to get or create a BigQuery session ID", http.StatusInternalServerError, nil)
 	}
 
 	getInsightsSQL := fmt.Sprintf("SELECT * FROM ML.GET_INSIGHTS(MODEL %s)", modelID)
 	connProps := []*bigqueryapi.ConnectionProperty{{Key: "session_id", Value: sessionID}}
-	return source.RunSQL(ctx, bqClient, getInsightsSQL, "SELECT", nil, connProps)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, bqClient, getInsightsSQL, "SELECT", nil, connProps)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -329,7 +332,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -339,3 +342,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution_test.go b/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution_test.go
index 7409acd14e..ceaa41035e 100644
--- a/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution_test.go
+++ b/internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution_test.go
@@ -17,7 +17,6 @@ package bigqueryanalyzecontribution_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryAnalyzeContribution(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-analyze-contribution
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-analyze-contribution
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigqueryanalyzecontribution.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-analyze-contribution",
+					Type:         "bigquery-analyze-contribution",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryAnalyzeContribution(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go b/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go
index ff9fc8e889..54d29d1605 100644
--- a/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go
+++ b/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go
@@ -33,7 +33,9 @@ import (
 	"golang.org/x/oauth2"
 )
 
-const kind string = "bigquery-conversational-analytics"
+const resourceType string = "bigquery-conversational-analytics"
+
+const gdaURLFormat = "https://geminidataanalytics.googleapis.com/v1beta/projects/%s/locations/%s:chat"
 
 const instructions = `**INSTRUCTIONS - FOLLOW THESE RULES:**
 1. **CONTENT:** Your answer should present the supporting data and then provide a conclusion based on that data.
@@ -41,8 +43,8 @@ const instructions = `**INSTRUCTIONS - FOLLOW THESE RULES:**
 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))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -107,7 +109,7 @@ type CAPayload struct {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -116,8 +118,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -130,7 +132,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	allowedDatasets := s.BigQueryAllowedDatasets()
@@ -172,10 +174,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	var tokenStr string
@@ -184,26 +186,26 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if source.UseClientAuthorization() {
 		// Use client-side access token
 		if accessToken == "" {
-			return nil, fmt.Errorf("tool is configured for client OAuth but no token was provided in the request header: %w", util.ErrUnauthorized)
+			return nil, util.NewClientServerError("tool is configured for client OAuth but no token was provided in the request header", http.StatusUnauthorized, nil)
 		}
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	} else {
 		// Get a token source for the Gemini Data Analytics API.
 		tokenSource, err := source.BigQueryTokenSourceWithScope(ctx, nil)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get token source: %w", err)
+			return nil, util.NewClientServerError("failed to get token source", http.StatusInternalServerError, err)
 		}
 
 		// Use cloud-platform token source for Gemini Data Analytics API
 		if tokenSource == nil {
-			return nil, fmt.Errorf("cloud-platform token source is missing")
+			return nil, util.NewClientServerError("cloud-platform token source is missing", http.StatusInternalServerError, nil)
 		}
 		token, err := tokenSource.Token()
 		if err != nil {
-			return nil, fmt.Errorf("failed to get token from cloud-platform token source: %w", err)
+			return nil, util.NewClientServerError("failed to get token from cloud-platform token source", http.StatusInternalServerError, err)
 		}
 		tokenStr = token.AccessToken
 	}
@@ -218,14 +220,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+			return nil, util.NewAgentError("failed to parse 'table_references' JSON string", err)
 		}
 	}
 
 	if len(source.BigQueryAllowedDatasets()) > 0 {
 		for _, tableRef := range tableRefs {
 			if !source.IsDatasetAllowed(tableRef.ProjectID, tableRef.DatasetID) {
-				return nil, fmt.Errorf("access to dataset '%s.%s' (from table '%s') is not allowed", tableRef.ProjectID, tableRef.DatasetID, tableRef.TableID)
+				return nil, util.NewAgentError(fmt.Sprintf("access to dataset '%s.%s' (from table '%s') is not allowed", tableRef.ProjectID, tableRef.DatasetID, tableRef.TableID), nil)
 			}
 		}
 	}
@@ -236,11 +238,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if location == "" {
 		location = "us"
 	}
-	caURL := fmt.Sprintf("https://geminidataanalytics.googleapis.com/v1alpha/projects/%s/locations/%s:chat", projectID, location)
+	caURL := fmt.Sprintf(gdaURLFormat, projectID, location)
 
 	headers := map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", tokenStr),
-		"Content-Type":  "application/json",
+		"Authorization":     fmt.Sprintf("Bearer %s", tokenStr),
+		"Content-Type":      "application/json",
+		"X-Goog-API-Client": util.GDAClientID,
 	}
 
 	payload := CAPayload{
@@ -252,22 +255,19 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			},
 			Options: Options{Chart: ChartOptions{Image: ImageOptions{NoImage: map[string]any{}}}},
 		},
-		ClientIdEnum: "GENAI_TOOLBOX",
+		ClientIdEnum: util.GDAClientID,
 	}
 
 	// Call the streaming API
 	response, err := getStream(caURL, payload, headers, source.GetMaxQueryResultRows())
 	if err != nil {
-		return nil, fmt.Errorf("failed to get response from conversational analytics API: %w", err)
+		// getStream wraps network errors or non-200 responses
+		return nil, util.NewClientServerError("failed to get response from conversational analytics API", http.StatusInternalServerError, err)
 	}
 
 	return response, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -285,7 +285,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -568,3 +568,7 @@ func appendMessage(messages []map[string]any, newMessage map[string]any) []map[s
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics_test.go b/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics_test.go
index aadbbbe4b4..153d656e5b 100644
--- a/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics_test.go
+++ b/internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics_test.go
@@ -17,7 +17,6 @@ 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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryConversationalAnalytics(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-conversational-analytics
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-conversational-analytics
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigqueryconversationalanalytics.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-conversational-analytics",
+					Type:         "bigquery-conversational-analytics",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryConversationalAnalytics(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql.go b/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql.go
index 6f2fc245c9..157740c1bb 100644
--- a/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql.go
+++ b/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strings"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
@@ -32,11 +33,11 @@ import (
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 )
 
-const kind string = "bigquery-execute-sql"
+const resourceType string = "bigquery-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -61,7 +62,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -70,8 +71,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -84,7 +85,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	var sqlDescriptionBuilder strings.Builder
@@ -152,25 +153,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	sql, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast sql parameter %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast sql parameter %s", paramsMap["sql"]), nil)
 	}
 	dryRun, ok := paramsMap["dry_run"].(bool)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast dry_run parameter %s", paramsMap["dry_run"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast dry_run parameter %s", paramsMap["dry_run"]), nil)
 	}
 
 	bqClient, restService, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	var connProps []*bigqueryapi.ConnectionProperty
@@ -178,7 +179,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if source.BigQueryWriteMode() == bigqueryds.WriteModeProtected {
 		session, err = source.BigQuerySession()(ctx)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get BigQuery session for protected mode: %w", err)
+			return nil, util.NewClientServerError("failed to get BigQuery session for protected mode", http.StatusInternalServerError, err)
 		}
 		connProps = []*bigqueryapi.ConnectionProperty{
 			{Key: "session_id", Value: session.ID},
@@ -187,7 +188,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	dryRunJob, err := bqutil.DryRunQuery(ctx, restService, bqClient.Project(), bqClient.Location, sql, nil, connProps)
 	if err != nil {
-		return nil, fmt.Errorf("query validation failed: %w", err)
+		return nil, util.NewClientServerError("query validation failed", http.StatusInternalServerError, err)
 	}
 
 	statementType := dryRunJob.Statistics.Query.StatementType
@@ -195,13 +196,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	switch source.BigQueryWriteMode() {
 	case bigqueryds.WriteModeBlocked:
 		if statementType != "SELECT" {
-			return nil, fmt.Errorf("write mode is 'blocked', only SELECT statements are allowed")
+			return nil, util.NewAgentError("write mode is 'blocked', only SELECT statements are allowed", nil)
 		}
 	case bigqueryds.WriteModeProtected:
 		if dryRunJob.Configuration != nil && dryRunJob.Configuration.Query != nil {
 			if dest := dryRunJob.Configuration.Query.DestinationTable; dest != nil && dest.DatasetId != session.DatasetID {
-				return nil, fmt.Errorf("protected write mode only supports SELECT statements, or write operations in the anonymous "+
-					"dataset of a BigQuery session, but destination was %q", dest.DatasetId)
+				return nil, util.NewAgentError(fmt.Sprintf("protected write mode only supports SELECT statements, or write operations in the anonymous "+
+					"dataset of a BigQuery session, but destination was %q", dest.DatasetId), nil)
 			}
 		}
 	}
@@ -209,11 +210,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if len(source.BigQueryAllowedDatasets()) > 0 {
 		switch statementType {
 		case "CREATE_SCHEMA", "DROP_SCHEMA", "ALTER_SCHEMA":
-			return nil, fmt.Errorf("dataset-level operations like '%s' are not allowed when dataset restrictions are in place", statementType)
+			return nil, util.NewAgentError(fmt.Sprintf("dataset-level operations like '%s' are not allowed when dataset restrictions are in place", statementType), nil)
 		case "CREATE_FUNCTION", "CREATE_TABLE_FUNCTION", "CREATE_PROCEDURE":
-			return nil, fmt.Errorf("creating stored routines ('%s') is not allowed when dataset restrictions are in place, as their contents cannot be safely analyzed", statementType)
+			return nil, util.NewAgentError(fmt.Sprintf("creating stored routines ('%s') is not allowed when dataset restrictions are in place, as their contents cannot be safely analyzed", statementType), nil)
 		case "CALL":
-			return nil, fmt.Errorf("calling stored procedures ('%s') is not allowed when dataset restrictions are in place, as their contents cannot be safely analyzed", statementType)
+			return nil, util.NewAgentError(fmt.Sprintf("calling stored procedures ('%s') is not allowed when dataset restrictions are in place, as their contents cannot be safely analyzed", statementType), nil)
 		}
 
 		// Use a map to avoid duplicate table names.
@@ -244,7 +245,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			parsedTables, parseErr := bqutil.TableParser(sql, source.BigQueryClient().Project())
 			if parseErr != nil {
 				// If parsing fails (e.g., EXECUTE IMMEDIATE), we cannot guarantee safety, so we must fail.
-				return nil, fmt.Errorf("could not parse tables from query to validate against allowed datasets: %w", parseErr)
+				return nil, util.NewAgentError("could not parse tables from query to validate against allowed datasets", parseErr)
 			}
 			tableNames = parsedTables
 		}
@@ -254,7 +255,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			if len(parts) == 3 {
 				projectID, datasetID := parts[0], parts[1]
 				if !source.IsDatasetAllowed(projectID, datasetID) {
-					return nil, fmt.Errorf("query accesses dataset '%s.%s', which is not in the allowed list", projectID, datasetID)
+					return nil, util.NewAgentError(fmt.Sprintf("query accesses dataset '%s.%s', which is not in the allowed list", projectID, datasetID), nil)
 				}
 			}
 		}
@@ -264,7 +265,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		if dryRunJob != nil {
 			jobJSON, err := json.MarshalIndent(dryRunJob, "", "  ")
 			if err != nil {
-				return nil, fmt.Errorf("failed to marshal dry run job to JSON: %w", err)
+				return nil, util.NewClientServerError("failed to marshal dry run job to JSON", http.StatusInternalServerError, err)
 			}
 			return string(jobJSON), nil
 		}
@@ -275,14 +276,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, bqClient, sql, statementType, nil, connProps)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sql))
+	resp, err := source.RunSQL(ctx, bqClient, sql, statementType, nil, connProps)
+	if err != nil {
+		return nil, util.NewClientServerError("error running sql", http.StatusInternalServerError, err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -302,7 +303,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -312,3 +313,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql_test.go b/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql_test.go
index 0b5d11879c..e341cee0ac 100644
--- a/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql_test.go
+++ b/internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql_test.go
@@ -17,7 +17,6 @@ package bigqueryexecutesql_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-execute-sql
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-execute-sql
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigqueryexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-execute-sql",
+					Type:         "bigquery-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigqueryforecast/bigqueryforecast.go b/internal/tools/bigquery/bigqueryforecast/bigqueryforecast.go
index b3d56fb465..5f4c5ce1f6 100644
--- a/internal/tools/bigquery/bigqueryforecast/bigqueryforecast.go
+++ b/internal/tools/bigquery/bigqueryforecast/bigqueryforecast.go
@@ -17,6 +17,7 @@ package bigqueryforecast
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
@@ -31,11 +32,11 @@ import (
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 )
 
-const kind string = "bigquery-forecast"
+const resourceType string = "bigquery-forecast"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,7 +60,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -68,8 +69,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -82,7 +83,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	allowedDatasets := s.BigQueryAllowedDatasets()
@@ -133,34 +134,34 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	historyData, ok := paramsMap["history_data"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast history_data parameter %v", paramsMap["history_data"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast history_data parameter %v", paramsMap["history_data"]), nil)
 	}
 	timestampCol, ok := paramsMap["timestamp_col"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast timestamp_col parameter %v", paramsMap["timestamp_col"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast timestamp_col parameter %v", paramsMap["timestamp_col"]), nil)
 	}
 	dataCol, ok := paramsMap["data_col"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast data_col parameter %v", paramsMap["data_col"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast data_col parameter %v", paramsMap["data_col"]), nil)
 	}
 	idColsRaw, ok := paramsMap["id_cols"].([]any)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast id_cols parameter %v", paramsMap["id_cols"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast id_cols parameter %v", paramsMap["id_cols"]), nil)
 	}
 	var idCols []string
 	for _, v := range idColsRaw {
 		s, ok := v.(string)
 		if !ok {
-			return nil, fmt.Errorf("id_cols contains non-string value: %v", v)
+			return nil, util.NewAgentError(fmt.Sprintf("id_cols contains non-string value: %v", v), nil)
 		}
 		idCols = append(idCols, s)
 	}
@@ -169,13 +170,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		if h, ok := paramsMap["horizon"].(float64); ok {
 			horizon = int(h)
 		} else {
-			return nil, fmt.Errorf("unable to cast horizon parameter %v", paramsMap["horizon"])
+			return nil, util.NewAgentError(fmt.Sprintf("unable to cast horizon parameter %v", paramsMap["horizon"]), nil)
 		}
 	}
 
 	bqClient, restService, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	var historyDataSource string
@@ -185,7 +186,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			var connProps []*bigqueryapi.ConnectionProperty
 			session, err := source.BigQuerySession()(ctx)
 			if err != nil {
-				return nil, fmt.Errorf("failed to get BigQuery session: %w", err)
+				return nil, util.NewClientServerError("failed to get BigQuery session", http.StatusInternalServerError, err)
 			}
 			if session != nil {
 				connProps = []*bigqueryapi.ConnectionProperty{
@@ -194,22 +195,22 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			}
 			dryRunJob, err := bqutil.DryRunQuery(ctx, restService, source.BigQueryClient().Project(), source.BigQueryClient().Location, historyData, nil, connProps)
 			if err != nil {
-				return nil, fmt.Errorf("query validation failed: %w", err)
+				return nil, util.ProcessGcpError(err)
 			}
 			statementType := dryRunJob.Statistics.Query.StatementType
 			if statementType != "SELECT" {
-				return nil, fmt.Errorf("the 'history_data' parameter only supports a table ID or a SELECT query. The provided query has statement type '%s'", statementType)
+				return nil, util.NewAgentError(fmt.Sprintf("the 'history_data' parameter only supports a table ID or a SELECT query. The provided query has statement type '%s'", statementType), nil)
 			}
 
 			queryStats := dryRunJob.Statistics.Query
 			if queryStats != nil {
 				for _, tableRef := range queryStats.ReferencedTables {
 					if !source.IsDatasetAllowed(tableRef.ProjectId, tableRef.DatasetId) {
-						return nil, fmt.Errorf("query in history_data accesses dataset '%s.%s', which is not in the allowed list", tableRef.ProjectId, tableRef.DatasetId)
+						return nil, util.NewAgentError(fmt.Sprintf("query in history_data accesses dataset '%s.%s', which is not in the allowed list", tableRef.ProjectId, tableRef.DatasetId), nil)
 					}
 				}
 			} else {
-				return nil, fmt.Errorf("could not analyze query in history_data to validate against allowed datasets")
+				return nil, util.NewAgentError("could not analyze query in history_data to validate against allowed datasets", nil)
 			}
 		}
 		historyDataSource = fmt.Sprintf("(%s)", historyData)
@@ -226,11 +227,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 				projectID = source.BigQueryClient().Project()
 				datasetID = parts[0]
 			default:
-				return nil, fmt.Errorf("invalid table ID format for 'history_data': %q. Expected 'dataset.table' or 'project.dataset.table'", historyData)
+				return nil, util.NewAgentError(fmt.Sprintf("invalid table ID format for 'history_data': %q. Expected 'dataset.table' or 'project.dataset.table'", historyData), nil)
 			}
 
 			if !source.IsDatasetAllowed(projectID, datasetID) {
-				return nil, fmt.Errorf("access to dataset '%s.%s' (from table '%s') is not allowed", projectID, datasetID, historyData)
+				return nil, util.NewAgentError(fmt.Sprintf("access to dataset '%s.%s' (from table '%s') is not allowed", projectID, datasetID, historyData), nil)
 			}
 		}
 		historyDataSource = fmt.Sprintf("TABLE `%s`", historyData)
@@ -243,15 +244,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	sql := fmt.Sprintf(`SELECT * 
 		FROM AI.FORECAST(
-			%s,
-			data_col => '%s',
-			timestamp_col => '%s',
-			horizon => %d%s)`,
+            %s,
+            data_col => '%s',
+            timestamp_col => '%s',
+            horizon => %d%s)`,
 		historyDataSource, dataCol, timestampCol, horizon, idColsArg)
 
 	session, err := source.BigQuerySession()(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get BigQuery session: %w", err)
+		return nil, util.NewClientServerError("failed to get BigQuery session", http.StatusInternalServerError, err)
 	}
 	var connProps []*bigqueryapi.ConnectionProperty
 	if session != nil {
@@ -264,15 +265,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sql))
 
-	return source.RunSQL(ctx, bqClient, sql, "SELECT", nil, connProps)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, bqClient, sql, "SELECT", nil, connProps)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -292,7 +293,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -302,3 +303,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigqueryforecast/bigqueryforecast_test.go b/internal/tools/bigquery/bigqueryforecast/bigqueryforecast_test.go
index 48de140b18..0257668e36 100644
--- a/internal/tools/bigquery/bigqueryforecast/bigqueryforecast_test.go
+++ b/internal/tools/bigquery/bigqueryforecast/bigqueryforecast_test.go
@@ -17,7 +17,6 @@ package bigqueryforecast_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryForecast(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-forecast
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-forecast
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigqueryforecast.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-forecast",
+					Type:         "bigquery-forecast",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryForecast(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo.go b/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo.go
index 021f8f1dfb..36d97ddb0e 100644
--- a/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo.go
+++ b/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo.go
@@ -17,6 +17,7 @@ package bigquerygetdatasetinfo
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
 	yaml "github.com/goccy/go-yaml"
@@ -24,17 +25,18 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	bqutil "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerycommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 )
 
-const kind string = "bigquery-get-dataset-info"
+const resourceType string = "bigquery-get-dataset-info"
 const projectKey string = "project"
 const datasetKey string = "dataset"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -56,7 +58,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -65,8 +67,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -79,7 +81,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	defaultProjectID := s.BigQueryProject()
@@ -120,47 +122,43 @@ type Tool struct {
 func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
-
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams[projectKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", projectKey)
+		// Updated: Use fmt.Sprintf for formatting, pass nil as cause
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", projectKey), nil)
 	}
 
 	datasetId, ok := mapParams[datasetKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", datasetKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", datasetKey), nil)
 	}
 
 	bqClient, _, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	if !source.IsDatasetAllowed(projectId, datasetId) {
-		return nil, fmt.Errorf("access denied to dataset '%s' because it is not in the configured list of allowed datasets for project '%s'", datasetId, projectId)
+		return nil, util.NewAgentError(fmt.Sprintf("access denied to dataset '%s' because it is not in the configured list of allowed datasets for project '%s'", datasetId, projectId), nil)
 	}
 
 	dsHandle := bqClient.DatasetInProject(projectId, datasetId)
 
 	metadata, err := dsHandle.Metadata(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get metadata for dataset %s (in project %s): %w", datasetId, projectId, err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	return metadata, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -178,7 +176,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -188,3 +186,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo_test.go b/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo_test.go
index bb4fa8890f..5a18b9fe1f 100644
--- a/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo_test.go
+++ b/internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo_test.go
@@ -17,7 +17,6 @@ package bigquerygetdatasetinfo_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryGetDatasetInfo(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-get-dataset-info
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-get-dataset-info
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerygetdatasetinfo.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-get-dataset-info",
+					Type:         "bigquery-get-dataset-info",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryGetDatasetInfo(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo.go b/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo.go
index b02b36689e..fcf1703b66 100644
--- a/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo.go
+++ b/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo.go
@@ -17,6 +17,7 @@ package bigquerygettableinfo
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
 	yaml "github.com/goccy/go-yaml"
@@ -24,18 +25,19 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	bqutil "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerycommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 )
 
-const kind string = "bigquery-get-table-info"
+const resourceType string = "bigquery-get-table-info"
 const projectKey string = "project"
 const datasetKey string = "dataset"
 const tableKey string = "table"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -57,7 +59,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -66,8 +68,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -80,7 +82,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	defaultProjectID := s.BigQueryProject()
@@ -125,35 +127,35 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams[projectKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", projectKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", projectKey), nil)
 	}
 
 	datasetId, ok := mapParams[datasetKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", datasetKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", datasetKey), nil)
 	}
 
 	tableId, ok := mapParams[tableKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", tableKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", tableKey), nil)
 	}
 
 	if !source.IsDatasetAllowed(projectId, datasetId) {
-		return nil, fmt.Errorf("access denied to dataset '%s' because it is not in the configured list of allowed datasets for project '%s'", datasetId, projectId)
+		return nil, util.NewAgentError(fmt.Sprintf("access denied to dataset '%s' because it is not in the configured list of allowed datasets for project '%s'", datasetId, projectId), nil)
 	}
 
 	bqClient, _, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	dsHandle := bqClient.DatasetInProject(projectId, datasetId)
@@ -161,16 +163,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	metadata, err := tableHandle.Metadata(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get metadata for table %s.%s.%s: %w", projectId, datasetId, tableId, err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	return metadata, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -188,7 +186,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -198,3 +196,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo_test.go b/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo_test.go
index 992dc4d843..c196ff3a0c 100644
--- a/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo_test.go
+++ b/internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo_test.go
@@ -17,7 +17,6 @@ package bigquerygettableinfo_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryGetTableInfo(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-get-table-info
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-get-table-info
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerygettableinfo.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-get-table-info",
+					Type:         "bigquery-get-table-info",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryGetTableInfo(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids.go b/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids.go
index e56fd8cf53..12d819c420 100644
--- a/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids.go
+++ b/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids.go
@@ -17,23 +17,25 @@ package bigquerylistdatasetids
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 	"google.golang.org/api/iterator"
 )
 
-const kind string = "bigquery-list-dataset-ids"
+const resourceType string = "bigquery-list-dataset-ids"
 const projectKey string = "project"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -77,7 +79,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	var projectParameter parameters.Parameter
@@ -120,10 +122,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	if len(source.BigQueryAllowedDatasets()) > 0 {
@@ -132,12 +134,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	mapParams := params.AsMap()
 	projectId, ok := mapParams[projectKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", projectKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", projectKey), nil)
 	}
 
 	bqClient, _, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 	datasetIterator := bqClient.Datasets(ctx)
 	datasetIterator.ProjectID = projectId
@@ -149,7 +151,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			break
 		}
 		if err != nil {
-			return nil, fmt.Errorf("unable to iterate through datasets: %w", err)
+			return nil, util.ProcessGcpError(err)
 		}
 
 		// Remove leading and trailing quotes
@@ -163,10 +165,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return datasetIds, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -184,7 +182,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -194,3 +192,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids_test.go b/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids_test.go
index 546410431b..21de3f9918 100644
--- a/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids_test.go
+++ b/internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids_test.go
@@ -17,7 +17,6 @@ package bigquerylistdatasetids_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryListDatasetIds(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-list-dataset-ids
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-list-dataset-ids
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerylistdatasetids.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-list-dataset-ids",
+					Type:         "bigquery-list-dataset-ids",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryListDatasetIds(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids.go b/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids.go
index d5489e28dd..f566759cea 100644
--- a/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids.go
+++ b/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids.go
@@ -17,6 +17,7 @@ package bigquerylisttableids
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	bigqueryapi "cloud.google.com/go/bigquery"
 	yaml "github.com/goccy/go-yaml"
@@ -24,18 +25,19 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	bqutil "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerycommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 	"google.golang.org/api/iterator"
 )
 
-const kind string = "bigquery-list-table-ids"
+const resourceType string = "bigquery-list-table-ids"
 const projectKey string = "project"
 const datasetKey string = "dataset"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -57,7 +59,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -66,8 +68,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -80,7 +82,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	defaultProjectID := s.BigQueryProject()
@@ -123,31 +125,30 @@ type Tool struct {
 func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
-
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams[projectKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", projectKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", projectKey), nil)
 	}
 
 	datasetId, ok := mapParams[datasetKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", datasetKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", datasetKey), nil)
 	}
 
 	if !source.IsDatasetAllowed(projectId, datasetId) {
-		return nil, fmt.Errorf("access denied to dataset '%s' because it is not in the configured list of allowed datasets for project '%s'", datasetId, projectId)
+		return nil, util.NewAgentError(fmt.Sprintf("access denied to dataset '%s' because it is not in the configured list of allowed datasets for project '%s'", datasetId, projectId), nil)
 	}
 
 	bqClient, _, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	dsHandle := bqClient.DatasetInProject(projectId, datasetId)
@@ -160,7 +161,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			break
 		}
 		if err != nil {
-			return nil, fmt.Errorf("failed to iterate through tables in dataset %s.%s: %w", projectId, datasetId, err)
+			return nil, util.ProcessGcpError(err)
 		}
 
 		// Remove leading and trailing quotes
@@ -174,10 +175,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return tableIds, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -195,7 +192,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -205,3 +202,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids_test.go b/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids_test.go
index 8e5076ce0f..7056764ccc 100644
--- a/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids_test.go
+++ b/internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids_test.go
@@ -17,7 +17,6 @@ package bigquerylisttableids_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQueryListTableIds(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-list-table-ids
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-list-table-ids
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerylisttableids.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-list-table-ids",
+					Type:         "bigquery-list-table-ids",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQueryListTableIds(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog.go b/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog.go
index 2b2e557f88..3cb5393178 100644
--- a/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog.go
+++ b/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog.go
@@ -17,6 +17,7 @@ package bigquerysearchcatalog
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	dataplexapi "cloud.google.com/go/dataplex/apiv1"
@@ -26,15 +27,16 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	bigqueryds "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/iterator"
 )
 
-const kind string = "bigquery-search-catalog"
+const resourceType string = "bigquery-search-catalog"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,7 +112,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -186,28 +188,31 @@ func ExtractType(resourceString string) string {
 	return typeMap[resourceString[lastIndex+1:]]
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	pageSize := int32(paramsMap["pageSize"].(int))
 	prompt, _ := paramsMap["prompt"].(string)
+
 	projectIdSlice, err := parameters.ConvertAnySliceToTyped(paramsMap["projectIds"].([]any), "string")
 	if err != nil {
-		return nil, fmt.Errorf("can't convert projectIds to array of strings: %s", err)
+		return nil, util.NewAgentError(fmt.Sprintf("can't convert projectIds to array of strings: %s", err), err)
 	}
 	projectIds := projectIdSlice.([]string)
+
 	datasetIdSlice, err := parameters.ConvertAnySliceToTyped(paramsMap["datasetIds"].([]any), "string")
 	if err != nil {
-		return nil, fmt.Errorf("can't convert datasetIds to array of strings: %s", err)
+		return nil, util.NewAgentError(fmt.Sprintf("can't convert datasetIds to array of strings: %s", err), err)
 	}
 	datasetIds := datasetIdSlice.([]string)
+
 	typesSlice, err := parameters.ConvertAnySliceToTyped(paramsMap["types"].([]any), "string")
 	if err != nil {
-		return nil, fmt.Errorf("can't convert types to array of strings: %s", err)
+		return nil, util.NewAgentError(fmt.Sprintf("can't convert types to array of strings: %s", err), err)
 	}
 	types := typesSlice.([]string)
 
@@ -223,17 +228,17 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if source.UseClientAuthorization() {
 		tokenStr, err := accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 		catalogClient, err = dataplexClientCreator(tokenStr)
 		if err != nil {
-			return nil, fmt.Errorf("error creating client from OAuth access token: %w", err)
+			return nil, util.NewClientServerError("error creating client from OAuth access token", http.StatusInternalServerError, err)
 		}
 	}
 
 	it := catalogClient.SearchEntries(ctx, req)
 	if it == nil {
-		return nil, fmt.Errorf("failed to create search entries iterator for project %q", source.BigQueryProject())
+		return nil, util.NewClientServerError(fmt.Sprintf("failed to create search entries iterator for project %q", source.BigQueryProject()), http.StatusInternalServerError, nil)
 	}
 
 	var results []Response
@@ -243,7 +248,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			break
 		}
 		if err != nil {
-			break
+			return nil, util.ProcessGcpError(err)
 		}
 		entrySource := entry.DataplexEntry.GetEntrySource()
 		resp := Response{
@@ -258,11 +263,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return results, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	// Parse parameters from the provided data
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -280,3 +280,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog_test.go b/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog_test.go
index 2885aecafb..bb218a9cd1 100644
--- a/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog_test.go
+++ b/internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog_test.go
@@ -17,7 +17,6 @@ package bigquerysearchcatalog_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlBigQuerySearch(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-search-catalog
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-search-catalog
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerysearchcatalog.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-search-catalog",
+					Type:         "bigquery-search-catalog",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlBigQuerySearch(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/bigquery/bigquerysql/bigquerysql.go b/internal/tools/bigquery/bigquerysql/bigquerysql.go
index b7cece9186..062511eacb 100644
--- a/internal/tools/bigquery/bigquerysql/bigquerysql.go
+++ b/internal/tools/bigquery/bigquerysql/bigquerysql.go
@@ -17,6 +17,7 @@ package bigquerysql
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"reflect"
 	"strings"
 
@@ -27,15 +28,16 @@ import (
 	bigqueryds "github.com/googleapis/genai-toolbox/internal/sources/bigquery"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	bqutil "github.com/googleapis/genai-toolbox/internal/tools/bigquery/bigquerycommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	bigqueryrestapi "google.golang.org/api/bigquery/v2"
 )
 
-const kind string = "bigquery-sql"
+const resourceType string = "bigquery-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -56,7 +58,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -68,8 +70,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -103,11 +105,10 @@ type Tool struct {
 func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
-
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	highLevelParams := make([]bigqueryapi.QueryParameter, 0, len(t.Parameters))
@@ -116,7 +117,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	for _, p := range t.Parameters {
@@ -127,13 +128,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		if arrayParam, ok := p.(*parameters.ArrayParameter); ok {
 			arrayParamValue, ok := value.([]any)
 			if !ok {
-				return nil, fmt.Errorf("unable to convert parameter `%s` to []any", name)
+				return nil, util.NewAgentError(fmt.Sprintf("unable to convert parameter `%s` to []any", name), nil)
 			}
 			itemType := arrayParam.GetItems().GetType()
 			var err error
 			value, err = parameters.ConvertAnySliceToTyped(arrayParamValue, itemType)
 			if err != nil {
-				return nil, fmt.Errorf("unable to convert parameter `%s` from []any to typed slice: %w", name, err)
+				return nil, util.NewAgentError(fmt.Sprintf("unable to convert parameter `%s` from []any to typed slice", name), err)
 			}
 		}
 
@@ -161,7 +162,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			lowLevelParam.ParameterType.Type = "ARRAY"
 			itemType, err := bqutil.BQTypeStringFromToolType(arrayParam.GetItems().GetType())
 			if err != nil {
-				return nil, err
+				return nil, util.NewAgentError("unable to get BigQuery type from tool parameter type", err)
 			}
 			lowLevelParam.ParameterType.ArrayType = &bigqueryrestapi.QueryParameterType{Type: itemType}
 
@@ -178,7 +179,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			// Handle scalar types based on their defined type.
 			bqType, err := bqutil.BQTypeStringFromToolType(p.GetType())
 			if err != nil {
-				return nil, err
+				return nil, util.NewAgentError("unable to get BigQuery type from tool parameter type", err)
 			}
 			lowLevelParam.ParameterType.Type = bqType
 			lowLevelParam.ParameterValue.Value = fmt.Sprintf("%v", value)
@@ -190,7 +191,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if source.BigQuerySession() != nil {
 		session, err := source.BigQuerySession()(ctx)
 		if err != nil {
-			return nil, fmt.Errorf("failed to get BigQuery session: %w", err)
+			return nil, util.NewClientServerError("failed to get BigQuery session", http.StatusInternalServerError, err)
 		}
 		if session != nil {
 			// Add session ID to the connection properties for subsequent calls.
@@ -200,21 +201,20 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	bqClient, restService, err := source.RetrieveClientAndService(accessToken)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("failed to retrieve BigQuery client", http.StatusInternalServerError, err)
 	}
 
 	dryRunJob, err := bqutil.DryRunQuery(ctx, restService, bqClient.Project(), bqClient.Location, newStatement, lowLevelParams, connProps)
 	if err != nil {
-		return nil, fmt.Errorf("query validation failed: %w", err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	statementType := dryRunJob.Statistics.Query.StatementType
-
-	return source.RunSQL(ctx, bqClient, newStatement, statementType, highLevelParams, connProps)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, bqClient, newStatement, statementType, highLevelParams, connProps)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -234,7 +234,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -244,3 +244,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigquery/bigquerysql/bigquerysql_test.go b/internal/tools/bigquery/bigquerysql/bigquerysql_test.go
index 967fd418cd..d646facad2 100644
--- a/internal/tools/bigquery/bigquerysql/bigquerysql_test.go
+++ b/internal/tools/bigquery/bigquerysql/bigquerysql_test.go
@@ -17,7 +17,6 @@ package bigquerysql_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"
@@ -38,22 +37,22 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-sql
-					source: my-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-sql
+            source: my-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerysql.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-sql",
+					Type:         "bigquery-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -67,20 +66,16 @@ func TestParseFromYamlBigQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
 	}
-
 }
 
 func TestParseFromYamlWithTemplateBigQuery(t *testing.T) {
@@ -96,33 +91,33 @@ func TestParseFromYamlWithTemplateBigQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigquery-sql
-					source: my-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
-			`,
+            kind: tools
+            name: example_tool
+            type: bigquery-sql
+            source: my-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items:
+                        name: column
+                        type: string
+                        description: A column name that will be returned from the query.
+            `,
 			want: server.ToolConfigs{
 				"example_tool": bigquerysql.Config{
 					Name:         "example_tool",
-					Kind:         "bigquery-sql",
+					Type:         "bigquery-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -140,18 +135,14 @@ func TestParseFromYamlWithTemplateBigQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
 	}
-
 }
diff --git a/internal/tools/bigtable/bigtable.go b/internal/tools/bigtable/bigtable.go
index fbd6e57932..48f659e95e 100644
--- a/internal/tools/bigtable/bigtable.go
+++ b/internal/tools/bigtable/bigtable.go
@@ -17,20 +17,22 @@ package bigtable
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"cloud.google.com/go/bigtable"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "bigtable-sql"
+const resourceType string = "bigtable-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -96,28 +98,28 @@ type Tool struct {
 func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
-
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
-	return source.RunSQL(ctx, newStatement, t.Parameters, newParams)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, t.Parameters, newParams)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -143,3 +145,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/bigtable/bigtable_test.go b/internal/tools/bigtable/bigtable_test.go
index 6d12b341e2..7344e9fa21 100644
--- a/internal/tools/bigtable/bigtable_test.go
+++ b/internal/tools/bigtable/bigtable_test.go
@@ -17,7 +17,6 @@ package bigtable_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"
@@ -38,22 +37,22 @@ func TestParseFromYamlBigtable(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigtable-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
+			kind: tools
+			name: example_tool
+			type: bigtable-sql
+			source: my-pg-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			parameters:
+				- name: country
+				  type: string
+				  description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": bigtable.Config{
 					Name:         "example_tool",
-					Kind:         "bigtable-sql",
+					Type:         "bigtable-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -67,15 +66,11 @@ func TestParseFromYamlBigtable(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -96,33 +91,33 @@ func TestParseFromYamlWithTemplateBigtable(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: bigtable-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+			kind: tools
+			name: example_tool
+			type: bigtable-sql
+			source: my-pg-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			parameters:
+				- name: country
+				  type: string
+				  description: some description
+			templateParameters:
+				- name: tableName
+				  type: string
+				  description: The table to select hotels from.
+				- name: fieldArray
+				  type: array
+				  description: The columns to return for the query.
+				  items: 
+						name: column
+						type: string
+						description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": bigtable.Config{
 					Name:         "example_tool",
-					Kind:         "bigtable-sql",
+					Type:         "bigtable-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -140,15 +135,11 @@ func TestParseFromYamlWithTemplateBigtable(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cassandra/cassandracql/cassandracql.go b/internal/tools/cassandra/cassandracql/cassandracql.go
index 60ae4dff6d..2cdcd92e57 100644
--- a/internal/tools/cassandra/cassandracql/cassandracql.go
+++ b/internal/tools/cassandra/cassandracql/cassandracql.go
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//	http://www.apache.org/licenses/LICENSE-2.0
+//  http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,20 +17,22 @@ package cassandracql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	gocql "github.com/apache/cassandra-gocql-driver/v2"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cassandra-cql"
+const resourceType string = "cassandra-cql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -60,9 +62,9 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind implements tools.ToolConfig.
-func (c Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType implements tools.ToolConfig.
+func (c Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize implements tools.ToolConfig.
@@ -107,23 +109,27 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 // Invoke implements tools.Tool.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
-	return source.RunSQL(ctx, newStatement, newParams)
+	resp, err := source.RunSQL(ctx, newStatement, newParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 // Manifest implements tools.Tool.
@@ -136,11 +142,6 @@ func (t Tool) McpManifest() tools.McpManifest {
 	return t.mcpManifest
 }
 
-// ParseParams implements tools.Tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.AllParams, paramValues, embeddingModelsMap, nil)
 }
@@ -150,3 +151,7 @@ var _ tools.Tool = Tool{}
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cassandra/cassandracql/cassandracql_test.go b/internal/tools/cassandra/cassandracql/cassandracql_test.go
index 3ed76b33f2..bcf6e128be 100644
--- a/internal/tools/cassandra/cassandracql/cassandracql_test.go
+++ b/internal/tools/cassandra/cassandracql/cassandracql_test.go
@@ -17,7 +17,6 @@ package cassandracql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlCassandra(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cassandra-cql
-					source: my-cassandra-instance
-					description: some description
-					statement: |
-						SELECT * FROM CQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-			`,
+            kind: tools
+            type: cassandra-cql
+            name: example_tool
+            source: my-cassandra-instance
+            description: some description
+            statement: |
+                SELECT * FROM CQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            `,
 			want: server.ToolConfigs{
 				"example_tool": cassandracql.Config{
 					Name:         "example_tool",
-					Kind:         "cassandra-cql",
+					Type:         "cassandra-cql",
 					Source:       "my-cassandra-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM CQL_STATEMENT;\n",
@@ -77,41 +76,41 @@ func TestParseFromYamlCassandra(t *testing.T) {
 		{
 			desc: "with template parameters",
 			in: `
-			tools:
-				example_tool:
-					kind: cassandra-cql
-					source: my-cassandra-instance
-					description: some description
-					statement: |
-						SELECT * FROM CQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: some description.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
-			`,
+            kind: tools
+            type: cassandra-cql
+            name: example_tool
+            source: my-cassandra-instance
+            description: some description
+            statement: |
+                SELECT * FROM CQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: some description.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                        name: column
+                        type: string
+                        description: A column name that will be returned from the query.
+            `,
 			want: server.ToolConfigs{
 				"example_tool": cassandracql.Config{
 					Name:         "example_tool",
-					Kind:         "cassandra-cql",
+					Type:         "cassandra-cql",
 					Source:       "my-cassandra-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM CQL_STATEMENT;\n",
@@ -131,18 +130,18 @@ func TestParseFromYamlCassandra(t *testing.T) {
 		{
 			desc: "without optional fields",
 			in: `
-			tools:
-				example_tool:
-					kind: cassandra-cql
-					source: my-cassandra-instance
-					description: some description
-					statement: |
-						SELECT * FROM CQL_STATEMENT;
-			`,
+            kind: tools
+            type: cassandra-cql
+            name: example_tool
+            source: my-cassandra-instance
+            description: some description
+            statement: |
+                SELECT * FROM CQL_STATEMENT;
+            `,
 			want: server.ToolConfigs{
 				"example_tool": cassandracql.Config{
 					Name:               "example_tool",
-					Kind:               "cassandra-cql",
+					Type:               "cassandra-cql",
 					Source:             "my-cassandra-instance",
 					Description:        "some description",
 					Statement:          "SELECT * FROM CQL_STATEMENT;\n",
@@ -155,15 +154,12 @@ func TestParseFromYamlCassandra(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go b/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go
index 191b8b3dfd..8b69d71b60 100644
--- a/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go
+++ b/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go
@@ -17,19 +17,21 @@ package clickhouse
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const executeSQLKind string = "clickhouse-execute-sql"
+const executeSQLType string = "clickhouse-execute-sql"
 
 func init() {
-	if !tools.Register(executeSQLKind, newExecuteSQLConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", executeSQLKind))
+	if !tools.Register(executeSQLType, newExecuteSQLConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", executeSQLType))
 	}
 }
 
@@ -47,7 +49,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -55,8 +57,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return executeSQLKind
+func (cfg Config) ToolConfigType() string {
+	return executeSQLType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -87,22 +89,22 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	sql, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast sql parameter %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast sql parameter %s", paramsMap["sql"]), nil)
 	}
-	return source.RunSQL(ctx, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sql, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -128,3 +130,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql_test.go b/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql_test.go
index 9bc0e8716d..47e5da5279 100644
--- a/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql_test.go
+++ b/internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql_test.go
@@ -17,7 +17,6 @@ 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"
@@ -36,16 +35,16 @@ func TestParseFromYamlClickHouseExecuteSQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: clickhouse-execute-sql
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: clickhouse-execute-sql
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "clickhouse-execute-sql",
+					Type:         "clickhouse-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -55,14 +54,12 @@ func TestParseFromYamlClickHouseExecuteSQL(t *testing.T) {
 	}
 	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)
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases.go b/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases.go
index 7d697502ab..900649f4a8 100644
--- a/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases.go
+++ b/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases.go
@@ -17,19 +17,21 @@ package clickhouse
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const listDatabasesKind string = "clickhouse-list-databases"
+const listDatabasesType string = "clickhouse-list-databases"
 
 func init() {
-	if !tools.Register(listDatabasesKind, newListDatabasesConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", listDatabasesKind))
+	if !tools.Register(listDatabasesType, newListDatabasesConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", listDatabasesType))
 	}
 }
 
@@ -47,7 +49,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	AuthRequired []string              `yaml:"authRequired"`
@@ -56,8 +58,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return listDatabasesKind
+func (cfg Config) ToolConfigType() string {
+	return listDatabasesType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -86,10 +88,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	// Query to list all databases
@@ -97,16 +99,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	out, err := source.RunSQL(ctx, query, nil)
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	return out, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.AllParams, paramValues, embeddingModelsMap, nil)
 }
@@ -130,3 +128,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases_test.go b/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases_test.go
index ca6d9b21b7..66a746086a 100644
--- a/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases_test.go
+++ b/internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases_test.go
@@ -17,17 +17,16 @@ 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"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-func TestListDatabasesConfigToolConfigKind(t *testing.T) {
+func TestListDatabasesConfigToolConfigType(t *testing.T) {
 	cfg := Config{}
-	if cfg.ToolConfigKind() != listDatabasesKind {
-		t.Errorf("expected %q, got %q", listDatabasesKind, cfg.ToolConfigKind())
+	if cfg.ToolConfigType() != listDatabasesType {
+		t.Errorf("expected %q, got %q", listDatabasesType, cfg.ToolConfigType())
 	}
 }
 
@@ -44,16 +43,16 @@ func TestParseFromYamlClickHouseListDatabases(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: clickhouse-list-databases
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: clickhouse-list-databases
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "clickhouse-list-databases",
+					Type:         "clickhouse-list-databases",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -63,14 +62,12 @@ func TestParseFromYamlClickHouseListDatabases(t *testing.T) {
 	}
 	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)
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -84,7 +81,7 @@ func TestListDatabasesToolParseParams(t *testing.T) {
 		},
 	}
 
-	params, err := tool.ParseParams(map[string]any{}, map[string]map[string]any{})
+	params, err := parameters.ParseParams(tool.GetParameters(), map[string]any{}, map[string]map[string]any{})
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
diff --git a/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables.go b/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables.go
index 7f5464c049..10fb432d55 100644
--- a/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables.go
+++ b/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables.go
@@ -17,20 +17,22 @@ package clickhouse
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const listTablesKind string = "clickhouse-list-tables"
+const listTablesType string = "clickhouse-list-tables"
 const databaseKey string = "database"
 
 func init() {
-	if !tools.Register(listTablesKind, newListTablesConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", listTablesKind))
+	if !tools.Register(listTablesType, newListTablesConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", listTablesType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	AuthRequired []string              `yaml:"authRequired"`
@@ -57,8 +59,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return listTablesKind
+func (cfg Config) ToolConfigType() string {
+	return listTablesType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -90,34 +92,37 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	database, ok := mapParams[databaseKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", databaseKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", databaseKey), nil)
 	}
+
 	// Query to list all tables in the specified database
+	// Note: formatting identifier directly is risky if input is untrusted, but standard for this tool structure.
 	query := fmt.Sprintf("SHOW TABLES FROM %s", database)
 
 	out, err := source.RunSQL(ctx, query, nil)
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	res, ok := out.([]any)
 	if !ok {
-		return nil, fmt.Errorf("unable to convert result to list")
+		return nil, util.NewClientServerError("unable to convert result to list", http.StatusInternalServerError, nil)
 	}
+
 	var tables []map[string]any
 	for _, item := range res {
 		tableMap, ok := item.(map[string]any)
 		if !ok {
-			return nil, fmt.Errorf("unexpected type in result: got %T, want map[string]any", item)
+			return nil, util.NewClientServerError(fmt.Sprintf("unexpected type in result: got %T, want map[string]any", item), http.StatusInternalServerError, nil)
 		}
 		tableMap["database"] = database
 		tables = append(tables, tableMap)
@@ -125,10 +130,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return tables, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.AllParams, paramValues, embeddingModelsMap, nil)
 }
@@ -152,3 +153,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables_test.go b/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables_test.go
index 4500dac099..cb1989b727 100644
--- a/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables_test.go
+++ b/internal/tools/clickhouse/clickhouselisttables/clickhouselisttables_test.go
@@ -17,17 +17,16 @@ 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"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-func TestListTablesConfigToolConfigKind(t *testing.T) {
+func TestListTablesConfigToolConfigType(t *testing.T) {
 	cfg := Config{}
-	if cfg.ToolConfigKind() != listTablesKind {
-		t.Errorf("expected %q, got %q", listTablesKind, cfg.ToolConfigKind())
+	if cfg.ToolConfigType() != listTablesType {
+		t.Errorf("expected %q, got %q", listTablesType, cfg.ToolConfigType())
 	}
 }
 
@@ -44,16 +43,16 @@ func TestParseFromYamlClickHouseListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: clickhouse-list-tables
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: clickhouse-list-tables
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "clickhouse-list-tables",
+					Type:         "clickhouse-list-tables",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -63,14 +62,12 @@ func TestParseFromYamlClickHouseListTables(t *testing.T) {
 	}
 	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)
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,7 +83,7 @@ func TestListTablesToolParseParams(t *testing.T) {
 		AllParams: parameters.Parameters{databaseParam},
 	}
 
-	params, err := tool.ParseParams(map[string]any{"database": "test_db"}, map[string]map[string]any{})
+	params, err := parameters.ParseParams(tool.GetParameters(), map[string]any{"database": "test_db"}, map[string]map[string]any{})
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}
diff --git a/internal/tools/clickhouse/clickhousesql/clickhousesql.go b/internal/tools/clickhouse/clickhousesql/clickhousesql.go
index 5a83143e67..aafd98b2e0 100644
--- a/internal/tools/clickhouse/clickhousesql/clickhousesql.go
+++ b/internal/tools/clickhouse/clickhousesql/clickhousesql.go
@@ -17,19 +17,21 @@ package clickhouse
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const sqlKind string = "clickhouse-sql"
+const sqlType string = "clickhouse-sql"
 
 func init() {
-	if !tools.Register(sqlKind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", sqlKind))
+	if !tools.Register(sqlType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", sqlType))
 	}
 }
 
@@ -47,7 +49,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -58,8 +60,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return sqlKind
+func (cfg Config) ToolConfigType() string {
+	return sqlType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -88,28 +90,28 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, token tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params: %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params: %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
-	return source.RunSQL(ctx, newStatement, newParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, newParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -135,3 +137,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/clickhouse/clickhousesql/clickhousesql_test.go b/internal/tools/clickhouse/clickhousesql/clickhousesql_test.go
index 3c50305e28..e7f38a1f6b 100644
--- a/internal/tools/clickhouse/clickhousesql/clickhousesql_test.go
+++ b/internal/tools/clickhouse/clickhousesql/clickhousesql_test.go
@@ -17,7 +17,6 @@ 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"
@@ -27,10 +26,10 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-func TestConfigToolConfigKind(t *testing.T) {
+func TestConfigToolConfigType(t *testing.T) {
 	config := Config{}
-	if config.ToolConfigKind() != sqlKind {
-		t.Errorf("Expected %s, got %s", sqlKind, config.ToolConfigKind())
+	if config.ToolConfigType() != sqlType {
+		t.Errorf("Expected %s, got %s", sqlType, config.ToolConfigType())
 	}
 }
 
@@ -47,17 +46,17 @@ func TestParseFromYamlClickHouseSQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: clickhouse-sql
-					source: my-instance
-					description: some description
-					statement: SELECT 1
+			kind: tools
+			name: example_tool
+			type: clickhouse-sql
+			source: my-instance
+			description: some description
+			statement: SELECT 1
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "clickhouse-sql",
+					Type:         "clickhouse-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "SELECT 1",
@@ -68,21 +67,21 @@ func TestParseFromYamlClickHouseSQL(t *testing.T) {
 		{
 			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
+			kind: tools
+			name: param_tool
+			type: 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",
+					Type:        "clickhouse-sql",
 					Source:      "test-source",
 					Description: "Test ClickHouse tool",
 					Statement:   "SELECT * FROM test_table WHERE id = $1",
@@ -96,14 +95,11 @@ func TestParseFromYamlClickHouseSQL(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -113,7 +109,7 @@ func TestParseFromYamlClickHouseSQL(t *testing.T) {
 func TestSQLConfigInitializeValidSource(t *testing.T) {
 	config := Config{
 		Name:        "test-tool",
-		Kind:        sqlKind,
+		Type:        sqlType,
 		Source:      "test-clickhouse",
 		Description: "Test tool",
 		Statement:   "SELECT 1",
diff --git a/internal/tools/cloudgda/cloudgda.go b/internal/tools/cloudgda/cloudgda.go
index 6ea132318e..14862909b4 100644
--- a/internal/tools/cloudgda/cloudgda.go
+++ b/internal/tools/cloudgda/cloudgda.go
@@ -18,15 +18,17 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-gemini-data-analytics-query"
+const resourceType string = "cloud-gemini-data-analytics-query"
 
 // Guidance is the tool guidance string.
 const Guidance = `Tool guidance:
@@ -44,8 +46,8 @@ Usage guidance:
   2. If ` + "`natural_language_answer`" + ` is produced, use ` + "`intent_explanation`" + ` and ` + "`generated_query`" + ` to see if you need to clarify any assumptions for the user.`
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -65,7 +67,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name              string             `yaml:"name" validate:"required"`
-	Kind              string             `yaml:"kind" validate:"required"`
+	Type              string             `yaml:"type" validate:"required"`
 	Source            string             `yaml:"source" validate:"required"`
 	Description       string             `yaml:"description" validate:"required"`
 	Location          string             `yaml:"location" validate:"required"`
@@ -77,8 +79,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -119,17 +121,16 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-// Invoke executes the tool logic
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	query, ok := paramsMap["query"].(string)
 	if !ok {
-		return nil, fmt.Errorf("query parameter not found or not a string")
+		return nil, util.NewAgentError("query parameter not found or not a string", nil)
 	}
 
 	// Parse the access token if provided
@@ -138,7 +139,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		var err error
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 
@@ -154,13 +155,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	bodyBytes, err := json.Marshal(payload)
 	if err != nil {
-		return nil, fmt.Errorf("failed to marshal request payload: %w", err)
+		return nil, util.NewClientServerError("failed to marshal request payload", http.StatusInternalServerError, err)
 	}
-	return source.RunQuery(ctx, tokenStr, bodyBytes)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunQuery(ctx, tokenStr, bodyBytes)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -180,7 +182,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -190,3 +192,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(_ tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudgda/cloudgda_test.go b/internal/tools/cloudgda/cloudgda_test.go
index 2e92c56213..d5e73658ea 100644
--- a/internal/tools/cloudgda/cloudgda_test.go
+++ b/internal/tools/cloudgda/cloudgda_test.go
@@ -23,7 +23,6 @@ import (
 	"net/http/httptest"
 	"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/server/resources"
@@ -36,6 +35,10 @@ import (
 )
 
 func TestParseFromYaml(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
 	t.Parallel()
 	tcs := []struct {
 		desc string
@@ -45,30 +48,30 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				my-gda-query-tool:
-					kind: cloud-gemini-data-analytics-query
-					source: gda-api-source
-					description: Test Description
-					location: us-central1
-					context:
-						datasourceReferences:
-							spannerReference:
-								databaseReference:
-									projectId:  "cloud-db-nl2sql"
-									region:     "us-central1"
-									instanceId: "evalbench"
-									databaseId: "financial"
-									engine:     "GOOGLE_SQL"
-								agentContextReference:
-									contextSetId: "projects/cloud-db-nl2sql/locations/us-east1/contextSets/bdf_gsql_gemini_all_templates"
-					generationOptions:
-						generateQueryResult: true
+			kind: tools
+			name: my-gda-query-tool
+			type: cloud-gemini-data-analytics-query
+			source: gda-api-source
+			description: Test Description
+			location: us-central1
+			context:
+				datasourceReferences:
+					spannerReference:
+						databaseReference:
+							projectId:  "cloud-db-nl2sql"
+							region:     "us-central1"
+							instanceId: "evalbench"
+							databaseId: "financial"
+							engine:     "GOOGLE_SQL"
+						agentContextReference:
+							contextSetId: "projects/cloud-db-nl2sql/locations/us-east1/contextSets/bdf_gsql_gemini_all_templates"
+			generationOptions:
+				generateQueryResult: true
 			`,
 			want: map[string]tools.ToolConfig{
 				"my-gda-query-tool": cloudgdatool.Config{
 					Name:         "my-gda-query-tool",
-					Kind:         "cloud-gemini-data-analytics-query",
+					Type:         "cloud-gemini-data-analytics-query",
 					Source:       "gda-api-source",
 					Description:  "Test Description",
 					Location:     "us-central1",
@@ -100,16 +103,12 @@ func TestParseFromYaml(t *testing.T) {
 		tc := tc
 		t.Run(tc.desc, func(t *testing.T) {
 			t.Parallel()
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Tools) {
-				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got.Tools)
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: want %v, got %v", tc.want, got)
 			}
 		})
 	}
@@ -135,13 +134,13 @@ func (rt *authRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
 }
 
 type mockSource struct {
-	kind    string
+	Type    string
 	client  *http.Client       // Can be used to inject a specific client
 	baseURL string             // BaseURL is needed to implement sources.Source.BaseURL
 	config  cloudgdasrc.Config // to return from ToConfig
 }
 
-func (m *mockSource) SourceKind() string             { return m.kind }
+func (m *mockSource) SourceType() string             { return m.Type }
 func (m *mockSource) ToConfig() sources.SourceConfig { return m.config }
 func (m *mockSource) GetClient(ctx context.Context, token string) (*http.Client, error) {
 	if m.client != nil {
@@ -166,7 +165,7 @@ func TestInitialize(t *testing.T) {
 
 	srcs := map[string]sources.Source{
 		"gda-api-source": &cloudgdasrc.Source{
-			Config:  cloudgdasrc.Config{Name: "gda-api-source", Kind: cloudgdasrc.SourceKind, ProjectID: "test-project"},
+			Config:  cloudgdasrc.Config{Name: "gda-api-source", Type: cloudgdasrc.SourceType, ProjectID: "test-project"},
 			Client:  &http.Client{},
 			BaseURL: cloudgdasrc.Endpoint,
 		},
@@ -180,7 +179,7 @@ func TestInitialize(t *testing.T) {
 			desc: "successful initialization",
 			cfg: cloudgdatool.Config{
 				Name:        "my-gda-query-tool",
-				Kind:        "cloud-gemini-data-analytics-query",
+				Type:        "cloud-gemini-data-analytics-query",
 				Source:      "gda-api-source",
 				Description: "Test Description",
 				Location:    "us-central1",
@@ -189,7 +188,7 @@ func TestInitialize(t *testing.T) {
 	}
 
 	// Add an incompatible source for testing
-	srcs["incompatible-source"] = &mockSource{kind: "another-kind"}
+	srcs["incompatible-source"] = &mockSource{Type: "another-type"}
 
 	for _, tc := range tcs {
 		tc := tc
@@ -287,7 +286,7 @@ func TestInvoke(t *testing.T) {
 
 	// Create a real cloudgdasrc.Source but inject the authenticated client
 	mockGdaSource := &cloudgdasrc.Source{
-		Config:  cloudgdasrc.Config{Name: "mock-gda-source", Kind: cloudgdasrc.SourceKind, ProjectID: "test-project"},
+		Config:  cloudgdasrc.Config{Name: "mock-gda-source", Type: cloudgdasrc.SourceType, ProjectID: "test-project"},
 		Client:  authClient,
 		BaseURL: mockServer.URL,
 	}
@@ -298,7 +297,7 @@ func TestInvoke(t *testing.T) {
 	// Initialize the tool config with context
 	toolCfg := cloudgdatool.Config{
 		Name:        "query-data-tool",
-		Kind:        "cloud-gemini-data-analytics-query",
+		Type:        "cloud-gemini-data-analytics-query",
 		Source:      "mock-gda-source",
 		Description: "Query Gemini Data Analytics",
 		Location:    "us-central1", // Set location for the test
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage.go b/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage.go
index bd77a069f0..acd55c61ca 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage.go
@@ -17,22 +17,24 @@ package fhirfetchpage
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-healthcare-fhir-fetch-page"
+const resourceType string = "cloud-healthcare-fhir-fetch-page"
 const (
 	pageURLKey = "pageURL"
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,28 +95,31 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	url, ok := params.AsMap()[pageURLKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", pageURLKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", pageURLKey), nil)
 	}
+
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.FHIRFetchPage(ctx, url, tokenStr)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.FHIRFetchPage(ctx, url, tokenStr)
+	if err != nil {
+
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -134,7 +139,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -144,3 +149,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage_test.go b/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage_test.go
index de85dd8674..1b5d6816bc 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage_test.go
@@ -17,7 +17,6 @@ package fhirfetchpage_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareFHIRFetchPage(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-fhir-fetch-page
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-fhir-fetch-page
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": fhirfetchpage.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-fhir-fetch-page",
+					Type:         "cloud-healthcare-fhir-fetch-page",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareFHIRFetchPage(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything.go b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything.go
index 1e7f648d6b..f81d601e03 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything.go
@@ -17,6 +17,7 @@ package fhirpatienteverything
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/goccy/go-yaml"
@@ -24,11 +25,12 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/googleapi"
 )
 
-const kind string = "cloud-healthcare-fhir-patient-everything"
+const resourceType string = "cloud-healthcare-fhir-patient-everything"
 const (
 	patientIDKey   = "patientID"
 	typeFilterKey  = "resourceTypesFilter"
@@ -36,8 +38,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -57,7 +59,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -66,8 +68,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -80,7 +82,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	idParameter := parameters.NewStringParameter(patientIDKey, "The ID of the patient FHIR resource for which the information is required")
@@ -116,26 +118,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedFHIRStores())
 	if err != nil {
-		return nil, err
+		// ValidateAndFetchStoreID usually returns input validation errors
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	patientID, ok := params.AsMap()[patientIDKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", patientIDKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", patientIDKey), nil)
 	}
 
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 
@@ -143,11 +146,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if val, ok := params.AsMap()[typeFilterKey]; ok {
 		types, ok := val.([]any)
 		if !ok {
-			return nil, fmt.Errorf("invalid '%s' parameter; expected a string array", typeFilterKey)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string array", typeFilterKey), nil)
 		}
 		typeFilterSlice, err := parameters.ConvertAnySliceToTyped(types, "string")
 		if err != nil {
-			return nil, fmt.Errorf("can't convert '%s' to array of strings: %s", typeFilterKey, err)
+			return nil, util.NewAgentError(fmt.Sprintf("can't convert '%s' to array of strings: %s", typeFilterKey, err), err)
 		}
 		if len(typeFilterSlice.([]string)) != 0 {
 			opts = append(opts, googleapi.QueryParameter("_type", strings.Join(typeFilterSlice.([]string), ",")))
@@ -156,17 +159,18 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if since, ok := params.AsMap()[sinceFilterKey]; ok {
 		sinceStr, ok := since.(string)
 		if !ok {
-			return nil, fmt.Errorf("invalid '%s' parameter; expected a string", sinceFilterKey)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", sinceFilterKey), nil)
 		}
 		if sinceStr != "" {
 			opts = append(opts, googleapi.QueryParameter("_since", sinceStr))
 		}
 	}
-	return source.FHIRPatientEverything(storeID, patientID, tokenStr, opts)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.FHIRPatientEverything(storeID, patientID, tokenStr, opts)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -186,7 +190,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -196,3 +200,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything_test.go b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything_test.go
index 703fd0c2d3..d6caf089ff 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything_test.go
@@ -17,7 +17,6 @@ package fhirpatienteverything_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareFHIRPatientEverything(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-fhir-patient-everything
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-fhir-patient-everything
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": fhirpatienteverything.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-fhir-patient-everything",
+					Type:         "cloud-healthcare-fhir-patient-everything",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareFHIRPatientEverything(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch.go b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch.go
index 8c8c0c95d3..5a25a5028c 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch.go
@@ -17,6 +17,7 @@ package fhirpatientsearch
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/goccy/go-yaml"
@@ -24,11 +25,12 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/googleapi"
 )
 
-const kind string = "cloud-healthcare-fhir-patient-search"
+const resourceType string = "cloud-healthcare-fhir-patient-search"
 const (
 	activeKey           = "active"
 	cityKey             = "city"
@@ -52,8 +54,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -73,7 +75,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -82,8 +84,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -96,7 +98,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{
@@ -150,22 +152,22 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedFHIRStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 
@@ -179,14 +181,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			var ok bool
 			summary, ok = v.(bool)
 			if !ok {
-				return nil, fmt.Errorf("invalid '%s' parameter; expected a boolean", summaryKey)
+				return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a boolean", summaryKey), nil)
 			}
 			continue
 		}
 
 		val, ok := v.(string)
 		if !ok {
-			return nil, fmt.Errorf("invalid parameter '%s'; expected a string", k)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid parameter '%s'; expected a string", k), nil)
 		}
 		if val == "" {
 			continue
@@ -205,7 +207,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			}
 			parts := strings.Split(val, "/")
 			if len(parts) != 2 {
-				return nil, fmt.Errorf("invalid '%s' format; expected YYYY-MM-DD/YYYY-MM-DD", k)
+				return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' format; expected YYYY-MM-DD/YYYY-MM-DD", k), nil)
 			}
 			var values []string
 			if parts[0] != "" {
@@ -229,17 +231,17 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		case familyNameKey:
 			opts = append(opts, googleapi.QueryParameter("family", val))
 		default:
-			return nil, fmt.Errorf("unexpected parameter key %q", k)
+			return nil, util.NewAgentError(fmt.Sprintf("unexpected parameter key %q", k), nil)
 		}
 	}
 	if summary {
 		opts = append(opts, googleapi.QueryParameter("_summary", "text"))
 	}
-	return source.FHIRPatientSearch(storeID, tokenStr, opts)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.FHIRPatientSearch(storeID, tokenStr, opts)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -259,7 +261,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -269,3 +271,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch_test.go b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch_test.go
index 072fbc02d4..1d59af3b23 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch_test.go
@@ -17,7 +17,6 @@ package fhirpatientsearch_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareFHIRPatientSearch(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-fhir-patient-search
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-fhir-patient-search
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": fhirpatientsearch.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-fhir-patient-search",
+					Type:         "cloud-healthcare-fhir-patient-search",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareFHIRPatientSearch(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset.go b/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset.go
index d26e4fd06e..6924233c74 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset.go
@@ -17,20 +17,22 @@ package gethealthcaredataset
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-get-dataset"
+const resourceType string = "cloud-healthcare-get-dataset"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -90,23 +92,23 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.GetDataset(tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetDataset(tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -126,7 +128,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -136,3 +138,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset_test.go b/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset_test.go
index 3e56f2e9e4..e36b6b5d2d 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset_test.go
@@ -17,7 +17,6 @@ package gethealthcaredataset_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlGetHealthcareDataset(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-get-dataset
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-get-dataset
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": getdataset.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-get-dataset",
+					Type:         "cloud-healthcare-get-dataset",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlGetHealthcareDataset(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore.go b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore.go
index 6a9b5bf75e..2ba82fa4cf 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore.go
@@ -17,21 +17,23 @@ package getdicomstore
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-get-dicom-store"
+const resourceType string = "cloud-healthcare-get-dicom-store"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{}
@@ -107,27 +109,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedDICOMStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.GetDICOMStore(storeID, tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetDICOMStore(storeID, tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -147,7 +149,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -157,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore_test.go b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore_test.go
index af87f20b9b..37ba8923e2 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore_test.go
@@ -17,7 +17,6 @@ package getdicomstore_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareGetDICOMStore(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-get-dicom-store
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-get-dicom-store
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": getdicomstore.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-get-dicom-store",
+					Type:         "cloud-healthcare-get-dicom-store",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareGetDICOMStore(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics.go b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics.go
index c5ade268c9..40b8f3a247 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics.go
@@ -17,21 +17,23 @@ package getdicomstoremetrics
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-get-dicom-store-metrics"
+const resourceType string = "cloud-healthcare-get-dicom-store-metrics"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{}
@@ -107,27 +109,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedDICOMStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.GetDICOMStoreMetrics(storeID, tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetDICOMStoreMetrics(storeID, tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -147,7 +149,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -157,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics_test.go b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics_test.go
index 43523f7b85..f421a42a73 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics_test.go
@@ -17,7 +17,6 @@ package getdicomstoremetrics_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareGetDICOMStoreMetrics(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-get-dicom-store-metrics
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-get-dicom-store-metrics
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": getdicomstoremetrics.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-get-dicom-store-metrics",
+					Type:         "cloud-healthcare-get-dicom-store-metrics",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareGetDICOMStoreMetrics(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource.go b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource.go
index 0e381b2806..57aa815361 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource.go
@@ -17,24 +17,26 @@ package getfhirresource
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-healthcare-get-fhir-resource"
+const resourceType string = "cloud-healthcare-get-fhir-resource"
 const (
 	typeKey = "resourceType"
 	idKey   = "resourceID"
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -77,7 +79,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	typeParameter := parameters.NewStringParameter(typeKey, "The FHIR resource type to retrieve (e.g., Patient, Observation).")
@@ -112,36 +114,36 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedFHIRStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	resType, ok := params.AsMap()[typeKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", typeKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", typeKey), nil)
 	}
 	resID, ok := params.AsMap()[idKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected a string", idKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected a string", idKey), nil)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.GetFHIRResource(storeID, resType, resID, tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetFHIRResource(storeID, resType, resID, tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -161,7 +163,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -171,3 +173,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource_test.go b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource_test.go
index 7c2ba5277f..a1ec0fd5c8 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource_test.go
@@ -17,7 +17,6 @@ package getfhirresource_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareGetFHIRResource(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-get-fhir-resource
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-get-fhir-resource
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": getfhirresource.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-get-fhir-resource",
+					Type:         "cloud-healthcare-get-fhir-resource",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareGetFHIRResource(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore.go b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore.go
index f3755ae0bb..e4ec7043eb 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore.go
@@ -17,21 +17,23 @@ package getfhirstore
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-get-fhir-store"
+const resourceType string = "cloud-healthcare-get-fhir-store"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{}
@@ -107,27 +109,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedFHIRStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.GetFHIRStore(storeID, tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetFHIRStore(storeID, tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -147,7 +149,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -157,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore_test.go b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore_test.go
index bcf3d54e51..007b186f3b 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore_test.go
@@ -17,7 +17,6 @@ package getfhirstore_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareGetFHIRStore(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-get-fhir-store
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-get-fhir-store
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": getfhirstore.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-get-fhir-store",
+					Type:         "cloud-healthcare-get-fhir-store",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareGetFHIRStore(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics.go b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics.go
index f105bbd7ec..d3e4eb07fb 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics.go
@@ -17,21 +17,23 @@ package getfhirstoremetrics
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-get-fhir-store-metrics"
+const resourceType string = "cloud-healthcare-get-fhir-store-metrics"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{}
@@ -107,27 +109,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedFHIRStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.GetFHIRStoreMetrics(storeID, tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetFHIRStoreMetrics(storeID, tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -147,7 +149,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -157,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics_test.go b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics_test.go
index bd112bb00d..36964ab7d9 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics_test.go
@@ -17,7 +17,6 @@ package getfhirstoremetrics_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareGetFHIRStoreMetrics(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-get-fhir-store-metrics
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-get-fhir-store-metrics
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": getfhirstoremetrics.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-get-fhir-store-metrics",
+					Type:         "cloud-healthcare-get-fhir-store-metrics",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareGetFHIRStoreMetrics(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores.go b/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores.go
index bdc4002c3a..fb43e9d353 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores.go
@@ -17,20 +17,22 @@ package listdicomstores
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-list-dicom-stores"
+const resourceType string = "cloud-healthcare-list-dicom-stores"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -90,23 +92,23 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.ListDICOMStores(tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.ListDICOMStores(tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -126,7 +128,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -136,3 +138,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores_test.go b/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores_test.go
index f9e874b2d9..6967f346f1 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores_test.go
@@ -17,7 +17,6 @@ package listdicomstores_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareListDICOMStores(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-list-dicom-stores
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-list-dicom-stores
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": listdicomstores.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-list-dicom-stores",
+					Type:         "cloud-healthcare-list-dicom-stores",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareListDICOMStores(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores.go b/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores.go
index c7918329cd..203c666b12 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores.go
@@ -17,20 +17,22 @@ package listfhirstores
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/healthcare/v1"
 )
 
-const kind string = "cloud-healthcare-list-fhir-stores"
+const resourceType string = "cloud-healthcare-list-fhir-stores"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -90,23 +92,23 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
-	return source.ListFHIRStores(tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.ListFHIRStores(tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -126,7 +128,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -136,3 +138,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores_test.go b/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores_test.go
index dc7d8d891e..70414613ea 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores_test.go
@@ -17,7 +17,6 @@ package listfhirstores_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareListFHIRStores(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-list-fhir-stores
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-list-fhir-stores
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": listfhirstores.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-list-fhir-stores",
+					Type:         "cloud-healthcare-list-fhir-stores",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareListFHIRStores(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance.go b/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance.go
index 44c7e8a612..711a0cfc86 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance.go
@@ -17,16 +17,18 @@ package retrieverendereddicominstance
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-healthcare-retrieve-rendered-dicom-instance"
+const resourceType string = "cloud-healthcare-retrieve-rendered-dicom-instance"
 const (
 	studyInstanceUIDKey  = "StudyInstanceUID"
 	seriesInstanceUIDKey = "SeriesInstanceUID"
@@ -35,8 +37,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -56,7 +58,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -65,8 +67,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -79,7 +81,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{
@@ -117,44 +119,44 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedDICOMStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 	study, ok := params.AsMap()[studyInstanceUIDKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid '%s' parameter; expected a string", studyInstanceUIDKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", studyInstanceUIDKey), nil)
 	}
 	series, ok := params.AsMap()[seriesInstanceUIDKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid '%s' parameter; expected a string", seriesInstanceUIDKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", seriesInstanceUIDKey), nil)
 	}
 	sop, ok := params.AsMap()[sopInstanceUIDKey].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid '%s' parameter; expected a string", sopInstanceUIDKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", sopInstanceUIDKey), nil)
 	}
 	frame, ok := params.AsMap()[frameNumberKey].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid '%s' parameter; expected an integer", frameNumberKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected an integer", frameNumberKey), nil)
 	}
-	return source.RetrieveRenderedDICOMInstance(storeID, study, series, sop, frame, tokenStr)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RetrieveRenderedDICOMInstance(storeID, study, series, sop, frame, tokenStr)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -174,7 +176,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -184,3 +186,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance_test.go b/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance_test.go
index 1522c3d8c3..adf6005529 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance_test.go
@@ -17,7 +17,6 @@ package retrieverendereddicominstance_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareRetrieveRenderedDICOMInstance(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-retrieve-rendered-dicom-instance
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-retrieve-rendered-dicom-instance
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": retrieverendereddicominstance.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-retrieve-rendered-dicom-instance",
+					Type:         "cloud-healthcare-retrieve-rendered-dicom-instance",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareRetrieveRenderedDICOMInstance(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances.go b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances.go
index 1223d09649..a3183238e8 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances.go
@@ -17,6 +17,7 @@ package searchdicominstances
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/goccy/go-yaml"
@@ -24,11 +25,12 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/googleapi"
 )
 
-const kind string = "cloud-healthcare-search-dicom-instances"
+const resourceType string = "cloud-healthcare-search-dicom-instances"
 const (
 	studyInstanceUIDKey       = "StudyInstanceUID"
 	patientNameKey            = "PatientName"
@@ -42,8 +44,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -63,7 +65,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -72,8 +74,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -86,7 +88,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{
@@ -131,33 +133,33 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedDICOMStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 
 	opts, err := common.ParseDICOMSearchParameters(params, []string{sopInstanceUIDKey, patientNameKey, patientIDKey, accessionNumberKey, referringPhysicianNameKey, studyDateKey, modalityKey})
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to parse DICOM search parameters", err)
 	}
 	paramsMap := params.AsMap()
 	dicomWebPath := "instances"
 	if studyInstanceUID, ok := paramsMap[studyInstanceUIDKey]; ok {
 		id, ok := studyInstanceUID.(string)
 		if !ok {
-			return nil, fmt.Errorf("invalid '%s' parameter; expected a string", studyInstanceUIDKey)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", studyInstanceUIDKey), nil)
 		}
 		if id != "" {
 			dicomWebPath = fmt.Sprintf("studies/%s/instances", id)
@@ -166,7 +168,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if seriesInstanceUID, ok := paramsMap[seriesInstanceUIDKey]; ok {
 		id, ok := seriesInstanceUID.(string)
 		if !ok {
-			return nil, fmt.Errorf("invalid '%s' parameter; expected a string", seriesInstanceUIDKey)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", seriesInstanceUIDKey), nil)
 		}
 		if id != "" {
 			if dicomWebPath != "instances" {
@@ -176,11 +178,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			}
 		}
 	}
-	return source.SearchDICOM(t.Kind, storeID, dicomWebPath, tokenStr, opts)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.SearchDICOM(t.Type, storeID, dicomWebPath, tokenStr, opts)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -200,7 +202,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -210,3 +212,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances_test.go b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances_test.go
index e28c6c1dd2..83a3ff5de3 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances_test.go
@@ -17,7 +17,6 @@ package searchdicominstances_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareSearchDICOMInstances(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-search-dicom-instances
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-search-dicom-instances
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": searchdicominstances.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-search-dicom-instances",
+					Type:         "cloud-healthcare-search-dicom-instances",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareSearchDICOMInstances(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries.go b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries.go
index 3c72fd99c3..75735b5db5 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries.go
@@ -17,17 +17,19 @@ package searchdicomseries
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/googleapi"
 )
 
-const kind string = "cloud-healthcare-search-dicom-series"
+const resourceType string = "cloud-healthcare-search-dicom-series"
 const (
 	studyInstanceUIDKey       = "StudyInstanceUID"
 	patientNameKey            = "PatientName"
@@ -40,8 +42,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -61,7 +63,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -70,8 +72,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -84,7 +86,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{
@@ -128,44 +130,44 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedDICOMStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 
 	opts, err := common.ParseDICOMSearchParameters(params, []string{seriesInstanceUIDKey, patientNameKey, patientIDKey, accessionNumberKey, referringPhysicianNameKey, studyDateKey, modalityKey})
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to parse DICOM search parameters", err)
 	}
 	paramsMap := params.AsMap()
 	dicomWebPath := "series"
 	if studyInstanceUID, ok := paramsMap[studyInstanceUIDKey]; ok {
 		id, ok := studyInstanceUID.(string)
 		if !ok {
-			return nil, fmt.Errorf("invalid '%s' parameter; expected a string", studyInstanceUIDKey)
+			return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", studyInstanceUIDKey), nil)
 		}
 		if id != "" {
 			dicomWebPath = fmt.Sprintf("studies/%s/series", id)
 		}
 	}
-	return source.SearchDICOM(t.Kind, storeID, dicomWebPath, tokenStr, opts)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.SearchDICOM(t.Type, storeID, dicomWebPath, tokenStr, opts)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -185,7 +187,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -195,3 +197,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries_test.go b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries_test.go
index 7558adcadf..e46eb0cb0f 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries_test.go
@@ -17,7 +17,6 @@ package searchdicomseries_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareSearchDICOMSeries(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-search-dicom-series
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-search-dicom-series
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": searchdicomseries.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-search-dicom-series",
+					Type:         "cloud-healthcare-search-dicom-series",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareSearchDICOMSeries(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies.go b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies.go
index d6d92f9dbb..d1f2a2ed30 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies.go
@@ -17,17 +17,19 @@ package searchdicomstudies
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/common"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/googleapi"
 )
 
-const kind string = "cloud-healthcare-search-dicom-studies"
+const resourceType string = "cloud-healthcare-search-dicom-studies"
 const (
 	studyInstanceUIDKey       = "StudyInstanceUID"
 	patientNameKey            = "PatientName"
@@ -38,8 +40,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,7 +61,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -68,8 +70,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -82,7 +84,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	params := parameters.Parameters{
@@ -124,32 +126,32 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	storeID, err := common.ValidateAndFetchStoreID(params, source.AllowedDICOMStores())
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to validate store ID", err)
 	}
 	var tokenStr string
 	if source.UseClientAuthorization() {
 		tokenStr, err = accessToken.ParseBearerToken()
 		if err != nil {
-			return nil, fmt.Errorf("error parsing access token: %w", err)
+			return nil, util.NewClientServerError("error parsing access token", http.StatusUnauthorized, err)
 		}
 	}
 	opts, err := common.ParseDICOMSearchParameters(params, []string{studyInstanceUIDKey, patientNameKey, patientIDKey, accessionNumberKey, referringPhysicianNameKey, studyDateKey})
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError("failed to parse DICOM search parameters", err)
 	}
 	dicomWebPath := "studies"
-	return source.SearchDICOM(t.Kind, storeID, dicomWebPath, tokenStr, opts)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.SearchDICOM(t.Type, storeID, dicomWebPath, tokenStr, opts)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -169,7 +171,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -179,3 +181,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies_test.go b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies_test.go
index 483f37e61b..6415eaedd2 100644
--- a/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies_test.go
+++ b/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies_test.go
@@ -17,7 +17,6 @@ package searchdicomstudies_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlHealthcareSearchDICOMStudies(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-healthcare-search-dicom-studies
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: cloud-healthcare-search-dicom-studies
+            source: my-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": searchdicomstudies.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-healthcare-search-dicom-studies",
+					Type:         "cloud-healthcare-search-dicom-studies",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYamlHealthcareSearchDICOMStudies(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames.go b/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames.go
new file mode 100644
index 0000000000..73253b7a9a
--- /dev/null
+++ b/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames.go
@@ -0,0 +1,161 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadminlistlognames
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+const resourceType string = "cloud-logging-admin-list-log-names"
+
+const defaultLimit int = 200
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	UseClientAuthorization() bool
+	ListLogNames(ctx context.Context, limit int, accessToken string) ([]string, error)
+}
+
+type Config struct {
+	Name         string   `yaml:"name" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
+}
+
+func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
+	limitDescription := fmt.Sprintf("Maximum number of log entries to return. Default: %d.", defaultLimit)
+	params := parameters.Parameters{
+		parameters.NewIntParameterWithRequired("limit", limitDescription, false),
+	}
+
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
+
+	t := Tool{
+		Config:      cfg,
+		manifest:    tools.Manifest{Description: cfg.Description, Parameters: params.Manifest(), AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+		Parameters:  params,
+	}
+	return t, nil
+}
+
+// validate interface
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+	Parameters  parameters.Parameters `yaml:"parameters"`
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	limit := defaultLimit
+	paramsMap := params.AsMap()
+	if val, ok := paramsMap["limit"].(int); ok && val > 0 {
+		limit = val
+	} else if ok && val < 0 {
+		return nil, util.NewAgentError("limit must be greater than or equal to 1", nil)
+	}
+
+	tokenString := ""
+	if source.UseClientAuthorization() {
+		tokenString, err = accessToken.ParseBearerToken()
+		if err != nil {
+			return nil, util.NewClientServerError("failed to parse access token", http.StatusUnauthorized, err)
+		}
+	}
+
+	resp, err := source.ListLogNames(ctx, limit, tokenString)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
+}
+
+func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
+	return parameters.ParseParams(t.Parameters, data, claimsMap)
+}
+
+func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return paramValues, nil
+}
+
+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(resourceMgr tools.SourceProvider) (bool, error) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return false, err
+	}
+	return source.UseClientAuthorization(), nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames_test.go b/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames_test.go
new file mode 100644
index 0000000000..e2b8887d9c
--- /dev/null
+++ b/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames_test.go
@@ -0,0 +1,122 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadminlistlognames_test
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"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/cloudloggingadmin/cloudloggingadminlistlognames"
+)
+
+func TestParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		want server.ToolConfigs
+	}{
+		{
+			desc: "basic example",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-list-log-names
+			source: my-logging-admin-source
+			description: list log names
+			authRequired:
+				- my-google-auth-service
+			`,
+			want: server.ToolConfigs{
+				"example_tool": cloudloggingadminlistlognames.Config{
+					Name:         "example_tool",
+					Type:         "cloud-logging-admin-list-log-names",
+					Source:       "my-logging-admin-source",
+					Description:  "list log names",
+					AuthRequired: []string{"my-google-auth-service"},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestFailParseFromYaml(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "Invalid type",
+			in: `
+			kind: tools
+			name: example_tool
+			type: invalid-type
+			source: my-instance
+			description: some description
+			`,
+			err: `unknown tool type: "invalid-type"`,
+		},
+		{
+			desc: "missing source",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-list-log-names
+			description: some description
+			`,
+			err: `Key: 'Config.Source' Error:Field validation for 'Source' failed on the 'required' tag`,
+		},
+		{
+			desc: "missing description",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-list-log-names
+			source: my-instance
+			`,
+			err: `Key: 'Config.Description' Error:Field validation for 'Description' failed on the 'required' tag`,
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if !strings.Contains(errStr, tc.err) {
+				t.Fatalf("unexpected error string: got %q, want substring %q", errStr, tc.err)
+			}
+		})
+	}
+}
diff --git a/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes/cloudloggingadminlistresourcetypes.go b/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes/cloudloggingadminlistresourcetypes.go
new file mode 100644
index 0000000000..ce171ec8aa
--- /dev/null
+++ b/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes/cloudloggingadminlistresourcetypes.go
@@ -0,0 +1,148 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadminlistresourcetypes
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+const resourceType string = "cloud-logging-admin-list-resource-types"
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	UseClientAuthorization() bool
+	ListResourceTypes(ctx context.Context, accessToken string) ([]string, error)
+}
+
+type Config struct {
+	Name         string   `yaml:"name" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
+}
+
+func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
+	// No parameters for this tool
+	var params parameters.Parameters
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
+
+	t := Tool{
+		Config:      cfg,
+		Parameters:  params,
+		manifest:    tools.Manifest{Description: cfg.Description, AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+	}
+	return t, nil
+}
+
+// validate interface
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	Parameters  parameters.Parameters `yaml:"parameters"`
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	tokenString := ""
+	if source.UseClientAuthorization() {
+		tokenString, err = accessToken.ParseBearerToken()
+		if err != nil {
+			return nil, util.NewClientServerError("failed to parse access token", http.StatusUnauthorized, err)
+		}
+	}
+
+	resp, err := source.ListResourceTypes(ctx, tokenString)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
+}
+
+func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
+	return parameters.ParamValues{}, nil
+}
+
+func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return paramValues, nil
+}
+
+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(resourceMgr tools.SourceProvider) (bool, error) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return false, err
+	}
+	return source.UseClientAuthorization(), nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes/cloudloggingadminlistresourcetypes_test.go b/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes/cloudloggingadminlistresourcetypes_test.go
new file mode 100644
index 0000000000..731fc924d8
--- /dev/null
+++ b/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes/cloudloggingadminlistresourcetypes_test.go
@@ -0,0 +1,122 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadminlistresourcetypes_test
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+	cloudloggingadminlistresourcetypes "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes"
+)
+
+func TestParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		want server.ToolConfigs
+	}{
+		{
+			desc: "basic example",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-list-resource-types
+			source: my-logging-admin-source
+			description: list resource types
+			authRequired:
+				- my-google-auth-service
+			`,
+			want: server.ToolConfigs{
+				"example_tool": cloudloggingadminlistresourcetypes.Config{
+					Name:         "example_tool",
+					Type:         "cloud-logging-admin-list-resource-types",
+					Source:       "my-logging-admin-source",
+					Description:  "list resource types",
+					AuthRequired: []string{"my-google-auth-service"},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestFailParseFromYaml(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "Invalid type",
+			in: `
+			kind: tools
+			name: example_tool
+			type: invalid-type
+			source: my-instance
+			description: some description
+			`,
+			err: `unknown tool type: "invalid-type"`,
+		},
+		{
+			desc: "missing source",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-list-resource-types
+			description: some description
+			`,
+			err: `Key: 'Config.Source' Error:Field validation for 'Source' failed on the 'required' tag`,
+		},
+		{
+			desc: "missing description",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-list-resource-types
+			source: my-instance
+			`,
+			err: `Key: 'Config.Description' Error:Field validation for 'Description' failed on the 'required' tag`,
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if !strings.Contains(errStr, tc.err) {
+				t.Fatalf("unexpected error string: got %q, want substring %q", errStr, tc.err)
+			}
+		})
+	}
+}
diff --git a/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs/cloudloggingadminquerylogs.go b/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs/cloudloggingadminquerylogs.go
new file mode 100644
index 0000000000..b5216fac02
--- /dev/null
+++ b/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs/cloudloggingadminquerylogs.go
@@ -0,0 +1,221 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadminquerylogs
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"time"
+
+	"github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	cla "github.com/googleapis/genai-toolbox/internal/sources/cloudloggingadmin"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+const (
+	resourceType string = "cloud-logging-admin-query-logs"
+
+	defaultLimit               int = 200
+	defaultStartTimeOffsetDays int = 30
+)
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	UseClientAuthorization() bool
+	QueryLogs(ctx context.Context, params cla.QueryLogsParams, accessToken string) ([]map[string]any, error)
+}
+
+type Config struct {
+	Name         string   `yaml:"name" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
+}
+
+func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
+	startTimeDescription := fmt.Sprintf("Start time in RFC3339 format (e.g., 2025-12-09T00:00:00Z). Defaults to %d days ago.", defaultStartTimeOffsetDays)
+	limitDescription := fmt.Sprintf("Maximum number of log entries to return. Default: %d.", defaultLimit)
+	params := parameters.Parameters{
+		parameters.NewStringParameterWithRequired(
+			"filter",
+			"Cloud Logging filter query. Common fields: resource.type, resource.labels.*, logName, severity, textPayload, jsonPayload.*, protoPayload.*, labels.*, httpRequest.*. Operators: =, !=, <, <=, >, >=, :, =~, AND, OR, NOT.",
+			false,
+		),
+		parameters.NewBooleanParameterWithRequired("newestFirst", "Set to true for newest logs first. Defaults to oldest first.", false),
+		parameters.NewStringParameterWithRequired("startTime", startTimeDescription, false),
+		parameters.NewStringParameterWithRequired("endTime", "End time in RFC3339 format (e.g., 2025-12-09T23:59:59Z). Defaults to now.", false),
+		parameters.NewBooleanParameterWithRequired("verbose", "Include additional fields (insertId, trace, spanId, httpRequest, labels, operation, sourceLocation). Defaults to false.", false),
+		parameters.NewIntParameterWithRequired("limit", limitDescription, false),
+	}
+
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
+
+	t := Tool{
+		Config:      cfg,
+		manifest:    tools.Manifest{Description: cfg.Description, Parameters: params.Manifest(), AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+		Parameters:  params,
+	}
+	return t, nil
+}
+
+// validate interface
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	Parameters  parameters.Parameters `yaml:"parameters"`
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	// Parse parameters
+	limit := defaultLimit
+	paramsMap := params.AsMap()
+	newestFirst, _ := paramsMap["newestFirst"].(bool)
+
+	// Check and set limit
+	if val, ok := paramsMap["limit"].(int); ok && val > 0 {
+		limit = val
+	} else if ok && val < 0 {
+		return nil, util.NewAgentError("limit must be greater than or equal to 1", nil)
+	}
+
+	// Check for verbosity of output
+	verbose, _ := paramsMap["verbose"].(bool)
+
+	// Build filter
+	var filter string
+	if f, ok := paramsMap["filter"].(string); ok {
+		if len(f) == 0 {
+			return nil, util.NewAgentError("filter cannot be empty if provided", nil)
+		}
+		filter = f
+	}
+
+	// Parse start time
+	var startTime string
+	if val, ok := paramsMap["startTime"].(string); ok && val != "" {
+		if _, err := time.Parse(time.RFC3339, val); err != nil {
+			return nil, util.NewAgentError(fmt.Sprintf("startTime must be in RFC3339 format (e.g., 2025-12-09T00:00:00Z): %v", err), err)
+		}
+		startTime = val
+	} else {
+		startTime = time.Now().AddDate(0, 0, -defaultStartTimeOffsetDays).Format(time.RFC3339)
+	}
+
+	// Parse end time
+	var endTime string
+	if val, ok := paramsMap["endTime"].(string); ok && val != "" {
+		if _, err := time.Parse(time.RFC3339, val); err != nil {
+			return nil, util.NewAgentError(fmt.Sprintf("endTime must be in RFC3339 format (e.g., 2025-12-09T23:59:59Z): %v", err), err)
+		}
+		endTime = val
+	}
+
+	tokenString := ""
+	if source.UseClientAuthorization() {
+		tokenString, err = accessToken.ParseBearerToken()
+		if err != nil {
+			return nil, util.NewClientServerError("failed to parse access token", http.StatusUnauthorized, err)
+		}
+	}
+
+	queryParams := cla.QueryLogsParams{
+		Filter:      filter,
+		NewestFirst: newestFirst,
+		StartTime:   startTime,
+		EndTime:     endTime,
+		Verbose:     verbose,
+		Limit:       limit,
+	}
+
+	resp, err := source.QueryLogs(ctx, queryParams, tokenString)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
+}
+
+func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
+	return parameters.ParseParams(t.Parameters, data, claimsMap)
+}
+
+func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return paramValues, nil
+}
+
+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(resourceMgr tools.SourceProvider) (bool, error) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return false, err
+	}
+	return source.UseClientAuthorization(), nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs/cloudloggingadminquerylogs_test.go b/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs/cloudloggingadminquerylogs_test.go
new file mode 100644
index 0000000000..c01368ccc7
--- /dev/null
+++ b/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs/cloudloggingadminquerylogs_test.go
@@ -0,0 +1,122 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package cloudloggingadminquerylogs_test
+
+import (
+	"context"
+	"strings"
+	"testing"
+
+	"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/cloudloggingadmin/cloudloggingadminquerylogs"
+)
+
+func TestParseFromYaml(t *testing.T) {
+	tcs := []struct {
+		desc string
+		in   string
+		want server.ToolConfigs
+	}{
+		{
+			desc: "basic example",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-query-logs
+			source: my-logging-admin-source
+			description: query logs
+			authRequired:
+				- my-google-auth-service
+			`,
+			want: server.ToolConfigs{
+				"example_tool": cloudloggingadminquerylogs.Config{
+					Name:         "example_tool",
+					Type:         "cloud-logging-admin-query-logs",
+					Source:       "my-logging-admin-source",
+					Description:  "query logs",
+					AuthRequired: []string{"my-google-auth-service"},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestFailParseFromYaml(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "Invalid type",
+			in: `
+			kind: tools
+			name: example_tool
+			type: invalid-type
+			source: my-instance
+			description: some description
+			`,
+			err: `unknown tool type: "invalid-type"`,
+		},
+		{
+			desc: "missing source",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-query-logs
+			description: some description
+			`,
+			err: `Key: 'Config.Source' Error:Field validation for 'Source' failed on the 'required' tag`,
+		},
+		{
+			desc: "missing description",
+			in: `
+			kind: tools
+			name: example_tool
+			type: cloud-logging-admin-query-logs
+			source: my-instance
+			`,
+			err: `Key: 'Config.Description' Error:Field validation for 'Description' failed on the 'required' tag`,
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if !strings.Contains(errStr, tc.err) {
+				t.Fatalf("unexpected error string: got %q, want substring %q", errStr, tc.err)
+			}
+		})
+	}
+}
diff --git a/internal/tools/cloudmonitoring/cloudmonitoring.go b/internal/tools/cloudmonitoring/cloudmonitoring.go
index aab95defbe..b3524b58bd 100644
--- a/internal/tools/cloudmonitoring/cloudmonitoring.go
+++ b/internal/tools/cloudmonitoring/cloudmonitoring.go
@@ -23,14 +23,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-monitoring-query-prometheus"
+const resourceType string = "cloud-monitoring-query-prometheus"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +59,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,26 +94,26 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	projectID, ok := paramsMap["projectId"].(string)
 	if !ok {
-		return nil, fmt.Errorf("projectId parameter not found or not a string")
+		return nil, util.NewAgentError("projectId parameter not found or not a string", nil)
 	}
 	query, ok := paramsMap["query"].(string)
 	if !ok {
-		return nil, fmt.Errorf("query parameter not found or not a string")
+		return nil, util.NewAgentError("query parameter not found or not a string", nil)
 	}
-	return source.RunQuery(projectID, query)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunQuery(projectID, query)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -138,3 +139,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudmonitoring/cloudmonitoring_test.go b/internal/tools/cloudmonitoring/cloudmonitoring_test.go
index 51c4d00c21..30b143444e 100644
--- a/internal/tools/cloudmonitoring/cloudmonitoring_test.go
+++ b/internal/tools/cloudmonitoring/cloudmonitoring_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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/sources"
@@ -29,12 +28,12 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-// mockIncompatibleSource is a source of a different kind to test error paths.
+// mockIncompatibleSource is a source of a different type to test error paths.
 type mockIncompatibleSource struct{ sources.Source }
 
 func TestInitialize(t *testing.T) {
 	t.Parallel()
-	testSource := &cloudmonitoringsrc.Source{Config: cloudmonitoringsrc.Config{Kind: "cloud-monitoring"}}
+	testSource := &cloudmonitoringsrc.Source{Config: cloudmonitoringsrc.Config{Type: "cloud-monitoring"}}
 	srcs := map[string]sources.Source{
 		"my-monitoring-source": testSource,
 		"incompatible-source":  &mockIncompatibleSource{},
@@ -55,7 +54,7 @@ func TestInitialize(t *testing.T) {
 			desc: "Success case with nil authRequired",
 			cfg: cloudmonitoring.Config{
 				Name:         "test-tool",
-				Kind:         "cloud-monitoring-query-prometheus",
+				Type:         "cloud-monitoring-query-prometheus",
 				Source:       "my-monitoring-source",
 				Description:  "A test description.",
 				AuthRequired: nil,
@@ -70,7 +69,7 @@ func TestInitialize(t *testing.T) {
 			desc: "Success case with specified authRequired",
 			cfg: cloudmonitoring.Config{
 				Name:         "test-tool-with-auth",
-				Kind:         "cloud-monitoring-query-prometheus",
+				Type:         "cloud-monitoring-query-prometheus",
 				Source:       "my-monitoring-source",
 				Description:  "Another test description.",
 				AuthRequired: []string{"google-auth-service"},
@@ -122,16 +121,16 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-monitoring-query-prometheus
-					source: my-instance
-					description: some description
-				`,
+			kind: tools
+			name: example_tool
+			type: cloud-monitoring-query-prometheus
+			source: my-instance
+			description: some description
+			`,
 			want: server.ToolConfigs{
 				"example_tool": cloudmonitoring.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-monitoring-query-prometheus",
+					Type:         "cloud-monitoring-query-prometheus",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -141,19 +140,19 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 		{
 			desc: "advanced example",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-monitoring-query-prometheus
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: cloud-monitoring-query-prometheus
+			source: my-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": cloudmonitoring.Config{
 					Name:         "example_tool",
-					Kind:         "cloud-monitoring-query-prometheus",
+					Type:         "cloud-monitoring-query-prometheus",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -163,15 +162,11 @@ func TestParseFromYamlCloudMonitoring(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools, cmp.AllowUnexported(cloudmonitoring.Config{})); diff != "" {
+			if diff := cmp.Diff(tc.want, got, cmp.AllowUnexported(cloudmonitoring.Config{})); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -189,44 +184,40 @@ func TestFailParseFromYamlCloudMonitoring(t *testing.T) {
 		err  string
 	}{
 		{
-			desc: "Invalid kind",
+			desc: "Invalid type",
 			in: `
-			tools:
-				example_tool:
-					kind: invalid-kind
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: invalid-type
+			source: my-instance
+			description: some description
 			`,
-			err: `unknown tool kind: "invalid-kind"`,
+			err: `unknown tool type: "invalid-type"`,
 		},
 		{
 			desc: "missing source",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-monitoring-query-prometheus
-					description: some description
+			kind: tools
+			name: example_tool
+			type: cloud-monitoring-query-prometheus
+			description: some description
 			`,
 			err: `Key: 'Config.Source' Error:Field validation for 'Source' failed on the 'required' tag`,
 		},
 		{
 			desc: "missing description",
 			in: `
-			tools:
-				example_tool:
-					kind: cloud-monitoring-query-prometheus
-					source: my-instance
+			kind: tools
+			name: example_tool
+			type: cloud-monitoring-query-prometheus
+			source: my-instance
 			`,
 			err: `Key: 'Config.Description' Error:Field validation for 'Description' failed on the 'required' tag`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance.go b/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance.go
index 887d2d8f9b..786fa45ced 100644
--- a/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance.go
+++ b/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance.go
@@ -17,20 +17,22 @@ package cloudsqlcloneinstance
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	sqladmin "google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-clone-instance"
+const resourceType string = "cloud-sql-clone-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 // Config defines the configuration for the clone-instance tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -61,9 +63,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -124,36 +126,35 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'project' parameter: %v", paramsMap["project"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'project' parameter: %v", paramsMap["project"]), nil)
 	}
 	sourceInstanceName, ok := paramsMap["sourceInstanceName"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'sourceInstanceName' parameter: %v", paramsMap["sourceInstanceName"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'sourceInstanceName' parameter: %v", paramsMap["sourceInstanceName"]), nil)
 	}
 	destinationInstanceName, ok := paramsMap["destinationInstanceName"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'destinationInstanceName' parameter: %v", paramsMap["destinationInstanceName"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'destinationInstanceName' parameter: %v", paramsMap["destinationInstanceName"]), nil)
 	}
 
 	pointInTime, _ := paramsMap["pointInTime"].(string)
 	preferredZone, _ := paramsMap["preferredZone"].(string)
 	preferredSecondaryZone, _ := paramsMap["preferredSecondaryZone"].(string)
 
-	return source.CloneInstance(ctx, project, sourceInstanceName, destinationInstanceName, pointInTime, preferredZone, preferredSecondaryZone, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CloneInstance(ctx, project, sourceInstanceName, destinationInstanceName, pointInTime, preferredZone, preferredSecondaryZone, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -176,7 +177,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -187,3 +188,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance_test.go b/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance_test.go
index 42fb94406d..2cb93c60b1 100644
--- a/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance_test.go
+++ b/internal/tools/cloudsql/cloudsqlcloneinstance/cloudsqlcloneinstance_test.go
@@ -18,7 +18,6 @@ import (
 	//"context"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-			  clone-instance-tool:
-			    kind: cloud-sql-clone-instance
-			    description: a test description
-			    source: a-source
+			kind: tools
+			name: clone-instance-tool
+			type: cloud-sql-clone-instance
+			description: a test description
+			source: a-source
 			`,
 			want: server.ToolConfigs{
 				"clone-instance-tool": cloudsqlcloneinstance.Config{
 					Name:         "clone-instance-tool",
-					Kind:         "cloud-sql-clone-instance",
+					Type:         "cloud-sql-clone-instance",
 					Description:  "a test description",
 					Source:       "a-source",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup.go b/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup.go
index 2ad723f0d5..926efeee1d 100644
--- a/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup.go
+++ b/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup.go
@@ -17,16 +17,18 @@ package cloudsqlcreatebackup
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-create-backup"
+const resourceType string = "cloud-sql-create-backup"
 
 var _ tools.ToolConfig = Config{}
 
@@ -40,15 +42,15 @@ type compatibleSource interface {
 // Config defines the configuration for the create-backup tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -60,9 +62,9 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 	return actual, nil
 }
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -73,7 +75,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -120,31 +122,30 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'project' parameter: %v", paramsMap["project"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'project' parameter: %v", paramsMap["project"]), nil)
 	}
 	instance, ok := paramsMap["instance"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'instance' parameter: %v", paramsMap["instance"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'instance' parameter: %v", paramsMap["instance"]), nil)
 	}
 
 	location, _ := paramsMap["location"].(string)
 	description, _ := paramsMap["backup_description"].(string)
 
-	return source.InsertBackupRun(ctx, project, instance, location, description, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.InsertBackupRun(ctx, project, instance, location, description, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -167,7 +168,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -178,3 +179,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup_test.go b/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup_test.go
index f3f46a470d..3136729817 100644
--- a/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup_test.go
+++ b/internal/tools/cloudsql/cloudsqlcreatebackup/cloudsqlcreatebackup_test.go
@@ -17,7 +17,6 @@ package cloudsqlcreatebackup_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-			  create-backup-tool:
-			    kind: cloud-sql-create-backup
-			    description: a test description
-			    source: a-source
+			kind: tools
+			name: create-backup-tool
+			type: cloud-sql-create-backup
+			description: a test description
+			source: a-source
 			`,
 			want: server.ToolConfigs{
 				"create-backup-tool": cloudsqlcreatebackup.Config{
 					Name:         "create-backup-tool",
-					Kind:         "cloud-sql-create-backup",
+					Type:         "cloud-sql-create-backup",
 					Description:  "a test description",
 					Source:       "a-source",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase.go b/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase.go
index bf9471be86..422e60bf3c 100644
--- a/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase.go
+++ b/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase.go
@@ -17,19 +17,21 @@ package cloudsqlcreatedatabase
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-sql-create-database"
+const resourceType string = "cloud-sql-create-database"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Config defines the configuration for the create-database tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -72,7 +74,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -117,32 +119,31 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	instance, ok := paramsMap["instance"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'instance' parameter")
+		return nil, util.NewAgentError("missing 'instance' parameter", nil)
 	}
 	name, ok := paramsMap["name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'name' parameter")
+		return nil, util.NewAgentError("missing 'name' parameter", nil)
 	}
-	return source.CreateDatabase(ctx, name, project, instance, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateDatabase(ctx, name, project, instance, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -165,7 +166,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -175,3 +176,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase_test.go b/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase_test.go
index 8630c916b6..7986d05850 100644
--- a/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase_test.go
+++ b/internal/tools/cloudsql/cloudsqlcreatedatabase/cloudsqlcreatedatabase_test.go
@@ -17,7 +17,6 @@ package cloudsqlcreatedatabase_test
 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/testutils"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				create-database:
-					kind: cloud-sql-create-database
-					source: my-source
-					description: some description
+			kind: tools
+			name: create-database
+			type: cloud-sql-create-database
+			source: my-source
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"create-database": cloudsqlcreatedatabase.Config{
 					Name:         "create-database",
-					Kind:         "cloud-sql-create-database",
+					Type:         "cloud-sql-create-database",
 					Source:       "my-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers.go b/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers.go
index 701e5e2151..101ea45f96 100644
--- a/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers.go
+++ b/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers.go
@@ -17,19 +17,21 @@ package cloudsqlcreateusers
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-sql-create-users"
+const resourceType string = "cloud-sql-create-users"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Config defines the configuration for the create-user tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -72,7 +74,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -119,35 +121,38 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	instance, ok := paramsMap["instance"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'instance' parameter")
+		return nil, util.NewAgentError("missing 'instance' parameter", nil)
 	}
 	name, ok := paramsMap["name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'name' parameter")
+		return nil, util.NewAgentError("missing 'name' parameter", nil)
 	}
 
 	iamUser, _ := paramsMap["iamUser"].(bool)
 	password, _ := paramsMap["password"].(string)
-	return source.CreateUsers(ctx, project, instance, name, password, iamUser, string(accessToken))
-}
+	if !iamUser && password == "" {
+		return nil, util.NewAgentError("missing 'password' parameter for non-IAM user", nil)
+	}
 
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateUsers(ctx, project, instance, name, password, iamUser, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -170,7 +175,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -180,3 +185,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers_test.go b/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers_test.go
index 594b5215cb..6ea0ed59c1 100644
--- a/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers_test.go
+++ b/internal/tools/cloudsql/cloudsqlcreateusers/cloudsqlcreateusers_test.go
@@ -17,7 +17,6 @@ package cloudsqlcreateusers_test
 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/testutils"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				create-user:
-					kind: cloud-sql-create-users
-					source: my-source
-					description: some description
+			kind: tools
+			name: create-user
+			type: cloud-sql-create-users
+			source: my-source
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"create-user": cloudsqlcreateusers.Config{
 					Name:         "create-user",
-					Kind:         "cloud-sql-create-users",
+					Type:         "cloud-sql-create-users",
 					Source:       "my-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances.go b/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances.go
index 6c2b57cfc2..8602ab2740 100644
--- a/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances.go
+++ b/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances.go
@@ -17,19 +17,21 @@ package cloudsqlgetinstances
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-sql-get-instance"
+const resourceType string = "cloud-sql-get-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Config defines the configuration for the get-instances tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -73,7 +75,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -117,28 +119,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	projectId, ok := paramsMap["projectId"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'projectId' parameter")
+		return nil, util.NewAgentError("missing 'projectId' parameter", nil)
 	}
 	instanceId, ok := paramsMap["instanceId"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'instanceId' parameter")
+		return nil, util.NewAgentError("missing 'instanceId' parameter", nil)
 	}
-	return source.GetInstance(ctx, projectId, instanceId, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.GetInstance(ctx, projectId, instanceId, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -161,7 +162,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -171,3 +172,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances_test.go b/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances_test.go
index 809ecfa815..249f4e2015 100644
--- a/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances_test.go
+++ b/internal/tools/cloudsql/cloudsqlgetinstances/cloudsqlgetinstances_test.go
@@ -17,7 +17,6 @@ package cloudsqlgetinstances_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				get-instances:
-					kind: cloud-sql-get-instance
-					description: "A tool to get cloud sql instances"
-					source: "my-gcp-source"
+			kind: tools
+			name: get-instances
+			type: cloud-sql-get-instance
+			description: "A tool to get cloud sql instances"
+			source: "my-gcp-source"
 			`,
 			want: server.ToolConfigs{
 				"get-instances": cloudsqlgetinstances.Config{
 					Name:         "get-instances",
-					Kind:         "cloud-sql-get-instance",
+					Type:         "cloud-sql-get-instance",
 					Description:  "A tool to get cloud sql instances",
 					Source:       "my-gcp-source",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases.go b/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases.go
index a18c9dcffb..41ebf08fe2 100644
--- a/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases.go
+++ b/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases.go
@@ -17,19 +17,21 @@ package cloudsqllistdatabases
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-sql-list-databases"
+const resourceType string = "cloud-sql-list-databases"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Config defines the configuration for the list-databases tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -72,7 +74,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -116,28 +118,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	instance, ok := paramsMap["instance"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'instance' parameter")
+		return nil, util.NewAgentError("missing 'instance' parameter", nil)
 	}
-	return source.ListDatabase(ctx, project, instance, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.ListDatabase(ctx, project, instance, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -160,7 +161,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -170,3 +171,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases_test.go b/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases_test.go
index f7c1d49380..4717110f73 100644
--- a/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases_test.go
+++ b/internal/tools/cloudsql/cloudsqllistdatabases/cloudsqllistdatabases_test.go
@@ -17,7 +17,6 @@ package cloudsqllistdatabases_test
 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/testutils"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				list-my-databases:
-					kind: cloud-sql-list-databases
-					description: some description
-					source: some-source
+			kind: tools
+			name: list-my-databases
+			type: cloud-sql-list-databases
+			description: some description
+			source: some-source
 			`,
 			want: server.ToolConfigs{
 				"list-my-databases": cloudsqllistdatabases.Config{
 					Name:         "list-my-databases",
-					Kind:         "cloud-sql-list-databases",
+					Type:         "cloud-sql-list-databases",
 					Description:  "some description",
 					AuthRequired: []string{},
 					Source:       "some-source",
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances.go b/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances.go
index 21ddd0a469..9c869eaae6 100644
--- a/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances.go
+++ b/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances.go
@@ -17,19 +17,21 @@ package cloudsqllistinstances
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "cloud-sql-list-instances"
+const resourceType string = "cloud-sql-list-instances"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Config defines the configuration for the list-instance tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -72,7 +74,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -115,24 +117,23 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
-	return source.ListInstance(ctx, project, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.ListInstance(ctx, project, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -155,7 +156,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -165,3 +166,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances_test.go b/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances_test.go
index bf7eabfc09..0ef4ce1b6e 100644
--- a/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances_test.go
+++ b/internal/tools/cloudsql/cloudsqllistinstances/cloudsqllistinstances_test.go
@@ -17,7 +17,6 @@ package cloudsqllistinstances
 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/testutils"
@@ -36,16 +35,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				list-my-instances:
-					kind: cloud-sql-list-instances
-					description: some description
-					source: some-source
+			kind: tools
+			name: list-my-instances
+			type: cloud-sql-list-instances
+			description: some description
+			source: some-source
 			`,
 			want: server.ToolConfigs{
 				"list-my-instances": Config{
 					Name:         "list-my-instances",
-					Kind:         "cloud-sql-list-instances",
+					Type:         "cloud-sql-list-instances",
 					Description:  "some description",
 					AuthRequired: []string{},
 					Source:       "some-source",
@@ -55,15 +54,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup.go b/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup.go
index 16c05f9ed3..a4e909d157 100644
--- a/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup.go
+++ b/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup.go
@@ -17,16 +17,18 @@ package cloudsqlrestorebackup
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-restore-backup"
+const resourceType string = "cloud-sql-restore-backup"
 
 var _ tools.ToolConfig = Config{}
 
@@ -40,15 +42,15 @@ type compatibleSource interface {
 // Config defines the configuration for the restore-backup tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -60,9 +62,9 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 	return actual, nil
 }
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -73,7 +75,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	project := s.GetDefaultProject()
@@ -120,34 +122,33 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 
 	targetProject, ok := paramsMap["target_project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'target_project' parameter: %v", paramsMap["target_project"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'target_project' parameter: %v", paramsMap["target_project"]), nil)
 	}
 	targetInstance, ok := paramsMap["target_instance"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'target_instance' parameter: %v", paramsMap["target_instance"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'target_instance' parameter: %v", paramsMap["target_instance"]), nil)
 	}
 	backupID, ok := paramsMap["backup_id"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'backup_id' parameter: %v", paramsMap["backup_id"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'backup_id' parameter: %v", paramsMap["backup_id"]), nil)
 	}
 	sourceProject, _ := paramsMap["source_project"].(string)
 	sourceInstance, _ := paramsMap["source_instance"].(string)
 
-	return source.RestoreBackup(ctx, targetProject, targetInstance, sourceProject, sourceInstance, backupID, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RestoreBackup(ctx, targetProject, targetInstance, sourceProject, sourceInstance, backupID, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -170,7 +171,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -181,3 +182,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup_test.go b/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup_test.go
index 7ed49142ed..27c4bd7467 100644
--- a/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup_test.go
+++ b/internal/tools/cloudsql/cloudsqlrestorebackup/cloudsqlrestorebackup_test.go
@@ -17,7 +17,6 @@ package cloudsqlrestorebackup_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-			  restore-backup-tool:
-			    kind: cloud-sql-restore-backup
-			    description: a test description
-			    source: a-source
+			kind: tools
+			name: restore-backup-tool
+			type: cloud-sql-restore-backup
+			description: a test description
+			source: a-source
 			`,
 			want: server.ToolConfigs{
 				"restore-backup-tool": cloudsqlrestorebackup.Config{
 					Name:         "restore-backup-tool",
-					Kind:         "cloud-sql-restore-backup",
+					Type:         "cloud-sql-restore-backup",
 					Description:  "a test description",
 					Source:       "a-source",
 					AuthRequired: []string{},
@@ -56,14 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation.go b/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation.go
index 4da7c7faba..610330ad65 100644
--- a/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation.go
+++ b/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation.go
@@ -17,17 +17,19 @@ package cloudsqlwaitforoperation
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"time"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-wait-for-operation"
+const resourceType string = "cloud-sql-wait-for-operation"
 
 var cloudSQLConnectionMessageTemplate = `Your Cloud SQL resource is ready.
 
@@ -71,8 +73,8 @@ Please refer to the official documentation for guidance on deploying the toolbox
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -94,7 +96,7 @@ type compatibleSource interface {
 // Config defines the configuration for the wait-for-operation tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -110,9 +112,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -124,7 +126,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -210,21 +212,21 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	operationID, ok := paramsMap["operation"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'operation' parameter")
+		return nil, util.NewAgentError("missing 'operation' parameter", nil)
 	}
 
 	ctx, cancel := context.WithTimeout(ctx, 30*time.Minute)
@@ -232,7 +234,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	service, err := source.GetService(ctx, string(accessToken))
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGcpError(err)
 	}
 
 	delay := t.Delay
@@ -244,13 +246,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	for retries < maxRetries {
 		select {
 		case <-ctx.Done():
-			return nil, fmt.Errorf("timed out waiting for operation: %w", ctx.Err())
+			return nil, util.NewClientServerError("timed out waiting for operation", http.StatusRequestTimeout, ctx.Err())
 		default:
 		}
 
 		op, err := source.GetWaitForOperations(ctx, service, project, operationID, cloudSQLConnectionMessageTemplate, delay)
 		if err != nil {
-			return nil, err
+			return nil, util.ProcessGcpError(err)
 		} else if op != nil {
 			return op, nil
 		}
@@ -262,12 +264,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		}
 		retries++
 	}
-	return nil, fmt.Errorf("exceeded max retries waiting for operation")
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	return nil, util.NewClientServerError("exceeded max retries waiting for operation", http.StatusGatewayTimeout, fmt.Errorf("exceeded max retries"))
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -290,7 +287,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -300,3 +297,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation_test.go b/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation_test.go
index 580ee5a4f4..994cd87bb4 100644
--- a/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation_test.go
+++ b/internal/tools/cloudsql/cloudsqlwaitforoperation/cloudsqlwaitforoperation_test.go
@@ -17,7 +17,6 @@ package cloudsqlwaitforoperation_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"
@@ -37,20 +36,20 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				wait-for-thing:
-					kind: cloud-sql-wait-for-operation
-					source: some-source
-					description: some description
-					delay: 1s
-					maxDelay: 5s
-					multiplier: 1.5
-					maxRetries: 5
+			kind: tools
+			name: wait-for-thing
+			type: cloud-sql-wait-for-operation
+			source: some-source
+			description: some description
+			delay: 1s
+			maxDelay: 5s
+			multiplier: 1.5
+			maxRetries: 5
 			`,
 			want: server.ToolConfigs{
 				"wait-for-thing": cloudsqlwaitforoperation.Config{
 					Name:         "wait-for-thing",
-					Kind:         "cloud-sql-wait-for-operation",
+					Type:         "cloud-sql-wait-for-operation",
 					Source:       "some-source",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -64,15 +63,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance.go b/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance.go
index 9a76293506..7adbd4dc2c 100644
--- a/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance.go
+++ b/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance.go
@@ -17,21 +17,23 @@ package cloudsqlmssqlcreateinstance
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-mssql-create-instance"
+const resourceType string = "cloud-sql-mssql-create-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 // Config defines the configuration for the create-instances tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -61,9 +63,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -121,33 +123,33 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'project' parameter: %s", paramsMap["project"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'project' parameter: %s", paramsMap["project"]), nil)
 	}
 	name, ok := paramsMap["name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'name' parameter: %s", paramsMap["name"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'name' parameter: %s", paramsMap["name"]), nil)
 	}
 	dbVersion, ok := paramsMap["databaseVersion"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'databaseVersion' parameter: %s", paramsMap["databaseVersion"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'databaseVersion' parameter: %s", paramsMap["databaseVersion"]), nil)
 	}
 	rootPassword, ok := paramsMap["rootPassword"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'rootPassword' parameter: %s", paramsMap["rootPassword"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'rootPassword' parameter: %s", paramsMap["rootPassword"]), nil)
 	}
 	editionPreset, ok := paramsMap["editionPreset"].(string)
 	if !ok {
-		return nil, fmt.Errorf("error casting 'editionPreset' parameter: %s", paramsMap["editionPreset"])
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'editionPreset' parameter: %s", paramsMap["editionPreset"]), nil)
 	}
 	settings := sqladmin.Settings{}
 	switch strings.ToLower(editionPreset) {
@@ -164,14 +166,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		settings.DataDiskSizeGb = 100
 		settings.DataDiskType = "PD_SSD"
 	default:
-		return nil, fmt.Errorf("invalid 'editionPreset': %q. Must be either 'Production' or 'Development'", editionPreset)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid 'editionPreset': %q. Must be either 'Production' or 'Development'", editionPreset), nil)
 	}
-	return source.CreateInstance(ctx, project, name, dbVersion, rootPassword, settings, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateInstance(ctx, project, name, dbVersion, rootPassword, settings, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -194,7 +195,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -204,3 +205,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance_test.go b/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance_test.go
index 54b381ae62..01928e87cd 100644
--- a/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance_test.go
+++ b/internal/tools/cloudsqlmssql/cloudsqlmssqlcreateinstance/cloudsqlmssqlcreateinstance_test.go
@@ -17,7 +17,6 @@ package cloudsqlmssqlcreateinstance_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				create-instance-tool:
-					kind: cloud-sql-mssql-create-instance
-					description: a test description
-					source: a-source
+			kind: tools
+			name: create-instance-tool
+			type: cloud-sql-mssql-create-instance
+			description: a test description
+			source: a-source
 			`,
 			want: server.ToolConfigs{
 				"create-instance-tool": cloudsqlmssqlcreateinstance.Config{
 					Name:         "create-instance-tool",
-					Kind:         "cloud-sql-mssql-create-instance",
+					Type:         "cloud-sql-mssql-create-instance",
 					Description:  "a test description",
 					Source:       "a-source",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance.go b/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance.go
index 247544dc15..358b1b343d 100644
--- a/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance.go
+++ b/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance.go
@@ -17,21 +17,23 @@ package cloudsqlmysqlcreateinstance
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	sqladmin "google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-mysql-create-instance"
+const resourceType string = "cloud-sql-mysql-create-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 // Config defines the configuration for the create-instances tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -61,9 +63,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -121,33 +123,33 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	name, ok := paramsMap["name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'name' parameter")
+		return nil, util.NewAgentError("missing 'name' parameter", nil)
 	}
 	dbVersion, ok := paramsMap["databaseVersion"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'databaseVersion' parameter")
+		return nil, util.NewAgentError("missing 'databaseVersion' parameter", nil)
 	}
 	rootPassword, ok := paramsMap["rootPassword"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'rootPassword' parameter")
+		return nil, util.NewAgentError("missing 'rootPassword' parameter", nil)
 	}
 	editionPreset, ok := paramsMap["editionPreset"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'editionPreset' parameter")
+		return nil, util.NewAgentError("missing 'editionPreset' parameter", nil)
 	}
 
 	settings := sqladmin.Settings{}
@@ -165,15 +167,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		settings.DataDiskSizeGb = 100
 		settings.DataDiskType = "PD_SSD"
 	default:
-		return nil, fmt.Errorf("invalid 'editionPreset': %q. Must be either 'Production' or 'Development'", editionPreset)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid 'editionPreset': %q. Must be either 'Production' or 'Development'", editionPreset), nil)
 	}
 
-	return source.CreateInstance(ctx, project, name, dbVersion, rootPassword, settings, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateInstance(ctx, project, name, dbVersion, rootPassword, settings, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -196,7 +197,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -206,3 +207,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance_test.go b/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance_test.go
index eb961412c8..88b4ea087d 100644
--- a/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance_test.go
+++ b/internal/tools/cloudsqlmysql/cloudsqlmysqlcreateinstance/cloudsqlmysqlcreateinstance_test.go
@@ -17,7 +17,6 @@ package cloudsqlmysqlcreateinstance_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				create-instance-tool:
-					kind: cloud-sql-mysql-create-instance
-					description: a test description
-					source: a-source
+			kind: tools
+			name: create-instance-tool
+			type: cloud-sql-mysql-create-instance
+			description: a test description
+			source: a-source
 			`,
 			want: server.ToolConfigs{
 				"create-instance-tool": cloudsqlmysqlcreateinstance.Config{
 					Name:         "create-instance-tool",
-					Kind:         "cloud-sql-mysql-create-instance",
+					Type:         "cloud-sql-mysql-create-instance",
 					Description:  "a test description",
 					Source:       "a-source",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances.go b/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances.go
index 8fe60179f0..e0e0a9f3f8 100644
--- a/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances.go
+++ b/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances.go
@@ -17,21 +17,23 @@ package cloudsqlpgcreateinstances
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	sqladmin "google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "cloud-sql-postgres-create-instance"
+const resourceType string = "cloud-sql-postgres-create-instance"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 // Config defines the configuration for the create-instances tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -61,9 +63,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -74,7 +76,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `cloud-sql-admin`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `cloud-sql-admin`", resourceType)
 	}
 
 	project := s.GetDefaultProject()
@@ -121,33 +123,33 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'project' parameter")
+		return nil, util.NewAgentError("missing 'project' parameter", nil)
 	}
 	name, ok := paramsMap["name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'name' parameter")
+		return nil, util.NewAgentError("missing 'name' parameter", nil)
 	}
 	dbVersion, ok := paramsMap["databaseVersion"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'databaseVersion' parameter")
+		return nil, util.NewAgentError("missing 'databaseVersion' parameter", nil)
 	}
 	rootPassword, ok := paramsMap["rootPassword"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'rootPassword' parameter")
+		return nil, util.NewAgentError("missing 'rootPassword' parameter", nil)
 	}
 	editionPreset, ok := paramsMap["editionPreset"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing 'editionPreset' parameter")
+		return nil, util.NewAgentError("missing 'editionPreset' parameter", nil)
 	}
 
 	settings := sqladmin.Settings{}
@@ -165,14 +167,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		settings.DataDiskSizeGb = 100
 		settings.DataDiskType = "PD_SSD"
 	default:
-		return nil, fmt.Errorf("invalid 'editionPreset': %q. Must be either 'Production' or 'Development'", editionPreset)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid 'editionPreset': %q. Must be either 'Production' or 'Development'", editionPreset), nil)
 	}
-	return source.CreateInstance(ctx, project, name, dbVersion, rootPassword, settings, string(accessToken))
-}
-
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.CreateInstance(ctx, project, name, dbVersion, rootPassword, settings, string(accessToken))
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -195,7 +196,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -205,3 +206,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances_test.go b/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances_test.go
index 950ba8b2de..12dca82574 100644
--- a/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances_test.go
+++ b/internal/tools/cloudsqlpg/cloudsqlpgcreateinstances/cloudsqlpgcreateinstances_test.go
@@ -17,7 +17,6 @@ package cloudsqlpgcreateinstances_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				create-instance-tool:
-					kind: cloud-sql-postgres-create-instance
-					description: a test description
-					source: a-source
+			kind: tools
+			name: create-instance-tool
+			type: cloud-sql-postgres-create-instance
+			description: a test description
+			source: a-source
 			`,
 			want: server.ToolConfigs{
 				"create-instance-tool": cloudsqlpgcreateinstances.Config{
 					Name:         "create-instance-tool",
-					Kind:         "cloud-sql-postgres-create-instance",
+					Type:         "cloud-sql-postgres-create-instance",
 					Description:  "a test description",
 					Source:       "a-source",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck.go b/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck.go
index a4fd600414..4f00896fb7 100644
--- a/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck.go
+++ b/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck.go
@@ -17,21 +17,23 @@ package cloudsqlpgupgradeprecheck
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"time"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	sqladmin "google.golang.org/api/sqladmin/v1"
 )
 
-const kind string = "postgres-upgrade-precheck"
+const resourceType string = "postgres-upgrade-precheck"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 // Config defines the configuration for the precheck-upgrade tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +62,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize initializes the tool from the configuration.
@@ -132,31 +134,31 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the tool's logic.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	project, ok := paramsMap["project"].(string)
 	if !ok || project == "" {
-		return nil, fmt.Errorf("missing or empty 'project' parameter")
+		return nil, util.NewAgentError("missing or empty 'project' parameter", nil)
 	}
 	instanceName, ok := paramsMap["instance"].(string)
 	if !ok || instanceName == "" {
-		return nil, fmt.Errorf("missing or empty 'instance' parameter")
+		return nil, util.NewAgentError("missing or empty 'instance' parameter", nil)
 	}
 	targetVersion, ok := paramsMap["targetDatabaseVersion"].(string)
 	if !ok || targetVersion == "" {
 		// This should not happen due to the default value
-		return nil, fmt.Errorf("missing or empty 'targetDatabaseVersion' parameter")
+		return nil, util.NewAgentError("missing or empty 'targetDatabaseVersion' parameter", nil)
 	}
 
 	service, err := source.GetService(ctx, string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("failed to get HTTP client from source: %w", err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	reqBody := &sqladmin.InstancesPreCheckMajorVersionUpgradeRequest{
@@ -168,7 +170,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	call := service.Instances.PreCheckMajorVersionUpgrade(project, instanceName, reqBody).Context(ctx)
 	op, err := call.Do()
 	if err != nil {
-		return nil, fmt.Errorf("failed to start pre-check operation: %w", err)
+		return nil, util.ProcessGcpError(err)
 	}
 
 	const pollTimeout = 20 * time.Second
@@ -177,7 +179,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	for time.Now().Before(cutoffTime) {
 		currentOp, err := service.Operations.Get(project, op.Name).Context(ctx).Do()
 		if err != nil {
-			return nil, fmt.Errorf("failed to get operation status: %w", err)
+			return nil, util.ProcessGcpError(err)
 		}
 
 		if currentOp.Status == "DONE" {
@@ -186,7 +188,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 				if currentOp.Error.Errors[0].Code != "" {
 					errMsg = fmt.Sprintf("%s (Code: %s)", errMsg, currentOp.Error.Errors[0].Code)
 				}
-				return nil, fmt.Errorf("%s", errMsg)
+				return nil, util.NewClientServerError(errMsg, http.StatusInternalServerError, fmt.Errorf("pre-check operation failed with error: %s", errMsg))
 			}
 
 			var preCheckItems []*sqladmin.PreCheckResponse
@@ -199,18 +201,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 		select {
 		case <-ctx.Done():
-			return nil, ctx.Err()
+			return nil, util.NewClientServerError("timed out waiting for operation", http.StatusRequestTimeout, ctx.Err())
 		case <-time.After(5 * time.Second):
 		}
 	}
 	return op, nil
 }
 
-// ParseParams parses the parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.AllParams, paramValues, embeddingModelsMap, nil)
 }
@@ -231,7 +228,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -241,3 +238,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck_test.go b/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck_test.go
index 27a117e1ba..790676cd70 100644
--- a/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck_test.go
+++ b/internal/tools/cloudsqlpg/cloudsqlpgupgradeprecheck/cloudsqlpgupgradeprecheck_test.go
@@ -17,7 +17,6 @@ package cloudsqlpgupgradeprecheck_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"
@@ -37,18 +36,18 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic precheck example",
 			in: `
-			tools:
-				precheck-upgrade-tool:
-					kind: postgres-upgrade-precheck
-					description: a precheck test description
-					source: some-admin-source
-					authRequired:
-						- https://www.googleapis.com/auth/cloud-platform
+			kind: tools
+			name: precheck-upgrade-tool
+			type: postgres-upgrade-precheck
+			description: a precheck test description
+			source: some-admin-source
+			authRequired:
+				- https://www.googleapis.com/auth/cloud-platform
 			`,
 			want: server.ToolConfigs{
 				"precheck-upgrade-tool": cloudsqlpgupgradeprecheck.Config{
 					Name:         "precheck-upgrade-tool",
-					Kind:         "postgres-upgrade-precheck",
+					Type:         "postgres-upgrade-precheck",
 					Description:  "a precheck test description",
 					Source:       "some-admin-source",
 					AuthRequired: []string{"https://www.googleapis.com/auth/cloud-platform"},
@@ -58,16 +57,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "precheck example with no auth",
 			in: `
-			tools:
-				precheck-upgrade-tool-no-auth:
-					kind: postgres-upgrade-precheck
-					description: a precheck test description no auth
-					source: other-admin-source
+			kind: tools
+			name: precheck-upgrade-tool-no-auth
+			type: postgres-upgrade-precheck
+			description: a precheck test description no auth
+			source: other-admin-source
 			`,
 			want: server.ToolConfigs{
 				"precheck-upgrade-tool-no-auth": cloudsqlpgupgradeprecheck.Config{
 					Name:         "precheck-upgrade-tool-no-auth",
-					Kind:         "postgres-upgrade-precheck",
+					Type:         "postgres-upgrade-precheck",
 					Description:  "a precheck test description no auth",
 					Source:       "other-admin-source",
 					AuthRequired: []string{},
@@ -77,15 +76,11 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff (-want +got):\n%s", diff)
 			}
 		})
diff --git a/internal/tools/cockroachdb/cockroachdbexecutesql/cockroachdbexecutesql.go b/internal/tools/cockroachdb/cockroachdbexecutesql/cockroachdbexecutesql.go
new file mode 100644
index 0000000000..72eaf3dd1e
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdbexecutesql/cockroachdbexecutesql.go
@@ -0,0 +1,180 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdbexecutesql
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	yaml "github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/sources/cockroachdb"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/orderedmap"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"github.com/jackc/pgx/v5"
+)
+
+const resourceType string = "cockroachdb-execute-sql"
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	Query(ctx context.Context, sql string, args ...interface{}) (pgx.Rows, error)
+}
+
+var compatibleSources = [...]string{cockroachdb.SourceType}
+
+type Config struct {
+	Name         string   `yaml:"name" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
+}
+
+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)
+	}
+
+	_, ok = rawS.(compatibleSource)
+	if !ok {
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be one of %q", resourceType, compatibleSources)
+	}
+
+	sqlParameter := parameters.NewStringParameter("sql", "The sql to execute.")
+	params := parameters.Parameters{sqlParameter}
+
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
+
+	t := Tool{
+		Config:      cfg,
+		Parameters:  params,
+		manifest:    tools.Manifest{Description: cfg.Description, Parameters: params.Manifest(), AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+	}
+	return t, nil
+}
+
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	Parameters parameters.Parameters `yaml:"parameters"`
+
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	paramsMap := params.AsMap()
+	sql, ok := paramsMap["sql"].(string)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("parameter 'sql' is required, unable to cast %v", paramsMap["sql"]), nil)
+	}
+
+	logger, err := util.LoggerFromContext(ctx)
+	if err != nil {
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
+	}
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", t.Type, sql))
+
+	results, err := source.Query(ctx, sql)
+	if err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("unable to execute query: %w", err))
+	}
+	defer results.Close()
+
+	fields := results.FieldDescriptions()
+
+	var out []any
+	for results.Next() {
+		v, err := results.Values()
+		if err != nil {
+			return nil, util.NewClientServerError("unable to parse row", http.StatusInternalServerError, err)
+		}
+		row := orderedmap.Row{}
+		for i, f := range fields {
+			row.Add(f.Name, v[i])
+		}
+		out = append(out, row)
+	}
+
+	if err := results.Err(); err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("error during row iteration: %w", err))
+	}
+
+	return out, nil
+}
+
+func (t Tool) EmbedParams(ctx context.Context, params parameters.ParamValues, models map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return params, nil
+}
+
+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(_ tools.SourceProvider) (bool, error) {
+	return false, nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/cockroachdb/cockroachdbexecutesql/cockroachdbexecutesql_test.go b/internal/tools/cockroachdb/cockroachdbexecutesql/cockroachdbexecutesql_test.go
new file mode 100644
index 0000000000..a7c8726a90
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdbexecutesql/cockroachdbexecutesql_test.go
@@ -0,0 +1,81 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdbexecutesql_test
+
+import (
+	"testing"
+
+	"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/cockroachdb/cockroachdbexecutesql"
+)
+
+func TestParseFromYamlCockroachDBExecuteSQL(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: `
+            kind: tools
+            name: execute_sql_tool
+            type: cockroachdb-execute-sql
+            source: my-crdb-instance
+            description: Execute SQL on CockroachDB
+			`,
+			want: server.ToolConfigs{
+				"execute_sql_tool": cockroachdbexecutesql.Config{
+					Name:         "execute_sql_tool",
+					Type:         "cockroachdb-execute-sql",
+					Source:       "my-crdb-instance",
+					Description:  "Execute SQL on CockroachDB",
+					AuthRequired: []string{},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestCockroachDBExecuteSQLToolConfigType(t *testing.T) {
+	cfg := cockroachdbexecutesql.Config{
+		Name:        "test-tool",
+		Type:        "cockroachdb-execute-sql",
+		Source:      "test-source",
+		Description: "test description",
+	}
+
+	if cfg.ToolConfigType() != "cockroachdb-execute-sql" {
+		t.Errorf("expected ToolConfigType 'cockroachdb-execute-sql', got %q", cfg.ToolConfigType())
+	}
+}
diff --git a/internal/tools/cockroachdb/cockroachdblistschemas/cockroachdblistschemas.go b/internal/tools/cockroachdb/cockroachdblistschemas/cockroachdblistschemas.go
new file mode 100644
index 0000000000..3d6fb880a4
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdblistschemas/cockroachdblistschemas.go
@@ -0,0 +1,181 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdblistschemas
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	yaml "github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/sources/cockroachdb"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"github.com/jackc/pgx/v5"
+)
+
+const resourceType string = "cockroachdb-list-schemas"
+
+const listSchemasStatement = `
+	SELECT
+		catalog_name,
+		schema_name,
+		crdb_is_user_defined
+	FROM information_schema.schemata
+	WHERE schema_name NOT IN ('pg_catalog', 'information_schema', 'pg_toast', 'crdb_internal', 'pg_extension')
+		AND schema_name NOT LIKE 'pg_temp_%'
+		AND schema_name NOT LIKE 'pg_toast_temp_%'
+	ORDER BY schema_name;
+`
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	Query(ctx context.Context, sql string, args ...interface{}) (pgx.Rows, error)
+}
+
+var _ compatibleSource = &cockroachdb.Source{}
+
+var compatibleSources = [...]string{cockroachdb.SourceType}
+
+type Config struct {
+	Name         string   `yaml:"name" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
+}
+
+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)
+	}
+
+	_, ok = rawS.(compatibleSource)
+	if !ok {
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be one of %q", resourceType, compatibleSources)
+	}
+
+	allParameters := parameters.Parameters{}
+	paramManifest := allParameters.Manifest()
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
+
+	t := Tool{
+		Config:      cfg,
+		AllParams:   allParameters,
+		manifest:    tools.Manifest{Description: cfg.Description, Parameters: paramManifest, AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+	}
+
+	return t, nil
+}
+
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	AllParams parameters.Parameters `yaml:"allParams"`
+
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	results, err := source.Query(ctx, listSchemasStatement)
+	if err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("unable to execute query: %w", err))
+	}
+	defer results.Close()
+
+	fields := results.FieldDescriptions()
+	var out []map[string]any
+
+	for results.Next() {
+		values, err := results.Values()
+		if err != nil {
+			return nil, util.NewClientServerError("unable to parse row", http.StatusInternalServerError, err)
+		}
+		rowMap := make(map[string]any)
+		for i, field := range fields {
+			rowMap[string(field.Name)] = values[i]
+		}
+		out = append(out, rowMap)
+	}
+
+	if err := results.Err(); err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("error reading query results: %w", err))
+	}
+
+	return out, nil
+}
+
+func (t Tool) EmbedParams(ctx context.Context, params parameters.ParamValues, models map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return params, nil
+}
+
+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(_ tools.SourceProvider) (bool, error) {
+	return false, nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cockroachdb/cockroachdblistschemas/cockroachdblistschemas_test.go b/internal/tools/cockroachdb/cockroachdblistschemas/cockroachdblistschemas_test.go
new file mode 100644
index 0000000000..260187641f
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdblistschemas/cockroachdblistschemas_test.go
@@ -0,0 +1,81 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdblistschemas_test
+
+import (
+	"testing"
+
+	"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/cockroachdb/cockroachdblistschemas"
+)
+
+func TestParseFromYamlCockroachDBListSchemas(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: `
+            kind: tools
+            name: list_schemas_tool
+            type: cockroachdb-list-schemas
+            source: my-crdb-instance
+            description: List schemas in CockroachDB
+			`,
+			want: server.ToolConfigs{
+				"list_schemas_tool": cockroachdblistschemas.Config{
+					Name:         "list_schemas_tool",
+					Type:         "cockroachdb-list-schemas",
+					Source:       "my-crdb-instance",
+					Description:  "List schemas in CockroachDB",
+					AuthRequired: []string{},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestCockroachDBListSchemasToolConfigType(t *testing.T) {
+	cfg := cockroachdblistschemas.Config{
+		Name:        "test-tool",
+		Type:        "cockroachdb-list-schemas",
+		Source:      "test-source",
+		Description: "test description",
+	}
+
+	if cfg.ToolConfigType() != "cockroachdb-list-schemas" {
+		t.Errorf("expected ToolConfigType 'cockroachdb-list-schemas', got %q", cfg.ToolConfigType())
+	}
+}
diff --git a/internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables.go b/internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables.go
new file mode 100644
index 0000000000..aa10e39258
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables.go
@@ -0,0 +1,255 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdblisttables
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	yaml "github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/sources/cockroachdb"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"github.com/jackc/pgx/v5"
+)
+
+const resourceType string = "cockroachdb-list-tables"
+
+const listTablesStatement = `
+	WITH desired_relkinds AS (
+		SELECT ARRAY['r', 'p']::char[] AS kinds
+	),
+	table_info AS (
+		SELECT
+			t.oid AS table_oid,
+			ns.nspname AS schema_name,
+			t.relname AS table_name,
+			pg_get_userbyid(t.relowner) AS table_owner,
+			obj_description(t.oid, 'pg_class') AS table_comment,
+			t.relkind AS object_kind
+		FROM
+			pg_class t
+		JOIN
+			pg_namespace ns ON ns.oid = t.relnamespace
+		CROSS JOIN desired_relkinds dk
+		WHERE
+			t.relkind = ANY(dk.kinds)
+			AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(string_to_array($1,',')))
+			AND ns.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast', 'crdb_internal', 'pg_extension')
+			AND ns.nspname NOT LIKE 'pg_temp_%' AND ns.nspname NOT LIKE 'pg_toast_temp_%'
+	),
+	columns_info AS (
+		SELECT
+			att.attrelid AS table_oid, att.attname AS column_name, format_type(att.atttypid, att.atttypmod) AS data_type,
+			att.attnum AS column_ordinal_position, att.attnotnull AS is_not_nullable,
+			pg_get_expr(ad.adbin, ad.adrelid) AS column_default, col_description(att.attrelid, att.attnum) AS column_comment
+		FROM pg_attribute att LEFT JOIN pg_attrdef ad ON att.attrelid = ad.adrelid AND att.attnum = ad.adnum
+		JOIN table_info ti ON att.attrelid = ti.table_oid WHERE att.attnum > 0 AND NOT att.attisdropped
+	),
+	constraints_info AS (
+		SELECT
+			con.conrelid AS table_oid, con.conname AS constraint_name, pg_get_constraintdef(con.oid) AS constraint_definition,
+			CASE con.contype WHEN 'p' THEN 'PRIMARY KEY' WHEN 'f' THEN 'FOREIGN KEY' WHEN 'u' THEN 'UNIQUE' WHEN 'c' THEN 'CHECK' ELSE con.contype::text END AS constraint_type,
+			(SELECT array_agg(att.attname ORDER BY u.attposition) FROM unnest(con.conkey) WITH ORDINALITY AS u(attnum, attposition) JOIN pg_attribute att ON att.attrelid = con.conrelid AND att.attnum = u.attnum) AS constraint_columns,
+			NULLIF(con.confrelid, 0)::regclass AS foreign_key_referenced_table,
+			(SELECT array_agg(att.attname ORDER BY u.attposition) FROM unnest(con.confkey) WITH ORDINALITY AS u(attnum, attposition) JOIN pg_attribute att ON att.attrelid = con.confrelid AND att.attnum = u.attnum WHERE con.contype = 'f') AS foreign_key_referenced_columns
+		FROM pg_constraint con JOIN table_info ti ON con.conrelid = ti.table_oid
+	),
+	indexes_info AS (
+		SELECT
+			idx.indrelid AS table_oid, ic.relname AS index_name, pg_get_indexdef(idx.indexrelid) AS index_definition,
+			idx.indisunique AS is_unique, idx.indisprimary AS is_primary, am.amname AS index_method,
+			(SELECT array_agg(att.attname ORDER BY u.ord) FROM unnest(idx.indkey::int[]) WITH ORDINALITY AS u(colidx, ord) LEFT JOIN pg_attribute att ON att.attrelid = idx.indrelid AND att.attnum = u.colidx WHERE u.colidx <> 0) AS index_columns
+		FROM pg_index idx JOIN pg_class ic ON ic.oid = idx.indexrelid JOIN pg_am am ON am.oid = ic.relam JOIN table_info ti ON idx.indrelid = ti.table_oid
+	)
+	SELECT
+		ti.schema_name,
+		ti.table_name AS object_name,
+		CASE
+		  WHEN $2 = 'simple' THEN
+			  json_build_object('name', ti.table_name)
+		  ELSE
+			json_build_object(
+				'schema_name', ti.schema_name,
+				'object_name', ti.table_name,
+				'object_type', CASE ti.object_kind
+								WHEN 'r' THEN 'TABLE'
+								WHEN 'p' THEN 'PARTITIONED TABLE'
+								ELSE ti.object_kind::text
+							END,
+				'owner', ti.table_owner,
+				'comment', ti.table_comment,
+				'columns', COALESCE((SELECT json_agg(json_build_object('column_name',ci.column_name,'data_type',ci.data_type,'ordinal_position',ci.column_ordinal_position,'is_not_nullable',ci.is_not_nullable,'column_default',ci.column_default,'column_comment',ci.column_comment) ORDER BY ci.column_ordinal_position) FROM columns_info ci WHERE ci.table_oid = ti.table_oid), '[]'::json),
+				'constraints', COALESCE((SELECT json_agg(json_build_object('constraint_name',cons.constraint_name,'constraint_type',cons.constraint_type,'constraint_definition',cons.constraint_definition,'constraint_columns',cons.constraint_columns,'foreign_key_referenced_table',cons.foreign_key_referenced_table,'foreign_key_referenced_columns',cons.foreign_key_referenced_columns)) FROM constraints_info cons WHERE cons.table_oid = ti.table_oid), '[]'::json),
+				'indexes', COALESCE((SELECT json_agg(json_build_object('index_name',ii.index_name,'index_definition',ii.index_definition,'is_unique',ii.is_unique,'is_primary',ii.is_primary,'index_method',ii.index_method,'index_columns',ii.index_columns)) FROM indexes_info ii WHERE ii.table_oid = ti.table_oid), '[]'::json)
+			) 
+		END AS object_details
+	FROM table_info ti ORDER BY ti.schema_name, ti.table_name;
+`
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	Query(ctx context.Context, sql string, args ...interface{}) (pgx.Rows, error)
+}
+
+var _ compatibleSource = &cockroachdb.Source{}
+
+var compatibleSources = [...]string{cockroachdb.SourceType}
+
+type Config struct {
+	Name         string   `yaml:"name" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
+}
+
+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)
+	}
+
+	_, ok = rawS.(compatibleSource)
+	if !ok {
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be one of %q", resourceType, compatibleSources)
+	}
+
+	allParameters := parameters.Parameters{
+		parameters.NewStringParameterWithDefault("table_names", "", "Optional: A comma-separated list of table names. If empty, details for all tables will be listed."),
+		parameters.NewStringParameterWithDefault("output_format", "detailed", "Optional: Use 'simple' for names only or 'detailed' for full info."),
+	}
+	paramManifest := allParameters.Manifest()
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
+
+	t := Tool{
+		Config:      cfg,
+		AllParams:   allParameters,
+		manifest:    tools.Manifest{Description: cfg.Description, Parameters: paramManifest, AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+	}
+
+	return t, nil
+}
+
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	AllParams parameters.Parameters `yaml:"allParams"`
+
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	paramsMap := params.AsMap()
+
+	tableNames, ok := paramsMap["table_names"].(string)
+	if !ok {
+		return nil, util.NewAgentError("invalid 'table_names' parameter; expected a string", nil)
+	}
+	outputFormat, _ := paramsMap["output_format"].(string)
+	if outputFormat != "simple" && outputFormat != "detailed" {
+		return nil, util.NewAgentError(fmt.Sprintf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat), nil)
+	}
+
+	results, err := source.Query(ctx, listTablesStatement, tableNames, outputFormat)
+	if err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("unable to execute query: %w", err))
+	}
+	defer results.Close()
+
+	fields := results.FieldDescriptions()
+	var out []map[string]any
+
+	for results.Next() {
+		values, err := results.Values()
+		if err != nil {
+			return nil, util.NewClientServerError("unable to parse row", http.StatusInternalServerError, err)
+		}
+		rowMap := make(map[string]any)
+		for i, field := range fields {
+			rowMap[string(field.Name)] = values[i]
+		}
+		out = append(out, rowMap)
+	}
+
+	if err := results.Err(); err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("error reading query results: %w", err))
+	}
+
+	return out, nil
+}
+
+func (t Tool) EmbedParams(ctx context.Context, params parameters.ParamValues, models map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return params, nil
+}
+
+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(_ tools.SourceProvider) (bool, error) {
+	return false, nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables_test.go b/internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables_test.go
new file mode 100644
index 0000000000..60516919b4
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdblisttables/cockroachdblisttables_test.go
@@ -0,0 +1,81 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdblisttables_test
+
+import (
+	"testing"
+
+	"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/cockroachdb/cockroachdblisttables"
+)
+
+func TestParseFromYamlCockroachDBListTables(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: `
+            kind: tools
+            name: list_tables_tool
+            type: cockroachdb-list-tables
+            source: my-crdb-instance
+            description: List tables in CockroachDB
+			`,
+			want: server.ToolConfigs{
+				"list_tables_tool": cockroachdblisttables.Config{
+					Name:         "list_tables_tool",
+					Type:         "cockroachdb-list-tables",
+					Source:       "my-crdb-instance",
+					Description:  "List tables in CockroachDB",
+					AuthRequired: []string{},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestCockroachDBListTablesToolConfigType(t *testing.T) {
+	cfg := cockroachdblisttables.Config{
+		Name:        "test-tool",
+		Type:        "cockroachdb-list-tables",
+		Source:      "test-source",
+		Description: "test description",
+	}
+
+	if cfg.ToolConfigType() != "cockroachdb-list-tables" {
+		t.Errorf("expected ToolConfigType 'cockroachdb-list-tables', got %q", cfg.ToolConfigType())
+	}
+}
diff --git a/internal/tools/cockroachdb/cockroachdbsql/cockroachdbsql.go b/internal/tools/cockroachdb/cockroachdbsql/cockroachdbsql.go
new file mode 100644
index 0000000000..a69fd4b8b2
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdbsql/cockroachdbsql.go
@@ -0,0 +1,186 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdbsql
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	yaml "github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/sources/cockroachdb"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/orderedmap"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+	"github.com/jackc/pgx/v5"
+)
+
+const resourceType string = "cockroachdb-sql"
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	Query(ctx context.Context, sql string, args ...interface{}) (pgx.Rows, error)
+}
+
+var _ compatibleSource = &cockroachdb.Source{}
+
+var compatibleSources = [...]string{cockroachdb.SourceType}
+
+type Config struct {
+	Name               string                `yaml:"name" validate:"required"`
+	Type               string                `yaml:"type" 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         parameters.Parameters `yaml:"parameters"`
+	TemplateParameters parameters.Parameters `yaml:"templateParameters"`
+}
+
+var _ tools.ToolConfig = Config{}
+
+func (cfg Config) ToolConfigType() string {
+	return resourceType
+}
+
+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)
+	}
+
+	_, ok = rawS.(compatibleSource)
+	if !ok {
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be one of %q", resourceType, compatibleSources)
+	}
+
+	allParameters, paramManifest, err := parameters.ProcessParameters(cfg.TemplateParameters, cfg.Parameters)
+	if err != nil {
+		return nil, err
+	}
+
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
+
+	t := Tool{
+		Config:      cfg,
+		AllParams:   allParameters,
+		manifest:    tools.Manifest{Description: cfg.Description, Parameters: paramManifest, AuthRequired: cfg.AuthRequired},
+		mcpManifest: mcpManifest,
+	}
+	return t, nil
+}
+
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	AllParams parameters.Parameters `yaml:"allParams"`
+
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	paramsMap := params.AsMap()
+	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
+	if err != nil {
+		return nil, util.NewAgentError(fmt.Sprintf("unable to resolve template params: %v", err), err)
+	}
+
+	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
+	if err != nil {
+		return nil, util.NewAgentError(fmt.Sprintf("unable to extract standard params: %v", err), err)
+	}
+	sliceParams := newParams.AsSlice()
+	results, err := source.Query(ctx, newStatement, sliceParams...)
+	if err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("unable to execute query: %w", err))
+	}
+	defer results.Close()
+
+	fields := results.FieldDescriptions()
+
+	var out []any
+	for results.Next() {
+		v, err := results.Values()
+		if err != nil {
+			return nil, util.NewClientServerError("unable to parse row", http.StatusInternalServerError, err)
+		}
+		row := orderedmap.Row{}
+		for i, f := range fields {
+			row.Add(f.Name, v[i])
+		}
+		out = append(out, row)
+	}
+
+	if err := results.Err(); err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("unable to execute query: %w", err))
+	}
+
+	return out, nil
+}
+
+func (t Tool) EmbedParams(ctx context.Context, params parameters.ParamValues, models map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return params, nil
+}
+
+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(_ tools.SourceProvider) (bool, error) {
+	return false, nil
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	return "Authorization", nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/cockroachdb/cockroachdbsql/cockroachdbsql_test.go b/internal/tools/cockroachdb/cockroachdbsql/cockroachdbsql_test.go
new file mode 100644
index 0000000000..1cca50a280
--- /dev/null
+++ b/internal/tools/cockroachdb/cockroachdbsql/cockroachdbsql_test.go
@@ -0,0 +1,93 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdbsql_test
+
+import (
+	"testing"
+
+	"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/cockroachdb/cockroachdbsql"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+)
+
+func TestParseFromYamlCockroachDB(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: `
+            kind: tools
+            name: example_tool
+            type: cockroachdb-sql
+            source: my-crdb-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: user_id
+                  type: string
+                  description: user id parameter
+			`,
+			want: server.ToolConfigs{
+				"example_tool": cockroachdbsql.Config{
+					Name:         "example_tool",
+					Type:         "cockroachdb-sql",
+					Source:       "my-crdb-instance",
+					Description:  "some description",
+					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
+					AuthRequired: []string{},
+					Parameters: []parameters.Parameter{
+						parameters.NewStringParameter("user_id", "user id parameter"),
+					},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+}
+
+func TestCockroachDBSQLToolConfigType(t *testing.T) {
+	cfg := cockroachdbsql.Config{
+		Name:        "test-tool",
+		Type:        "cockroachdb-sql",
+		Source:      "test-source",
+		Description: "test description",
+		Statement:   "SELECT 1",
+	}
+
+	if cfg.ToolConfigType() != "cockroachdb-sql" {
+		t.Errorf("expected ToolConfigType 'cockroachdb-sql', got %q", cfg.ToolConfigType())
+	}
+}
diff --git a/internal/tools/couchbase/couchbase.go b/internal/tools/couchbase/couchbase.go
index a43c85f506..439d7cb053 100644
--- a/internal/tools/couchbase/couchbase.go
+++ b/internal/tools/couchbase/couchbase.go
@@ -17,20 +17,22 @@ package couchbase
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/couchbase/gocb/v2"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "couchbase-sql"
+const resourceType string = "couchbase-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -58,11 +60,10 @@ type Config struct {
 	TemplateParameters parameters.Parameters `yaml:"templateParameters"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -72,7 +73,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
-	// finish tool setup
 	t := Tool{
 		Config:      cfg,
 		AllParams:   allParameters,
@@ -82,7 +82,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -96,27 +95,28 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	namedParamsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, namedParamsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, namedParamsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
-	return source.RunSQL(newStatement, newParams)
-}
 
-func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claimsMap)
+	resp, err := source.RunSQL(newStatement, newParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -142,3 +142,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/couchbase/couchbase_test.go b/internal/tools/couchbase/couchbase_test.go
index 6f8f2bc459..554c871c0d 100644
--- a/internal/tools/couchbase/couchbase_test.go
+++ b/internal/tools/couchbase/couchbase_test.go
@@ -20,73 +20,12 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/couchbase"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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 TestParseFromYamlCouchbase(t *testing.T) {
-	tcs := []struct {
-		desc string
-		in   string
-		want server.ToolConfigs
-	}{
-		{
-			desc: "basic example",
-			in: `
-			tools:
-				example_tool:
-					kind: couchbase-sql
-					source: my-couchbase-instance
-					description: some tool description
-					statement: |
-						select * from hotel WHERE name = $hotel;
-					parameters:
-						- name: hotel
-						  type: string
-						  description: hotel parameter description
-			`,
-			want: server.ToolConfigs{
-				"example_tool": couchbase.Config{
-					Name:         "example_tool",
-					Kind:         "couchbase-sql",
-					AuthRequired: []string{},
-					Source:       "my-couchbase-instance",
-					Description:  "some tool description",
-					Statement:    "select * from hotel WHERE name = $hotel;\n",
-					Parameters: []parameters.Parameter{
-						parameters.NewStringParameter("hotel", "hotel parameter description"),
-					},
-				},
-			},
-		},
-	}
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
-
-			// Create a context with a logger
-			ctx, err := testutils.ContextWithNewLogger()
-			if err != nil {
-				t.Fatalf("unable to create context with logger: %s", err)
-			}
-
-			// Parse contents with context
-			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 TestParseFromYamlWithTemplateMssql(t *testing.T) {
+func TestParseFromYaml(t *testing.T) {
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -99,26 +38,55 @@ func TestParseFromYamlWithTemplateMssql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: couchbase-sql
-					source: my-couchbase-instance
-					description: some tool description
-					statement: |
-						select * from {{.tableName}} WHERE name = $hotel;
-					parameters:
-						- name: hotel
-						  type: string
-						  description: hotel parameter description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
+			kind: tools
+			name: example_tool
+			type: couchbase-sql
+			source: my-couchbase-instance
+			description: some tool description
+			statement: |
+				select * from hotel WHERE name = $hotel;
+			parameters:
+				- name: hotel
+				  type: string
+				  description: hotel parameter description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": couchbase.Config{
 					Name:         "example_tool",
-					Kind:         "couchbase-sql",
+					Type:         "couchbase-sql",
+					AuthRequired: []string{},
+					Source:       "my-couchbase-instance",
+					Description:  "some tool description",
+					Statement:    "select * from hotel WHERE name = $hotel;\n",
+					Parameters: []parameters.Parameter{
+						parameters.NewStringParameter("hotel", "hotel parameter description"),
+					},
+				},
+			},
+		},
+		{
+			desc: "with template",
+			in: `
+			kind: tools
+			name: example_tool
+			type: couchbase-sql
+			source: my-couchbase-instance
+			description: some tool description
+			statement: |
+				select * from {{.tableName}} WHERE name = $hotel;
+			parameters:
+				- name: hotel
+				  type: string
+				  description: hotel parameter description
+			templateParameters:
+				- name: tableName
+				  type: string
+				  description: The table to select hotels from.
+			`,
+			want: server.ToolConfigs{
+				"example_tool": couchbase.Config{
+					Name:         "example_tool",
+					Type:         "couchbase-sql",
 					AuthRequired: []string{},
 					Source:       "my-couchbase-instance",
 					Description:  "some tool description",
@@ -135,15 +103,11 @@ func TestParseFromYamlWithTemplateMssql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal.go b/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal.go
index 7ab1036991..6f8bc383d1 100644
--- a/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal.go
+++ b/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal.go
@@ -24,14 +24,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "dataform-compile-local"
+const resourceType string = "dataform-compile-local"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -45,15 +46,15 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -86,27 +87,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
 	paramsMap := params.AsMap()
 
 	projectDir, ok := paramsMap["project_dir"].(string)
 	if !ok || projectDir == "" {
-		return nil, fmt.Errorf("error casting 'project_dir' to string or invalid value")
+		return nil, util.NewAgentError("error casting 'project_dir' to string or invalid value", nil)
 	}
 
 	cmd := exec.CommandContext(ctx, "dataform", "compile", projectDir, "--json")
 	output, err := cmd.CombinedOutput()
 	if err != nil {
-		return nil, fmt.Errorf("error executing dataform compile: %w\nOutput: %s", err, string(output))
+		// Compilation failures are considered AgentErrors (invalid user code/project)
+		return nil, util.NewAgentError(fmt.Sprintf("error executing dataform compile: %v\nOutput: %s", err, string(output)), err)
 	}
 
 	return strings.TrimSpace(string(output)), nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -130,3 +128,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal_test.go b/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal_test.go
index 40b85f0363..89cb950aea 100644
--- a/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal_test.go
+++ b/internal/tools/dataform/dataformcompilelocal/dataformcompilelocal_test.go
@@ -17,7 +17,6 @@ package dataformcompilelocal_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"
@@ -37,15 +36,15 @@ func TestParseFromYamlDataformCompile(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: dataform-compile-local
-					description: some description
+			kind: tools
+			name: example_tool
+			type: dataform-compile-local
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": dataformcompilelocal.Config{
 					Name:         "example_tool",
-					Kind:         "dataform-compile-local",
+					Type:         "dataform-compile-local",
 					Description:  "some description",
 					AuthRequired: []string{},
 				},
@@ -54,15 +53,11 @@ func TestParseFromYamlDataformCompile(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry.go b/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry.go
index 3fed4ef0cc..3cbf3fa7ea 100644
--- a/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry.go
+++ b/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry.go
@@ -17,20 +17,22 @@ package dataplexlookupentry
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	dataplexpb "cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "dataplex-lookup-entry"
+const resourceType string = "dataplex-lookup-entry"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description"`
 	AuthRequired []string              `yaml:"authRequired"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,10 +112,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
@@ -122,15 +124,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	view, _ := paramsMap["view"].(int)
 	aspectTypeSlice, err := parameters.ConvertAnySliceToTyped(paramsMap["aspectTypes"].([]any), "string")
 	if err != nil {
-		return nil, fmt.Errorf("can't convert aspectTypes to array of strings: %s", err)
+		return nil, util.NewAgentError(fmt.Sprintf("can't convert aspectTypes to array of strings: %s", err), err)
 	}
 	aspectTypes := aspectTypeSlice.([]string)
-	return source.LookupEntry(ctx, name, view, aspectTypes, entry)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	// Parse parameters from the provided data
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.LookupEntry(ctx, name, view, aspectTypes, entry)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -158,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry_test.go b/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry_test.go
index 8c3d5942c2..514125d512 100644
--- a/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry_test.go
+++ b/internal/tools/dataplex/dataplexlookupentry/dataplexlookupentry_test.go
@@ -17,7 +17,6 @@ package dataplexlookupentry_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"
@@ -38,16 +37,16 @@ func TestParseFromYamlDataplexLookupEntry(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: dataplex-lookup-entry
-					source: my-instance
-					description: some description
-			`,
+            kind: tools
+            name: example_tool
+            type: dataplex-lookup-entry
+            source: my-instance
+            description: some description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": dataplexlookupentry.Config{
 					Name:         "example_tool",
-					Kind:         "dataplex-lookup-entry",
+					Type:         "dataplex-lookup-entry",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,34 +56,34 @@ func TestParseFromYamlDataplexLookupEntry(t *testing.T) {
 		{
 			desc: "advanced example",
 			in: `
-			tools:
-				example_tool:
-					kind: dataplex-lookup-entry
-					source: my-instance
-					description: some description
-					parameters:
-						- name: name
-							type: string
-							description: some name description
-						- name: view
-							type: string
-							description: some view description
-						- name: aspectTypes
-							type: array
-							description: some aspect types description
-							default: []
-							items: 
-								name: aspectType
-								type: string
-								description: some aspect type description
-						- name: entry
-							type: string
-							description: some entry description
-			`,
+            kind: tools
+            name: example_tool
+            type: dataplex-lookup-entry
+            source: my-instance
+            description: some description
+            parameters:
+                - name: name
+                  type: string
+                  description: some name description
+                - name: view
+                  type: string
+                  description: some view description
+                - name: aspectTypes
+                  type: array
+                  description: some aspect types description
+                  default: []
+                  items: 
+                    name: aspectType
+                    type: string
+                    description: some aspect type description
+                - name: entry
+                  type: string
+                  description: some entry description
+            `,
 			want: server.ToolConfigs{
 				"example_tool": dataplexlookupentry.Config{
 					Name:         "example_tool",
-					Kind:         "dataplex-lookup-entry",
+					Type:         "dataplex-lookup-entry",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -100,18 +99,14 @@ func TestParseFromYamlDataplexLookupEntry(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
 	}
-
 }
diff --git a/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes.go b/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes.go
index 214f7396e1..7489d1a1cc 100644
--- a/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes.go
+++ b/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes.go
@@ -17,20 +17,22 @@ package dataplexsearchaspecttypes
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "dataplex-search-aspect-types"
+const resourceType string = "dataplex-search-aspect-types"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -57,8 +59,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,21 +95,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
-	query, _ := paramsMap["query"].(string)
-	pageSize, _ := paramsMap["pageSize"].(int)
-	orderBy, _ := paramsMap["orderBy"].(string)
-	return source.SearchAspectTypes(ctx, query, pageSize, orderBy)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	// Parse parameters from the provided data
-	return parameters.ParseParams(t.Parameters, data, claims)
+	query, ok := paramsMap["query"].(string)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'query' parameter: %v", paramsMap["query"]), nil)
+	}
+	pageSize, ok := paramsMap["pageSize"].(int)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'pageSize' parameter: %v", paramsMap["pageSize"]), nil)
+	}
+	orderBy, ok := paramsMap["orderBy"].(string)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'orderBy' parameter: %v", paramsMap["orderBy"]), nil)
+	}
+	resp, err := source.SearchAspectTypes(ctx, query, pageSize, orderBy)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -135,3 +145,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes_test.go b/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes_test.go
index 963091b03d..cb081ca45f 100644
--- a/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes_test.go
+++ b/internal/tools/dataplex/dataplexsearchaspecttypes/dataplexsearchaspecttypes_test.go
@@ -17,7 +17,6 @@ package dataplexsearchaspecttypes_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlDataplexSearchAspectTypes(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: dataplex-search-aspect-types
-					source: my-instance
-					description: some description
-			`,
+		            kind: tools
+		            name: example_tool
+		            type: dataplex-search-aspect-types
+		            source: my-instance
+		            description: some description
+		            `,
 			want: server.ToolConfigs{
 				"example_tool": dataplexsearchaspecttypes.Config{
 					Name:         "example_tool",
-					Kind:         "dataplex-search-aspect-types",
+					Type:         "dataplex-search-aspect-types",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,18 +55,14 @@ func TestParseFromYamlDataplexSearchAspectTypes(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
 	}
-
 }
diff --git a/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries.go b/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries.go
index 7180848a4b..230ef8356b 100644
--- a/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries.go
+++ b/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries.go
@@ -17,20 +17,22 @@ package dataplexsearchentries
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"cloud.google.com/go/dataplex/apiv1/dataplexpb"
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "dataplex-search-entries"
+const resourceType string = "dataplex-search-entries"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -57,8 +59,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,21 +95,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
-	query, _ := paramsMap["query"].(string)
-	pageSize, _ := paramsMap["pageSize"].(int)
-	orderBy, _ := paramsMap["orderBy"].(string)
-	return source.SearchEntries(ctx, query, pageSize, orderBy)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	// Parse parameters from the provided data
-	return parameters.ParseParams(t.Parameters, data, claims)
+	query, ok := paramsMap["query"].(string)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'query' parameter: %v", paramsMap["query"]), nil)
+	}
+	pageSize, ok := paramsMap["pageSize"].(int)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'pageSize' parameter: %v", paramsMap["pageSize"]), nil)
+	}
+	orderBy, ok := paramsMap["orderBy"].(string)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("error casting 'orderBy' parameter: %v", paramsMap["orderBy"]), nil)
+	}
+	resp, err := source.SearchEntries(ctx, query, pageSize, orderBy)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -134,3 +144,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries_test.go b/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries_test.go
index f916c82f74..e8b80883ac 100644
--- a/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries_test.go
+++ b/internal/tools/dataplex/dataplexsearchentries/dataplexsearchentries_test.go
@@ -17,7 +17,6 @@ package dataplexsearchentries_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlDataplexSearchEntries(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: dataplex-search-entries
-					source: my-instance
-					description: some description
-			`,
+		            kind: tools
+		            name: example_tool
+		            type: dataplex-search-entries
+		            source: my-instance
+		            description: some description
+		            `,
 			want: server.ToolConfigs{
 				"example_tool": dataplexsearchentries.Config{
 					Name:         "example_tool",
-					Kind:         "dataplex-search-entries",
+					Type:         "dataplex-search-entries",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,18 +55,14 @@ func TestParseFromYamlDataplexSearchEntries(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
 	}
-
 }
diff --git a/internal/tools/dgraph/dgraph.go b/internal/tools/dgraph/dgraph.go
index 7d56baadd9..fb4d76f1e1 100644
--- a/internal/tools/dgraph/dgraph.go
+++ b/internal/tools/dgraph/dgraph.go
@@ -17,20 +17,22 @@ package dgraph
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/sources/dgraph"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "dgraph-dql"
+const resourceType string = "dgraph-dql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	Statement    string                `yaml:"statement" validate:"required"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -91,16 +93,16 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
-	return source.RunSQL(t.Statement, params, t.IsQuery, t.Timeout)
-}
-
-func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claimsMap)
+	resp, err := source.RunSQL(t.Statement, params, t.IsQuery, t.Timeout)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -126,3 +128,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/dgraph/dgraph_test.go b/internal/tools/dgraph/dgraph_test.go
index cb4f672ff3..08ea32e2e4 100644
--- a/internal/tools/dgraph/dgraph_test.go
+++ b/internal/tools/dgraph/dgraph_test.go
@@ -17,7 +17,6 @@ package dgraph_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"
@@ -37,20 +36,20 @@ func TestParseFromYamlDgraph(t *testing.T) {
 		{
 			desc: "basic query example",
 			in: `
-			tools:
-				example_tool:
-					kind: dgraph-dql
-					source: my-dgraph-instance
-					description: some tool description
-					isQuery: true
-					timeout: 20s
-					statement: |
-						    query {q(func: eq(email, "example@email.com")) {email}}
+			kind: tools
+			name: example_tool
+			type: dgraph-dql
+			source: my-dgraph-instance
+			description: some tool description
+			isQuery: true
+			timeout: 20s
+			statement: |
+				    query {q(func: eq(email, "example@email.com")) {email}}
 			`,
 			want: server.ToolConfigs{
 				"example_tool": dgraph.Config{
 					Name:         "example_tool",
-					Kind:         "dgraph-dql",
+					Type:         "dgraph-dql",
 					Source:       "my-dgraph-instance",
 					AuthRequired: []string{},
 					Description:  "some tool description",
@@ -63,18 +62,18 @@ func TestParseFromYamlDgraph(t *testing.T) {
 		{
 			desc: "basic mutation example",
 			in: `
-			tools:
-				example_tool:
-					kind: dgraph-dql
-					source: my-dgraph-instance
-					description: some tool description
-					statement: |
-					  mutation {set { _:a <name> "a@email.com" . _:b <email> "b@email.com" .}}
+			kind: tools
+			name: example_tool
+			type: dgraph-dql
+			source: my-dgraph-instance
+			description: some tool description
+			statement: |
+			  mutation {set { _:a <name> "a@email.com" . _:b <email> "b@email.com" .}}
 			`,
 			want: server.ToolConfigs{
 				"example_tool": dgraph.Config{
 					Name:         "example_tool",
-					Kind:         "dgraph-dql",
+					Type:         "dgraph-dql",
 					Source:       "my-dgraph-instance",
 					Description:  "some tool description",
 					AuthRequired: []string{},
@@ -85,15 +84,11 @@ func TestParseFromYamlDgraph(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql.go b/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql.go
index 0e13013635..3cf828d30e 100644
--- a/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql.go
+++ b/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql.go
@@ -17,9 +17,11 @@ package elasticsearchesql
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"time"
 
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
 	"github.com/goccy/go-yaml"
@@ -28,11 +30,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const kind string = "elasticsearch-esql"
+const resourceType string = "elasticsearch-esql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -43,7 +45,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	AuthRequired []string              `yaml:"authRequired" validate:"required"`
@@ -55,8 +57,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (c Config) ToolConfigKind() string {
-	return kind
+func (c Config) ToolConfigType() string {
+	return resourceType
 }
 
 func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.ToolConfig, error) {
@@ -89,10 +91,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	var cancel context.CancelFunc
@@ -119,15 +121,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	for _, param := range t.Parameters {
 		if param.GetType() == "array" {
-			return nil, fmt.Errorf("array parameters are not supported yet")
+			return nil, util.NewAgentError("array parameters are not supported yet", nil)
 		}
 		sqlParams = append(sqlParams, map[string]any{param.GetName(): paramMap[param.GetName()]})
 	}
-	return source.RunSQL(ctx, t.Format, query, sqlParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, t.Format, query, sqlParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -153,3 +155,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql_test.go b/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql_test.go
index ec65d2842a..aca93acdb4 100644
--- a/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql_test.go
+++ b/internal/tools/elasticsearch/elasticsearchesql/elasticsearchesql_test.go
@@ -17,7 +17,6 @@ package elasticsearchesql
 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/testutils"
@@ -37,19 +36,19 @@ func TestParseFromYamlElasticsearchEsql(t *testing.T) {
 		{
 			desc: "basic search example",
 			in: `
-		tools:
-			example_tool:
-				kind: elasticsearch-esql
-				source: my-elasticsearch-instance
-				description: Elasticsearch ES|QL tool
-				query: |
-				  FROM my-index
-				  | KEEP first_name, last_name
+            kind: tools
+            name: example_tool
+            type: elasticsearch-esql
+            source: my-elasticsearch-instance
+            description: Elasticsearch ES|QL tool
+            query: |
+                FROM my-index
+                | KEEP first_name, last_name
 		`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "elasticsearch-esql",
+					Type:         "elasticsearch-esql",
 					Source:       "my-elasticsearch-instance",
 					Description:  "Elasticsearch ES|QL tool",
 					AuthRequired: []string{},
@@ -60,23 +59,23 @@ func TestParseFromYamlElasticsearchEsql(t *testing.T) {
 		{
 			desc: "search with customizable limit parameter",
 			in: `
-			tools:
-				example_tool:
-					kind: elasticsearch-esql
-					source: my-elasticsearch-instance
-					description: Elasticsearch ES|QL tool with customizable limit
-					parameters:
-						- name: limit
-						  type: integer
-						  description: Limit the number of results
-					query: |
-					  FROM my-index
-					  | LIMIT ?limit
+            kind: tools
+            name: example_tool
+            type: elasticsearch-esql
+            source: my-elasticsearch-instance
+            description: Elasticsearch ES|QL tool with customizable limit
+            parameters:
+                - name: limit
+                  type: integer
+                  description: Limit the number of results
+            query: |
+                FROM my-index
+                | LIMIT ?limit
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "elasticsearch-esql",
+					Type:         "elasticsearch-esql",
 					Source:       "my-elasticsearch-instance",
 					Description:  "Elasticsearch ES|QL tool with customizable limit",
 					AuthRequired: []string{},
@@ -91,15 +90,12 @@ func TestParseFromYamlElasticsearchEsql(t *testing.T) {
 
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql.go b/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql.go
index fa5e414f63..b1d97f1235 100644
--- a/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql.go
+++ b/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firebird-execute-sql"
+const resourceType string = "firebird-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +59,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -90,29 +91,30 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
+	sqlStr, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast parameter 'sql' to string: %v", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, sql, nil)
-}
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -138,3 +140,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql_test.go b/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql_test.go
index a2f8f02355..b91e68eb19 100644
--- a/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql_test.go
+++ b/internal/tools/firebird/firebirdexecutesql/firebirdexecutesql_test.go
@@ -17,7 +17,6 @@ package firebirdexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: firebird-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: firebird-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": firebirdexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "firebird-execute-sql",
+					Type:         "firebird-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/firebird/firebirdsql/firebirdsql.go b/internal/tools/firebird/firebirdsql/firebirdsql.go
index aad9b54aa5..fbadc1c2a1 100644
--- a/internal/tools/firebird/firebirdsql/firebirdsql.go
+++ b/internal/tools/firebird/firebirdsql/firebirdsql.go
@@ -18,20 +18,22 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firebird-sql"
+const resourceType string = "firebird-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -98,21 +100,21 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	statement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params: %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params: %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	namedArgs := make([]any, 0, len(newParams))
@@ -127,11 +129,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			namedArgs = append(namedArgs, value)
 		}
 	}
-	return source.RunSQL(ctx, statement, namedArgs)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, statement, namedArgs)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -157,3 +160,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/firebird/firebirdsql/firebirdsql_test.go b/internal/tools/firebird/firebirdsql/firebirdsql_test.go
index 5530699035..e329d237ac 100644
--- a/internal/tools/firebird/firebirdsql/firebirdsql_test.go
+++ b/internal/tools/firebird/firebirdsql/firebirdsql_test.go
@@ -17,7 +17,6 @@ package firebirdsql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlFirebird(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: firebird-sql
-					source: my-fdb-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: firebird-sql
+            source: my-fdb-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": firebirdsql.Config{
 					Name:         "example_tool",
-					Kind:         "firebird-sql",
+					Type:         "firebird-sql",
 					Source:       "my-fdb-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -77,15 +76,12 @@ func TestParseFromYamlFirebird(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -106,33 +102,33 @@ func TestParseFromYamlWithTemplateParamsFirebird(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: firebird-sql
-					source: my-fdb-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: name
-						  type: string
-						  description: some description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: firebird-sql
+            source: my-fdb-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: name
+                  type: string
+                  description: some description
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": firebirdsql.Config{
 					Name:         "example_tool",
-					Kind:         "firebird-sql",
+					Type:         "firebird-sql",
 					Source:       "my-fdb-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -150,15 +146,12 @@ func TestParseFromYamlWithTemplateParamsFirebird(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments.go b/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments.go
index 2878116045..893948983d 100644
--- a/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments.go
+++ b/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments.go
@@ -17,24 +17,26 @@ package firestoreadddocuments
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	firestoreapi "cloud.google.com/go/firestore"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firestore-add-documents"
+const resourceType string = "firestore-add-documents"
 const collectionPathKey string = "collectionPath"
 const documentDataKey string = "documentData"
 const returnDocumentDataKey string = "returnData"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -128,32 +130,32 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	// Get collection path
 	collectionPath, ok := mapParams[collectionPathKey].(string)
 	if !ok || collectionPath == "" {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter", collectionPathKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter", collectionPathKey), nil)
 	}
 	// Validate collection path
-	if err := util.ValidateCollectionPath(collectionPath); err != nil {
-		return nil, fmt.Errorf("invalid collection path: %w", err)
+	if err := fsUtil.ValidateCollectionPath(collectionPath); err != nil {
+		return nil, util.NewAgentError(fmt.Sprintf("invalid collection path: %v", err), err)
 	}
 	// Get document data
 	documentDataRaw, ok := mapParams[documentDataKey]
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter", documentDataKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter", documentDataKey), nil)
 	}
 	// Convert the document data from JSON format to Firestore format
 	// The client is passed to handle referenceValue types
-	documentData, err := util.JSONToFirestoreValue(documentDataRaw, source.FirestoreClient())
+	documentData, err := fsUtil.JSONToFirestoreValue(documentDataRaw, source.FirestoreClient())
 	if err != nil {
-		return nil, fmt.Errorf("failed to convert document data: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("failed to convert document data: %v", err), err)
 	}
 
 	// Get return document data flag
@@ -161,11 +163,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if val, ok := mapParams[returnDocumentDataKey].(bool); ok {
 		returnData = val
 	}
-	return source.AddDocuments(ctx, collectionPath, documentData, returnData)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.AddDocuments(ctx, collectionPath, documentData, returnData)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -191,3 +193,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments_test.go b/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments_test.go
index 5e743714f1..62ad017c7d 100644
--- a/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments_test.go
+++ b/internal/tools/firestore/firestoreadddocuments/firestoreadddocuments_test.go
@@ -17,7 +17,6 @@ package firestoreadddocuments_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreAddDocuments(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				add_docs_tool:
-					kind: firestore-add-documents
-					source: my-firestore-instance
-					description: Add documents to Firestore collections
+			kind: tools
+			name: add_docs_tool
+			type: firestore-add-documents
+			source: my-firestore-instance
+			description: Add documents to Firestore collections
 			`,
 			want: server.ToolConfigs{
 				"add_docs_tool": firestoreadddocuments.Config{
 					Name:         "add_docs_tool",
-					Kind:         "firestore-add-documents",
+					Type:         "firestore-add-documents",
 					Source:       "my-firestore-instance",
 					Description:  "Add documents to Firestore collections",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreAddDocuments(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_add_docs:
-					kind: firestore-add-documents
-					source: prod-firestore
-					description: Add documents with authentication
-					authRequired:
-						- google-auth-service
-						- api-key-service
+			kind: tools
+			name: secure_add_docs
+			type: firestore-add-documents
+			source: prod-firestore
+			description: Add documents with authentication
+			authRequired:
+				- google-auth-service
+				- api-key-service
 			`,
 			want: server.ToolConfigs{
 				"secure_add_docs": firestoreadddocuments.Config{
 					Name:         "secure_add_docs",
-					Kind:         "firestore-add-documents",
+					Type:         "firestore-add-documents",
 					Source:       "prod-firestore",
 					Description:  "Add documents with authentication",
 					AuthRequired: []string{"google-auth-service", "api-key-service"},
@@ -78,15 +77,11 @@ func TestParseFromYamlFirestoreAddDocuments(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +94,57 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		add_user_docs:
-			kind: firestore-add-documents
-			source: users-firestore
-			description: Add user documents
-			authRequired:
-				- user-auth
-		add_product_docs:
-			kind: firestore-add-documents
-			source: products-firestore
-			description: Add product documents
-		add_order_docs:
-			kind: firestore-add-documents
-			source: orders-firestore
-			description: Add order documents
-			authRequired:
-				- user-auth
-				- admin-auth
+	kind: tools
+	name: add_user_docs
+	type: firestore-add-documents
+	source: users-firestore
+	description: Add user documents
+	authRequired:
+		- user-auth
+---
+	kind: tools
+	name: add_product_docs
+	type: firestore-add-documents
+	source: products-firestore
+	description: Add product documents
+---
+	kind: tools
+	name: add_order_docs
+	type: firestore-add-documents
+	source: orders-firestore
+	description: Add order documents
+	authRequired:
+		- user-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"add_user_docs": firestoreadddocuments.Config{
 			Name:         "add_user_docs",
-			Kind:         "firestore-add-documents",
+			Type:         "firestore-add-documents",
 			Source:       "users-firestore",
 			Description:  "Add user documents",
 			AuthRequired: []string{"user-auth"},
 		},
 		"add_product_docs": firestoreadddocuments.Config{
 			Name:         "add_product_docs",
-			Kind:         "firestore-add-documents",
+			Type:         "firestore-add-documents",
 			Source:       "products-firestore",
 			Description:  "Add product documents",
 			AuthRequired: []string{},
 		},
 		"add_order_docs": firestoreadddocuments.Config{
 			Name:         "add_order_docs",
-			Kind:         "firestore-add-documents",
+			Type:         "firestore-add-documents",
 			Source:       "orders-firestore",
 			Description:  "Add order documents",
 			AuthRequired: []string{"user-auth", "admin-auth"},
 		},
 	}
-
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments.go b/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments.go
index f92780d616..22bdf47e5a 100644
--- a/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments.go
+++ b/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments.go
@@ -17,22 +17,24 @@ package firestoredeletedocuments
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	firestoreapi "cloud.google.com/go/firestore"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firestore-delete-documents"
+const resourceType string = "firestore-delete-documents"
 const documentPathsKey string = "documentPaths"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,43 +96,43 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	documentPathsRaw, ok := mapParams[documentPathsKey].([]any)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected an array", documentPathsKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected an array", documentPathsKey), nil)
 	}
 	if len(documentPathsRaw) == 0 {
-		return nil, fmt.Errorf("'%s' parameter cannot be empty", documentPathsKey)
+		return nil, util.NewAgentError(fmt.Sprintf("'%s' parameter cannot be empty", documentPathsKey), nil)
 	}
 
 	// Use ConvertAnySliceToTyped to convert the slice
 	typedSlice, err := parameters.ConvertAnySliceToTyped(documentPathsRaw, "string")
 	if err != nil {
-		return nil, fmt.Errorf("failed to convert document paths: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("failed to convert document paths: %v", err), err)
 	}
 
 	documentPaths, ok := typedSlice.([]string)
 	if !ok {
-		return nil, fmt.Errorf("unexpected type conversion error for document paths")
+		return nil, util.NewAgentError("unexpected type conversion error for document paths", nil)
 	}
 
 	// Validate each document path
 	for i, path := range documentPaths {
-		if err := util.ValidateDocumentPath(path); err != nil {
-			return nil, fmt.Errorf("invalid document path at index %d: %w", i, err)
+		if err := fsUtil.ValidateDocumentPath(path); err != nil {
+			return nil, util.NewAgentError(fmt.Sprintf("invalid document path at index %d: %v", i, err), err)
 		}
 	}
-	return source.DeleteDocuments(ctx, documentPaths)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.DeleteDocuments(ctx, documentPaths)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -156,3 +158,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments_test.go b/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments_test.go
index 15cfce822c..fe02e2d6c2 100644
--- a/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments_test.go
+++ b/internal/tools/firestore/firestoredeletedocuments/firestoredeletedocuments_test.go
@@ -17,7 +17,6 @@ package firestoredeletedocuments_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreDeleteDocuments(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				delete_docs_tool:
-					kind: firestore-delete-documents
-					source: my-firestore-instance
-					description: Delete documents from Firestore by paths
+			kind: tools
+			name: delete_docs_tool
+			type: firestore-delete-documents
+			source: my-firestore-instance
+			description: Delete documents from Firestore by paths
 			`,
 			want: server.ToolConfigs{
 				"delete_docs_tool": firestoredeletedocuments.Config{
 					Name:         "delete_docs_tool",
-					Kind:         "firestore-delete-documents",
+					Type:         "firestore-delete-documents",
 					Source:       "my-firestore-instance",
 					Description:  "Delete documents from Firestore by paths",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreDeleteDocuments(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_delete_docs:
-					kind: firestore-delete-documents
-					source: prod-firestore
-					description: Delete documents with authentication
-					authRequired:
-						- google-auth-service
-						- api-key-service
+			kind: tools
+			name: secure_delete_docs
+			type: firestore-delete-documents
+			source: prod-firestore
+			description: Delete documents with authentication
+			authRequired:
+				- google-auth-service
+				- api-key-service
 			`,
 			want: server.ToolConfigs{
 				"secure_delete_docs": firestoredeletedocuments.Config{
 					Name:         "secure_delete_docs",
-					Kind:         "firestore-delete-documents",
+					Type:         "firestore-delete-documents",
 					Source:       "prod-firestore",
 					Description:  "Delete documents with authentication",
 					AuthRequired: []string{"google-auth-service", "api-key-service"},
@@ -78,15 +77,11 @@ func TestParseFromYamlFirestoreDeleteDocuments(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +94,58 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		delete_user_docs:
-			kind: firestore-delete-documents
-			source: users-firestore
-			description: Delete user documents
-			authRequired:
-				- user-auth
-		delete_product_docs:
-			kind: firestore-delete-documents
-			source: products-firestore
-			description: Delete product documents
-		delete_order_docs:
-			kind: firestore-delete-documents
-			source: orders-firestore
-			description: Delete order documents
-			authRequired:
-				- user-auth
-				- admin-auth
+	kind: tools
+	name: delete_user_docs
+	type: firestore-delete-documents
+	source: users-firestore
+	description: Delete user documents
+	authRequired:
+		- user-auth
+---
+	kind: tools
+	name: delete_product_docs
+	type: firestore-delete-documents
+	source: products-firestore
+	description: Delete product documents
+---
+	kind: tools
+	name: delete_order_docs
+	type: firestore-delete-documents
+	source: orders-firestore
+	description: Delete order documents
+	authRequired:
+		- user-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"delete_user_docs": firestoredeletedocuments.Config{
 			Name:         "delete_user_docs",
-			Kind:         "firestore-delete-documents",
+			Type:         "firestore-delete-documents",
 			Source:       "users-firestore",
 			Description:  "Delete user documents",
 			AuthRequired: []string{"user-auth"},
 		},
 		"delete_product_docs": firestoredeletedocuments.Config{
 			Name:         "delete_product_docs",
-			Kind:         "firestore-delete-documents",
+			Type:         "firestore-delete-documents",
 			Source:       "products-firestore",
 			Description:  "Delete product documents",
 			AuthRequired: []string{},
 		},
 		"delete_order_docs": firestoredeletedocuments.Config{
 			Name:         "delete_order_docs",
-			Kind:         "firestore-delete-documents",
+			Type:         "firestore-delete-documents",
 			Source:       "orders-firestore",
 			Description:  "Delete order documents",
 			AuthRequired: []string{"user-auth", "admin-auth"},
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments.go b/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments.go
index 42e6cb86e9..71c4e181a6 100644
--- a/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments.go
+++ b/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments.go
@@ -17,22 +17,24 @@ package firestoregetdocuments
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	firestoreapi "cloud.google.com/go/firestore"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firestore-get-documents"
+const resourceType string = "firestore-get-documents"
 const documentPathsKey string = "documentPaths"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,44 +96,44 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	documentPathsRaw, ok := mapParams[documentPathsKey].([]any)
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter; expected an array", documentPathsKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter; expected an array", documentPathsKey), nil)
 	}
 
 	if len(documentPathsRaw) == 0 {
-		return nil, fmt.Errorf("'%s' parameter cannot be empty", documentPathsKey)
+		return nil, util.NewAgentError(fmt.Sprintf("'%s' parameter cannot be empty", documentPathsKey), nil)
 	}
 
 	// Use ConvertAnySliceToTyped to convert the slice
 	typedSlice, err := parameters.ConvertAnySliceToTyped(documentPathsRaw, "string")
 	if err != nil {
-		return nil, fmt.Errorf("failed to convert document paths: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("failed to convert document paths: %v", err), err)
 	}
 
 	documentPaths, ok := typedSlice.([]string)
 	if !ok {
-		return nil, fmt.Errorf("unexpected type conversion error for document paths")
+		return nil, util.NewAgentError("unexpected type conversion error for document paths", nil)
 	}
 
 	// Validate each document path
 	for i, path := range documentPaths {
-		if err := util.ValidateDocumentPath(path); err != nil {
-			return nil, fmt.Errorf("invalid document path at index %d: %w", i, err)
+		if err := fsUtil.ValidateDocumentPath(path); err != nil {
+			return nil, util.NewAgentError(fmt.Sprintf("invalid document path at index %d: %v", i, err), err)
 		}
 	}
-	return source.GetDocuments(ctx, documentPaths)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetDocuments(ctx, documentPaths)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -157,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments_test.go b/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments_test.go
index 4cc6ab6245..5a44b9d687 100644
--- a/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments_test.go
+++ b/internal/tools/firestore/firestoregetdocuments/firestoregetdocuments_test.go
@@ -17,7 +17,6 @@ package firestoregetdocuments_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreGetDocuments(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				get_docs_tool:
-					kind: firestore-get-documents
-					source: my-firestore-instance
-					description: Retrieve documents from Firestore by paths
+			kind: tools
+			name: get_docs_tool
+			type: firestore-get-documents
+			source: my-firestore-instance
+			description: Retrieve documents from Firestore by paths
 			`,
 			want: server.ToolConfigs{
 				"get_docs_tool": firestoregetdocuments.Config{
 					Name:         "get_docs_tool",
-					Kind:         "firestore-get-documents",
+					Type:         "firestore-get-documents",
 					Source:       "my-firestore-instance",
 					Description:  "Retrieve documents from Firestore by paths",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreGetDocuments(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_get_docs:
-					kind: firestore-get-documents
-					source: prod-firestore
-					description: Get documents with authentication
-					authRequired:
-						- google-auth-service
-						- api-key-service
+			kind: tools
+			name: secure_get_docs
+			type: firestore-get-documents
+			source: prod-firestore
+			description: Get documents with authentication
+			authRequired:
+				- google-auth-service
+				- api-key-service
 			`,
 			want: server.ToolConfigs{
 				"secure_get_docs": firestoregetdocuments.Config{
 					Name:         "secure_get_docs",
-					Kind:         "firestore-get-documents",
+					Type:         "firestore-get-documents",
 					Source:       "prod-firestore",
 					Description:  "Get documents with authentication",
 					AuthRequired: []string{"google-auth-service", "api-key-service"},
@@ -78,15 +77,11 @@ func TestParseFromYamlFirestoreGetDocuments(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +94,58 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		get_user_docs:
-			kind: firestore-get-documents
-			source: users-firestore
-			description: Get user documents
-			authRequired:
-				- user-auth
-		get_product_docs:
-			kind: firestore-get-documents
-			source: products-firestore
-			description: Get product documents
-		get_order_docs:
-			kind: firestore-get-documents
-			source: orders-firestore
-			description: Get order documents
-			authRequired:
-				- user-auth
-				- admin-auth
+	kind: tools
+	name: get_user_docs
+	type: firestore-get-documents
+	source: users-firestore
+	description: Get user documents
+	authRequired:
+		- user-auth
+---
+	kind: tools
+	name: get_product_docs
+	type: firestore-get-documents
+	source: products-firestore
+	description: Get product documents
+---
+	kind: tools
+	name: get_order_docs
+	type: firestore-get-documents
+	source: orders-firestore
+	description: Get order documents
+	authRequired:
+		- user-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"get_user_docs": firestoregetdocuments.Config{
 			Name:         "get_user_docs",
-			Kind:         "firestore-get-documents",
+			Type:         "firestore-get-documents",
 			Source:       "users-firestore",
 			Description:  "Get user documents",
 			AuthRequired: []string{"user-auth"},
 		},
 		"get_product_docs": firestoregetdocuments.Config{
 			Name:         "get_product_docs",
-			Kind:         "firestore-get-documents",
+			Type:         "firestore-get-documents",
 			Source:       "products-firestore",
 			Description:  "Get product documents",
 			AuthRequired: []string{},
 		},
 		"get_order_docs": firestoregetdocuments.Config{
 			Name:         "get_order_docs",
-			Kind:         "firestore-get-documents",
+			Type:         "firestore-get-documents",
 			Source:       "orders-firestore",
 			Description:  "Get order documents",
 			AuthRequired: []string{"user-auth", "admin-auth"},
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestoregetrules/firestoregetrules.go b/internal/tools/firestore/firestoregetrules/firestoregetrules.go
index d153130e18..8740a93888 100644
--- a/internal/tools/firestore/firestoregetrules/firestoregetrules.go
+++ b/internal/tools/firestore/firestoregetrules/firestoregetrules.go
@@ -17,20 +17,22 @@ package firestoregetrules
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/firebaserules/v1"
 )
 
-const kind string = "firestore-get-rules"
+const resourceType string = "firestore-get-rules"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -92,16 +94,16 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
-	return source.GetRules(ctx)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.GetRules(ctx)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -127,3 +129,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestoregetrules/firestoregetrules_test.go b/internal/tools/firestore/firestoregetrules/firestoregetrules_test.go
index 405eb1377a..c4a7dfb6bb 100644
--- a/internal/tools/firestore/firestoregetrules/firestoregetrules_test.go
+++ b/internal/tools/firestore/firestoregetrules/firestoregetrules_test.go
@@ -17,7 +17,6 @@ package firestoregetrules_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreGetRules(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				get_rules_tool:
-					kind: firestore-get-rules
-					source: my-firestore-instance
-					description: Retrieves the active Firestore security rules for the current project
+			kind: tools
+			name: get_rules_tool
+			type: firestore-get-rules
+			source: my-firestore-instance
+			description: Retrieves the active Firestore security rules for the current project
 			`,
 			want: server.ToolConfigs{
 				"get_rules_tool": firestoregetrules.Config{
 					Name:         "get_rules_tool",
-					Kind:         "firestore-get-rules",
+					Type:         "firestore-get-rules",
 					Source:       "my-firestore-instance",
 					Description:  "Retrieves the active Firestore security rules for the current project",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreGetRules(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_get_rules:
-					kind: firestore-get-rules
-					source: prod-firestore
-					description: Get Firestore security rules with authentication
-					authRequired:
-						- google-auth-service
-						- admin-service
+			kind: tools
+			name: secure_get_rules
+			type: firestore-get-rules
+			source: prod-firestore
+			description: Get Firestore security rules with authentication
+			authRequired:
+				- google-auth-service
+				- admin-service
 			`,
 			want: server.ToolConfigs{
 				"secure_get_rules": firestoregetrules.Config{
 					Name:         "secure_get_rules",
-					Kind:         "firestore-get-rules",
+					Type:         "firestore-get-rules",
 					Source:       "prod-firestore",
 					Description:  "Get Firestore security rules with authentication",
 					AuthRequired: []string{"google-auth-service", "admin-service"},
@@ -78,15 +77,11 @@ func TestParseFromYamlFirestoreGetRules(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +94,58 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		get_dev_rules:
-			kind: firestore-get-rules
-			source: dev-firestore
-			description: Get development Firestore rules
-			authRequired:
-				- dev-auth
-		get_staging_rules:
-			kind: firestore-get-rules
-			source: staging-firestore
-			description: Get staging Firestore rules
-		get_prod_rules:
-			kind: firestore-get-rules
-			source: prod-firestore
-			description: Get production Firestore rules
-			authRequired:
-				- prod-auth
-				- admin-auth
+	kind: tools
+	name: get_dev_rules
+	type: firestore-get-rules
+	source: dev-firestore
+	description: Get development Firestore rules
+	authRequired:
+		- dev-auth
+---
+	kind: tools
+	name: get_staging_rules
+	type: firestore-get-rules
+	source: staging-firestore
+	description: Get staging Firestore rules
+---
+	kind: tools
+	name: get_prod_rules
+	type: firestore-get-rules
+	source: prod-firestore
+	description: Get production Firestore rules
+	authRequired:
+		- prod-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"get_dev_rules": firestoregetrules.Config{
 			Name:         "get_dev_rules",
-			Kind:         "firestore-get-rules",
+			Type:         "firestore-get-rules",
 			Source:       "dev-firestore",
 			Description:  "Get development Firestore rules",
 			AuthRequired: []string{"dev-auth"},
 		},
 		"get_staging_rules": firestoregetrules.Config{
 			Name:         "get_staging_rules",
-			Kind:         "firestore-get-rules",
+			Type:         "firestore-get-rules",
 			Source:       "staging-firestore",
 			Description:  "Get staging Firestore rules",
 			AuthRequired: []string{},
 		},
 		"get_prod_rules": firestoregetrules.Config{
 			Name:         "get_prod_rules",
-			Kind:         "firestore-get-rules",
+			Type:         "firestore-get-rules",
 			Source:       "prod-firestore",
 			Description:  "Get production Firestore rules",
 			AuthRequired: []string{"prod-auth", "admin-auth"},
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestorelistcollections/firestorelistcollections.go b/internal/tools/firestore/firestorelistcollections/firestorelistcollections.go
index 4e09600e73..62db352013 100644
--- a/internal/tools/firestore/firestorelistcollections/firestorelistcollections.go
+++ b/internal/tools/firestore/firestorelistcollections/firestorelistcollections.go
@@ -17,22 +17,24 @@ package firestorelistcollections
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	firestoreapi "cloud.google.com/go/firestore"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firestore-list-collections"
+const resourceType string = "firestore-list-collections"
 const parentPathKey string = "parentPath"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -95,10 +97,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
@@ -107,15 +109,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	parentPath, _ := mapParams[parentPathKey].(string)
 	if parentPath != "" {
 		// Validate parent document path
-		if err := util.ValidateDocumentPath(parentPath); err != nil {
-			return nil, fmt.Errorf("invalid parent document path: %w", err)
+		if err := fsUtil.ValidateDocumentPath(parentPath); err != nil {
+			return nil, util.NewAgentError(fmt.Sprintf("invalid parent document path: %v", err), err)
 		}
 	}
-	return source.ListCollections(ctx, parentPath)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.ListCollections(ctx, parentPath)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -141,3 +143,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestorelistcollections/firestorelistcollections_test.go b/internal/tools/firestore/firestorelistcollections/firestorelistcollections_test.go
index d3b08ae649..1b8b374a8e 100644
--- a/internal/tools/firestore/firestorelistcollections/firestorelistcollections_test.go
+++ b/internal/tools/firestore/firestorelistcollections/firestorelistcollections_test.go
@@ -17,7 +17,6 @@ package firestorelistcollections_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreListCollections(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				list_collections_tool:
-					kind: firestore-list-collections
-					source: my-firestore-instance
-					description: List collections in Firestore
+			kind: tools
+			name: list_collections_tool
+			type: firestore-list-collections
+			source: my-firestore-instance
+			description: List collections in Firestore
 			`,
 			want: server.ToolConfigs{
 				"list_collections_tool": firestorelistcollections.Config{
 					Name:         "list_collections_tool",
-					Kind:         "firestore-list-collections",
+					Type:         "firestore-list-collections",
 					Source:       "my-firestore-instance",
 					Description:  "List collections in Firestore",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreListCollections(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_list_collections:
-					kind: firestore-list-collections
-					source: prod-firestore
-					description: List collections with authentication
-					authRequired:
-						- google-auth-service
-						- api-key-service
+			kind: tools
+			name: secure_list_collections
+			type: firestore-list-collections
+			source: prod-firestore
+			description: List collections with authentication
+			authRequired:
+				- google-auth-service
+				- api-key-service
 			`,
 			want: server.ToolConfigs{
 				"secure_list_collections": firestorelistcollections.Config{
 					Name:         "secure_list_collections",
-					Kind:         "firestore-list-collections",
+					Type:         "firestore-list-collections",
 					Source:       "prod-firestore",
 					Description:  "List collections with authentication",
 					AuthRequired: []string{"google-auth-service", "api-key-service"},
@@ -78,15 +77,11 @@ func TestParseFromYamlFirestoreListCollections(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +94,58 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		list_user_collections:
-			kind: firestore-list-collections
-			source: users-firestore
-			description: List user-related collections
-			authRequired:
-				- user-auth
-		list_product_collections:
-			kind: firestore-list-collections
-			source: products-firestore
-			description: List product-related collections
-		list_admin_collections:
-			kind: firestore-list-collections
-			source: admin-firestore
-			description: List administrative collections
-			authRequired:
-				- user-auth
-				- admin-auth
+	kind: tools
+	name: list_user_collections
+	type: firestore-list-collections
+	source: users-firestore
+	description: List user-related collections
+	authRequired:
+		- user-auth
+---
+	kind: tools
+	name: list_product_collections
+	type: firestore-list-collections
+	source: products-firestore
+	description: List product-related collections
+---
+	kind: tools
+	name: list_admin_collections
+	type: firestore-list-collections
+	source: admin-firestore
+	description: List administrative collections
+	authRequired:
+		- user-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"list_user_collections": firestorelistcollections.Config{
 			Name:         "list_user_collections",
-			Kind:         "firestore-list-collections",
+			Type:         "firestore-list-collections",
 			Source:       "users-firestore",
 			Description:  "List user-related collections",
 			AuthRequired: []string{"user-auth"},
 		},
 		"list_product_collections": firestorelistcollections.Config{
 			Name:         "list_product_collections",
-			Kind:         "firestore-list-collections",
+			Type:         "firestore-list-collections",
 			Source:       "products-firestore",
 			Description:  "List product-related collections",
 			AuthRequired: []string{},
 		},
 		"list_admin_collections": firestorelistcollections.Config{
 			Name:         "list_admin_collections",
-			Kind:         "firestore-list-collections",
+			Type:         "firestore-list-collections",
 			Source:       "admin-firestore",
 			Description:  "List administrative collections",
 			AuthRequired: []string{"user-auth", "admin-auth"},
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestorequery/firestorequery.go b/internal/tools/firestore/firestorequery/firestorequery.go
index 3501d52b5b..15d6e1b842 100644
--- a/internal/tools/firestore/firestorequery/firestorequery.go
+++ b/internal/tools/firestore/firestorequery/firestorequery.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 
@@ -26,19 +27,20 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
 // Constants for tool configuration
 const (
-	kind         = "firestore-query"
+	resourceType = "firestore-query"
 	defaultLimit = 100
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -60,7 +62,7 @@ type compatibleSource interface {
 // Config represents the configuration for the Firestore query tool
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -80,9 +82,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of tool configuration
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of tool configuration
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance from the configuration
@@ -158,16 +160,16 @@ var validOperators = map[string]bool{
 }
 
 // Invoke executes the Firestore query based on the provided parameters
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 	// Process collection path with template substitution
 	collectionPath, err := parameters.PopulateTemplate("collectionPath", t.CollectionPath, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("failed to process collection path: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("failed to process collection path: %v", err), err)
 	}
 
 	var filter firestoreapi.EntityFilter
@@ -176,13 +178,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		// Apply template substitution to filters
 		filtersJSON, err := parameters.PopulateTemplateWithJSON("filters", t.Filters, paramsMap)
 		if err != nil {
-			return nil, fmt.Errorf("failed to process filters template: %w", err)
+			return nil, util.NewAgentError(fmt.Sprintf("failed to process filters template: %v", err), err)
 		}
 
 		// Parse the simplified filter format
 		var simplifiedFilter SimplifiedFilter
 		if err := json.Unmarshal([]byte(filtersJSON), &simplifiedFilter); err != nil {
-			return nil, fmt.Errorf("failed to parse filters: %w", err)
+			return nil, util.NewAgentError(fmt.Sprintf("failed to parse filters: %v", err), err)
 		}
 
 		// Convert simplified filter to Firestore filter
@@ -191,17 +193,17 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Process and apply ordering
 	orderBy, err := t.getOrderBy(paramsMap)
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError(fmt.Sprintf("failed to process order by: %v", err), err)
 	}
 	// Process select fields
 	selectFields, err := t.processSelectFields(paramsMap)
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError(fmt.Sprintf("failed to process select fields: %v", err), err)
 	}
 	// Process and apply limit
 	limit, err := t.getLimit(paramsMap)
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError(fmt.Sprintf("failed to process limit: %v", err), err)
 	}
 
 	// prevent panic when accessing orderBy incase it is nil
@@ -215,10 +217,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Build the query
 	query, err := source.BuildQuery(collectionPath, filter, selectFields, orderByField, orderByDirection, limit, t.AnalyzeQuery)
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGcpError(err)
 	}
 	// Execute the query and return results
-	return source.ExecuteQuery(ctx, query, t.AnalyzeQuery)
+	resp, err := source.ExecuteQuery(ctx, query, t.AnalyzeQuery)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 // convertToFirestoreFilter converts simplified filter format to Firestore EntityFilter
@@ -255,7 +261,7 @@ func (t Tool) convertToFirestoreFilter(source compatibleSource, filter Simplifie
 	if filter.Field != "" && filter.Op != "" && filter.Value != nil {
 		if validOperators[filter.Op] {
 			// Convert the value using the Firestore native JSON converter
-			convertedValue, err := util.JSONToFirestoreValue(filter.Value, source.FirestoreClient())
+			convertedValue, err := fsUtil.JSONToFirestoreValue(filter.Value, source.FirestoreClient())
 			if err != nil {
 				// If conversion fails, use the original value
 				convertedValue = filter.Value
@@ -367,7 +373,7 @@ func (t Tool) getLimit(params map[string]any) (int, error) {
 		if processedValue != "" {
 			parsedLimit, err := strconv.Atoi(processedValue)
 			if err != nil {
-				return 0, fmt.Errorf("failed to parse limit value '%s': %w", processedValue, err)
+				return 0, err
 			}
 			limit = parsedLimit
 		}
@@ -375,11 +381,6 @@ func (t Tool) getLimit(params map[string]any) (int, error) {
 	return limit, nil
 }
 
-// ParseParams parses and validates input parameters
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -406,3 +407,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestorequery/firestorequery_test.go b/internal/tools/firestore/firestorequery/firestorequery_test.go
index 178bbe8071..380b1b26d1 100644
--- a/internal/tools/firestore/firestorequery/firestorequery_test.go
+++ b/internal/tools/firestore/firestorequery/firestorequery_test.go
@@ -17,7 +17,6 @@ package firestorequery_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"
@@ -38,22 +37,22 @@ func TestParseFromYamlFirestoreQuery(t *testing.T) {
 		{
 			desc: "basic example with parameterized collection path",
 			in: `
-			tools:
-				query_users_tool:
-					kind: firestore-query
-					source: my-firestore-instance
-					description: Query users collection with parameterized path
-					collectionPath: "users/{{.userId}}/documents"
-					parameters:
-						- name: userId
-						  type: string
-						  description: The user ID to query documents for
-						  required: true
+            kind: tools
+            name: query_users_tool
+            type: firestore-query
+            source: my-firestore-instance
+            description: Query users collection with parameterized path
+            collectionPath: "users/{{.userId}}/documents"
+            parameters:
+                - name: userId
+                  type: string
+                  description: The user ID to query documents for
+                  required: true
 			`,
 			want: server.ToolConfigs{
 				"query_users_tool": firestorequery.Config{
 					Name:           "query_users_tool",
-					Kind:           "firestore-query",
+					Type:           "firestore-query",
 					Source:         "my-firestore-instance",
 					Description:    "Query users collection with parameterized path",
 					CollectionPath: "users/{{.userId}}/documents",
@@ -67,41 +66,41 @@ func TestParseFromYamlFirestoreQuery(t *testing.T) {
 		{
 			desc: "with parameterized filters",
 			in: `
-			tools:
-				query_products_tool:
-					kind: firestore-query
-					source: prod-firestore
-					description: Query products with dynamic filters
-					collectionPath: "products"
-					filters: |
-						{
-							"and": [
-								{"field": "category", "op": "==", "value": {"stringValue": "{{.category}}"}},
-								{"field": "price", "op": "<=", "value": {"doubleValue": {{.maxPrice}}}}
-							]
-						}
-					parameters:
-						- name: category
-						  type: string
-						  description: Product category to filter by
-						  required: true
-						- name: maxPrice
-						  type: float
-						  description: Maximum price for products
-						  required: true
+            kind: tools
+            name: query_products_tool
+            type: firestore-query
+            source: prod-firestore
+            description: Query products with dynamic filters
+            collectionPath: "products"
+            filters: |
+                {
+                    "and": [
+                        {"field": "category", "op": "==", "value": {"stringValue": "{{.category}}"}},
+                        {"field": "price", "op": "<=", "value": {"doubleValue": {{.maxPrice}}}}
+                    ]
+                }
+            parameters:
+                - name: category
+                  type: string
+                  description: Product category to filter by
+                  required: true
+                - name: maxPrice
+                  type: float
+                  description: Maximum price for products
+                  required: true
 			`,
 			want: server.ToolConfigs{
 				"query_products_tool": firestorequery.Config{
 					Name:           "query_products_tool",
-					Kind:           "firestore-query",
+					Type:           "firestore-query",
 					Source:         "prod-firestore",
 					Description:    "Query products with dynamic filters",
 					CollectionPath: "products",
 					Filters: `{
-  "and": [
-    {"field": "category", "op": "==", "value": {"stringValue": "{{.category}}"}},
-    {"field": "price", "op": "<=", "value": {"doubleValue": {{.maxPrice}}}}
-  ]
+    "and": [
+        {"field": "category", "op": "==", "value": {"stringValue": "{{.category}}"}},
+        {"field": "price", "op": "<=", "value": {"doubleValue": {{.maxPrice}}}}
+    ]
 }
 `,
 					AuthRequired: []string{},
@@ -115,30 +114,30 @@ func TestParseFromYamlFirestoreQuery(t *testing.T) {
 		{
 			desc: "with select fields and orderBy",
 			in: `
-			tools:
-				query_orders_tool:
-					kind: firestore-query
-					source: orders-firestore
-					description: Query orders with field selection
-					collectionPath: "orders"
-					select:
-						- orderId
-						- customerName
-						- totalAmount
-					orderBy:
-						field: "{{.sortField}}"
-						direction: "DESCENDING"
-					limit: 50
-					parameters:
-						- name: sortField
-						  type: string
-						  description: Field to sort by
-						  required: true
+            kind: tools
+            name: query_orders_tool
+            type: firestore-query
+            source: orders-firestore
+            description: Query orders with field selection
+            collectionPath: "orders"
+            select:
+                - orderId
+                - customerName
+                - totalAmount
+            orderBy:
+                field: "{{.sortField}}"
+                direction: "DESCENDING"
+            limit: 50
+            parameters:
+                - name: sortField
+                  type: string
+                  description: Field to sort by
+                  required: true
 			`,
 			want: server.ToolConfigs{
 				"query_orders_tool": firestorequery.Config{
 					Name:           "query_orders_tool",
-					Kind:           "firestore-query",
+					Type:           "firestore-query",
 					Source:         "orders-firestore",
 					Description:    "Query orders with field selection",
 					CollectionPath: "orders",
@@ -158,59 +157,59 @@ func TestParseFromYamlFirestoreQuery(t *testing.T) {
 		{
 			desc: "with auth requirements and complex filters",
 			in: `
-			tools:
-				secure_query_tool:
-					kind: firestore-query
-					source: secure-firestore
-					description: Query with authentication and complex filters
-					collectionPath: "{{.collection}}"
-					filters: |
-						{
-							"or": [
-								{
-									"and": [
-										{"field": "status", "op": "==", "value": {"stringValue": "{{.status}}"}},
-										{"field": "priority", "op": ">=", "value": {"integerValue": "{{.minPriority}}"}}
-									]
-								},
-								{"field": "urgent", "op": "==", "value": {"booleanValue": true}}
-							]
-						}
-					analyzeQuery: true
-					authRequired:
-						- google-auth-service
-						- api-key-service
-					parameters:
-						- name: collection
-						  type: string
-						  description: Collection name to query
-						  required: true
-						- name: status
-						  type: string
-						  description: Status to filter by
-						  required: true
-						- name: minPriority
-						  type: integer
-						  description: Minimum priority level
-						  default: 1
+            kind: tools
+            name: secure_query_tool
+            type: firestore-query
+            source: secure-firestore
+            description: Query with authentication and complex filters
+            collectionPath: "{{.collection}}"
+            filters: |
+                {
+                    "or": [
+                        {
+                            "and": [
+                                {"field": "status", "op": "==", "value": {"stringValue": "{{.status}}"}},
+                                {"field": "priority", "op": ">=", "value": {"integerValue": "{{.minPriority}}"}}
+                            ]
+                        },
+                        {"field": "urgent", "op": "==", "value": {"booleanValue": true}}
+                    ]
+                }
+            analyzeQuery: true
+            authRequired:
+                - google-auth-service
+                - api-key-service
+            parameters:
+                - name: collection
+                  type: string
+                  description: Collection name to query
+                  required: true
+                - name: status
+                  type: string
+                  description: Status to filter by
+                  required: true
+                - name: minPriority
+                  type: integer
+                  description: Minimum priority level
+                  default: 1
 			`,
 			want: server.ToolConfigs{
 				"secure_query_tool": firestorequery.Config{
 					Name:           "secure_query_tool",
-					Kind:           "firestore-query",
+					Type:           "firestore-query",
 					Source:         "secure-firestore",
 					Description:    "Query with authentication and complex filters",
 					CollectionPath: "{{.collection}}",
 					Filters: `{
-  "or": [
-    {
-      "and": [
-        {"field": "status", "op": "==", "value": {"stringValue": "{{.status}}"}},
-        {"field": "priority", "op": ">=", "value": {"integerValue": "{{.minPriority}}"}}
-      ]
-    },
-    {"field": "urgent", "op": "==", "value": {"booleanValue": true}}
-  ]
+    "or": [
+        {
+            "and": [
+                {"field": "status", "op": "==", "value": {"stringValue": "{{.status}}"}},
+                {"field": "priority", "op": ">=", "value": {"integerValue": "{{.minPriority}}"}}
+            ]
+        },
+        {"field": "urgent", "op": "==", "value": {"booleanValue": true}}
+    ]
 }
 `,
 					AnalyzeQuery: true,
@@ -226,71 +225,71 @@ func TestParseFromYamlFirestoreQuery(t *testing.T) {
 		{
 			desc: "with Firestore native JSON value types and template parameters",
 			in: `
-			tools:
-				query_with_typed_values:
-					kind: firestore-query
-					source: typed-firestore
-					description: Query with Firestore native JSON value types
-					collectionPath: "countries"
-					filters: |
-						{
-							"or": [
-								{"field": "continent", "op": "==", "value": {"stringValue": "{{.continent}}"}},
-								{
-									"and": [
-										{"field": "area", "op": ">", "value": {"integerValue": "2000000"}},
-										{"field": "area", "op": "<", "value": {"integerValue": "3000000"}},
-										{"field": "population", "op": ">=", "value": {"integerValue": "{{.minPopulation}}"}},
-										{"field": "gdp", "op": ">", "value": {"doubleValue": {{.minGdp}}}},
-										{"field": "isActive", "op": "==", "value": {"booleanValue": {{.isActive}}}},
-										{"field": "lastUpdated", "op": ">=", "value": {"timestampValue": "{{.startDate}}"}}
-									]
-								}
-							]
-						}
-					parameters:
-						- name: continent
-						  type: string
-						  description: Continent to filter by
-						  required: true
-						- name: minPopulation
-						  type: string
-						  description: Minimum population as string
-						  required: true
-						- name: minGdp
-						  type: float
-						  description: Minimum GDP value
-						  required: true
-						- name: isActive
-						  type: boolean
-						  description: Filter by active status
-						  required: true
-						- name: startDate
-						  type: string
-						  description: Start date in RFC3339 format
-						  required: true
+            kind: tools
+            name: query_with_typed_values
+            type: firestore-query
+            source: typed-firestore
+            description: Query with Firestore native JSON value types
+            collectionPath: "countries"
+            filters: |
+                {
+                    "or": [
+                        {"field": "continent", "op": "==", "value": {"stringValue": "{{.continent}}"}},
+                        {
+                            "and": [
+                                {"field": "area", "op": ">", "value": {"integerValue": "2000000"}},
+                                {"field": "area", "op": "<", "value": {"integerValue": "3000000"}},
+                                {"field": "population", "op": ">=", "value": {"integerValue": "{{.minPopulation}}"}},
+                                {"field": "gdp", "op": ">", "value": {"doubleValue": {{.minGdp}}}},
+                                {"field": "isActive", "op": "==", "value": {"booleanValue": {{.isActive}}}},
+                                {"field": "lastUpdated", "op": ">=", "value": {"timestampValue": "{{.startDate}}"}}
+                            ]
+                        }
+                    ]
+                }
+            parameters:
+                - name: continent
+                  type: string
+                  description: Continent to filter by
+                  required: true
+                - name: minPopulation
+                  type: string
+                  description: Minimum population as string
+                  required: true
+                - name: minGdp
+                  type: float
+                  description: Minimum GDP value
+                  required: true
+                - name: isActive
+                  type: boolean
+                  description: Filter by active status
+                  required: true
+                - name: startDate
+                  type: string
+                  description: Start date in RFC3339 format
+                  required: true
 			`,
 			want: server.ToolConfigs{
 				"query_with_typed_values": firestorequery.Config{
 					Name:           "query_with_typed_values",
-					Kind:           "firestore-query",
+					Type:           "firestore-query",
 					Source:         "typed-firestore",
 					Description:    "Query with Firestore native JSON value types",
 					CollectionPath: "countries",
 					Filters: `{
-  "or": [
-    {"field": "continent", "op": "==", "value": {"stringValue": "{{.continent}}"}},
-    {
-      "and": [
-        {"field": "area", "op": ">", "value": {"integerValue": "2000000"}},
-        {"field": "area", "op": "<", "value": {"integerValue": "3000000"}},
-        {"field": "population", "op": ">=", "value": {"integerValue": "{{.minPopulation}}"}},
-        {"field": "gdp", "op": ">", "value": {"doubleValue": {{.minGdp}}}},
-        {"field": "isActive", "op": "==", "value": {"booleanValue": {{.isActive}}}},
-        {"field": "lastUpdated", "op": ">=", "value": {"timestampValue": "{{.startDate}}"}}
-      ]
-    }
-  ]
+    "or": [
+        {"field": "continent", "op": "==", "value": {"stringValue": "{{.continent}}"}},
+        {
+            "and": [
+                {"field": "area", "op": ">", "value": {"integerValue": "2000000"}},
+                {"field": "area", "op": "<", "value": {"integerValue": "3000000"}},
+                {"field": "population", "op": ">=", "value": {"integerValue": "{{.minPopulation}}"}},
+                {"field": "gdp", "op": ">", "value": {"doubleValue": {{.minGdp}}}},
+                {"field": "isActive", "op": "==", "value": {"booleanValue": {{.isActive}}}},
+                {"field": "lastUpdated", "op": ">=", "value": {"timestampValue": "{{.startDate}}"}}
+            ]
+        }
+    ]
 }
 `,
 					AuthRequired: []string{},
@@ -307,15 +306,12 @@ func TestParseFromYamlFirestoreQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -328,94 +324,98 @@ func TestParseFromYamlMultipleQueryTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		query_user_posts:
-			kind: firestore-query
-			source: social-firestore
-			description: Query user posts with filtering
-			collectionPath: "users/{{.userId}}/posts"
-			filters: |
-				{
-					"and": [
-						{"field": "visibility", "op": "==", "value": {"stringValue": "{{.visibility}}"}},
-						{"field": "createdAt", "op": ">=", "value": {"timestampValue": "{{.startDate}}"}}
-					]
-				}
-			select:
-				- title
-				- content
-				- likes
-			orderBy:
-				field: createdAt
-				direction: "{{.sortOrder}}"
-			limit: 20
-			parameters:
-				- name: userId
-				  type: string
-				  description: User ID whose posts to query
-				  required: true
-				- name: visibility
-				  type: string
-				  description: Post visibility (public, private, friends)
-				  required: true
-				- name: startDate
-				  type: string
-				  description: Start date for posts
-				  required: true
-				- name: sortOrder
-				  type: string
-				  description: Sort order (ASCENDING or DESCENDING)
-				  default: "DESCENDING"
-		query_inventory:
-			kind: firestore-query
-			source: inventory-firestore
-			description: Query inventory items
-			collectionPath: "warehouses/{{.warehouseId}}/inventory"
-			filters: |
-				{
-					"field": "quantity", "op": "<", "value": {"integerValue": "{{.threshold}}"}}
-			parameters:
-				- name: warehouseId
-				  type: string
-				  description: Warehouse ID to check inventory
-				  required: true
-				- name: threshold
-				  type: integer
-				  description: Quantity threshold for low stock
-				  required: true
-		query_transactions:
-			kind: firestore-query
-			source: finance-firestore
-			description: Query financial transactions
-			collectionPath: "accounts/{{.accountId}}/transactions"
-			filters: |
-				{
-					"or": [
-						{"field": "type", "op": "==", "value": {"stringValue": "{{.transactionType}}"}},
-						{"field": "amount", "op": ">", "value": {"doubleValue": {{.minAmount}}}}
-					]
-				}
-			analyzeQuery: true
-			authRequired:
-				- finance-auth
-			parameters:
-				- name: accountId
-				  type: string
-				  description: Account ID for transactions
-				  required: true
-				- name: transactionType
-				  type: string
-				  description: Type of transaction
-				  default: "all"
-				- name: minAmount
-				  type: float
-				  description: Minimum transaction amount
-				  default: 0
+	kind: tools
+	name: query_user_posts
+	type: firestore-query
+	source: social-firestore
+	description: Query user posts with filtering
+	collectionPath: "users/{{.userId}}/posts"
+	filters: |
+		{
+			"and": [
+				{"field": "visibility", "op": "==", "value": {"stringValue": "{{.visibility}}"}},
+				{"field": "createdAt", "op": ">=", "value": {"timestampValue": "{{.startDate}}"}}
+			]
+		}
+	select:
+		- title
+		- content
+		- likes
+	orderBy:
+		field: createdAt
+		direction: "{{.sortOrder}}"
+	limit: 20
+	parameters:
+		- name: userId
+		  type: string
+		  description: User ID whose posts to query
+		  required: true
+		- name: visibility
+		  type: string
+		  description: Post visibility (public, private, friends)
+		  required: true
+		- name: startDate
+		  type: string
+		  description: Start date for posts
+		  required: true
+		- name: sortOrder
+		  type: string
+		  description: Sort order (ASCENDING or DESCENDING)
+		  default: "DESCENDING"
+---
+	kind: tools
+	name: query_inventory
+	type: firestore-query
+	source: inventory-firestore
+	description: Query inventory items
+	collectionPath: "warehouses/{{.warehouseId}}/inventory"
+	filters: |
+		{
+			"field": "quantity", "op": "<", "value": {"integerValue": "{{.threshold}}"}}
+	parameters:
+		- name: warehouseId
+		  type: string
+		  description: Warehouse ID to check inventory
+		  required: true
+		- name: threshold
+		  type: integer
+		  description: Quantity threshold for low stock
+		  required: true
+---
+	kind: tools
+	name: query_transactions
+	type: firestore-query
+	source: finance-firestore
+	description: Query financial transactions
+	collectionPath: "accounts/{{.accountId}}/transactions"
+	filters: |
+		{
+			"or": [
+				{"field": "type", "op": "==", "value": {"stringValue": "{{.transactionType}}"}},
+				{"field": "amount", "op": ">", "value": {"doubleValue": {{.minAmount}}}}
+			]
+		}
+	analyzeQuery: true
+	authRequired:
+		- finance-auth
+	parameters:
+		- name: accountId
+		  type: string
+		  description: Account ID for transactions
+		  required: true
+		- name: transactionType
+		  type: string
+		  description: Type of transaction
+		  default: "all"
+		- name: minAmount
+		  type: float
+		  description: Minimum transaction amount
+		  default: 0
 	`
 	want := server.ToolConfigs{
 		"query_user_posts": firestorequery.Config{
 			Name:           "query_user_posts",
-			Kind:           "firestore-query",
+			Type:           "firestore-query",
 			Source:         "social-firestore",
 			Description:    "Query user posts with filtering",
 			CollectionPath: "users/{{.userId}}/posts",
@@ -442,7 +442,7 @@ func TestParseFromYamlMultipleQueryTools(t *testing.T) {
 		},
 		"query_inventory": firestorequery.Config{
 			Name:           "query_inventory",
-			Kind:           "firestore-query",
+			Type:           "firestore-query",
 			Source:         "inventory-firestore",
 			Description:    "Query inventory items",
 			CollectionPath: "warehouses/{{.warehouseId}}/inventory",
@@ -457,7 +457,7 @@ func TestParseFromYamlMultipleQueryTools(t *testing.T) {
 		},
 		"query_transactions": firestorequery.Config{
 			Name:           "query_transactions",
-			Kind:           "firestore-query",
+			Type:           "firestore-query",
 			Source:         "finance-firestore",
 			Description:    "Query financial transactions",
 			CollectionPath: "accounts/{{.accountId}}/transactions",
@@ -478,15 +478,11 @@ func TestParseFromYamlMultipleQueryTools(t *testing.T) {
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestorequerycollection/firestorequerycollection.go b/internal/tools/firestore/firestorequerycollection/firestorequerycollection.go
index f4c6aa493c..65c44e8e0c 100644
--- a/internal/tools/firestore/firestorequerycollection/firestorequerycollection.go
+++ b/internal/tools/firestore/firestorequerycollection/firestorequerycollection.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strings"
 
 	firestoreapi "cloud.google.com/go/firestore"
@@ -25,13 +26,14 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
 // Constants for tool configuration
 const (
-	kind            = "firestore-query-collection"
+	resourceType    = "firestore-query-collection"
 	defaultLimit    = 100
 	defaultAnalyze  = false
 	maxFilterLength = 100 // Maximum filters to prevent abuse
@@ -73,8 +75,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -96,7 +98,7 @@ type compatibleSource interface {
 // Config represents the configuration for the Firestore query collection tool
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -105,9 +107,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of tool configuration
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of tool configuration
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance from the configuration
@@ -230,16 +232,16 @@ func (o *OrderByConfig) GetDirection() firestoreapi.Direction {
 }
 
 // Invoke executes the Firestore query based on the provided parameters
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	// Parse parameters
 	queryParams, err := t.parseQueryParameters(params)
 	if err != nil {
-		return nil, err
+		return nil, util.NewAgentError(fmt.Sprintf("failed to parse query parameters: %v", err), err)
 	}
 
 	var filter firestoreapi.EntityFilter
@@ -270,9 +272,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Build the query
 	query, err := source.BuildQuery(queryParams.CollectionPath, filter, nil, orderByField, orderByDirection, queryParams.Limit, queryParams.AnalyzeQuery)
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGcpError(err)
 	}
-	return source.ExecuteQuery(ctx, query, queryParams.AnalyzeQuery)
+	resp, err := source.ExecuteQuery(ctx, query, queryParams.AnalyzeQuery)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 // queryParameters holds all parsed query parameters
@@ -295,7 +301,7 @@ func (t Tool) parseQueryParameters(params parameters.ParamValues) (*queryParamet
 	}
 
 	// Validate collection path
-	if err := util.ValidateCollectionPath(collectionPath); err != nil {
+	if err := fsUtil.ValidateCollectionPath(collectionPath); err != nil {
 		return nil, fmt.Errorf("invalid collection path: %w", err)
 	}
 
@@ -388,11 +394,6 @@ func (t Tool) parseOrderBy(orderByRaw interface{}) (*OrderByConfig, error) {
 	return &orderBy, nil
 }
 
-// ParseParams parses and validates input parameters
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -419,3 +420,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestorequerycollection/firestorequerycollection_test.go b/internal/tools/firestore/firestorequerycollection/firestorequerycollection_test.go
index 355ce8e188..450ad18016 100644
--- a/internal/tools/firestore/firestorequerycollection/firestorequerycollection_test.go
+++ b/internal/tools/firestore/firestorequerycollection/firestorequerycollection_test.go
@@ -17,7 +17,6 @@ package firestorequerycollection_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreQueryCollection(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				query_users_tool:
-					kind: firestore-query-collection
-					source: my-firestore-instance
-					description: Query users collection with filters and ordering
+            kind: tools
+            name: query_users_tool
+            type: firestore-query-collection
+            source: my-firestore-instance
+            description: Query users collection with filters and ordering
 			`,
 			want: server.ToolConfigs{
 				"query_users_tool": firestorequerycollection.Config{
 					Name:         "query_users_tool",
-					Kind:         "firestore-query-collection",
+					Type:         "firestore-query-collection",
 					Source:       "my-firestore-instance",
 					Description:  "Query users collection with filters and ordering",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreQueryCollection(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_query_tool:
-					kind: firestore-query-collection
-					source: prod-firestore
-					description: Query collections with authentication
-					authRequired:
-						- google-auth-service
-						- api-key-service
+            kind: tools
+            name: secure_query_tool
+            type: firestore-query-collection
+            source: prod-firestore
+            description: Query collections with authentication
+            authRequired:
+                - google-auth-service
+                - api-key-service
 			`,
 			want: server.ToolConfigs{
 				"secure_query_tool": firestorequerycollection.Config{
 					Name:         "secure_query_tool",
-					Kind:         "firestore-query-collection",
+					Type:         "firestore-query-collection",
 					Source:       "prod-firestore",
 					Description:  "Query collections with authentication",
 					AuthRequired: []string{"google-auth-service", "api-key-service"},
@@ -78,15 +77,12 @@ func TestParseFromYamlFirestoreQueryCollection(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +95,58 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		query_users:
-			kind: firestore-query-collection
-			source: users-firestore
-			description: Query user documents with filtering
-			authRequired:
-				- user-auth
-		query_products:
-			kind: firestore-query-collection
-			source: products-firestore
-			description: Query product catalog
-		query_orders:
-			kind: firestore-query-collection
-			source: orders-firestore
-			description: Query customer orders with complex filters
-			authRequired:
-				- user-auth
-				- admin-auth
+	kind: tools
+	name: query_users
+	type: firestore-query-collection
+	source: users-firestore
+	description: Query user documents with filtering
+	authRequired:
+		- user-auth
+---
+	kind: tools
+	name: query_products
+	type: firestore-query-collection
+	source: products-firestore
+	description: Query product catalog
+---
+	kind: tools
+	name: query_orders
+	type: firestore-query-collection
+	source: orders-firestore
+	description: Query customer orders with complex filters
+	authRequired:
+		- user-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"query_users": firestorequerycollection.Config{
 			Name:         "query_users",
-			Kind:         "firestore-query-collection",
+			Type:         "firestore-query-collection",
 			Source:       "users-firestore",
 			Description:  "Query user documents with filtering",
 			AuthRequired: []string{"user-auth"},
 		},
 		"query_products": firestorequerycollection.Config{
 			Name:         "query_products",
-			Kind:         "firestore-query-collection",
+			Type:         "firestore-query-collection",
 			Source:       "products-firestore",
 			Description:  "Query product catalog",
 			AuthRequired: []string{},
 		},
 		"query_orders": firestorequerycollection.Config{
 			Name:         "query_orders",
-			Kind:         "firestore-query-collection",
+			Type:         "firestore-query-collection",
 			Source:       "orders-firestore",
 			Description:  "Query customer orders with complex filters",
 			AuthRequired: []string{"user-auth", "admin-auth"},
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument.go b/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument.go
index a791de7a17..85588e6217 100644
--- a/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument.go
+++ b/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument.go
@@ -17,6 +17,7 @@ package firestoreupdatedocument
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	firestoreapi "cloud.google.com/go/firestore"
@@ -24,19 +25,20 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
-	"github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	fsUtil "github.com/googleapis/genai-toolbox/internal/tools/firestore/util"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "firestore-update-document"
+const resourceType string = "firestore-update-document"
 const documentPathKey string = "documentPath"
 const documentDataKey string = "documentData"
 const updateMaskKey string = "updateMask"
 const returnDocumentDataKey string = "returnData"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +57,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -64,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -138,10 +140,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
@@ -149,18 +151,18 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Get document path
 	documentPath, ok := mapParams[documentPathKey].(string)
 	if !ok || documentPath == "" {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter", documentPathKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter", documentPathKey), nil)
 	}
 
 	// Validate document path
-	if err := util.ValidateDocumentPath(documentPath); err != nil {
-		return nil, fmt.Errorf("invalid document path: %w", err)
+	if err := fsUtil.ValidateDocumentPath(documentPath); err != nil {
+		return nil, util.NewAgentError(fmt.Sprintf("invalid document path: %v", err), err)
 	}
 
 	// Get document data
 	documentDataRaw, ok := mapParams[documentDataKey]
 	if !ok {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter", documentDataKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter", documentDataKey), nil)
 	}
 
 	// Get update mask if provided
@@ -170,11 +172,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			// Use ConvertAnySliceToTyped to convert the slice
 			typedSlice, err := parameters.ConvertAnySliceToTyped(updateMaskArray, "string")
 			if err != nil {
-				return nil, fmt.Errorf("failed to convert update mask: %w", err)
+				return nil, util.NewAgentError(fmt.Sprintf("failed to convert update mask: %v", err), err)
 			}
 			updatePaths, ok = typedSlice.([]string)
 			if !ok {
-				return nil, fmt.Errorf("unexpected type conversion error for update mask")
+				return nil, util.NewAgentError("unexpected type conversion error for update mask", nil)
 			}
 		}
 	}
@@ -184,15 +186,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if len(updatePaths) > 0 {
 
 		// Convert document data without delete markers
-		dataMap, err := util.JSONToFirestoreValue(documentDataRaw, source.FirestoreClient())
+		dataMap, err := fsUtil.JSONToFirestoreValue(documentDataRaw, source.FirestoreClient())
 		if err != nil {
-			return nil, fmt.Errorf("failed to convert document data: %w", err)
+			return nil, util.NewAgentError(fmt.Sprintf("failed to convert document data: %v", err), err)
 		}
 
 		// Ensure it's a map
 		dataMapTyped, ok := dataMap.(map[string]interface{})
 		if !ok {
-			return nil, fmt.Errorf("document data must be a map")
+			return nil, util.NewAgentError("document data must be a map", nil)
 		}
 
 		for _, path := range updatePaths {
@@ -210,9 +212,9 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		}
 	} else {
 		// Update all fields in the document data (merge)
-		documentData, err = util.JSONToFirestoreValue(documentDataRaw, source.FirestoreClient())
+		documentData, err = fsUtil.JSONToFirestoreValue(documentDataRaw, source.FirestoreClient())
 		if err != nil {
-			return nil, fmt.Errorf("failed to convert document data: %w", err)
+			return nil, util.NewAgentError(fmt.Sprintf("failed to convert document data: %v", err), err)
 		}
 	}
 
@@ -221,7 +223,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if val, ok := mapParams[returnDocumentDataKey].(bool); ok {
 		returnData = val
 	}
-	return source.UpdateDocument(ctx, documentPath, updates, documentData, returnData)
+	resp, err := source.UpdateDocument(ctx, documentPath, updates, documentData, returnData)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 // getFieldValue retrieves a value from a nested map using a dot-separated path
@@ -250,10 +256,6 @@ func getFieldValue(data map[string]interface{}, path string) (interface{}, bool)
 	return nil, false
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -277,3 +279,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument_test.go b/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument_test.go
index 3311aeb86e..924c3d676a 100644
--- a/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument_test.go
+++ b/internal/tools/firestore/firestoreupdatedocument/firestoreupdatedocument_test.go
@@ -19,10 +19,11 @@ import (
 	"strings"
 	"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/sources"
 	firestoreds "github.com/googleapis/genai-toolbox/internal/sources/firestore"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
@@ -31,59 +32,65 @@ func TestNewConfig(t *testing.T) {
 	tests := []struct {
 		name    string
 		yaml    string
-		want    Config
+		want    server.ToolConfigs
 		wantErr bool
 	}{
 		{
 			name: "valid config",
 			yaml: `
-name: test-update-document
-kind: firestore-update-document
-source: test-firestore
-description: Update a document in Firestore
-authRequired:
-  - google-oauth
-`,
-			want: Config{
-				Name:         "test-update-document",
-				Kind:         "firestore-update-document",
-				Source:       "test-firestore",
-				Description:  "Update a document in Firestore",
-				AuthRequired: []string{"google-oauth"},
+			kind: tools
+			name: test-update-document
+			type: firestore-update-document
+			source: test-firestore
+			description: Update a document in Firestore
+			authRequired:
+			  - google-oauth
+			`,
+			want: server.ToolConfigs{
+				"test-update-document": Config{
+					Name:         "test-update-document",
+					Type:         "firestore-update-document",
+					Source:       "test-firestore",
+					Description:  "Update a document in Firestore",
+					AuthRequired: []string{"google-oauth"},
+				},
 			},
 			wantErr: false,
 		},
 		{
 			name: "minimal config",
 			yaml: `
-name: test-update-document
-kind: firestore-update-document
-source: test-firestore
-description: Update a document
-`,
-			want: Config{
-				Name:        "test-update-document",
-				Kind:        "firestore-update-document",
-				Source:      "test-firestore",
-				Description: "Update a document",
+			kind: tools
+			name: test-update-document
+			type: firestore-update-document
+			source: test-firestore
+			description: Update a document
+			`,
+			want: server.ToolConfigs{
+				"test-update-document": Config{
+					Name:         "test-update-document",
+					Type:         "firestore-update-document",
+					Source:       "test-firestore",
+					Description:  "Update a document",
+					AuthRequired: []string{},
+				},
 			},
 			wantErr: false,
 		},
 		{
 			name: "invalid yaml",
 			yaml: `
-name: test-update-document
-kind: [invalid
-`,
+			kind: tools
+			name: test-update-document
+			type: [invalid
+			`,
 			wantErr: true,
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			decoder := yaml.NewDecoder(strings.NewReader(tt.yaml))
-			got, err := newConfig(context.Background(), "test-update-document", decoder)
-
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tt.yaml))
 			if tt.wantErr {
 				if err == nil {
 					t.Fatalf("expected error but got none")
@@ -102,12 +109,12 @@ kind: [invalid
 	}
 }
 
-func TestConfig_ToolConfigKind(t *testing.T) {
+func TestConfig_ToolConfigType(t *testing.T) {
 	cfg := Config{}
-	got := cfg.ToolConfigKind()
+	got := cfg.ToolConfigType()
 	want := "firestore-update-document"
 	if got != want {
-		t.Fatalf("ToolConfigKind() = %v, want %v", got, want)
+		t.Fatalf("ToolConfigType() = %v, want %v", got, want)
 	}
 }
 
@@ -123,7 +130,7 @@ func TestConfig_Initialize(t *testing.T) {
 			name: "valid initialization",
 			config: Config{
 				Name:        "test-update-document",
-				Kind:        "firestore-update-document",
+				Type:        "firestore-update-document",
 				Source:      "test-firestore",
 				Description: "Update a document",
 			},
@@ -161,8 +168,8 @@ func TestConfig_Initialize(t *testing.T) {
 			if actualTool.Name != tt.config.Name {
 				t.Fatalf("tool.Name = %v, want %v", actualTool.Name, tt.config.Name)
 			}
-			if actualTool.Kind != "firestore-update-document" {
-				t.Fatalf("tool.Kind = %v, want %v", actualTool.Kind, "firestore-update-document")
+			if actualTool.Type != "firestore-update-document" {
+				t.Fatalf("tool.Type = %v, want %v", actualTool.Type, "firestore-update-document")
 			}
 			if diff := cmp.Diff(tt.config.AuthRequired, actualTool.AuthRequired); diff != "" {
 				t.Fatalf("AuthRequired mismatch (-want +got):\n%s", diff)
@@ -235,7 +242,7 @@ func TestTool_ParseParams(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			params, err := tool.ParseParams(tt.data, tt.claims)
+			params, err := parameters.ParseParams(tool.GetParameters(), tt.data, tt.claims)
 
 			if tt.wantErr {
 				if err == nil {
diff --git a/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules.go b/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules.go
index 9442982e02..12f981b14d 100644
--- a/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules.go
+++ b/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules.go
@@ -17,16 +17,18 @@ package firestorevalidaterules
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/api/firebaserules/v1"
 )
 
-const kind string = "firestore-validate-rules"
+const resourceType string = "firestore-validate-rules"
 
 // Parameter keys
 const (
@@ -34,8 +36,8 @@ const (
 )
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -106,10 +108,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
@@ -117,13 +119,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Get source parameter
 	sourceParam, ok := mapParams[sourceKey].(string)
 	if !ok || sourceParam == "" {
-		return nil, fmt.Errorf("invalid or missing '%s' parameter", sourceKey)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid or missing '%s' parameter", sourceKey), nil)
 	}
-	return source.ValidateRules(ctx, sourceParam)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.ValidateRules(ctx, sourceParam)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -149,3 +151,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules_test.go b/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules_test.go
index f63945d078..f454bb5e35 100644
--- a/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules_test.go
+++ b/internal/tools/firestore/firestorevalidaterules/firestorevalidaterules_test.go
@@ -17,7 +17,6 @@ package firestorevalidaterules_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlFirestoreValidateRules(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				validate_rules_tool:
-					kind: firestore-validate-rules
-					source: my-firestore-instance
-					description: Validate Firestore security rules
+			kind: tools
+			name: validate_rules_tool
+			type: firestore-validate-rules
+			source: my-firestore-instance
+			description: Validate Firestore security rules
 			`,
 			want: server.ToolConfigs{
 				"validate_rules_tool": firestorevalidaterules.Config{
 					Name:         "validate_rules_tool",
-					Kind:         "firestore-validate-rules",
+					Type:         "firestore-validate-rules",
 					Source:       "my-firestore-instance",
 					Description:  "Validate Firestore security rules",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlFirestoreValidateRules(t *testing.T) {
 		{
 			desc: "with auth requirements",
 			in: `
-			tools:
-				secure_validate_rules:
-					kind: firestore-validate-rules
-					source: prod-firestore
-					description: Validate rules with authentication
-					authRequired:
-						- google-auth-service
-						- api-key-service
+			kind: tools
+			name: secure_validate_rules
+			type: firestore-validate-rules
+			source: prod-firestore
+			description: Validate rules with authentication
+			authRequired:
+				- google-auth-service
+				- api-key-service
 			`,
 			want: server.ToolConfigs{
 				"secure_validate_rules": firestorevalidaterules.Config{
 					Name:         "secure_validate_rules",
-					Kind:         "firestore-validate-rules",
+					Type:         "firestore-validate-rules",
 					Source:       "prod-firestore",
 					Description:  "Validate rules with authentication",
 					AuthRequired: []string{"google-auth-service", "api-key-service"},
@@ -78,15 +77,11 @@ func TestParseFromYamlFirestoreValidateRules(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -99,58 +94,58 @@ func TestParseFromYamlMultipleTools(t *testing.T) {
 		t.Fatalf("unexpected error: %s", err)
 	}
 	in := `
-	tools:
-		validate_dev_rules:
-			kind: firestore-validate-rules
-			source: dev-firestore
-			description: Validate development environment rules
-			authRequired:
-				- dev-auth
-		validate_staging_rules:
-			kind: firestore-validate-rules
-			source: staging-firestore
-			description: Validate staging environment rules
-		validate_prod_rules:
-			kind: firestore-validate-rules
-			source: prod-firestore
-			description: Validate production environment rules
-			authRequired:
-				- prod-auth
-				- admin-auth
+	kind: tools
+	name: validate_dev_rules
+	type: firestore-validate-rules
+	source: dev-firestore
+	description: Validate development environment rules
+	authRequired:
+		- dev-auth
+---
+	kind: tools
+	name: validate_staging_rules
+	type: firestore-validate-rules
+	source: staging-firestore
+	description: Validate staging environment rules
+---
+	kind: tools
+	name: validate_prod_rules
+	type: firestore-validate-rules
+	source: prod-firestore
+	description: Validate production environment rules
+	authRequired:
+		- prod-auth
+		- admin-auth
 	`
 	want := server.ToolConfigs{
 		"validate_dev_rules": firestorevalidaterules.Config{
 			Name:         "validate_dev_rules",
-			Kind:         "firestore-validate-rules",
+			Type:         "firestore-validate-rules",
 			Source:       "dev-firestore",
 			Description:  "Validate development environment rules",
 			AuthRequired: []string{"dev-auth"},
 		},
 		"validate_staging_rules": firestorevalidaterules.Config{
 			Name:         "validate_staging_rules",
-			Kind:         "firestore-validate-rules",
+			Type:         "firestore-validate-rules",
 			Source:       "staging-firestore",
 			Description:  "Validate staging environment rules",
 			AuthRequired: []string{},
 		},
 		"validate_prod_rules": firestorevalidaterules.Config{
 			Name:         "validate_prod_rules",
-			Kind:         "firestore-validate-rules",
+			Type:         "firestore-validate-rules",
 			Source:       "prod-firestore",
 			Description:  "Validate production environment rules",
 			AuthRequired: []string{"prod-auth", "admin-auth"},
 		},
 	}
 
-	got := struct {
-		Tools server.ToolConfigs `yaml:"tools"`
-	}{}
-	// Parse contents
-	err = yaml.UnmarshalContext(ctx, testutils.FormatYaml(in), &got)
+	_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(in))
 	if err != nil {
 		t.Fatalf("unable to unmarshal: %s", err)
 	}
-	if diff := cmp.Diff(want, got.Tools); diff != "" {
+	if diff := cmp.Diff(want, got); diff != "" {
 		t.Fatalf("incorrect parse: diff %v", diff)
 	}
 }
diff --git a/internal/tools/http/http.go b/internal/tools/http/http.go
index 6ba9699e2b..c7be1c185b 100644
--- a/internal/tools/http/http.go
+++ b/internal/tools/http/http.go
@@ -17,26 +17,26 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"maps"
 	"net/http"
 	"net/url"
 	"slices"
 	"strings"
-
-	"maps"
 	"text/template"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "http"
+const resourceType string = "http"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -57,7 +57,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	AuthRequired []string              `yaml:"authRequired"`
@@ -74,8 +74,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -88,7 +88,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source kind must be `http`", kind)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be `http`", resourceType)
 	}
 
 	// Combine Source and Tool headers.
@@ -98,7 +98,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	maps.Copy(combinedHeaders, cfg.Headers)
 
 	// Create a slice for all parameters
-	allParameters := slices.Concat(cfg.PathParams, cfg.BodyParams, cfg.HeaderParams, cfg.QueryParams)
+	allParameters := slices.Concat(cfg.PathParams, cfg.QueryParams, cfg.BodyParams, cfg.HeaderParams)
 
 	// Verify no duplicate parameter names
 	err := parameters.CheckDuplicateParameters(allParameters)
@@ -226,10 +226,10 @@ func getHeaders(headerParams parameters.Parameters, defaultHeaders map[string]st
 	return allHeaders, nil
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
@@ -237,31 +237,35 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Calculate request body
 	requestBody, err := getRequestBody(t.BodyParams, t.RequestBody, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating request body: %s", err)
+		return nil, util.NewAgentError("error populating request body", err)
 	}
 
 	// Calculate URL
 	urlString, err := getURL(source.HttpBaseURL(), t.Path, t.PathParams, t.QueryParams, source.HttpQueryParams(), paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating path parameters: %s", err)
+		return nil, util.NewAgentError("error populating path parameters", err)
 	}
 
-	req, _ := http.NewRequest(string(t.Method), urlString, strings.NewReader(requestBody))
+	req, err := http.NewRequestWithContext(ctx, string(t.Method), urlString, strings.NewReader(requestBody))
+	if err != nil {
+		return nil, util.NewClientServerError("error creating http request", http.StatusInternalServerError, err)
+	}
 
 	// Calculate request headers
 	allHeaders, err := getHeaders(t.HeaderParams, t.Headers, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating request headers: %s", err)
+		return nil, util.NewAgentError("error populating request headers", err)
 	}
 	// Set request headers
 	for k, v := range allHeaders {
 		req.Header.Set(k, v)
 	}
-	return source.RunRequest(req)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunRequest(req)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -287,3 +291,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/http/http_test.go b/internal/tools/http/http_test.go
index 62bacbca4d..2cdb756ee7 100644
--- a/internal/tools/http/http_test.go
+++ b/internal/tools/http/http_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -39,18 +38,18 @@ func TestParseFromYamlHTTP(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: http
-					source: my-instance
-					method: GET
-					description: some description
-					path: search
-				`,
+			kind: tools
+			name: example_tool
+			type: http
+			source: my-instance
+			method: GET
+			description: some description
+			path: search
+			`,
 			want: server.ToolConfigs{
 				"example_tool": http.Config{
 					Name:         "example_tool",
-					Kind:         "http",
+					Type:         "http",
 					Source:       "my-instance",
 					Method:       "GET",
 					Path:         "search",
@@ -62,54 +61,54 @@ func TestParseFromYamlHTTP(t *testing.T) {
 		{
 			desc: "advanced example",
 			in: `
-			tools:
-				example_tool:
-					kind: http
-					source: my-instance
-					method: GET
-					path: "{{.pathParam}}?name=alice&pet=cat"
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					queryParams:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					pathParams:
-					    - name: pathParam
-					      type: string
-					      description: path param
-					requestBody: |
-							{
-								"age": {{.age}},
-								"city": "{{.city}}",
-								"food": {{.food}}
-							}
-					bodyParams:
-						- name: age
-						  type: integer
-						  description: age num
-						- name: city
-						  type: string
-						  description: city string
-					headers:
-						Authorization: API_KEY
-						Content-Type: application/json
-					headerParams:
-						- name: Language
-						  type: string
-						  description: language string
+			kind: tools
+			name: example_tool
+			type: http
+			source: my-instance
+			method: GET
+			path: "{{.pathParam}}?name=alice&pet=cat"
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			queryParams:
+				- name: country
+				  type: string
+				  description: some description
+				  authServices:
+					- name: my-google-auth-service
+					  field: user_id
+					- name: other-auth-service
+					  field: user_id
+			pathParams:
+			    - name: pathParam
+			      type: string
+			      description: path param
+			requestBody: |
+					{
+						"age": {{.age}},
+						"city": "{{.city}}",
+						"food": {{.food}}
+					}
+			bodyParams:
+				- name: age
+				  type: integer
+				  description: age num
+				- name: city
+				  type: string
+				  description: city string
+			headers:
+				Authorization: API_KEY
+				Content-Type: application/json
+			headerParams:
+				- name: Language
+				  type: string
+				  description: language string
 			`,
 			want: server.ToolConfigs{
 				"example_tool": http.Config{
 					Name:         "example_tool",
-					Kind:         "http",
+					Type:         "http",
 					Source:       "my-instance",
 					Method:       "GET",
 					Path:         "{{.pathParam}}?name=alice&pet=cat",
@@ -140,15 +139,11 @@ func TestParseFromYamlHTTP(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -169,55 +164,51 @@ func TestFailParseFromYamlHTTP(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: http
-					source: my-instance
-					method: GOT
-					path: "search?name=alice&pet=cat"
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					queryParams:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					requestBody: |
-							{
-								"age": {{.age}},
-								"city": "{{.city}}"
-							}
-					bodyParams:
-						- name: age
-						  type: integer
-						  description: age num
-						- name: city
-						  type: string
-						  description: city string
-					headers:
-						Authorization: API_KEY
-						Content-Type: application/json
-					headerParams:
-						- name: Language
-						  type: string
-						  description: language string
+			kind: tools
+			name: example_tool
+			type: http
+			source: my-instance
+			method: GOT
+			path: "search?name=alice&pet=cat"
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			queryParams:
+				- name: country
+				  type: string
+				  description: some description
+				  authServices:
+					- name: my-google-auth-service
+					  field: user_id
+					- name: other-auth-service
+					  field: user_id
+			requestBody: |
+					{
+						"age": {{.age}},
+						"city": "{{.city}}"
+					}
+			bodyParams:
+				- name: age
+				  type: integer
+				  description: age num
+				- name: city
+				  type: string
+				  description: city string
+			headers:
+				Authorization: API_KEY
+				Content-Type: application/json
+			headerParams:
+				- name: Language
+				  type: string
+				  description: language string
 			`,
 			err: `GOT is not a valid http method`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement.go b/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement.go
index 5e354d7fd2..5c6a6e5880 100644
--- a/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement.go
+++ b/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement.go
@@ -16,6 +16,7 @@ package lookeradddashboardelement
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-add-dashboard-element"
+const resourceType string = "looker-add-dashboard-element"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -64,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -134,58 +135,74 @@ var (
 	visType  string = "vis"
 )
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	logger.DebugContext(ctx, "params = ", params)
 
 	wq, err := lookercommon.ProcessQueryArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error building query request: %w", err)
+		return nil, util.NewAgentError("error building query request", err)
 	}
 
 	paramsMap := params.AsMap()
-	dashboard_id := paramsMap["dashboard_id"].(string)
-	title := paramsMap["title"].(string)
 
-	visConfig := paramsMap["vis_config"].(map[string]any)
+	dashboard_id, ok := paramsMap["dashboard_id"].(string)
+	if !ok {
+		return nil, util.NewAgentError("dashboard_id parameter missing or invalid", nil)
+	}
+
+	title, ok := paramsMap["title"].(string)
+	if !ok {
+		title = ""
+	}
+
+	visConfig, ok := paramsMap["vis_config"].(map[string]any)
+	if !ok {
+		visConfig = make(map[string]any)
+	}
 	wq.VisConfig = &visConfig
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	qresp, err := sdk.CreateQuery(*wq, "id", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create query request: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	dashFilters := []any{}
 	if v, ok := paramsMap["dashboard_filters"]; ok {
 		if v != nil {
-			dashFilters = paramsMap["dashboard_filters"].([]any)
+			if df, ok := v.([]any); ok {
+				dashFilters = df
+			}
 		}
 	}
 
 	var filterables []v4.ResultMakerFilterables
 	for _, m := range dashFilters {
-		f := m.(map[string]any)
+		f, ok := m.(map[string]any)
+		if !ok {
+			return nil, util.NewAgentError("invalid dashboard filter structure", nil)
+		}
 		name, ok := f["dashboard_filter_name"].(string)
 		if !ok {
-			return nil, fmt.Errorf("error processing dashboard filter: %w", err)
+			return nil, util.NewAgentError("error processing dashboard filter: missing dashboard_filter_name", nil)
 		}
 		field, ok := f["field"].(string)
 		if !ok {
-			return nil, fmt.Errorf("error processing dashboard filter: %w", err)
+			return nil, util.NewAgentError("error processing dashboard filter: missing field", nil)
 		}
 		listener := v4.ResultMakerFilterablesListen{
 			DashboardFilterName: &name,
@@ -233,7 +250,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	resp, err := sdk.CreateDashboardElement(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create dashboard element request: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)
 
@@ -244,10 +261,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -261,7 +274,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -273,9 +286,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement_test.go b/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement_test.go
index 93c007043f..0c55ee0f9d 100644
--- a/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement_test.go
+++ b/internal/tools/looker/lookeradddashboardelement/lookeradddashboardelement_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerAddDashboardElement(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-add-dashboard-element
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-add-dashboard-element
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-add-dashboard-element",
+					Type:         "looker-add-dashboard-element",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerAddDashboardElement(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerAddDashboardElement(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-add-dashboard-element
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-add-dashboard-element
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-add-dashboard-element\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-add-dashboard-element\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-add-dashboard-element\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-add-dashboard-element",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter.go b/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter.go
index c6c56f85e2..71ca790850 100644
--- a/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter.go
+++ b/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter.go
@@ -16,6 +16,7 @@ package lookeradddashboardfilter
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-add-dashboard-filter"
+const resourceType string = "looker-add-dashboard-filter"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -128,33 +129,54 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "params = ", params)
 
 	paramsMap := params.AsMap()
-	dashboard_id := paramsMap["dashboard_id"].(string)
-	name := paramsMap["name"].(string)
-	title := paramsMap["title"].(string)
-	filterType := paramsMap["filter_type"].(string)
+	dashboard_id, ok := paramsMap["dashboard_id"].(string)
+	if !ok {
+		return nil, util.NewAgentError("dashboard_id parameter missing or invalid", nil)
+	}
+	name, ok := paramsMap["name"].(string)
+	if !ok {
+		return nil, util.NewAgentError("name parameter missing or invalid", nil)
+	}
+	title, ok := paramsMap["title"].(string)
+	if !ok {
+		return nil, util.NewAgentError("title parameter missing or invalid", nil)
+	}
+	filterType, ok := paramsMap["filter_type"].(string)
+	if !ok {
+		return nil, util.NewAgentError("filter_type parameter missing or invalid", nil)
+	}
+
 	switch filterType {
 	case "date_filter":
 	case "number_filter":
 	case "string_filter":
 	case "field_filter":
 	default:
-		return nil, fmt.Errorf("invalid filter type: %s. Must be one of date_filter, number_filter, string_filter, field_filter", filterType)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid filter type: %s. Must be one of date_filter, number_filter, string_filter, field_filter", filterType), nil)
+	}
+
+	allowMultipleValues, ok := paramsMap["allow_multiple_values"].(bool)
+	if !ok {
+		// defaults should handle this, but safe fallback
+		allowMultipleValues = true
+	}
+	required, ok := paramsMap["required"].(bool)
+	if !ok {
+		required = false
 	}
-	allowMultipleValues := paramsMap["allow_multiple_values"].(bool)
-	required := paramsMap["required"].(bool)
 
 	req := v4.WriteCreateDashboardFilter{
 		DashboardId:         dashboard_id,
@@ -165,9 +187,8 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		Required:            &required,
 	}
 
-	if v, ok := paramsMap["default_value"]; ok {
-		if v != nil {
-			defaultValue := paramsMap["default_value"].(string)
+	if v, ok := paramsMap["default_value"]; ok && v != nil {
+		if defaultValue, ok := v.(string); ok {
 			req.DefaultValue = &defaultValue
 		}
 	}
@@ -175,15 +196,15 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	if filterType == "field_filter" {
 		model, ok := paramsMap["model"].(string)
 		if !ok || model == "" {
-			return nil, fmt.Errorf("model must be specified for field_filter type")
+			return nil, util.NewAgentError("model must be specified for field_filter type", nil)
 		}
 		explore, ok := paramsMap["explore"].(string)
 		if !ok || explore == "" {
-			return nil, fmt.Errorf("explore must be specified for field_filter type")
+			return nil, util.NewAgentError("explore must be specified for field_filter type", nil)
 		}
 		dimension, ok := paramsMap["dimension"].(string)
 		if !ok || dimension == "" {
-			return nil, fmt.Errorf("dimension must be specified for field_filter type")
+			return nil, util.NewAgentError("dimension must be specified for field_filter type", nil)
 		}
 
 		req.Model = &model
@@ -193,12 +214,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	resp, err := sdk.CreateDashboardFilter(req, "name", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create dashboard filter request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)
 
@@ -209,10 +230,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -230,7 +247,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -238,9 +255,13 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter_test.go b/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter_test.go
index 43f43dc6c6..0f95161b67 100644
--- a/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter_test.go
+++ b/internal/tools/looker/lookeradddashboardfilter/lookeradddashboardfilter_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerAddDashboardFilter(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-add-dashboard-filter
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-add-dashboard-filter
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-add-dashboard-filter",
+					Type:         "looker-add-dashboard-filter",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerAddDashboardFilter(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerAddDashboardFilter(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-add-dashboard-filter
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-add-dashboard-filter
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-add-dashboard-filter\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-add-dashboard-filter\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-add-dashboard-filter\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-add-dashboard-filter",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics.go b/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics.go
index 94cc18e960..c952beb816 100644
--- a/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics.go
+++ b/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics.go
@@ -34,7 +34,7 @@ import (
 	"golang.org/x/oauth2"
 )
 
-const kind string = "looker-conversational-analytics"
+const resourceType string = "looker-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.
@@ -42,8 +42,8 @@ const instructions = `**INSTRUCTIONS - FOLLOW THESE RULES:**
 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))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -126,7 +126,7 @@ type CAPayload struct {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -136,8 +136,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -150,11 +150,11 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	s, ok := rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	if s.GoogleCloudProject() == "" {
-		return nil, fmt.Errorf("project must be defined for source to use with %q tool", kind)
+		return nil, fmt.Errorf("project must be defined for source to use with %q tool", resourceType)
 	}
 
 	userQueryParameter := parameters.NewStringParameter("user_query_with_context", "The user's question, potentially including conversation history and system instructions for context.")
@@ -215,10 +215,10 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	var tokenStr string
@@ -226,11 +226,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Get credentials for the API call
 	// Use cloud-platform token source for Gemini Data Analytics API
 	if t.TokenSource == nil {
-		return nil, fmt.Errorf("cloud-platform token source is missing")
+		return nil, util.NewClientServerError("cloud-platform token source is missing", http.StatusInternalServerError, nil)
 	}
 	token, err := t.TokenSource.Token()
 	if err != nil {
-		return nil, fmt.Errorf("failed to get token from cloud-platform token source: %w", err)
+		return nil, util.NewClientServerError("failed to get token from cloud-platform token source", http.StatusInternalServerError, err)
 	}
 	tokenStr = token.AccessToken
 
@@ -267,8 +267,9 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	caURL := fmt.Sprintf("https://geminidataanalytics.googleapis.com/v1beta/projects/%s/locations/%s:chat", url.PathEscape(projectID), url.PathEscape(location))
 
 	headers := map[string]string{
-		"Authorization": fmt.Sprintf("Bearer %s", tokenStr),
-		"Content-Type":  "application/json",
+		"Authorization":     fmt.Sprintf("Bearer %s", tokenStr),
+		"Content-Type":      "application/json",
+		"X-Goog-API-Client": util.GDAClientID,
 	}
 
 	payload := CAPayload{
@@ -280,22 +281,18 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			},
 			Options: ConversationOptions{Chart: ChartOptions{Image: ImageOptions{NoImage: map[string]any{}}}},
 		},
-		ClientIdEnum: "GENAI_TOOLBOX",
+		ClientIdEnum: util.GDAClientID,
 	}
 
 	// Call the streaming API
 	response, err := getStream(ctx, caURL, payload, headers)
 	if err != nil {
-		return nil, fmt.Errorf("failed to get response from conversational analytics API: %w", err)
+		return nil, util.NewClientServerError("failed to get response from conversational analytics API", http.StatusInternalServerError, err)
 	}
 
 	return response, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -309,7 +306,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -561,9 +558,13 @@ func appendMessage(messages []map[string]any, newMessage map[string]any) []map[s
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics_test.go b/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics_test.go
index fbc17e47c4..9e0fdb26ed 100644
--- a/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics_test.go
+++ b/internal/tools/looker/lookerconversationalanalytics/lookerconversationalanalytics_test.go
@@ -17,7 +17,6 @@ package lookerconversationalanalytics_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlLookerConversationalAnalytics(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-conversational-analytics
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-conversational-analytics
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": lookerconversationalanalytics.Config{
 					Name:         "example_tool",
-					Kind:         "looker-conversational-analytics",
+					Type:         "looker-conversational-analytics",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,11 @@ func TestParseFromYamlLookerConversationalAnalytics(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile.go b/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile.go
index b65be502ef..830df321f7 100644
--- a/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile.go
+++ b/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile.go
@@ -16,23 +16,25 @@ package lookercreateprojectfile
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
 	"github.com/looker-open-source/sdk-codegen/go/rtl"
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-create-project-file"
+const resourceType string = "looker-create-project-file"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,29 +112,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams["project_id"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'project_id' must be a string, got %T", mapParams["project_id"])
+		return nil, util.NewAgentError(fmt.Sprintf("'project_id' must be a string, got %T", mapParams["project_id"]), nil)
 	}
 	filePath, ok := mapParams["file_path"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'file_path' must be a string, got %T", mapParams["file_path"])
+		return nil, util.NewAgentError(fmt.Sprintf("'file_path' must be a string, got %T", mapParams["file_path"]), nil)
 	}
 	fileContent, ok := mapParams["file_content"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'file_content' must be a string, got %T", mapParams["file_content"])
+		return nil, util.NewAgentError(fmt.Sprintf("'file_content' must be a string, got %T", mapParams["file_content"]), nil)
 	}
 
 	req := lookercommon.FileContent{
@@ -142,7 +144,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	err = lookercommon.CreateProjectFile(sdk, projectId, req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create_project_file request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	data := make(map[string]any)
@@ -152,10 +154,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -169,7 +167,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -181,9 +179,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile_test.go b/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile_test.go
index bd9b910b4d..d8a90fa390 100644
--- a/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile_test.go
+++ b/internal/tools/looker/lookercreateprojectfile/lookercreateprojectfile_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerCreateProjectFile(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-create-project-file
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-create-project-file
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-create-project-file",
+					Type:         "looker-create-project-file",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerCreateProjectFile(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerCreateProjectFile(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-create-project-file
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-create-project-file
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-create-project-file\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-create-project-file\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-create-project-file\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-create-project-file",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile.go b/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile.go
index b49690c8d3..741b6bb220 100644
--- a/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile.go
+++ b/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile.go
@@ -16,23 +16,25 @@ package lookerdeleteprojectfile
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
 	"github.com/looker-open-source/sdk-codegen/go/rtl"
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-delete-project-file"
+const resourceType string = "looker-delete-project-file"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -111,30 +113,30 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams["project_id"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'project_id' must be a string, got %T", mapParams["project_id"])
+		return nil, util.NewAgentError(fmt.Sprintf("'project_id' must be a string, got %T", mapParams["project_id"]), nil)
 	}
 	filePath, ok := mapParams["file_path"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'file_path' must be a string, got %T", mapParams["file_path"])
+		return nil, util.NewAgentError(fmt.Sprintf("'file_path' must be a string, got %T", mapParams["file_path"]), nil)
 	}
 
 	err = lookercommon.DeleteProjectFile(sdk, projectId, filePath, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making delete_project_file request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	data := make(map[string]any)
@@ -144,10 +146,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -161,7 +159,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -173,9 +171,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile_test.go b/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile_test.go
index ff0ab2bf7b..16f226a9f5 100644
--- a/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile_test.go
+++ b/internal/tools/looker/lookerdeleteprojectfile/lookerdeleteprojectfile_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerDeleteProjectFile(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-delete-project-file
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-delete-project-file
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-delete-project-file",
+					Type:         "looker-delete-project-file",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerDeleteProjectFile(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerDeleteProjectFile(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-delete-project-file
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-delete-project-file
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-delete-project-file\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-delete-project-file\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-delete-project-file\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-delete-project-file",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerdevmode/lookerdevmode.go b/internal/tools/looker/lookerdevmode/lookerdevmode.go
index 46736125cf..274062052f 100644
--- a/internal/tools/looker/lookerdevmode/lookerdevmode.go
+++ b/internal/tools/looker/lookerdevmode/lookerdevmode.go
@@ -16,6 +16,7 @@ package lookerdevmode
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-dev-mode"
+const resourceType string = "looker-dev-mode"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,18 +54,17 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
 	Annotations  *tools.ToolAnnotations `yaml:"annotations,omitempty"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -81,7 +81,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, annotations)
 
-	// finish tool setup
 	return Tool{
 		Config:     cfg,
 		Parameters: params,
@@ -94,7 +93,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -108,25 +106,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	mapParams := params.AsMap()
 	devMode, ok := mapParams["devMode"].(bool)
 	if !ok {
-		return nil, fmt.Errorf("'devMode' must be a boolean, got %T", mapParams["devMode"])
+		return nil, util.NewAgentError(fmt.Sprintf("'devMode' must be a boolean, got %T", mapParams["devMode"]), nil)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	var devModeString string
 	if devMode {
@@ -139,17 +137,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.UpdateSession(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error setting/resetting dev mode: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "result = ", resp)
 
 	return resp, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -163,7 +157,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -175,9 +169,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerdevmode/lookerdevmode_test.go b/internal/tools/looker/lookerdevmode/lookerdevmode_test.go
index dd776f77e2..961bb5cb40 100644
--- a/internal/tools/looker/lookerdevmode/lookerdevmode_test.go
+++ b/internal/tools/looker/lookerdevmode/lookerdevmode_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerDevMode(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-dev-mode
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-dev-mode
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-dev-mode",
+					Type:         "looker-dev-mode",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerDevMode(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerDevMode(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-dev-mode
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-dev-mode
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-dev-mode\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-dev-mode\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-dev-mode\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-dev-mode",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl.go b/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl.go
index 7a4b9506d3..908aae9e18 100644
--- a/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl.go
+++ b/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl.go
@@ -4,7 +4,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//	http://www.apache.org/licenses/LICENSE-2.0
+//  http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,6 +17,7 @@ package lookergenerateembedurl
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-generate-embed-url"
+const resourceType string = "looker-generate-embed-url"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -114,15 +115,15 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 	embedType := paramsMap["type"].(string)
@@ -138,7 +139,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	forceLogoutLogin := true
@@ -151,17 +152,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	logger.ErrorContext(ctx, "Making request %v", req)
 	resp, err := sdk.CreateEmbedUrlAsMe(req, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error making create_embed_url_as_me request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.ErrorContext(ctx, "Got response %v", resp)
 
 	return resp, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -175,7 +172,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -187,9 +184,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl_test.go b/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl_test.go
index 93dcd0eb88..08aeba23d5 100644
--- a/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl_test.go
+++ b/internal/tools/looker/lookergenerateembedurl/lookergenerateembedurl_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGenerateEmbedUrl(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-generate-embed-url
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-generate-embed-url
+			source: my-instance
+			description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-generate-embed-url",
+					Type:         "looker-generate-embed-url",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerGenerateEmbedUrl(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -85,23 +80,19 @@ func TestFailParseFromYamlLookerGenerateEmbedUrl(t *testing.T) {
 		{
 			desc: "Invalid field",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-generate-embed-url
-					source: my-instance
-					description: some description
-					invalid_field: "should not be here"
+			kind: tools
+			name: example_tool
+			type: looker-generate-embed-url
+			source: my-instance
+			description: some description
+			invalid_field: "should not be here"
 			`,
 			err: "unknown field",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases.go b/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases.go
index 96c80f5cdd..c62fcef1f1 100644
--- a/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases.go
+++ b/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases.go
@@ -16,22 +16,24 @@ package lookergetconnectiondatabases
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
 	"github.com/looker-open-source/sdk-codegen/go/rtl"
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-connection-databases"
+const resourceType string = "looker-get-connection-databases"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -107,35 +109,30 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	conn, ok := mapParams["conn"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'conn' must be a string, got %T", mapParams["conn"])
+		return nil, util.NewAgentError(fmt.Sprintf("'conn' must be a string, got %T", mapParams["conn"]), nil)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	resp, err := sdk.ConnectionDatabases(conn, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_connection_databases request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
-	//logger.DebugContext(ctx, "Got response of %v\n", resp)
 
 	return resp, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -149,7 +146,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -161,9 +158,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases_test.go b/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases_test.go
index 284d4102bb..6f137e85dc 100644
--- a/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases_test.go
+++ b/internal/tools/looker/lookergetconnectiondatabases/lookergetconnectiondatabases_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetConnectionDatabases(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-databases
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-databases
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-connection-databases",
+					Type:         "looker-get-connection-databases",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetConnectionDatabases(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetConnectionDatabases(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-databases
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-databases
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-connection-databases\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-connection-databases\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-connection-databases\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-connection-databases",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetconnections/lookergetconnections.go b/internal/tools/looker/lookergetconnections/lookergetconnections.go
index f6875b3d3b..585b30f8ca 100644
--- a/internal/tools/looker/lookergetconnections/lookergetconnections.go
+++ b/internal/tools/looker/lookergetconnections/lookergetconnections.go
@@ -16,6 +16,7 @@ package lookergetconnections
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-connections"
+const resourceType string = "looker-get-connections"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -107,24 +108,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	resp, err := sdk.AllConnections("name, dialect(name), database, schema", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_connections request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	var data []any
@@ -140,7 +141,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		}
 		conn, err := sdk.ConnectionFeatures(*v.Name, "multiple_databases", source.LookerApiSettings())
 		if err != nil {
-			return nil, fmt.Errorf("error making get_connection_features request: %s", err)
+			return nil, util.ProcessGeneralError(err)
 		}
 		vMap["supports_multiple_databases"] = *conn.MultipleDatabases
 		logger.DebugContext(ctx, "Converted to %v\n", vMap)
@@ -151,10 +152,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParamValues{}, nil
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.ParamValues{}, nil
 }
@@ -168,7 +165,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -180,9 +177,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetconnections/lookergetconnections_test.go b/internal/tools/looker/lookergetconnections/lookergetconnections_test.go
index b921a57e94..0e7cc03777 100644
--- a/internal/tools/looker/lookergetconnections/lookergetconnections_test.go
+++ b/internal/tools/looker/lookergetconnections/lookergetconnections_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetConnections(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connections
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connections
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-connections",
+					Type:         "looker-get-connections",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetConnections(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetConnections(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connections
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connections
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-connections\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-connections\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-connections\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-connections",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas.go b/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas.go
index 472bf3166f..3528b08a2e 100644
--- a/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas.go
+++ b/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas.go
@@ -16,22 +16,24 @@ package lookergetconnectionschemas
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
 	"github.com/looker-open-source/sdk-codegen/go/rtl"
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-connection-schemas"
+const resourceType string = "looker-get-connection-schemas"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -108,22 +110,22 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	conn, ok := mapParams["conn"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'conn' must be a string, got %T", mapParams["conn"])
+		return nil, util.NewAgentError(fmt.Sprintf("'conn' must be a string, got %T", mapParams["conn"]), nil)
 	}
 	db, _ := mapParams["db"].(string)
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	req := v4.RequestConnectionSchemas{
 		ConnectionName: conn,
@@ -133,15 +135,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.ConnectionSchemas(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_connection_schemas request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	return resp, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -155,7 +153,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -167,9 +165,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas_test.go b/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas_test.go
index 1c2951102f..c0e7207517 100644
--- a/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas_test.go
+++ b/internal/tools/looker/lookergetconnectionschemas/lookergetconnectionschemas_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetConnectionSchemas(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-schemas
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-schemas
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-connection-schemas",
+					Type:         "looker-get-connection-schemas",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetConnectionSchemas(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetConnectionSchemas(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-schemas
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-schemas
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-connection-schemas\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-connection-schemas\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-connection-schemas\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-connection-schemas",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns.go b/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns.go
index 1fdeadd1fd..61e3974c1a 100644
--- a/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns.go
+++ b/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns.go
@@ -16,6 +16,7 @@ package lookergetconnectiontablecolumns
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-connection-table-columns"
+const resourceType string = "looker-get-connection-table-columns"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -111,34 +112,34 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	mapParams := params.AsMap()
 	conn, ok := mapParams["conn"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'conn' must be a string, got %T", mapParams["conn"])
+		return nil, util.NewAgentError(fmt.Sprintf("'conn' must be a string, got %T", mapParams["conn"]), nil)
 	}
 	db, _ := mapParams["db"].(string)
 	schema, ok := mapParams["schema"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'schema' must be a string, got %T", mapParams["schema"])
+		return nil, util.NewAgentError(fmt.Sprintf("'schema' must be a string, got %T", mapParams["schema"]), nil)
 	}
 	tables, ok := mapParams["tables"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'tables' must be a string, got %T", mapParams["tables"])
+		return nil, util.NewAgentError(fmt.Sprintf("'tables' must be a string, got %T", mapParams["tables"]), nil)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	req := v4.RequestConnectionColumns{
 		ConnectionName: conn,
@@ -150,7 +151,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.ConnectionColumns(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_connection_table_columns request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	var data []any
 	for _, t := range resp {
@@ -175,10 +176,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -192,7 +189,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -204,9 +201,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns_test.go b/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns_test.go
index 3242a31ffb..c01a8ce8d1 100644
--- a/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns_test.go
+++ b/internal/tools/looker/lookergetconnectiontablecolumns/lookergetconnectiontablecolumns_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetConnectionTableColumns(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-table-columns
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-table-columns
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-connection-table-columns",
+					Type:         "looker-get-connection-table-columns",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetConnectionTableColumns(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetConnectionTableColumns(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-table-columns
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-table-columns
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-connection-table-columns\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-connection-table-columns\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-connection-table-columns\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-connection-table-columns",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables.go b/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables.go
index dfdbd120e4..0a26997efe 100644
--- a/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables.go
+++ b/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables.go
@@ -16,6 +16,7 @@ package lookergetconnectiontables
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-connection-tables"
+const resourceType string = "looker-get-connection-tables"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,30 +111,30 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	mapParams := params.AsMap()
 	conn, ok := mapParams["conn"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'conn' must be a string, got %T", mapParams["conn"])
+		return nil, util.NewAgentError(fmt.Sprintf("'conn' must be a string, got %T", mapParams["conn"]), nil)
 	}
 	db, _ := mapParams["db"].(string)
 	schema, ok := mapParams["schema"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'schema' must be a string, got %T", mapParams["schema"])
+		return nil, util.NewAgentError(fmt.Sprintf("'schema' must be a string, got %T", mapParams["schema"]), nil)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	req := v4.RequestConnectionTables{
 		ConnectionName: conn,
@@ -144,7 +145,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.ConnectionTables(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_connection_tables request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	var data []any
 	for _, s := range resp {
@@ -166,10 +167,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -183,7 +180,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -195,9 +192,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables_test.go b/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables_test.go
index 1b6ec50aa0..0267accaf5 100644
--- a/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables_test.go
+++ b/internal/tools/looker/lookergetconnectiontables/lookergetconnectiontables_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetConnectionTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-tables
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-tables
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-connection-tables",
+					Type:         "looker-get-connection-tables",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetConnectionTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetConnectionTables(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-connection-tables
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-connection-tables
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-connection-tables\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-connection-tables\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-connection-tables\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-connection-tables",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetdashboards/lookergetdashboards.go b/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
index 60b5e82503..a4df73fbf7 100644
--- a/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
+++ b/internal/tools/looker/lookergetdashboards/lookergetdashboards.go
@@ -16,6 +16,7 @@ package lookergetdashboards
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-dashboards"
+const resourceType string = "looker-get-dashboards"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -116,15 +117,15 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 	title := paramsMap["title"].(string)
@@ -142,7 +143,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	req := v4.RequestSearchDashboards{
 		Title:       title_ptr,
@@ -153,7 +154,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	logger.ErrorContext(ctx, "Making request %v", req)
 	resp, err := sdk.SearchDashboards(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_dashboards request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.ErrorContext(ctx, "Got response %v", resp)
 	var data []any
@@ -177,10 +178,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -194,7 +191,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -206,9 +203,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetdashboards/lookergetdashboards_test.go b/internal/tools/looker/lookergetdashboards/lookergetdashboards_test.go
index b3eba2af62..83e2e8f9c5 100644
--- a/internal/tools/looker/lookergetdashboards/lookergetdashboards_test.go
+++ b/internal/tools/looker/lookergetdashboards/lookergetdashboards_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetDashboards(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-dashboards
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-dashboards
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-dashboards",
+					Type:         "looker-get-dashboards",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetDashboards(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetDashboards(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-dashboards
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-dashboards
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-dashboards\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-dashboards\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-dashboards\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-dashboards",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetdimensions/lookergetdimensions.go b/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
index 1144a8c420..3373fe7db4 100644
--- a/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
+++ b/internal/tools/looker/lookergetdimensions/lookergetdimensions.go
@@ -16,6 +16,7 @@ package lookergetdimensions
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-dimensions"
+const resourceType string = "looker-get-dimensions"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,24 +110,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	model, explore, err := lookercommon.ProcessFieldArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error processing model or explore: %w", err)
+		return nil, util.NewAgentError("error processing model or explore", err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	fields := lookercommon.DimensionsFields
 	req := v4.RequestLookmlModelExplore{
@@ -136,26 +137,22 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.LookmlModelExplore(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_dimensions request: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	if err := lookercommon.CheckLookerExploreFields(&resp); err != nil {
-		return nil, fmt.Errorf("error processing get_dimensions response: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Dimensions, source.LookerShowHiddenFields())
 	if err != nil {
-		return nil, fmt.Errorf("error extracting get_dimensions response: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "data = ", data)
 
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -169,7 +166,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -181,9 +178,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetdimensions/lookergetdimensions_test.go b/internal/tools/looker/lookergetdimensions/lookergetdimensions_test.go
index 53dba27533..5d63e5d074 100644
--- a/internal/tools/looker/lookergetdimensions/lookergetdimensions_test.go
+++ b/internal/tools/looker/lookergetdimensions/lookergetdimensions_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetDimensions(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-dimensions
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-dimensions
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-dimensions",
+					Type:         "looker-get-dimensions",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetDimensions(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetDimensions(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-dimensions
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-dimensions
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-dimensions\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-dimensions\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-dimensions\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-dimensions",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetexplores/lookergetexplores.go b/internal/tools/looker/lookergetexplores/lookergetexplores.go
index 39996152ec..2a58ffdcde 100644
--- a/internal/tools/looker/lookergetexplores/lookergetexplores.go
+++ b/internal/tools/looker/lookergetexplores/lookergetexplores.go
@@ -16,6 +16,7 @@ package lookergetexplores
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-explores"
+const resourceType string = "looker-get-explores"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -64,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,29 +110,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	mapParams := params.AsMap()
 	model, ok := mapParams["model"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'model' must be a string, got %T", mapParams["model"])
+		return nil, util.NewAgentError(fmt.Sprintf("'model' must be a string, got %T", mapParams["model"]), nil)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	resp, err := sdk.LookmlModel(model, "explores(name,description,label,group_label,hidden)", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_explores request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	var data []any
@@ -161,10 +162,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -178,7 +175,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -190,9 +187,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetexplores/lookergetexplores_test.go b/internal/tools/looker/lookergetexplores/lookergetexplores_test.go
index 1c0b0d72b3..4e3aa50795 100644
--- a/internal/tools/looker/lookergetexplores/lookergetexplores_test.go
+++ b/internal/tools/looker/lookergetexplores/lookergetexplores_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetExplores(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-explores
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-explores
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-explores",
+					Type:         "looker-get-explores",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetExplores(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetFilters(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-explores
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-explores
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-explores\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-explores\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-explores\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-explores",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetfilters/lookergetfilters.go b/internal/tools/looker/lookergetfilters/lookergetfilters.go
index 880680bbdb..20db21c0b5 100644
--- a/internal/tools/looker/lookergetfilters/lookergetfilters.go
+++ b/internal/tools/looker/lookergetfilters/lookergetfilters.go
@@ -16,6 +16,7 @@ package lookergetfilters
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-filters"
+const resourceType string = "looker-get-filters"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,25 +110,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	model, explore, err := lookercommon.ProcessFieldArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error processing model or explore: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("error processing model or explore: %v", err), err)
 	}
 
 	fields := lookercommon.FiltersFields
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
@@ -136,26 +137,22 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.LookmlModelExplore(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_filters request: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_filters request: %v", err), http.StatusInternalServerError, err)
 	}
 
 	if err := lookercommon.CheckLookerExploreFields(&resp); err != nil {
-		return nil, fmt.Errorf("error processing get_filters response: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error processing get_filters response: %v", err), http.StatusInternalServerError, err)
 	}
 
 	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Filters, source.LookerShowHiddenFields())
 	if err != nil {
-		return nil, fmt.Errorf("error extracting get_filters response: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error extracting get_filters response: %v", err), http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "data = ", data)
 
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -169,7 +166,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -181,9 +178,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetfilters/lookergetfilters_test.go b/internal/tools/looker/lookergetfilters/lookergetfilters_test.go
index 0cec5dd0bb..76b3ab19db 100644
--- a/internal/tools/looker/lookergetfilters/lookergetfilters_test.go
+++ b/internal/tools/looker/lookergetfilters/lookergetfilters_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetFilters(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-filters
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-filters
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-filters",
+					Type:         "looker-get-filters",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetFilters(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetFilters(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-filters
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-filters
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-filters\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-filters\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-filters\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-filters",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetlooks/lookergetlooks.go b/internal/tools/looker/lookergetlooks/lookergetlooks.go
index 9a3a8a5456..f6642c5772 100644
--- a/internal/tools/looker/lookergetlooks/lookergetlooks.go
+++ b/internal/tools/looker/lookergetlooks/lookergetlooks.go
@@ -16,6 +16,7 @@ package lookergetlooks
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-looks"
+const resourceType string = "looker-get-looks"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -116,23 +117,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
-	title := paramsMap["title"].(string)
+	title, ok := paramsMap["title"].(string)
+	if !ok {
+		return nil, util.NewAgentError("missing or invalid 'title' parameter", nil)
+	}
 	title_ptr := &title
 	if *title_ptr == "" {
 		title_ptr = nil
 	}
-	desc := paramsMap["desc"].(string)
+	desc, ok := paramsMap["desc"].(string)
+	if !ok {
+		return nil, util.NewAgentError("missing or invalid 'desc' parameter", nil)
+	}
 	desc_ptr := &desc
 	if *desc_ptr == "" {
 		desc_ptr = nil
@@ -142,7 +149,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 	req := v4.RequestSearchLooks{
 		Title:       title_ptr,
@@ -152,7 +159,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.SearchLooks(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_looks request: %s", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_looks request: %s", err), http.StatusInternalServerError, err)
 	}
 
 	var data []any
@@ -177,10 +184,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -194,7 +197,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -206,9 +209,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetlooks/lookergetlooks_test.go b/internal/tools/looker/lookergetlooks/lookergetlooks_test.go
index b6a4f23dd7..56320498eb 100644
--- a/internal/tools/looker/lookergetlooks/lookergetlooks_test.go
+++ b/internal/tools/looker/lookergetlooks/lookergetlooks_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetLooks(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-looks
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-looks
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-looks",
+					Type:         "looker-get-looks",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetLooks(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetLooks(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-looks
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-looks
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-looks\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-looks\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-looks\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-looks",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetmeasures/lookergetmeasures.go b/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
index 9ca671841f..d326c55909 100644
--- a/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
+++ b/internal/tools/looker/lookergetmeasures/lookergetmeasures.go
@@ -16,6 +16,7 @@ package lookergetmeasures
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-measures"
+const resourceType string = "looker-get-measures"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,25 +110,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	model, explore, err := lookercommon.ProcessFieldArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error processing model or explore: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("error processing model or explore: %v", err), err)
 	}
 
 	fields := lookercommon.MeasuresFields
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
@@ -136,26 +137,22 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.LookmlModelExplore(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_measures request: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_measures request: %v", err), http.StatusInternalServerError, err)
 	}
 
 	if err := lookercommon.CheckLookerExploreFields(&resp); err != nil {
-		return nil, fmt.Errorf("error processing get_measures response: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error processing get_measures response: %v", err), http.StatusInternalServerError, err)
 	}
 
 	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Measures, source.LookerShowHiddenFields())
 	if err != nil {
-		return nil, fmt.Errorf("error extracting get_measures response: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error extracting get_measures response: %v", err), http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "data = ", data)
 
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -169,7 +166,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -181,9 +178,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetmeasures/lookergetmeasures_test.go b/internal/tools/looker/lookergetmeasures/lookergetmeasures_test.go
index 7587b4cd3c..cb29d86f85 100644
--- a/internal/tools/looker/lookergetmeasures/lookergetmeasures_test.go
+++ b/internal/tools/looker/lookergetmeasures/lookergetmeasures_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetMeasures(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-measures
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-measures
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-measures",
+					Type:         "looker-get-measures",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetMeasures(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetMeasures(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-measures
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-measures
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-measures\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-measures\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-measures\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-measures",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetmodels/lookergetmodels.go b/internal/tools/looker/lookergetmodels/lookergetmodels.go
index 3ba6c30f91..221570f652 100644
--- a/internal/tools/looker/lookergetmodels/lookergetmodels.go
+++ b/internal/tools/looker/lookergetmodels/lookergetmodels.go
@@ -16,6 +16,7 @@ package lookergetmodels
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-models"
+const resourceType string = "looker-get-models"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -64,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -108,15 +109,15 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	excludeEmpty := false
@@ -125,7 +126,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 	req := v4.RequestAllLookmlModels{
 		ExcludeEmpty:    &excludeEmpty,
@@ -134,7 +135,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.AllLookmlModels(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_models request: %s", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_models request: %s", err), http.StatusInternalServerError, err)
 	}
 
 	var data []any
@@ -153,10 +154,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParamValues{}, nil
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.ParamValues{}, nil
 }
@@ -170,7 +167,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -182,9 +179,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetmodels/lookergetmodels_test.go b/internal/tools/looker/lookergetmodels/lookergetmodels_test.go
index b28c02c317..742d004599 100644
--- a/internal/tools/looker/lookergetmodels/lookergetmodels_test.go
+++ b/internal/tools/looker/lookergetmodels/lookergetmodels_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetModels(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-models
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-models
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-models",
+					Type:         "looker-get-models",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetModels(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetModels(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-models
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-models
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-models\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-models\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-models\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-models",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetparameters/lookergetparameters.go b/internal/tools/looker/lookergetparameters/lookergetparameters.go
index 3dd0acb833..172c6d0cdf 100644
--- a/internal/tools/looker/lookergetparameters/lookergetparameters.go
+++ b/internal/tools/looker/lookergetparameters/lookergetparameters.go
@@ -7,7 +7,7 @@
 //	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,
+// distributed under the License is distributed under 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.
@@ -16,6 +16,7 @@ package lookergetparameters
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-parameters"
+const resourceType string = "looker-get-parameters"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,25 +110,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	model, explore, err := lookercommon.ProcessFieldArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error processing model or explore: %w", err)
+		return nil, util.NewAgentError(fmt.Sprintf("error processing model or explore: %v", err), err)
 	}
 
 	fields := lookercommon.ParametersFields
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 	req := v4.RequestLookmlModelExplore{
 		LookmlModelName: *model,
@@ -136,26 +137,22 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.LookmlModelExplore(req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_parameters request: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_parameters request: %v", err), http.StatusInternalServerError, err)
 	}
 
 	if err := lookercommon.CheckLookerExploreFields(&resp); err != nil {
-		return nil, fmt.Errorf("error processing get_parameters response: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error processing get_parameters response: %v", err), http.StatusInternalServerError, err)
 	}
 
 	data, err := lookercommon.ExtractLookerFieldProperties(ctx, resp.Fields.Parameters, source.LookerShowHiddenFields())
 	if err != nil {
-		return nil, fmt.Errorf("error extracting get_parameters response: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error extracting get_parameters response: %v", err), http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "data = ", data)
 
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -169,7 +166,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -181,9 +178,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetparameters/lookergetparameters_test.go b/internal/tools/looker/lookergetparameters/lookergetparameters_test.go
index 3c4679e8ec..6c54db6e16 100644
--- a/internal/tools/looker/lookergetparameters/lookergetparameters_test.go
+++ b/internal/tools/looker/lookergetparameters/lookergetparameters_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetParameters(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-parameters
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-parameters
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-parameters",
+					Type:         "looker-get-parameters",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetParameters(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetParameters(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-parameters
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-parameters
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-parameters\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-parameters\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-parameters\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-parameters",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetprojectfile/lookergetprojectfile.go b/internal/tools/looker/lookergetprojectfile/lookergetprojectfile.go
index 1843860e75..378111b754 100644
--- a/internal/tools/looker/lookergetprojectfile/lookergetprojectfile.go
+++ b/internal/tools/looker/lookergetprojectfile/lookergetprojectfile.go
@@ -16,6 +16,7 @@ package lookergetprojectfile
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-project-file"
+const resourceType string = "looker-get-project-file"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -64,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,35 +111,35 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams["project_id"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'project_id' must be a string, got %T", mapParams["project_id"])
+		return nil, util.NewAgentError(fmt.Sprintf("'project_id' must be a string, got %T", mapParams["project_id"]), nil)
 	}
 	filePath, ok := mapParams["file_path"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'file_path' must be a string, got %T", mapParams["file_path"])
+		return nil, util.NewAgentError(fmt.Sprintf("'file_path' must be a string, got %T", mapParams["file_path"]), nil)
 	}
 
 	resp, err := lookercommon.GetProjectFileContent(sdk, projectId, filePath, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_project_file request: %s", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_project_file request: %s", err), http.StatusInternalServerError, err)
 	}
 
 	logger.DebugContext(ctx, "Got response of %v\n", resp)
@@ -149,10 +150,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -166,7 +163,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -178,9 +175,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetprojectfile/lookergetprojectfile_test.go b/internal/tools/looker/lookergetprojectfile/lookergetprojectfile_test.go
index cfd182c1d6..d3d5c9382e 100644
--- a/internal/tools/looker/lookergetprojectfile/lookergetprojectfile_test.go
+++ b/internal/tools/looker/lookergetprojectfile/lookergetprojectfile_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetProjectFile(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-project-file
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-project-file
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-project-file",
+					Type:         "looker-get-project-file",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetProjectFile(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,19 @@ func TestFailParseFromYamlLookerGetProjectFile(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-project-file
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-project-file
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-project-file\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-project-file\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-project-file\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-project-file",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles.go b/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles.go
index d6e42ac451..b2a05ff626 100644
--- a/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles.go
+++ b/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles.go
@@ -16,6 +16,7 @@ package lookergetprojectfiles
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-project-files"
+const resourceType string = "looker-get-project-files"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -108,31 +109,31 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams["project_id"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'project_id' must be a string, got %T", mapParams["project_id"])
+		return nil, util.NewAgentError(fmt.Sprintf("'project_id' must be a string, got %T", mapParams["project_id"]), nil)
 	}
 
 	resp, err := sdk.AllProjectFiles(projectId, "", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_project_files request: %s", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_project_files request: %s", err), http.StatusInternalServerError, err)
 	}
 
 	var data []any
@@ -165,10 +166,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -182,7 +179,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -194,9 +191,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles_test.go b/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles_test.go
index 83a315b449..319b3f8461 100644
--- a/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles_test.go
+++ b/internal/tools/looker/lookergetprojectfiles/lookergetprojectfiles_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetProjectFiles(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-project-files
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-project-files
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-project-files",
+					Type:         "looker-get-project-files",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerGetProjectFiles(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerGetProjectFiles(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-project-files
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-project-files
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-project-files\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-project-files\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-project-files\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-project-files",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookergetprojects/lookergetprojects.go b/internal/tools/looker/lookergetprojects/lookergetprojects.go
index fd7f0288da..74118951a6 100644
--- a/internal/tools/looker/lookergetprojects/lookergetprojects.go
+++ b/internal/tools/looker/lookergetprojects/lookergetprojects.go
@@ -16,6 +16,7 @@ package lookergetprojects
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -28,11 +29,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-get-projects"
+const resourceType string = "looker-get-projects"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -53,7 +54,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -107,25 +108,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 
 	resp, err := sdk.AllProjects("id,name", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making get_models request: %s", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error making get_models request: %s", err), http.StatusInternalServerError, err)
 	}
 
 	var data []any
@@ -142,10 +143,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParamValues{}, nil
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.ParamValues{}, nil
 }
@@ -159,7 +156,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -171,9 +168,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookergetprojects/lookergetprojects_test.go b/internal/tools/looker/lookergetprojects/lookergetprojects_test.go
index 3a25be54d5..b390257457 100644
--- a/internal/tools/looker/lookergetprojects/lookergetprojects_test.go
+++ b/internal/tools/looker/lookergetprojects/lookergetprojects_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerGetProjects(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-projects
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-projects
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-get-projects",
+					Type:         "looker-get-projects",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerGetProjects(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +81,19 @@ func TestFailParseFromYamlLookerGetProjecProjects(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-get-projects
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-get-projects
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-get-projects\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-get-projects\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-get-projects\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-get-projects",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze.go b/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze.go
index 1f3ef98d05..ae28c7e5f9 100644
--- a/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze.go
+++ b/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -34,11 +35,11 @@ import (
 // =================================================================================================================
 // START MCP SERVER CORE LOGIC
 // =================================================================================================================
-const kind string = "looker-health-analyze"
+const resourceType string = "looker-health-analyze"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,7 +60,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -69,8 +70,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -125,20 +126,20 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error getting sdk: %v", err), http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
@@ -159,7 +160,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	action, ok := paramsMap["action"].(string)
 	if !ok {
-		return nil, fmt.Errorf("action parameter not found")
+		return nil, util.NewAgentError("action parameter not found", nil)
 	}
 
 	switch action {
@@ -167,7 +168,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		projectId, _ := paramsMap["project"].(string)
 		result, err := analyzeTool.projects(ctx, projectId)
 		if err != nil {
-			return nil, fmt.Errorf("error analyzing projects: %w", err)
+			return nil, util.NewClientServerError(fmt.Sprintf("error analyzing projects: %v", err), http.StatusInternalServerError, err)
 		}
 		logger.DebugContext(ctx, "result = ", result)
 		return result, nil
@@ -176,7 +177,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		modelName, _ := paramsMap["model"].(string)
 		result, err := analyzeTool.models(ctx, projectName, modelName)
 		if err != nil {
-			return nil, fmt.Errorf("error analyzing models: %w", err)
+			return nil, util.NewClientServerError(fmt.Sprintf("error analyzing models: %v", err), http.StatusInternalServerError, err)
 		}
 		logger.DebugContext(ctx, "result = ", result)
 		return result, nil
@@ -185,17 +186,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		exploreName, _ := paramsMap["explore"].(string)
 		result, err := analyzeTool.explores(ctx, modelName, exploreName)
 		if err != nil {
-			return nil, fmt.Errorf("error analyzing explores: %w", err)
+			return nil, util.NewClientServerError(fmt.Sprintf("error analyzing explores: %v", err), http.StatusInternalServerError, err)
 		}
 		logger.DebugContext(ctx, "result = ", result)
 		return result, nil
 	default:
-		return nil, fmt.Errorf("unknown action: %s", action)
+		return nil, util.NewAgentError(fmt.Sprintf("unknown action: %s", action), nil)
 	}
 }
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
@@ -210,7 +208,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -234,23 +232,23 @@ type analyzeTool struct {
 	minQueries int
 }
 
-func (t *analyzeTool) projects(ctx context.Context, id string) ([]map[string]interface{}, error) {
+func (t *analyzeTool) projects(ctx context.Context, id string) ([]map[string]interface{}, util.ToolboxError) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	var projects []*v4.Project
 	if id != "" {
 		p, err := t.SdkClient.Project(id, "", nil)
 		if err != nil {
-			return nil, fmt.Errorf("error fetching project %s: %w", id, err)
+			return nil, util.NewClientServerError(fmt.Sprintf("error fetching project %s: %v", id, err), http.StatusInternalServerError, err)
 		}
 		projects = append(projects, &p)
 	} else {
 		allProjects, err := t.SdkClient.AllProjects("", nil)
 		if err != nil {
-			return nil, fmt.Errorf("error fetching all projects: %w", err)
+			return nil, util.NewClientServerError(fmt.Sprintf("error fetching all projects: %v", err), http.StatusInternalServerError, err)
 		}
 		for i := range allProjects {
 			projects = append(projects, &allProjects[i])
@@ -265,7 +263,7 @@ func (t *analyzeTool) projects(ctx context.Context, id string) ([]map[string]int
 
 		projectFiles, err := t.SdkClient.AllProjectFiles(pID, "", nil)
 		if err != nil {
-			return nil, fmt.Errorf("error fetching files for project %s: %w", pName, err)
+			return nil, util.NewClientServerError(fmt.Sprintf("error fetching files for project %s: %v", pName, err), http.StatusInternalServerError, err)
 		}
 
 		modelCount := 0
@@ -300,21 +298,21 @@ func (t *analyzeTool) projects(ctx context.Context, id string) ([]map[string]int
 	return results, nil
 }
 
-func (t *analyzeTool) models(ctx context.Context, project, model string) ([]map[string]interface{}, error) {
+func (t *analyzeTool) models(ctx context.Context, project, model string) ([]map[string]interface{}, util.ToolboxError) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.InfoContext(ctx, "Analyzing models...")
 
 	usedModels, err := t.getUsedModels(ctx)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("error fetching used models", http.StatusInternalServerError, err)
 	}
 
 	lookmlModels, err := t.SdkClient.AllLookmlModels(v4.RequestAllLookmlModels{}, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error fetching LookML models: %w", err)
+		return nil, util.NewClientServerError("error fetching LookML models", http.StatusInternalServerError, err)
 	}
 
 	var results []map[string]interface{}
@@ -359,7 +357,7 @@ func (t *analyzeTool) getUsedModels(ctx context.Context) (map[string]int, error)
 	}
 	raw, err := lookercommon.RunInlineQuery(ctx, t.SdkClient, query, "json", nil)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError(fmt.Sprintf("error running inline query for used models: %v", err), http.StatusInternalServerError, err)
 	}
 
 	var data []map[string]interface{}
@@ -374,7 +372,7 @@ func (t *analyzeTool) getUsedModels(ctx context.Context) (map[string]int, error)
 	return results, nil
 }
 
-func (t *analyzeTool) getUsedExploreFields(ctx context.Context, model, explore string) (map[string]int, error) {
+func (t *analyzeTool) getUsedExploreFields(ctx context.Context, model, explore string) (map[string]int, util.ToolboxError) {
 	limit := "5000"
 	query := &v4.WriteQuery{
 		Model:  "system__activity",
@@ -391,7 +389,7 @@ func (t *analyzeTool) getUsedExploreFields(ctx context.Context, model, explore s
 	}
 	raw, err := lookercommon.RunInlineQuery(ctx, t.SdkClient, query, "json", nil)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError(fmt.Sprintf("error running inline query for used explore fields: %v", err), http.StatusInternalServerError, err)
 	}
 
 	var data []map[string]interface{}
@@ -421,16 +419,16 @@ func (t *analyzeTool) getUsedExploreFields(ctx context.Context, model, explore s
 	return results, nil
 }
 
-func (t *analyzeTool) explores(ctx context.Context, model, explore string) ([]map[string]interface{}, error) {
+func (t *analyzeTool) explores(ctx context.Context, model, explore string) ([]map[string]interface{}, util.ToolboxError) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.InfoContext(ctx, "Analyzing explores...")
 
 	lookmlModels, err := t.SdkClient.AllLookmlModels(v4.RequestAllLookmlModels{}, nil)
 	if err != nil {
-		return nil, fmt.Errorf("error fetching LookML models: %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("error fetching LookML models: %v", err), http.StatusInternalServerError, err)
 	}
 
 	var results []map[string]interface{}
@@ -537,7 +535,7 @@ func (t *analyzeTool) explores(ctx context.Context, model, explore string) ([]ma
 
 			rawQueryCount, err := lookercommon.RunInlineQuery(ctx, t.SdkClient, queryCountQueryBody, "json", nil)
 			if err != nil {
-				return nil, err
+				return nil, util.NewClientServerError(fmt.Sprintf("error running inline query for query count: %v", err), http.StatusInternalServerError, err)
 			}
 			queryCount := 0
 			var data []map[string]interface{}
@@ -569,9 +567,13 @@ func (t *analyzeTool) explores(ctx context.Context, model, explore string) ([]ma
 // =================================================================================================================
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze_test.go b/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze_test.go
index 7d41a972e8..52d0af8c89 100644
--- a/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze_test.go
+++ b/internal/tools/looker/lookerhealthanalyze/lookerhealthanalyze_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerHealthAnalyze(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-health-analyze
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-health-analyze
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": lha.Config{
 					Name:         "example_tool",
-					Kind:         "looker-health-analyze",
+					Type:         "looker-health-analyze",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerHealthAnalyze(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -85,22 +80,18 @@ func TestFailParseFromYamlLookerHealthAnalyze(t *testing.T) {
 		{
 			desc: "Invalid field",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-health-analyze
-					source: my-instance
-					invalid_field: true
+			kind: tools
+			name: example_tool
+			type: looker-health-analyze
+			source: my-instance
+			invalid_field: true
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-health-analyze\": [2:1] unknown field \"invalid_field\"",
+			err: "unable to parse tool \"example_tool\" as type \"looker-health-analyze\": [2:1] unknown field \"invalid_field\"",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerhealthpulse/lookerhealthpulse.go b/internal/tools/looker/lookerhealthpulse/lookerhealthpulse.go
index 08556114d4..6d0177ecf5 100644
--- a/internal/tools/looker/lookerhealthpulse/lookerhealthpulse.go
+++ b/internal/tools/looker/lookerhealthpulse/lookerhealthpulse.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"strings"
 
 	yaml "github.com/goccy/go-yaml"
@@ -34,11 +35,11 @@ import (
 // =================================================================================================================
 // START MCP SERVER CORE LOGIC
 // =================================================================================================================
-const kind string = "looker-health-pulse"
+const resourceType string = "looker-health-pulse"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,7 +60,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -69,8 +70,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -116,20 +117,20 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	pulseTool := &pulseTool{
@@ -140,7 +141,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	paramsMap := params.AsMap()
 	action, ok := paramsMap["action"].(string)
 	if !ok {
-		return nil, fmt.Errorf("action parameter not found")
+		return nil, util.NewAgentError("action parameter not found", nil)
 	}
 
 	pulseParams := PulseParams{
@@ -149,7 +150,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	result, err := pulseTool.RunPulse(ctx, source, pulseParams)
 	if err != nil {
-		return nil, fmt.Errorf("error running pulse: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	logger.DebugContext(ctx, "result = ", result)
@@ -157,10 +158,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return result, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -174,7 +171,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -469,9 +466,13 @@ func (t *pulseTool) checkLegacyFeatures(ctx context.Context, source compatibleSo
 // =================================================================================================================
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerhealthpulse/lookerhealthpulse_test.go b/internal/tools/looker/lookerhealthpulse/lookerhealthpulse_test.go
index 12a7b69a77..7ef3779bbd 100644
--- a/internal/tools/looker/lookerhealthpulse/lookerhealthpulse_test.go
+++ b/internal/tools/looker/lookerhealthpulse/lookerhealthpulse_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerHealthPulse(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-health-pulse
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-health-pulse
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": lhp.Config{
 					Name:         "example_tool",
-					Kind:         "looker-health-pulse",
+					Type:         "looker-health-pulse",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerHealthPulse(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -85,22 +80,18 @@ func TestFailParseFromYamlLookerHealthPulse(t *testing.T) {
 		{
 			desc: "Invalid field",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-health-pulse
-					source: my-instance
-					invalid_field: true
+			kind: tools
+			name: example_tool
+			type: looker-health-pulse
+			source: my-instance
+			invalid_field: true
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-health-pulse\": [2:1] unknown field \"invalid_field\"",
+			err: "unable to parse tool \"example_tool\" as type \"looker-health-pulse\": [2:1] unknown field \"invalid_field\"",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum.go b/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum.go
index bb4e3c9967..c3b5658d57 100644
--- a/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum.go
+++ b/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -34,11 +35,11 @@ import (
 // =================================================================================================================
 // START MCP SERVER CORE LOGIC
 // =================================================================================================================
-const kind string = "looker-health-vacuum"
+const resourceType string = "looker-health-vacuum"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,7 +60,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -69,8 +70,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -125,15 +126,15 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
@@ -154,25 +155,29 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	action, ok := paramsMap["action"].(string)
 	if !ok {
-		return nil, fmt.Errorf("action parameter not found")
+		return nil, util.NewAgentError("action parameter not found", nil)
 	}
 
+	var res []map[string]interface{}
+
 	switch action {
 	case "models":
 		project, _ := paramsMap["project"].(string)
 		model, _ := paramsMap["model"].(string)
-		return vacuumTool.models(ctx, project, model)
+		res, err = vacuumTool.models(ctx, project, model)
 	case "explores":
 		model, _ := paramsMap["model"].(string)
 		explore, _ := paramsMap["explore"].(string)
-		return vacuumTool.explores(ctx, model, explore)
+		res, err = vacuumTool.explores(ctx, model, explore)
 	default:
-		return nil, fmt.Errorf("unknown action: %s", action)
+		return nil, util.NewAgentError(fmt.Sprintf("unknown action: %s", action), nil)
 	}
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+
+	return res, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -188,7 +193,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -473,9 +478,13 @@ func (t *vacuumTool) getUsedExploreFields(ctx context.Context, model, explore st
 // =================================================================================================================
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum_test.go b/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum_test.go
index 59fd2f2121..7da00fc980 100644
--- a/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum_test.go
+++ b/internal/tools/looker/lookerhealthvacuum/lookerhealthvacuum_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerHealthVacuum(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-health-vacuum
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-health-vacuum
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": lhv.Config{
 					Name:         "example_tool",
-					Kind:         "looker-health-vacuum",
+					Type:         "looker-health-vacuum",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerHealthVacuum(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -85,22 +80,18 @@ func TestFailParseFromYamlLookerHealthVacuum(t *testing.T) {
 		{
 			desc: "Invalid field",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-health-vacuum
-					source: my-instance
-					invalid_field: true
+			kind: tools
+			name: example_tool
+			type: looker-health-vacuum
+			source: my-instance
+			invalid_field: true
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-health-vacuum\": [2:1] unknown field \"invalid_field\"",
+			err: "unable to parse tool \"example_tool\" as type \"looker-health-vacuum\": [2:1] unknown field \"invalid_field\"",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookermakedashboard/lookermakedashboard.go b/internal/tools/looker/lookermakedashboard/lookermakedashboard.go
index 13b0fc54b6..8934e46dc9 100644
--- a/internal/tools/looker/lookermakedashboard/lookermakedashboard.go
+++ b/internal/tools/looker/lookermakedashboard/lookermakedashboard.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"slices"
 
 	yaml "github.com/goccy/go-yaml"
@@ -30,11 +31,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-make-dashboard"
+const resourceType string = "looker-make-dashboard"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -116,21 +117,21 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "params = ", params)
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
@@ -141,19 +142,19 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	mrespFields := "id,personal_folder_id"
 	mresp, err := sdk.Me(mrespFields, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making me request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	if folder == "" {
 		if mresp.PersonalFolderId == nil || *mresp.PersonalFolderId == "" {
-			return nil, fmt.Errorf("user does not have a personal folder. A folder must be specified")
+			return nil, util.NewAgentError("user does not have a personal folder. A folder must be specified", nil)
 		}
 		folder = *mresp.PersonalFolderId
 	}
 
 	dashs, err := sdk.FolderDashboards(folder, "title", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error getting existing dashboards in folder: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	dashTitles := []string{}
@@ -162,7 +163,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	if slices.Contains(dashTitles, title) {
 		lt, _ := json.Marshal(dashTitles)
-		return nil, fmt.Errorf("title %s already used in folder. Currently used titles are %v. Make the call again with a unique title", title, string(lt))
+		return nil, util.NewAgentError(fmt.Sprintf("title %s already used in folder. Currently used titles are %v. Make the call again with a unique title", title, string(lt)), nil)
 	}
 
 	wd := v4.WriteDashboard{
@@ -172,7 +173,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.CreateDashboard(wd, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create dashboard request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)
 
@@ -197,10 +198,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -214,7 +211,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -226,9 +223,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookermakedashboard/lookermakedashboard_test.go b/internal/tools/looker/lookermakedashboard/lookermakedashboard_test.go
index 2da79199ed..ef332cb1f6 100644
--- a/internal/tools/looker/lookermakedashboard/lookermakedashboard_test.go
+++ b/internal/tools/looker/lookermakedashboard/lookermakedashboard_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerMakeDashboard(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-make-dashboard
-					source: my-instance
-					description: some description
-				`,
+			kind: tools
+			name: example_tool
+			type: looker-make-dashboard
+			source: my-instance
+			description: some description
+			`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-make-dashboard",
+					Type:         "looker-make-dashboard",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerMakeDashboard(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +81,19 @@ func TestFailParseFromYamlMakeDashboard(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-make-dashboard
-					source: my-instance
-					method: GOT
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-make-dashboard
+			source: my-instance
+			method: GOT
+			description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-make-dashboard\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-make-dashboard\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-make-dashboard\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-make-dashboard",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookermakelook/lookermakelook.go b/internal/tools/looker/lookermakelook/lookermakelook.go
index 43509cd5cc..3dcaf91716 100644
--- a/internal/tools/looker/lookermakelook/lookermakelook.go
+++ b/internal/tools/looker/lookermakelook/lookermakelook.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"slices"
 
 	yaml "github.com/goccy/go-yaml"
@@ -31,11 +32,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-make-look"
+const resourceType string = "looker-make-look"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -56,7 +57,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -66,8 +67,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -123,25 +124,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "params = ", params)
 	wq, err := lookercommon.ProcessQueryArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error building query request: %w", err)
+		return nil, util.NewAgentError("error building query request", err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 	title := paramsMap["title"].(string)
@@ -152,19 +153,19 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	mrespFields := "id,personal_folder_id"
 	mresp, err := sdk.Me(mrespFields, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making me request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	if folder == "" {
 		if mresp.PersonalFolderId == nil || *mresp.PersonalFolderId == "" {
-			return nil, fmt.Errorf("user does not have a personal folder. A folder must be specified")
+			return nil, util.NewAgentError("user does not have a personal folder. A folder must be specified", nil)
 		}
 		folder = *mresp.PersonalFolderId
 	}
 
 	looks, err := sdk.FolderLooks(folder, "title", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error getting existing looks in folder: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	lookTitles := []string{}
@@ -173,7 +174,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	if slices.Contains(lookTitles, title) {
 		lt, _ := json.Marshal(lookTitles)
-		return nil, fmt.Errorf("title %s already used in folder. Currently used titles are %v. Make the call again with a unique title", title, string(lt))
+		return nil, util.NewAgentError(fmt.Sprintf("title %s already used in folder. Currently used titles are %v. Make the call again with a unique title", title, string(lt)), nil)
 	}
 
 	wq.VisConfig = &visConfig
@@ -181,7 +182,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	qrespFields := "id"
 	qresp, err := sdk.CreateQuery(*wq, qrespFields, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create query request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	wlwq := v4.WriteLookWithQuery{
@@ -193,7 +194,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := sdk.CreateLook(wlwq, "", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making create look request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = %v", resp)
 
@@ -218,10 +219,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -235,7 +232,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -247,9 +244,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookermakelook/lookermakelook_test.go b/internal/tools/looker/lookermakelook/lookermakelook_test.go
index f6a3bd71f5..38e06a9aee 100644
--- a/internal/tools/looker/lookermakelook/lookermakelook_test.go
+++ b/internal/tools/looker/lookermakelook/lookermakelook_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerMakeLook(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-make-look
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-make-look
+			source: my-instance
+			description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-make-look",
+					Type:         "looker-make-look",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerMakeLook(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +81,19 @@ func TestFailParseFromYamlLookerMakeLook(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-make-look
-					source: my-instance
-					method: GOT
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-make-look
+			source: my-instance
+			method: GOT
+			description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-make-look\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-make-look\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-make-look\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-make-look",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerquery/lookerquery.go b/internal/tools/looker/lookerquery/lookerquery.go
index 7120f46f02..2d099f7519 100644
--- a/internal/tools/looker/lookerquery/lookerquery.go
+++ b/internal/tools/looker/lookerquery/lookerquery.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -30,11 +31,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-query"
+const resourceType string = "looker-query"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,27 +110,27 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	wq, err := lookercommon.ProcessQueryArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error building WriteQuery request: %w", err)
+		return nil, util.NewAgentError("error building WriteQuery request", err)
 	}
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	resp, err := lookercommon.RunInlineQuery(ctx, sdk, wq, "json", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making query request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	logger.DebugContext(ctx, "resp = ", resp)
@@ -137,7 +138,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	var data []any
 	e := json.Unmarshal([]byte(resp), &data)
 	if e != nil {
-		return nil, fmt.Errorf("error unmarshaling query response: %s", e)
+		return nil, util.NewClientServerError("error unmarshaling query response", http.StatusInternalServerError, e)
 	}
 
 	logger.DebugContext(ctx, "data = ", data)
@@ -145,10 +146,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -162,7 +159,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -174,9 +171,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerquery/lookerquery_test.go b/internal/tools/looker/lookerquery/lookerquery_test.go
index e204096e50..1e30a96da4 100644
--- a/internal/tools/looker/lookerquery/lookerquery_test.go
+++ b/internal/tools/looker/lookerquery/lookerquery_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-query
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-query
+			source: my-instance
+			description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-query",
+					Type:         "looker-query",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,11 @@ func TestParseFromYamlLookerQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +81,19 @@ func TestFailParseFromYamlLookerQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-query
-					source: my-instance
-					method: GOT
-					description: some description
+			kind: tools
+			name: example_tool
+			type: looker-query
+			source: my-instance
+			method: GOT
+			description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-query\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-query\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-query\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-query",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerquerysql/lookerquerysql.go b/internal/tools/looker/lookerquerysql/lookerquerysql.go
index b587311928..577b67678e 100644
--- a/internal/tools/looker/lookerquerysql/lookerquerysql.go
+++ b/internal/tools/looker/lookerquerysql/lookerquerysql.go
@@ -16,6 +16,7 @@ package lookerquerysql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-query-sql"
+const resourceType string = "looker-query-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -64,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -108,37 +109,33 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	wq, err := lookercommon.ProcessQueryArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error building query request: %w", err)
+		return nil, util.NewAgentError("error building query request", err)
 	}
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	resp, err := lookercommon.RunInlineQuery(ctx, sdk, wq, "sql", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making query request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = ", resp)
 
 	return resp, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -152,7 +149,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -164,9 +161,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerquerysql/lookerquerysql_test.go b/internal/tools/looker/lookerquerysql/lookerquerysql_test.go
index bb8e25d7a4..6a49f36bbe 100644
--- a/internal/tools/looker/lookerquerysql/lookerquerysql_test.go
+++ b/internal/tools/looker/lookerquerysql/lookerquerysql_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerQuerySql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-query-sql
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-query-sql
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-query-sql",
+					Type:         "looker-query-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerQuerySql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerQuerySql(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-query-sql
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-query-sql
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-query-sql\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-query-sql\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-query-sql\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-query-sql",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerqueryurl/lookerqueryurl.go b/internal/tools/looker/lookerqueryurl/lookerqueryurl.go
index 9cc5f4f507..3b9050b796 100644
--- a/internal/tools/looker/lookerqueryurl/lookerqueryurl.go
+++ b/internal/tools/looker/lookerqueryurl/lookerqueryurl.go
@@ -16,6 +16,7 @@ package lookerqueryurl
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-query-url"
+const resourceType string = "looker-query-url"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -54,7 +55,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -64,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -115,34 +116,37 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "params = ", params)
 	wq, err := lookercommon.ProcessQueryArgs(ctx, params)
 	if err != nil {
-		return nil, fmt.Errorf("error building query request: %w", err)
+		return nil, util.NewAgentError("error building query request", err)
 	}
 
 	paramsMap := params.AsMap()
-	visConfig := paramsMap["vis_config"].(map[string]any)
+	visConfig, ok := paramsMap["vis_config"].(map[string]any)
+	if !ok {
+		visConfig = make(map[string]any)
+	}
 	wq.VisConfig = &visConfig
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	respFields := "id,slug,share_url,expanded_share_url"
 	resp, err := sdk.CreateQuery(*wq, respFields, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making query request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = ", resp)
 
@@ -164,10 +168,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -181,7 +181,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -193,9 +193,13 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerqueryurl/lookerqueryurl_test.go b/internal/tools/looker/lookerqueryurl/lookerqueryurl_test.go
index 740e3aaa3e..e98838f913 100644
--- a/internal/tools/looker/lookerqueryurl/lookerqueryurl_test.go
+++ b/internal/tools/looker/lookerqueryurl/lookerqueryurl_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerQueryUrl(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-query-url
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-query-url
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-query-url",
+					Type:         "looker-query-url",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerQueryUrl(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerQueryUrl(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-query-url
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-query-url
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-query-url\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-query-url\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-query-url\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-query-url",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerrundashboard/lookerrundashboard.go b/internal/tools/looker/lookerrundashboard/lookerrundashboard.go
index 25081e5da7..20c9433452 100644
--- a/internal/tools/looker/lookerrundashboard/lookerrundashboard.go
+++ b/internal/tools/looker/lookerrundashboard/lookerrundashboard.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"sync"
 
 	yaml "github.com/goccy/go-yaml"
@@ -31,11 +32,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-run-dashboard"
+const resourceType string = "looker-run-dashboard"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -56,7 +57,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -66,8 +67,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -114,15 +115,15 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "params = ", params)
 	paramsMap := params.AsMap()
@@ -131,11 +132,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 	dashboard, err := sdk.Dashboard(dashboard_id, "", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error getting dashboard: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	data := make(map[string]any)
@@ -161,10 +162,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -178,7 +175,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -279,9 +276,13 @@ func merge(channels ...<-chan map[string]any) <-chan map[string]any {
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerrundashboard/lookerrundashboard_test.go b/internal/tools/looker/lookerrundashboard/lookerrundashboard_test.go
index 6726e04545..20b55ce433 100644
--- a/internal/tools/looker/lookerrundashboard/lookerrundashboard_test.go
+++ b/internal/tools/looker/lookerrundashboard/lookerrundashboard_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerRunDashboard(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-run-dashboard
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-run-dashboard
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-run-dashboard",
+					Type:         "looker-run-dashboard",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerRunDashboard(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerRunDashboard(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-run-dashboard
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-run-dashboard
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-run-dashboard\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-run-dashboard\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-run-dashboard\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-run-dashboard",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerrunlook/lookerrunlook.go b/internal/tools/looker/lookerrunlook/lookerrunlook.go
index c1c7123509..5dec4ae308 100644
--- a/internal/tools/looker/lookerrunlook/lookerrunlook.go
+++ b/internal/tools/looker/lookerrunlook/lookerrunlook.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -30,11 +31,11 @@ import (
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-run-look"
+const resourceType string = "looker-run-look"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -55,7 +56,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -65,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -115,15 +116,15 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get logger from ctx: %s", err)
+		return nil, util.NewClientServerError("unable to get logger from ctx", http.StatusInternalServerError, err)
 	}
 	logger.DebugContext(ctx, "params = ", params)
 	paramsMap := params.AsMap()
@@ -134,12 +135,12 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	look, err := sdk.Look(look_id, "", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error getting look definition: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	wq := v4.WriteQuery{
@@ -155,14 +156,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	resp, err := lookercommon.RunInlineQuery(ctx, sdk, &wq, "json", source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making run_look request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	logger.DebugContext(ctx, "resp = ", resp)
 
 	var data []any
 	e := json.Unmarshal([]byte(resp), &data)
 	if e != nil {
-		return nil, fmt.Errorf("error Unmarshaling run_look response: %s", e)
+		return nil, util.NewClientServerError("error Unmarshaling run_look response", http.StatusInternalServerError, e)
 	}
 
 	logger.DebugContext(ctx, "data = ", data)
@@ -170,10 +171,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -191,7 +188,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -199,9 +196,13 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerrunlook/lookerrunlook_test.go b/internal/tools/looker/lookerrunlook/lookerrunlook_test.go
index ac2dfbe99c..ea4076b843 100644
--- a/internal/tools/looker/lookerrunlook/lookerrunlook_test.go
+++ b/internal/tools/looker/lookerrunlook/lookerrunlook_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerRunLook(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-run-look
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-run-look
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-run-look",
+					Type:         "looker-run-look",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerRunLook(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerRunLook(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-run-look
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-run-look
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-run-look\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-run-look\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-run-look\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-run-look",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile.go b/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile.go
index 03701268ab..35ea7328b1 100644
--- a/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile.go
+++ b/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile.go
@@ -16,23 +16,25 @@ package lookerupdateprojectfile
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 	"github.com/googleapis/genai-toolbox/internal/tools/looker/lookercommon"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
 	"github.com/looker-open-source/sdk-codegen/go/rtl"
 	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
 )
 
-const kind string = "looker-update-project-file"
+const resourceType string = "looker-update-project-file"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +54,7 @@ type compatibleSource interface {
 }
 type Config struct {
 	Name         string                 `yaml:"name" validate:"required"`
-	Kind         string                 `yaml:"kind" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
 	Source       string                 `yaml:"source" validate:"required"`
 	Description  string                 `yaml:"description" validate:"required"`
 	AuthRequired []string               `yaml:"authRequired"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -111,29 +113,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	sdk, err := source.GetLookerSDK(string(accessToken))
 	if err != nil {
-		return nil, fmt.Errorf("error getting sdk: %w", err)
+		return nil, util.NewClientServerError("error getting sdk", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
 	projectId, ok := mapParams["project_id"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'project_id' must be a string, got %T", mapParams["project_id"])
+		return nil, util.NewAgentError(fmt.Sprintf("'project_id' must be a string, got %T", mapParams["project_id"]), nil)
 	}
 	filePath, ok := mapParams["file_path"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'file_path' must be a string, got %T", mapParams["file_path"])
+		return nil, util.NewAgentError(fmt.Sprintf("'file_path' must be a string, got %T", mapParams["file_path"]), nil)
 	}
 	fileContent, ok := mapParams["file_content"].(string)
 	if !ok {
-		return nil, fmt.Errorf("'file_content' must be a string, got %T", mapParams["file_content"])
+		return nil, util.NewAgentError(fmt.Sprintf("'file_content' must be a string, got %T", mapParams["file_content"]), nil)
 	}
 
 	req := lookercommon.FileContent{
@@ -143,7 +145,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	err = lookercommon.UpdateProjectFile(sdk, projectId, req, source.LookerApiSettings())
 	if err != nil {
-		return nil, fmt.Errorf("error making update_project_file request: %s", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	data := make(map[string]any)
@@ -153,10 +155,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return data, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -174,7 +172,7 @@ func (t Tool) Authorized(verifiedAuthServices []string) bool {
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return false, err
 	}
@@ -182,9 +180,13 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 }
 
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
 		return "", err
 	}
 	return source.GetAuthTokenHeaderName(), nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile_test.go b/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile_test.go
index fef23faab7..2d7064bbb2 100644
--- a/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile_test.go
+++ b/internal/tools/looker/lookerupdateprojectfile/lookerupdateprojectfile_test.go
@@ -18,7 +18,6 @@ import (
 	"strings"
 	"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"
@@ -38,16 +37,16 @@ func TestParseFromYamlLookerUpdateProjectFile(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-update-project-file
-					source: my-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-update-project-file
+            source: my-instance
+            description: some description
 				`,
 			want: server.ToolConfigs{
 				"example_tool": lkr.Config{
 					Name:         "example_tool",
-					Kind:         "looker-update-project-file",
+					Type:         "looker-update-project-file",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,15 +56,12 @@ func TestParseFromYamlLookerUpdateProjectFile(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -86,23 +82,20 @@ func TestFailParseFromYamlLookerUpdateProjectFile(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: looker-update-project-file
-					source: my-instance
-					method: GOT
-					description: some description
+            kind: tools
+            name: example_tool
+            type: looker-update-project-file
+            source: my-instance
+            method: GOT
+            description: some description
 			`,
-			err: "unable to parse tool \"example_tool\" as kind \"looker-update-project-file\": [4:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n   3 | kind: looker-update-project-file\n>  4 | method: GOT\n       ^\n   5 | source: my-instance",
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-update-project-file\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-update-project-file",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/looker/lookervalidateproject/lookervalidateproject.go b/internal/tools/looker/lookervalidateproject/lookervalidateproject.go
new file mode 100644
index 0000000000..b769ebde9e
--- /dev/null
+++ b/internal/tools/looker/lookervalidateproject/lookervalidateproject.go
@@ -0,0 +1,178 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package lookervalidateproject
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+
+	yaml "github.com/goccy/go-yaml"
+	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/sources"
+	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
+	"github.com/googleapis/genai-toolbox/internal/util/parameters"
+
+	"github.com/looker-open-source/sdk-codegen/go/rtl"
+	v4 "github.com/looker-open-source/sdk-codegen/go/sdk/v4"
+)
+
+const resourceType string = "looker-validate-project"
+
+func init() {
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
+	}
+}
+
+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 {
+	UseClientAuthorization() bool
+	GetAuthTokenHeaderName() string
+	LookerApiSettings() *rtl.ApiSettings
+	GetLookerSDK(string) (*v4.LookerSDK, error)
+}
+
+type Config struct {
+	Name         string                 `yaml:"name" validate:"required"`
+	Type         string                 `yaml:"type" validate:"required"`
+	Source       string                 `yaml:"source" validate:"required"`
+	Description  string                 `yaml:"description" validate:"required"`
+	AuthRequired []string               `yaml:"authRequired"`
+	Annotations  *tools.ToolAnnotations `yaml:"annotations,omitempty"`
+}
+
+// validate interface
+var _ tools.ToolConfig = Config{}
+
+func (cfg Config) ToolConfigType() string {
+	return resourceType
+}
+
+func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
+	projectIdParameter := parameters.NewStringParameter("project_id", "The id of the project to validate")
+	params := parameters.Parameters{projectIdParameter}
+
+	annotations := cfg.Annotations
+	if annotations == nil {
+		readOnlyHint := true
+		annotations = &tools.ToolAnnotations{
+			ReadOnlyHint: &readOnlyHint,
+		}
+	}
+
+	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, annotations)
+
+	// finish tool setup
+	return Tool{
+		Config:     cfg,
+		Parameters: params,
+		manifest: tools.Manifest{
+			Description:  cfg.Description,
+			Parameters:   params.Manifest(),
+			AuthRequired: cfg.AuthRequired,
+		},
+		mcpManifest: mcpManifest,
+	}, nil
+}
+
+// validate interface
+var _ tools.Tool = Tool{}
+
+type Tool struct {
+	Config
+	Parameters  parameters.Parameters `yaml:"parameters"`
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
+}
+
+func (t Tool) ToConfig() tools.ToolConfig {
+	return t.Config
+}
+
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
+	}
+
+	logger, err := util.LoggerFromContext(ctx)
+	if err != nil {
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
+	}
+
+	sdk, err := source.GetLookerSDK(string(accessToken))
+	if err != nil {
+		return nil, util.NewClientServerError("failed to initialize Looker SDK", http.StatusInternalServerError, err)
+	}
+
+	mapParams := params.AsMap()
+	projectId, ok := mapParams["project_id"].(string)
+	if !ok {
+		return nil, util.NewAgentError(fmt.Sprintf("'project_id' must be a string, got %T", mapParams["project_id"]), nil)
+	}
+
+	resp, err := sdk.ValidateProject(projectId, "", source.LookerApiSettings())
+	if err != nil {
+		return nil, util.ProcessGeneralError(fmt.Errorf("error making validate_project request: %w", err))
+	}
+
+	logger.DebugContext(ctx, "Got response of %v\n", resp)
+
+	return resp, nil
+}
+
+func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
+	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
+}
+
+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(resourceMgr tools.SourceProvider) (bool, error) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return false, err
+	}
+	return source.UseClientAuthorization(), nil
+}
+
+func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
+	if err != nil {
+		return "", err
+	}
+	return source.GetAuthTokenHeaderName(), nil
+}
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/looker/lookervalidateproject/lookervalidateproject_test.go b/internal/tools/looker/lookervalidateproject/lookervalidateproject_test.go
new file mode 100644
index 0000000000..c71721ac9d
--- /dev/null
+++ b/internal/tools/looker/lookervalidateproject/lookervalidateproject_test.go
@@ -0,0 +1,109 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package lookervalidateproject_test
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/google/go-cmp/cmp"
+	"github.com/googleapis/genai-toolbox/internal/server"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+	lkr "github.com/googleapis/genai-toolbox/internal/tools/looker/lookervalidateproject"
+)
+
+func TestParseFromYamlLookerValidateProject(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: `
+            kind: tools
+            name: example_tool
+            type: looker-validate-project
+            source: my-instance
+            description: some description
+				`,
+			want: server.ToolConfigs{
+				"example_tool": lkr.Config{
+					Name:         "example_tool",
+					Type:         "looker-validate-project",
+					Source:       "my-instance",
+					Description:  "some description",
+					AuthRequired: []string{},
+				},
+			},
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err != nil {
+				t.Fatalf("unable to unmarshal: %s", err)
+			}
+			if diff := cmp.Diff(tc.want, got); diff != "" {
+				t.Fatalf("incorrect parse: diff %v", diff)
+			}
+		})
+	}
+
+}
+
+func TestFailParseFromYamlLookerValidateProject(t *testing.T) {
+	ctx, err := testutils.ContextWithNewLogger()
+	if err != nil {
+		t.Fatalf("unexpected error: %s", err)
+	}
+	tcs := []struct {
+		desc string
+		in   string
+		err  string
+	}{
+		{
+			desc: "Invalid method",
+			in: `
+            kind: tools
+            name: example_tool
+            type: looker-validate-project
+            source: my-instance
+            method: GOT
+            description: some description
+			`,
+			err: "error unmarshaling tools: unable to parse tool \"example_tool\" as type \"looker-validate-project\": [3:1] unknown field \"method\"\n   1 | authRequired: []\n   2 | description: some description\n>  3 | method: GOT\n       ^\n   4 | name: example_tool\n   5 | source: my-instance\n   6 | type: looker-validate-project",
+		},
+	}
+	for _, tc := range tcs {
+		t.Run(tc.desc, func(t *testing.T) {
+			// Parse contents
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
+			if err == nil {
+				t.Fatalf("expect parsing to fail")
+			}
+			errStr := err.Error()
+			if !strings.Contains(errStr, tc.err) {
+				t.Fatalf("unexpected error string: got %q, want substring %q", errStr, tc.err)
+			}
+		})
+	}
+
+}
diff --git a/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql.go b/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql.go
index f93097e809..9e0e3c644a 100644
--- a/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql.go
+++ b/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mindsdb-execute-sql"
+const resourceType string = "mindsdb-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,17 +51,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -73,7 +74,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 		InputSchema: inputSchema,
 	}
 
-	// finish tool setup
 	t := Tool{
 		Config:      cfg,
 		Parameters:  params,
@@ -83,7 +83,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -97,23 +96,23 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
+	sqlStr, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql"]), nil)
 	}
 
-	return source.RunSQL(ctx, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -139,3 +138,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql_test.go b/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql_test.go
index 4c5f2b84cb..db59ec7c54 100644
--- a/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql_test.go
+++ b/internal/tools/mindsdb/mindsdbexecutesql/mindsdbexecutesql_test.go
@@ -17,7 +17,6 @@ package mindsdbexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mindsdb-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mindsdb-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mindsdbexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "mindsdb-execute-sql",
+					Type:         "mindsdb-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mindsdb/mindsdbsql/mindsdbsql.go b/internal/tools/mindsdb/mindsdbsql/mindsdbsql.go
index ee297865c6..782846ca6b 100644
--- a/internal/tools/mindsdb/mindsdbsql/mindsdbsql.go
+++ b/internal/tools/mindsdb/mindsdbsql/mindsdbsql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mindsdb-sql"
+const resourceType string = "mindsdb-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -58,11 +60,10 @@ type Config struct {
 	TemplateParameters parameters.Parameters `yaml:"templateParameters"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -79,7 +80,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 		InputSchema: paramMcpManifest,
 	}
 
-	// finish tool setup
 	t := Tool{
 		Config:      cfg,
 		AllParams:   allParameters,
@@ -89,7 +89,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -99,29 +98,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -151,3 +150,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mindsdb/mindsdbsql/mindsdbsql_test.go b/internal/tools/mindsdb/mindsdbsql/mindsdbsql_test.go
index 3493717391..d203797196 100644
--- a/internal/tools/mindsdb/mindsdbsql/mindsdbsql_test.go
+++ b/internal/tools/mindsdb/mindsdbsql/mindsdbsql_test.go
@@ -17,7 +17,6 @@ package mindsdbsql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlmindsdbsql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mindsdb-sql
-					source: my-mindsdbsql-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: mindsdb-sql
+            source: my-mindsdbsql-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mindsdbsql.Config{
 					Name:         "example_tool",
-					Kind:         "mindsdb-sql",
+					Type:         "mindsdb-sql",
 					Source:       "my-mindsdbsql-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -77,15 +76,12 @@ func TestParseFromYamlmindsdbsql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -105,41 +101,41 @@ func TestParseFromYamlWithTemplateParamsmindsdbsql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mindsdb-sql
-					source: my-mindsdbsql-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: mindsdb-sql
+            source: my-mindsdbsql-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mindsdbsql.Config{
 					Name:         "example_tool",
-					Kind:         "mindsdb-sql",
+					Type:         "mindsdb-sql",
 					Source:       "my-mindsdbsql-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -159,15 +155,12 @@ func TestParseFromYamlWithTemplateParamsmindsdbsql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mongodb/mongodbaggregate/mongodbaggregate.go b/internal/tools/mongodb/mongodbaggregate/mongodbaggregate.go
index 00bf5641aa..519e79b696 100644
--- a/internal/tools/mongodb/mongodbaggregate/mongodbaggregate.go
+++ b/internal/tools/mongodb/mongodbaggregate/mongodbaggregate.go
@@ -16,22 +16,24 @@ package mongodbaggregate
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const kind string = "mongodb-aggregate"
+const resourceType string = "mongodb-aggregate"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name            string                `yaml:"name" validate:"required"`
-	Kind            string                `yaml:"kind" validate:"required"`
+	Type            string                `yaml:"type" validate:"required"`
 	Source          string                `yaml:"source" validate:"required"`
 	AuthRequired    []string              `yaml:"authRequired" validate:"required"`
 	Description     string                `yaml:"description" validate:"required"`
@@ -65,8 +67,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -102,22 +104,22 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	pipelineString, err := parameters.PopulateTemplateWithJSON("MongoDBAggregatePipeline", t.PipelinePayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating pipeline: %s", err)
+		return nil, util.NewAgentError("error populating pipeline", err)
 	}
-	return source.Aggregate(ctx, pipelineString, t.Canonical, t.ReadOnly, t.Database, t.Collection)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.Aggregate(ctx, pipelineString, t.Canonical, t.ReadOnly, t.Database, t.Collection)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -147,3 +149,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbaggregate/mongodbaggregate_test.go b/internal/tools/mongodb/mongodbaggregate/mongodbaggregate_test.go
index 266ac5e982..a9adf7f272 100644
--- a/internal/tools/mongodb/mongodbaggregate/mongodbaggregate_test.go
+++ b/internal/tools/mongodb/mongodbaggregate/mongodbaggregate_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbaggregate"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,25 +39,25 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-aggregate
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					readOnly: true
-					pipelinePayload: |
-					    [{ $match: { name: {{json .name}} }}]
-					pipelineParams:
-                        - name: name 
-                          type: string
-                          description: small description
+            kind: tools
+            name: example_tool
+            type: mongodb-aggregate
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            readOnly: true
+            pipelinePayload: |
+                [{ $match: { name: {{json .name}} }}]
+            pipelineParams:
+                - name: name 
+                  type: string
+                  description: small description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbaggregate.Config{
 					Name:            "example_tool",
-					Kind:            "mongodb-aggregate",
+					Type:            "mongodb-aggregate",
 					Source:          "my-instance",
 					AuthRequired:    []string{},
 					Database:        "test_db",
@@ -81,15 +80,12 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -110,25 +106,21 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-aggregate
-					source: my-instance
-					description: some description
-					collection: test_coll
-					pipelinePayload: |
-					  [{ $match: { name : {{json .name}} }}]
+            kind: tools
+            name: example_tool
+            type: mongodb-aggregate
+            source: my-instance
+            description: some description
+            collection: test_coll
+            pipelinePayload: |
+              [{ $match: { name : {{json .name}} }}]
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-aggregate"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-aggregate"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany.go b/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany.go
index 29a2a33495..8f67aec41f 100644
--- a/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany.go
+++ b/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany.go
@@ -16,22 +16,24 @@ package mongodbdeletemany
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const kind string = "mongodb-delete-many"
+const resourceType string = "mongodb-delete-many"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name          string                `yaml:"name" validate:"required"`
-	Kind          string                `yaml:"kind" validate:"required"`
+	Type          string                `yaml:"type" validate:"required"`
 	Source        string                `yaml:"source" validate:"required"`
 	AuthRequired  []string              `yaml:"authRequired" validate:"required"`
 	Description   string                `yaml:"description" validate:"required"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -106,22 +108,22 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	filterString, err := parameters.PopulateTemplateWithJSON("MongoDBDeleteManyFilter", t.FilterPayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating filter: %s", err)
+		return nil, util.NewAgentError("error populating filter", err)
 	}
-	return source.DeleteMany(ctx, filterString, t.Database, t.Collection)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.DeleteMany(ctx, filterString, t.Database, t.Collection)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -151,3 +153,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany_test.go b/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany_test.go
index e5861949cf..af9ee4933e 100644
--- a/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany_test.go
+++ b/internal/tools/mongodb/mongodbdeletemany/mongodbdeletemany_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeletemany"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,24 +39,24 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-delete-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
+            kind: tools
+            name: example_tool
+            type: mongodb-delete-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbdeletemany.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-delete-many",
+					Type:          "mongodb-delete-many",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -79,15 +78,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -108,25 +103,21 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-delete-many
-					source: my-instance
-					description: some description
-					collection: test_coll
-					filterPayload: |
-					  { name : {{json .name}} }
+            kind: tools
+            name: example_tool
+            type: mongodb-delete-many
+            source: my-instance
+            description: some description
+            collection: test_coll
+            filterPayload: |
+              { name : {{json .name}} }
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-delete-many"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-delete-many"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone.go b/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone.go
index 2d761d83ed..55f855c7e0 100644
--- a/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone.go
+++ b/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone.go
@@ -9,29 +9,31 @@
 // 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
+// See the License for the language governing permissions and
 // limitations under the License.
 package mongodbdeleteone
 
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const kind string = "mongodb-delete-one"
+const resourceType string = "mongodb-delete-one"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name          string                `yaml:"name" validate:"required"`
-	Kind          string                `yaml:"kind" validate:"required"`
+	Type          string                `yaml:"type" validate:"required"`
 	Source        string                `yaml:"source" validate:"required"`
 	AuthRequired  []string              `yaml:"authRequired" validate:"required"`
 	Description   string                `yaml:"description" validate:"required"`
@@ -63,8 +65,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -106,23 +108,23 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	filterString, err := parameters.PopulateTemplateWithJSON("MongoDBDeleteOneFilter", t.FilterPayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating filter: %s", err)
+		return nil, util.NewAgentError("error populating filter", err)
 	}
-	return source.DeleteOne(ctx, filterString, t.Database, t.Collection)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.DeleteOne(ctx, filterString, t.Database, t.Collection)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -152,3 +154,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone_test.go b/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone_test.go
index 4aa99da297..3f395c6315 100644
--- a/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone_test.go
+++ b/internal/tools/mongodb/mongodbdeleteone/mongodbdeleteone_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbdeleteone"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,24 +39,24 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-delete-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
+            kind: tools
+            name: example_tool
+            type: mongodb-delete-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbdeleteone.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-delete-one",
+					Type:          "mongodb-delete-one",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -79,15 +78,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -108,25 +103,21 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-delete-one
-					source: my-instance
-					description: some description
-					collection: test_coll
-					filterPayload: |
-					  { name : {{json .name}} }
+            kind: tools
+            name: example_tool
+            type: mongodb-delete-one
+            source: my-instance
+            description: some description
+            collection: test_coll
+            filterPayload: |
+              { name : {{json .name}} }
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-delete-one"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-delete-one"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbfind/mongodbfind.go b/internal/tools/mongodb/mongodbfind/mongodbfind.go
index 12ccd84636..9da5a8b30e 100644
--- a/internal/tools/mongodb/mongodbfind/mongodbfind.go
+++ b/internal/tools/mongodb/mongodbfind/mongodbfind.go
@@ -16,25 +16,26 @@ package mongodbfind
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const kind string = "mongodb-find"
+const resourceType string = "mongodb-find"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,12 +49,12 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 
 type compatibleSource interface {
 	MongoClient() *mongo.Client
-	Find(context.Context, string, string, string, *options.FindOptions) ([]any, error)
+	Find(context.Context, string, string, string, *options.FindOptionsBuilder) ([]any, error)
 }
 
 type Config struct {
 	Name           string                `yaml:"name" validate:"required"`
-	Kind           string                `yaml:"kind" validate:"required"`
+	Type           string                `yaml:"type" validate:"required"`
 	Source         string                `yaml:"source" validate:"required"`
 	AuthRequired   []string              `yaml:"authRequired" validate:"required"`
 	Description    string                `yaml:"description" validate:"required"`
@@ -71,8 +72,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -118,10 +119,10 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func getOptions(ctx context.Context, sortParameters parameters.Parameters, projectPayload string, limit int64, paramsMap map[string]any) (*options.FindOptions, error) {
+func getOptions(ctx context.Context, sortParameters parameters.Parameters, projectPayload string, limit int64, paramsMap map[string]any) (*options.FindOptionsBuilder, error) {
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		panic(err)
+		return nil, err
 	}
 
 	opts := options.Find()
@@ -157,26 +158,26 @@ func getOptions(ctx context.Context, sortParameters parameters.Parameters, proje
 	return opts, nil
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	filterString, err := parameters.PopulateTemplateWithJSON("MongoDBFindFilterString", t.FilterPayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating filter: %s", err)
+		return nil, util.NewAgentError("error populating filter", err)
 	}
 	opts, err := getOptions(ctx, t.SortParams, t.ProjectPayload, t.Limit, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating options: %s", err)
+		return nil, util.NewAgentError("error populating options", err)
 	}
-	return source.Find(ctx, filterString, t.Database, t.Collection, opts)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.Find(ctx, filterString, t.Database, t.Collection, opts)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -206,3 +207,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbfind/mongodbfind_test.go b/internal/tools/mongodb/mongodbfind/mongodbfind_test.go
index 6b56d9c7c4..dcc2591414 100644
--- a/internal/tools/mongodb/mongodbfind/mongodbfind_test.go
+++ b/internal/tools/mongodb/mongodbfind/mongodbfind_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfind"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,30 +39,30 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-find
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					projectPayload: |
-					  { name: 1, age: 1 }
-					projectParams: []
-					sortPayload: |
-					  { timestamp: -1 }
-					sortParams: []
+            kind: tools
+            name: example_tool
+            type: mongodb-find
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            projectPayload: |
+              { name: 1, age: 1 }
+            projectParams: []
+            sortPayload: |
+              { timestamp: -1 }
+            sortParams: []
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbfind.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-find",
+					Type:          "mongodb-find",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -89,15 +88,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -118,25 +113,21 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-find
-					source: my-instance
-					description: some description
-					collection: test_coll
-					filterPayload: |
-					  { name : {{json .name}} }
+            kind: tools
+            name: example_tool
+            type: mongodb-find
+            source: my-instance
+            description: some description
+            collection: test_coll
+            filterPayload: |
+              { name : {{json .name}} }
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-find"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-find"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbfindone/mongodbfindone.go b/internal/tools/mongodb/mongodbfindone/mongodbfindone.go
index e9f1555c66..f75af4328a 100644
--- a/internal/tools/mongodb/mongodbfindone/mongodbfindone.go
+++ b/internal/tools/mongodb/mongodbfindone/mongodbfindone.go
@@ -16,24 +16,26 @@ package mongodbfindone
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/bson"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
 )
 
-const kind string = "mongodb-find-one"
+const resourceType string = "mongodb-find-one"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -47,12 +49,12 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 
 type compatibleSource interface {
 	MongoClient() *mongo.Client
-	FindOne(context.Context, string, string, string, *options.FindOneOptions) ([]any, error)
+	FindOne(context.Context, string, string, string, *options.FindOneOptionsBuilder) ([]any, error)
 }
 
 type Config struct {
 	Name           string                `yaml:"name" validate:"required"`
-	Kind           string                `yaml:"kind" validate:"required"`
+	Type           string                `yaml:"type" validate:"required"`
 	Source         string                `yaml:"source" validate:"required"`
 	AuthRequired   []string              `yaml:"authRequired" validate:"required"`
 	Description    string                `yaml:"description" validate:"required"`
@@ -67,8 +69,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,36 +112,36 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	filterString, err := parameters.PopulateTemplateWithJSON("MongoDBFindOneFilterString", t.FilterPayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating filter: %s", err)
+		return nil, util.NewAgentError("error populating filter", err)
 	}
 
 	opts := options.FindOne()
 	if len(t.ProjectPayload) > 0 {
 		result, err := parameters.PopulateTemplateWithJSON("MongoDBFindOneProjectString", t.ProjectPayload, paramsMap)
 		if err != nil {
-			return nil, fmt.Errorf("error populating project payload: %s", err)
+			return nil, util.NewAgentError("error populating project payload", err)
 		}
 		var projection any
 		err = bson.UnmarshalExtJSON([]byte(result), false, &projection)
 		if err != nil {
-			return nil, fmt.Errorf("error unmarshalling projection: %s", err)
+			return nil, util.NewAgentError("error unmarshalling projection", err)
 		}
 		opts = opts.SetProjection(projection)
 	}
-	return source.FindOne(ctx, filterString, t.Database, t.Collection, opts)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.FindOne(ctx, filterString, t.Database, t.Collection, opts)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -169,3 +171,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbfindone/mongodbfindone_test.go b/internal/tools/mongodb/mongodbfindone/mongodbfindone_test.go
index a8d5b9bfc0..ce23e01e11 100644
--- a/internal/tools/mongodb/mongodbfindone/mongodbfindone_test.go
+++ b/internal/tools/mongodb/mongodbfindone/mongodbfindone_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbfindone"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,27 +39,27 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-find-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					projectPayload: |
-					  { name: 1, age: 1 }
-					projectParams: []
+            kind: tools
+            name: example_tool
+            type: mongodb-find-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            projectPayload: |
+              { name: 1, age: 1 }
+            projectParams: []
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbfindone.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-find-one",
+					Type:          "mongodb-find-one",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -84,15 +83,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -113,25 +108,21 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-find-one
-					source: my-instance
-					description: some description
-					collection: test_coll
-					filterPayload: |
-					  { name : {{json .name}} }
+            kind: tools
+            name: example_tool
+            type: mongodb-find-one
+            source: my-instance
+            description: some description
+            collection: test_coll
+            filterPayload: |
+              { name : {{json .name}} }
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-find-one"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-find-one"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany.go b/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany.go
index 0dc11a230b..0de1cc8de4 100644
--- a/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany.go
+++ b/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany.go
@@ -15,24 +15,25 @@ package mongodbinsertmany
 
 import (
 	"context"
-	"errors"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
-const kind string = "mongodb-insert-many"
+const resourceType string = "mongodb-insert-many"
 
 const paramDataKey = "data"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -100,27 +101,27 @@ type Tool struct {
 	mcpManifest   tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	if len(params) == 0 {
-		return nil, errors.New("no input found")
+		return nil, util.NewAgentError("no input found", nil)
 	}
 
 	paramsMap := params.AsMap()
 
 	jsonData, ok := paramsMap[paramDataKey].(string)
 	if !ok {
-		return nil, errors.New("no input found")
+		return nil, util.NewAgentError("no input found or invalid type for data", nil)
 	}
-	return source.InsertMany(ctx, jsonData, t.Canonical, t.Database, t.Collection)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.PayloadParams, data, claims)
+	resp, err := source.InsertMany(ctx, jsonData, t.Canonical, t.Database, t.Collection)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -150,3 +151,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.PayloadParams
+}
diff --git a/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany_test.go b/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany_test.go
index 19ac3ce0c1..e965e056d9 100644
--- a/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany_test.go
+++ b/internal/tools/mongodb/mongodbinsertmany/mongodbinsertmany_test.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertmany"
 
-	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"
@@ -39,18 +38,18 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbinsertmany.Config{
 					Name:         "example_tool",
-					Kind:         "mongodb-insert-many",
+					Type:         "mongodb-insert-many",
 					Source:       "my-instance",
 					AuthRequired: []string{},
 					Database:     "test_db",
@@ -63,19 +62,19 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "true canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					canonical: true
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            canonical: true
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbinsertmany.Config{
 					Name:         "example_tool",
-					Kind:         "mongodb-insert-many",
+					Type:         "mongodb-insert-many",
 					Source:       "my-instance",
 					AuthRequired: []string{},
 					Database:     "test_db",
@@ -88,19 +87,19 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "false canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					canonical: false
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            canonical: false
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbinsertmany.Config{
 					Name:         "example_tool",
-					Kind:         "mongodb-insert-many",
+					Type:         "mongodb-insert-many",
 					Source:       "my-instance",
 					AuthRequired: []string{},
 					Database:     "test_db",
@@ -113,15 +112,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -142,23 +137,19 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-many
-					source: my-instance
-					description: some description
-					collection: test_coll
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-many
+            source: my-instance
+            description: some description
+            collection: test_coll
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-insert-many"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-insert-many"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbinsertone/mongodbinsertone.go b/internal/tools/mongodb/mongodbinsertone/mongodbinsertone.go
index a93589c053..3fc9260a51 100644
--- a/internal/tools/mongodb/mongodbinsertone/mongodbinsertone.go
+++ b/internal/tools/mongodb/mongodbinsertone/mongodbinsertone.go
@@ -15,24 +15,25 @@ package mongodbinsertone
 
 import (
 	"context"
-	"errors"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
-const kind string = "mongodb-insert-one"
+const resourceType string = "mongodb-insert-one"
 
 const dataParamsKey = "data"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	AuthRequired []string `yaml:"authRequired" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
@@ -63,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -101,24 +102,24 @@ type Tool struct {
 	mcpManifest   tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	if len(params) == 0 {
-		return nil, errors.New("no input found")
+		return nil, util.NewAgentError("no input found", nil)
 	}
 	// use the first, assume it's a string
 	jsonData, ok := params[0].Value.(string)
 	if !ok {
-		return nil, errors.New("no input found")
+		return nil, util.NewAgentError("no input found or invalid type for data", nil)
 	}
-	return source.InsertOne(ctx, jsonData, t.Canonical, t.Database, t.Collection)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.PayloadParams, data, claims)
+	resp, err := source.InsertOne(ctx, jsonData, t.Canonical, t.Database, t.Collection)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -148,3 +149,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.PayloadParams
+}
diff --git a/internal/tools/mongodb/mongodbinsertone/mongodbinsertone_test.go b/internal/tools/mongodb/mongodbinsertone/mongodbinsertone_test.go
index a61dde20b0..ace38f2d78 100644
--- a/internal/tools/mongodb/mongodbinsertone/mongodbinsertone_test.go
+++ b/internal/tools/mongodb/mongodbinsertone/mongodbinsertone_test.go
@@ -20,7 +20,6 @@ import (
 
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbinsertone"
 
-	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"
@@ -39,18 +38,18 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbinsertone.Config{
 					Name:         "example_tool",
-					Kind:         "mongodb-insert-one",
+					Type:         "mongodb-insert-one",
 					Source:       "my-instance",
 					AuthRequired: []string{},
 					Database:     "test_db",
@@ -63,19 +62,19 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "true canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					canonical: true
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            canonical: true
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbinsertone.Config{
 					Name:         "example_tool",
-					Kind:         "mongodb-insert-one",
+					Type:         "mongodb-insert-one",
 					Source:       "my-instance",
 					AuthRequired: []string{},
 					Database:     "test_db",
@@ -88,19 +87,19 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "false canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					canonical: false
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            canonical: false
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbinsertone.Config{
 					Name:         "example_tool",
-					Kind:         "mongodb-insert-one",
+					Type:         "mongodb-insert-one",
 					Source:       "my-instance",
 					AuthRequired: []string{},
 					Database:     "test_db",
@@ -113,15 +112,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -142,24 +137,20 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-insert-one
-					source: my-instance
-					description: some description
-					collection: test_coll
-					canonical: true
+            kind: tools
+            name: example_tool
+            type: mongodb-insert-one
+            source: my-instance
+            description: some description
+            collection: test_coll
+            canonical: true
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-insert-one"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-insert-one"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany.go b/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany.go
index b80bc4972e..7e34e52384 100644
--- a/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany.go
+++ b/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany.go
@@ -16,21 +16,23 @@ package mongodbupdatemany
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
-const kind string = "mongodb-update-many"
+const resourceType string = "mongodb-update-many"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name          string                `yaml:"name" validate:"required"`
-	Kind          string                `yaml:"kind" validate:"required"`
+	Type          string                `yaml:"type" validate:"required"`
 	Source        string                `yaml:"source" validate:"required"`
 	AuthRequired  []string              `yaml:"authRequired" validate:"required"`
 	Description   string                `yaml:"description" validate:"required"`
@@ -66,8 +68,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -109,26 +111,26 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	filterString, err := parameters.PopulateTemplateWithJSON("MongoDBUpdateManyFilter", t.FilterPayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating filter: %s", err)
+		return nil, util.NewAgentError("error populating filter", err)
 	}
 	updateString, err := parameters.PopulateTemplateWithJSON("MongoDBUpdateMany", t.UpdatePayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get update: %w", err)
+		return nil, util.NewAgentError("unable to get update", err)
 	}
-	return source.UpdateMany(ctx, filterString, t.Canonical, updateString, t.Database, t.Collection, t.Upsert)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.UpdateMany(ctx, filterString, t.Canonical, updateString, t.Database, t.Collection, t.Upsert)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -158,3 +160,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany_test.go b/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany_test.go
index b7353afe08..f3fcf468d5 100644
--- a/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany_test.go
+++ b/internal/tools/mongodb/mongodbupdatemany/mongodbupdatemany_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdatemany"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,30 +39,30 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					updatePayload: |
-					    { $set: { name: {{json .name}} } }
-					updateParams:
-                        - name: name 
-                          type: string
-                          description: small description
+            kind: tools
+            name: example_tool
+            type: mongodb-update-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            updatePayload: |
+                { $set: { name: {{json .name}} } }
+            updateParams:
+                - name: name 
+                  type: string
+                  description: small description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbupdatemany.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-update-many",
+					Type:          "mongodb-update-many",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -96,31 +95,31 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "true canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					canonical: true
-					updatePayload: |
-					    { $set: { name: {{json .name}} } }
-					updateParams:
-                        - name: name 
-                          type: string
-                          description: small description
+            kind: tools
+            name: example_tool
+            type: mongodb-update-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            canonical: true
+            updatePayload: |
+                { $set: { name: {{json .name}} } }
+            updateParams:
+                - name: name 
+                  type: string
+                  description: small description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbupdatemany.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-update-many",
+					Type:          "mongodb-update-many",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -153,31 +152,31 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "false canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-many
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					canonical: false
-					updatePayload: |
-					    { $set: { name: {{json .name}} } }
-					updateParams:
-                        - name: name 
-                          type: string
-                          description: small description
+            kind: tools
+            name: example_tool
+            type: mongodb-update-many
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            canonical: false
+            updatePayload: |
+                { $set: { name: {{json .name}} } }
+            updateParams:
+                - name: name 
+                  type: string
+                  description: small description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbupdatemany.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-update-many",
+					Type:          "mongodb-update-many",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -210,15 +209,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -239,36 +234,32 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-many
-					source: my-instance
-					description: some description
-					collection: test_coll
-					filterPayload: |
-					  { name : {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					canonical: true
-					updatePayload: |
-					  { $set: { name: {{json .name}} } }
-					updateParams:
-						- name: data
-						  type: string
-						  description: the content in json
+            kind: tools
+            name: example_tool
+            type: mongodb-update-many
+            source: my-instance
+            description: some description
+            collection: test_coll
+            filterPayload: |
+              { name : {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            canonical: true
+            updatePayload: |
+              { $set: { name: {{json .name}} } }
+            updateParams:
+                - name: data
+                  type: string
+                  description: the content in json
 			`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-update-many"`,
+			err: `unable to parse tool "example_tool" as type "mongodb-update-many"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mongodb/mongodbupdateone/mongodbupdateone.go b/internal/tools/mongodb/mongodbupdateone/mongodbupdateone.go
index d3236992e8..6369e08a91 100644
--- a/internal/tools/mongodb/mongodbupdateone/mongodbupdateone.go
+++ b/internal/tools/mongodb/mongodbupdateone/mongodbupdateone.go
@@ -16,21 +16,23 @@ package mongodbupdateone
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
-	"go.mongodb.org/mongo-driver/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo"
 )
 
-const kind string = "mongodb-update-one"
+const resourceType string = "mongodb-update-one"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name          string                `yaml:"name" validate:"required"`
-	Kind          string                `yaml:"kind" validate:"required"`
+	Type          string                `yaml:"type" validate:"required"`
 	Source        string                `yaml:"source" validate:"required"`
 	AuthRequired  []string              `yaml:"authRequired" validate:"required"`
 	Description   string                `yaml:"description" validate:"required"`
@@ -67,8 +69,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -110,26 +112,26 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	filterString, err := parameters.PopulateTemplateWithJSON("MongoDBUpdateOneFilter", t.FilterPayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("error populating filter: %s", err)
+		return nil, util.NewAgentError("error populating filter", err)
 	}
 	updateString, err := parameters.PopulateTemplateWithJSON("MongoDBUpdateOne", t.UpdatePayload, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to get update: %w", err)
+		return nil, util.NewAgentError("unable to get update", err)
 	}
-	return source.UpdateOne(ctx, filterString, t.Canonical, updateString, t.Database, t.Collection, t.Upsert)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.UpdateOne(ctx, filterString, t.Canonical, updateString, t.Database, t.Collection, t.Upsert)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -159,3 +161,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mongodb/mongodbupdateone/mongodbupdateone_test.go b/internal/tools/mongodb/mongodbupdateone/mongodbupdateone_test.go
index b450892fb2..87202485f7 100644
--- a/internal/tools/mongodb/mongodbupdateone/mongodbupdateone_test.go
+++ b/internal/tools/mongodb/mongodbupdateone/mongodbupdateone_test.go
@@ -21,7 +21,6 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/mongodb/mongodbupdateone"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 
-	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"
@@ -40,31 +39,31 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					updatePayload: |
-					    { $set : { item: {{json .item}} } }
-					updateParams:
-                        - name: item
-                          type: string
-                          description: small description
-					upsert: true
+            kind: tools
+            name: example_tool
+            type: mongodb-update-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            updatePayload: |
+                { $set : { item: {{json .item}} } }
+            updateParams:
+                - name: item
+                  type: string
+                  description: small description
+            upsert: true
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbupdateone.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-update-one",
+					Type:          "mongodb-update-one",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -98,32 +97,32 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "false canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					updatePayload: |
-					    { $set : { item: {{json .item}} } }
-					updateParams:
-                        - name: item
-                          type: string
-                          description: small description
-					canonical: false
-					upsert: true
+            kind: tools
+            name: example_tool
+            type: mongodb-update-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            updatePayload: |
+                { $set : { item: {{json .item}} } }
+            updateParams:
+                - name: item
+                  type: string
+                  description: small description
+            canonical: false
+            upsert: true
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbupdateone.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-update-one",
+					Type:          "mongodb-update-one",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -157,32 +156,32 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "true canonical",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-one
-					source: my-instance
-					description: some description
-					database: test_db
-					collection: test_coll
-					filterPayload: |
-					    { name: {{json .name}} }
-					filterParams:
-                        - name: name 
-                          type: string
-                          description: small description
-					updatePayload: |
-					    { $set : { item: {{json .item}} } }
-					updateParams:
-                        - name: item
-                          type: string
-                          description: small description
-					canonical: true
-					upsert: true
+            kind: tools
+            name: example_tool
+            type: mongodb-update-one
+            source: my-instance
+            description: some description
+            database: test_db
+            collection: test_coll
+            filterPayload: |
+                { name: {{json .name}} }
+            filterParams:
+                - name: name 
+                  type: string
+                  description: small description
+            updatePayload: |
+                { $set : { item: {{json .item}} } }
+            updateParams:
+                - name: item
+                  type: string
+                  description: small description
+            canonical: true
+            upsert: true
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mongodbupdateone.Config{
 					Name:          "example_tool",
-					Kind:          "mongodb-update-one",
+					Type:          "mongodb-update-one",
 					Source:        "my-instance",
 					AuthRequired:  []string{},
 					Database:      "test_db",
@@ -216,15 +215,11 @@ func TestParseFromYamlMongoQuery(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -245,24 +240,20 @@ func TestFailParseFromYamlMongoQuery(t *testing.T) {
 		{
 			desc: "Invalid method",
 			in: `
-			tools:
-				example_tool:
-					kind: mongodb-update-one
-					source: my-instance
-					description: some description
-					collection: test_coll
-					filterPayload: |
-					  { name : {{json .name}} }`,
-			err: `unable to parse tool "example_tool" as kind "mongodb-update-one"`,
+            kind: tools
+            name: example_tool
+            type: mongodb-update-one
+            source: my-instance
+            description: some description
+            collection: test_coll
+            filterPayload: |
+              { name : {{json .name}} }`,
+			err: `unable to parse tool "example_tool" as type "mongodb-update-one"`,
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql.go b/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql.go
index efa43cec03..ae3d497b84 100644
--- a/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql.go
+++ b/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mssql-execute-sql"
+const resourceType string = "mssql-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -89,29 +90,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
+	sqlStr, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -141,3 +142,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql_test.go b/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql_test.go
index 5042b54215..560be13cad 100644
--- a/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql_test.go
+++ b/internal/tools/mssql/mssqlexecutesql/mssqlexecutesql_test.go
@@ -17,7 +17,6 @@ package mssqlexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mssql-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mssql-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mssqlexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "mssql-execute-sql",
+					Type:         "mssql-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mssql/mssqllisttables/mssqllisttables.go b/internal/tools/mssql/mssqllisttables/mssqllisttables.go
index 82f987b9a5..ea462e2740 100644
--- a/internal/tools/mssql/mssqllisttables/mssqllisttables.go
+++ b/internal/tools/mssql/mssqllisttables/mssqllisttables.go
@@ -18,268 +18,270 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mssql-list-tables"
+const resourceType string = "mssql-list-tables"
 
 const listTablesStatement = `
-	WITH table_info AS (
-		SELECT
-			t.object_id AS table_oid,
-			s.name AS schema_name,
-			t.name AS table_name,
-			dp.name AS table_owner, -- Schema's owner principal name
-			CAST(ep.value AS NVARCHAR(MAX)) AS table_comment, -- Cast for JSON compatibility
-			CASE
-				WHEN EXISTS ( -- Check if the table has more than one partition for any of its indexes or heap
-					SELECT 1 FROM sys.partitions p
-					WHERE p.object_id = t.object_id AND p.partition_number > 1
-				) THEN 'PARTITIONED TABLE'
-				ELSE 'TABLE'
-			END AS object_type_detail
-		FROM
-			sys.tables t
-		INNER JOIN
-			sys.schemas s ON t.schema_id = s.schema_id
-		LEFT JOIN
-			sys.database_principals dp ON s.principal_id = dp.principal_id
-		LEFT JOIN
-			sys.extended_properties ep ON ep.major_id = t.object_id AND ep.minor_id = 0 AND ep.class = 1 AND ep.name = 'MS_Description'
-		WHERE
-			t.type = 'U' -- User tables
-			AND s.name NOT IN ('sys', 'INFORMATION_SCHEMA', 'guest', 'db_owner', 'db_accessadmin', 'db_backupoperator', 'db_datareader', 'db_datawriter', 'db_ddladmin', 'db_denydatareader', 'db_denydatawriter', 'db_securityadmin')
-			AND (@table_names IS NULL OR LTRIM(RTRIM(@table_names)) = '' OR t.name IN (SELECT LTRIM(RTRIM(value)) FROM STRING_SPLIT(@table_names, ',')))
-	),
-	columns_info AS (
-		SELECT
-			c.object_id AS table_oid,
-			c.name AS column_name,
-			CONCAT(
-				UPPER(TY.name), -- Base type name
-				CASE
-					WHEN TY.name IN ('char', 'varchar', 'nchar', 'nvarchar', 'binary', 'varbinary') THEN
-						CONCAT('(', IIF(c.max_length = -1, 'MAX', CAST(c.max_length / CASE WHEN TY.name IN ('nchar', 'nvarchar') THEN 2 ELSE 1 END AS VARCHAR(10))), ')')
-					WHEN TY.name IN ('decimal', 'numeric') THEN
-						CONCAT('(', c.precision, ',', c.scale, ')')
-					WHEN TY.name IN ('datetime2', 'datetimeoffset', 'time') THEN
-						CONCAT('(', c.scale, ')')
-					ELSE ''
-				END
-			) AS data_type,
-			c.column_id AS column_ordinal_position,
-			IIF(c.is_nullable = 0, CAST(1 AS BIT), CAST(0 AS BIT)) AS is_not_nullable,
-			dc.definition AS column_default,
-			CAST(epc.value AS NVARCHAR(MAX)) AS column_comment
-		FROM
-			sys.columns c
-		JOIN
-			table_info ti ON c.object_id = ti.table_oid
-		JOIN
-			sys.types TY ON c.user_type_id = TY.user_type_id AND TY.is_user_defined = 0 -- Ensure we get base types
-		LEFT JOIN
-			sys.default_constraints dc ON c.object_id = dc.parent_object_id AND c.column_id = dc.parent_column_id
-		LEFT JOIN
-			sys.extended_properties epc ON epc.major_id = c.object_id AND epc.minor_id = c.column_id AND epc.class = 1 AND epc.name = 'MS_Description'
-	),
-	constraints_info AS (
-		-- Primary Keys & Unique Constraints
-		SELECT
-			kc.parent_object_id AS table_oid,
-			kc.name AS constraint_name,
-			REPLACE(kc.type_desc, '_CONSTRAINT', '') AS constraint_type, -- 'PRIMARY_KEY', 'UNIQUE'
-			STUFF((SELECT ', ' + col.name
-				FROM sys.index_columns ic
-				JOIN sys.columns col ON ic.object_id = col.object_id AND ic.column_id = col.column_id
-				WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id
-				ORDER BY ic.key_ordinal
-				FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS constraint_columns,
-			NULL AS foreign_key_referenced_table,
-			NULL AS foreign_key_referenced_columns,
-			CASE kc.type
-				WHEN 'PK' THEN 'PRIMARY KEY (' + STUFF((SELECT ', ' + col.name FROM sys.index_columns ic JOIN sys.columns col ON ic.object_id = col.object_id AND ic.column_id = col.column_id WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id ORDER BY ic.key_ordinal FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') + ')'
-				WHEN 'UQ' THEN 'UNIQUE (' + STUFF((SELECT ', ' + col.name FROM sys.index_columns ic JOIN sys.columns col ON ic.object_id = col.object_id AND ic.column_id = col.column_id WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id ORDER BY ic.key_ordinal FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') + ')'
-			END AS constraint_definition
-		FROM sys.key_constraints kc
-		JOIN table_info ti ON kc.parent_object_id = ti.table_oid
-		UNION ALL
-		-- Foreign Keys
-		SELECT
-			fk.parent_object_id AS table_oid,
-			fk.name AS constraint_name,
-			'FOREIGN KEY' AS constraint_type,
-			STUFF((SELECT ', ' + pc.name
-				FROM sys.foreign_key_columns fkc
-				JOIN sys.columns pc ON fkc.parent_object_id = pc.object_id AND fkc.parent_column_id = pc.column_id
-				WHERE fkc.constraint_object_id = fk.object_id
-				ORDER BY fkc.constraint_column_id
-				FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS constraint_columns,
-			SCHEMA_NAME(rt.schema_id) + '.' + OBJECT_NAME(fk.referenced_object_id) AS foreign_key_referenced_table,
-			STUFF((SELECT ', ' + rc.name
-				FROM sys.foreign_key_columns fkc
-				JOIN sys.columns rc ON fkc.referenced_object_id = rc.object_id AND fkc.referenced_column_id = rc.column_id
-				WHERE fkc.constraint_object_id = fk.object_id
-				ORDER BY fkc.constraint_column_id
-				FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS foreign_key_referenced_columns,
-			OBJECT_DEFINITION(fk.object_id) AS constraint_definition
-		FROM sys.foreign_keys fk
-		JOIN sys.tables rt ON fk.referenced_object_id = rt.object_id
-		JOIN table_info ti ON fk.parent_object_id = ti.table_oid
-		UNION ALL
-		-- Check Constraints
-		SELECT
-			cc.parent_object_id AS table_oid,
-			cc.name AS constraint_name,
-			'CHECK' AS constraint_type,
-			NULL AS constraint_columns, -- Definition includes column context
-			NULL AS foreign_key_referenced_table,
-			NULL AS foreign_key_referenced_columns,
-			cc.definition AS constraint_definition
-		FROM sys.check_constraints cc
-		JOIN table_info ti ON cc.parent_object_id = ti.table_oid
-	),
-	indexes_info AS (
-		SELECT
-			i.object_id AS table_oid,
-			i.name AS index_name,
-			i.type_desc AS index_method, -- CLUSTERED, NONCLUSTERED, XML, etc.
-			i.is_unique,
-			i.is_primary_key AS is_primary,
-			STUFF((SELECT ', ' + c.name
-				FROM sys.index_columns ic
-				JOIN sys.columns c ON i.object_id = c.object_id AND ic.column_id = c.column_id
-				WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0
-				ORDER BY ic.key_ordinal
-				FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS index_columns,
-			(
-				'COLUMNS: (' + ISNULL(STUFF((SELECT ', ' + c.name + CASE WHEN ic.is_descending_key = 1 THEN ' DESC' ELSE '' END
-										FROM sys.index_columns ic
-										JOIN sys.columns c ON i.object_id = c.object_id AND ic.column_id = c.column_id
-										WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0
-										ORDER BY ic.key_ordinal FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, ''), 'N/A') + ')' +
-				ISNULL(CHAR(13)+CHAR(10) + 'INCLUDE: (' + STUFF((SELECT ', ' + c.name
-										FROM sys.index_columns ic
-										JOIN sys.columns c ON i.object_id = c.object_id AND ic.column_id = c.column_id
-										WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 1
-										ORDER BY ic.index_column_id FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') + ')', '') +
-				ISNULL(CHAR(13)+CHAR(10) + 'FILTER: (' + i.filter_definition + ')', '')
-			) AS index_definition_details
-		FROM
-			sys.indexes i
-		JOIN
-			table_info ti ON i.object_id = ti.table_oid
-		WHERE i.type <> 0 -- Exclude Heaps
-		AND i.name IS NOT NULL -- Exclude unnamed heap indexes; named indexes (PKs are often named) are preferred.
-	),
-	triggers_info AS (
-		SELECT
-			tr.parent_id AS table_oid,
-			tr.name AS trigger_name,
-			OBJECT_DEFINITION(tr.object_id) AS trigger_definition,
-			CASE tr.is_disabled WHEN 0 THEN 'ENABLED' ELSE 'DISABLED' END AS trigger_enabled_state
-		FROM
-			sys.triggers tr
-		JOIN
-			table_info ti ON tr.parent_id = ti.table_oid
-		WHERE
-			tr.is_ms_shipped = 0
-			AND tr.parent_class_desc = 'OBJECT_OR_COLUMN' -- DML Triggers on tables/views
-	)
-	SELECT
-		ti.schema_name,
-		ti.table_name AS object_name,
-		CASE
-			WHEN @output_format = 'simple' THEN
-				(SELECT ti.table_name AS name FOR JSON PATH, WITHOUT_ARRAY_WRAPPER)
-			ELSE
-				(
-					SELECT
-						ti.schema_name AS schema_name,
-						ti.table_name AS object_name,
-						ti.object_type_detail AS object_type,
-						ti.table_owner AS owner,
-						ti.table_comment AS comment,
-						JSON_QUERY(ISNULL((
-							SELECT
-								ci.column_name,
-								ci.data_type,
-								ci.column_ordinal_position,
-								ci.is_not_nullable,
-								ci.column_default,
-								ci.column_comment
-							FROM columns_info ci
-							WHERE ci.table_oid = ti.table_oid
-							ORDER BY ci.column_ordinal_position
-							FOR JSON PATH
-						), '[]')) AS columns,
-						JSON_QUERY(ISNULL((
-							SELECT
-								cons.constraint_name,
-								cons.constraint_type,
-								cons.constraint_definition,
-								JSON_QUERY(
-									CASE
-										WHEN cons.constraint_columns IS NOT NULL AND LTRIM(RTRIM(cons.constraint_columns)) <> ''
-										THEN '[' + (SELECT STRING_AGG('"' + LTRIM(RTRIM(value)) + '"', ',') FROM STRING_SPLIT(cons.constraint_columns, ',')) + ']'
-										ELSE '[]'
-									END
-								) AS constraint_columns,
-								cons.foreign_key_referenced_table,
-								JSON_QUERY(
-									CASE
-										WHEN cons.foreign_key_referenced_columns IS NOT NULL AND LTRIM(RTRIM(cons.foreign_key_referenced_columns)) <> ''
-										THEN '[' + (SELECT STRING_AGG('"' + LTRIM(RTRIM(value)) + '"', ',') FROM STRING_SPLIT(cons.foreign_key_referenced_columns, ',')) + ']'
-										ELSE '[]'
-									END
-								) AS foreign_key_referenced_columns
-							FROM constraints_info cons
-							WHERE cons.table_oid = ti.table_oid
-							FOR JSON PATH
-						), '[]')) AS constraints,
-						JSON_QUERY(ISNULL((
-							SELECT
-								ii.index_name,
-								ii.index_definition_details AS index_definition,
-								ii.is_unique,
-								ii.is_primary,
-								ii.index_method,
-								JSON_QUERY(
-									CASE
-										WHEN ii.index_columns IS NOT NULL AND LTRIM(RTRIM(ii.index_columns)) <> ''
-										THEN '[' + (SELECT STRING_AGG('"' + LTRIM(RTRIM(value)) + '"', ',') FROM STRING_SPLIT(ii.index_columns, ',')) + ']'
-										ELSE '[]'
-									END
-								) AS index_columns
-							FROM indexes_info ii
-							WHERE ii.table_oid = ti.table_oid
-							FOR JSON PATH
-						), '[]')) AS indexes,
-						JSON_QUERY(ISNULL((
-							SELECT
-								tri.trigger_name,
-								tri.trigger_definition,
-								tri.trigger_enabled_state
-							FROM triggers_info tri
-							WHERE tri.table_oid = ti.table_oid
-							FOR JSON PATH
-						), '[]')) AS triggers
-					FOR JSON PATH, WITHOUT_ARRAY_WRAPPER -- Creates a single JSON object for this table's details
-				)
-		END AS object_details
-	FROM
-		table_info ti
-	ORDER BY
-		ti.schema_name, ti.table_name;
+    WITH table_info AS (
+        SELECT
+            t.object_id AS table_oid,
+            s.name AS schema_name,
+            t.name AS table_name,
+            dp.name AS table_owner, -- Schema's owner principal name
+            CAST(ep.value AS NVARCHAR(MAX)) AS table_comment, -- Cast for JSON compatibility
+            CASE
+                WHEN EXISTS ( -- Check if the table has more than one partition for any of its indexes or heap
+                    SELECT 1 FROM sys.partitions p
+                    WHERE p.object_id = t.object_id AND p.partition_number > 1
+                ) THEN 'PARTITIONED TABLE'
+                ELSE 'TABLE'
+            END AS object_type_detail
+        FROM
+            sys.tables t
+        INNER JOIN
+            sys.schemas s ON t.schema_id = s.schema_id
+        LEFT JOIN
+            sys.database_principals dp ON s.principal_id = dp.principal_id
+        LEFT JOIN
+            sys.extended_properties ep ON ep.major_id = t.object_id AND ep.minor_id = 0 AND ep.class = 1 AND ep.name = 'MS_Description'
+        WHERE
+            t.type = 'U' -- User tables
+            AND s.name NOT IN ('sys', 'INFORMATION_SCHEMA', 'guest', 'db_owner', 'db_accessadmin', 'db_backupoperator', 'db_datareader', 'db_datawriter', 'db_ddladmin', 'db_denydatareader', 'db_denydatawriter', 'db_securityadmin')
+            AND (@table_names IS NULL OR LTRIM(RTRIM(@table_names)) = '' OR t.name IN (SELECT LTRIM(RTRIM(value)) FROM STRING_SPLIT(@table_names, ',')))
+    ),
+    columns_info AS (
+        SELECT
+            c.object_id AS table_oid,
+            c.name AS column_name,
+            CONCAT(
+                UPPER(TY.name), -- Base type name
+                CASE
+                    WHEN TY.name IN ('char', 'varchar', 'nchar', 'nvarchar', 'binary', 'varbinary') THEN
+                        CONCAT('(', IIF(c.max_length = -1, 'MAX', CAST(c.max_length / CASE WHEN TY.name IN ('nchar', 'nvarchar') THEN 2 ELSE 1 END AS VARCHAR(10))), ')')
+                    WHEN TY.name IN ('decimal', 'numeric') THEN
+                        CONCAT('(', c.precision, ',', c.scale, ')')
+                    WHEN TY.name IN ('datetime2', 'datetimeoffset', 'time') THEN
+                        CONCAT('(', c.scale, ')')
+                    ELSE ''
+                END
+            ) AS data_type,
+            c.column_id AS column_ordinal_position,
+            IIF(c.is_nullable = 0, CAST(1 AS BIT), CAST(0 AS BIT)) AS is_not_nullable,
+            dc.definition AS column_default,
+            CAST(epc.value AS NVARCHAR(MAX)) AS column_comment
+        FROM
+            sys.columns c
+        JOIN
+            table_info ti ON c.object_id = ti.table_oid
+        JOIN
+            sys.types TY ON c.user_type_id = TY.user_type_id AND TY.is_user_defined = 0 -- Ensure we get base types
+        LEFT JOIN
+            sys.default_constraints dc ON c.object_id = dc.parent_object_id AND c.column_id = dc.parent_column_id
+        LEFT JOIN
+            sys.extended_properties epc ON epc.major_id = c.object_id AND epc.minor_id = c.column_id AND epc.class = 1 AND epc.name = 'MS_Description'
+    ),
+    constraints_info AS (
+        -- Primary Keys & Unique Constraints
+        SELECT
+            kc.parent_object_id AS table_oid,
+            kc.name AS constraint_name,
+            REPLACE(kc.type_desc, '_CONSTRAINT', '') AS constraint_type, -- 'PRIMARY_KEY', 'UNIQUE'
+            STUFF((SELECT ', ' + col.name
+                FROM sys.index_columns ic
+                JOIN sys.columns col ON ic.object_id = col.object_id AND ic.column_id = col.column_id
+                WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id
+                ORDER BY ic.key_ordinal
+                FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS constraint_columns,
+            NULL AS foreign_key_referenced_table,
+            NULL AS foreign_key_referenced_columns,
+            CASE kc.type
+                WHEN 'PK' THEN 'PRIMARY KEY (' + STUFF((SELECT ', ' + col.name FROM sys.index_columns ic JOIN sys.columns col ON ic.object_id = col.object_id AND ic.column_id = col.column_id WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id ORDER BY ic.key_ordinal FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') + ')'
+                WHEN 'UQ' THEN 'UNIQUE (' + STUFF((SELECT ', ' + col.name FROM sys.index_columns ic JOIN sys.columns col ON ic.object_id = col.object_id AND ic.column_id = col.column_id WHERE ic.object_id = kc.parent_object_id AND ic.index_id = kc.unique_index_id ORDER BY ic.key_ordinal FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') + ')'
+            END AS constraint_definition
+        FROM sys.key_constraints kc
+        JOIN table_info ti ON kc.parent_object_id = ti.table_oid
+        UNION ALL
+        -- Foreign Keys
+        SELECT
+            fk.parent_object_id AS table_oid,
+            fk.name AS constraint_name,
+            'FOREIGN KEY' AS constraint_type,
+            STUFF((SELECT ', ' + pc.name
+                FROM sys.foreign_key_columns fkc
+                JOIN sys.columns pc ON fkc.parent_object_id = pc.object_id AND fkc.parent_column_id = pc.column_id
+                WHERE fkc.constraint_object_id = fk.object_id
+                ORDER BY fkc.constraint_column_id
+                FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS constraint_columns,
+            SCHEMA_NAME(rt.schema_id) + '.' + OBJECT_NAME(fk.referenced_object_id) AS foreign_key_referenced_table,
+            STUFF((SELECT ', ' + rc.name
+                FROM sys.foreign_key_columns fkc
+                JOIN sys.columns rc ON fkc.referenced_object_id = rc.object_id AND fkc.referenced_column_id = rc.column_id
+                WHERE fkc.constraint_object_id = fk.object_id
+                ORDER BY fkc.constraint_column_id
+                FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS foreign_key_referenced_columns,
+            OBJECT_DEFINITION(fk.object_id) AS constraint_definition
+        FROM sys.foreign_keys fk
+        JOIN sys.tables rt ON fk.referenced_object_id = rt.object_id
+        JOIN table_info ti ON fk.parent_object_id = ti.table_oid
+        UNION ALL
+        -- Check Constraints
+        SELECT
+            cc.parent_object_id AS table_oid,
+            cc.name AS constraint_name,
+            'CHECK' AS constraint_type,
+            NULL AS constraint_columns, -- Definition includes column context
+            NULL AS foreign_key_referenced_table,
+            NULL AS foreign_key_referenced_columns,
+            cc.definition AS constraint_definition
+        FROM sys.check_constraints cc
+        JOIN table_info ti ON cc.parent_object_id = ti.table_oid
+    ),
+    indexes_info AS (
+        SELECT
+            i.object_id AS table_oid,
+            i.name AS index_name,
+            i.type_desc AS index_method, -- CLUSTERED, NONCLUSTERED, XML, etc.
+            i.is_unique,
+            i.is_primary_key AS is_primary,
+            STUFF((SELECT ', ' + c.name
+                FROM sys.index_columns ic
+                JOIN sys.columns c ON i.object_id = c.object_id AND ic.column_id = c.column_id
+                WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0
+                ORDER BY ic.key_ordinal
+                FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS index_columns,
+            (
+                'COLUMNS: (' + ISNULL(STUFF((SELECT ', ' + c.name + CASE WHEN ic.is_descending_key = 1 THEN ' DESC' ELSE '' END
+                                        FROM sys.index_columns ic
+                                        JOIN sys.columns c ON i.object_id = c.object_id AND ic.column_id = c.column_id
+                                        WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 0
+                                        ORDER BY ic.key_ordinal FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, ''), 'N/A') + ')' +
+                ISNULL(CHAR(13)+CHAR(10) + 'INCLUDE: (' + STUFF((SELECT ', ' + c.name
+                                        FROM sys.index_columns ic
+                                        JOIN sys.columns c ON i.object_id = c.object_id AND ic.column_id = c.column_id
+                                        WHERE ic.object_id = i.object_id AND ic.index_id = i.index_id AND ic.is_included_column = 1
+                                        ORDER BY ic.index_column_id FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') + ')', '') +
+                ISNULL(CHAR(13)+CHAR(10) + 'FILTER: (' + i.filter_definition + ')', '')
+            ) AS index_definition_details
+        FROM
+            sys.indexes i
+        JOIN
+            table_info ti ON i.object_id = ti.table_oid
+        WHERE i.type <> 0 -- Exclude Heaps
+        AND i.name IS NOT NULL -- Exclude unnamed heap indexes; named indexes (PKs are often named) are preferred.
+    ),
+    triggers_info AS (
+        SELECT
+            tr.parent_id AS table_oid,
+            tr.name AS trigger_name,
+            OBJECT_DEFINITION(tr.object_id) AS trigger_definition,
+            CASE tr.is_disabled WHEN 0 THEN 'ENABLED' ELSE 'DISABLED' END AS trigger_enabled_state
+        FROM
+            sys.triggers tr
+        JOIN
+            table_info ti ON tr.parent_id = ti.table_oid
+        WHERE
+            tr.is_ms_shipped = 0
+            AND tr.parent_class_desc = 'OBJECT_OR_COLUMN' -- DML Triggers on tables/views
+    )
+    SELECT
+        ti.schema_name,
+        ti.table_name AS object_name,
+        CASE
+            WHEN @output_format = 'simple' THEN
+                (SELECT ti.table_name AS name FOR JSON PATH, WITHOUT_ARRAY_WRAPPER)
+            ELSE
+                (
+                    SELECT
+                        ti.schema_name AS schema_name,
+                        ti.table_name AS object_name,
+                        ti.object_type_detail AS object_type,
+                        ti.table_owner AS owner,
+                        ti.table_comment AS comment,
+                        JSON_QUERY(ISNULL((
+                            SELECT
+                                ci.column_name,
+                                ci.data_type,
+                                ci.column_ordinal_position,
+                                ci.is_not_nullable,
+                                ci.column_default,
+                                ci.column_comment
+                            FROM columns_info ci
+                            WHERE ci.table_oid = ti.table_oid
+                            ORDER BY ci.column_ordinal_position
+                            FOR JSON PATH
+                        ), '[]')) AS columns,
+                        JSON_QUERY(ISNULL((
+                            SELECT
+                                cons.constraint_name,
+                                cons.constraint_type,
+                                cons.constraint_definition,
+                                JSON_QUERY(
+                                    CASE
+                                        WHEN cons.constraint_columns IS NOT NULL AND LTRIM(RTRIM(cons.constraint_columns)) <> ''
+                                        THEN '[' + (SELECT STRING_AGG('"' + LTRIM(RTRIM(value)) + '"', ',') FROM STRING_SPLIT(cons.constraint_columns, ',')) + ']'
+                                        ELSE '[]'
+                                    END
+                                ) AS constraint_columns,
+                                cons.foreign_key_referenced_table,
+                                JSON_QUERY(
+                                    CASE
+                                        WHEN cons.foreign_key_referenced_columns IS NOT NULL AND LTRIM(RTRIM(cons.foreign_key_referenced_columns)) <> ''
+                                        THEN '[' + (SELECT STRING_AGG('"' + LTRIM(RTRIM(value)) + '"', ',') FROM STRING_SPLIT(cons.foreign_key_referenced_columns, ',')) + ']'
+                                        ELSE '[]'
+                                    END
+                                ) AS foreign_key_referenced_columns
+                            FROM constraints_info cons
+                            WHERE cons.table_oid = ti.table_oid
+                            FOR JSON PATH
+                        ), '[]')) AS constraints,
+                        JSON_QUERY(ISNULL((
+                            SELECT
+                                ii.index_name,
+                                ii.index_definition_details AS index_definition,
+                                ii.is_unique,
+                                ii.is_primary,
+                                ii.index_method,
+                                JSON_QUERY(
+                                    CASE
+                                        WHEN ii.index_columns IS NOT NULL AND LTRIM(RTRIM(ii.index_columns)) <> ''
+                                        THEN '[' + (SELECT STRING_AGG('"' + LTRIM(RTRIM(value)) + '"', ',') FROM STRING_SPLIT(ii.index_columns, ',')) + ']'
+                                        ELSE '[]'
+                                    END
+                                ) AS index_columns
+                            FROM indexes_info ii
+                            WHERE ii.table_oid = ti.table_oid
+                            FOR JSON PATH
+                        ), '[]')) AS indexes,
+                        JSON_QUERY(ISNULL((
+                            SELECT
+                                tri.trigger_name,
+                                tri.trigger_definition,
+                                tri.trigger_enabled_state
+                            FROM triggers_info tri
+                            WHERE tri.table_oid = ti.table_oid
+                            FOR JSON PATH
+                        ), '[]')) AS triggers
+                    FOR JSON PATH, WITHOUT_ARRAY_WRAPPER -- Creates a single JSON object for this table's details
+                )
+        END AS object_details
+    FROM
+        table_info ti
+    ORDER BY
+        ti.schema_name, ti.table_name;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -298,7 +300,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -307,8 +309,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -339,17 +341,17 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	outputFormat, _ := paramsMap["output_format"].(string)
 	if outputFormat != "simple" && outputFormat != "detailed" {
-		return nil, fmt.Errorf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat), nil)
 	}
 
 	namedArgs := []any{
@@ -358,18 +360,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	}
 	resp, err := source.RunSQL(ctx, listTablesStatement, namedArgs)
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGeneralError(err)
 	}
 	// if there's no results, return empty list instead of null
 	resSlice, ok := resp.([]any)
 	if !ok || len(resSlice) == 0 {
 		return []any{}, nil
 	}
-	return resp, err
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -399,3 +397,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mssql/mssqllisttables/mssqllisttables_test.go b/internal/tools/mssql/mssqllisttables/mssqllisttables_test.go
index 029a89a1ca..1da6d18eae 100644
--- a/internal/tools/mssql/mssqllisttables/mssqllisttables_test.go
+++ b/internal/tools/mssql/mssqllisttables/mssqllisttables_test.go
@@ -17,7 +17,6 @@ package mssqllisttables_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlmssqlListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mssql-list-tables
-					source: my-mssql-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mssql-list-tables
+            source: my-mssql-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mssqllisttables.Config{
 					Name:         "example_tool",
-					Kind:         "mssql-list-tables",
+					Type:         "mssql-list-tables",
 					Source:       "my-mssql-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlmssqlListTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mssql/mssqlsql/mssqlsql.go b/internal/tools/mssql/mssqlsql/mssqlsql.go
index d0ce09c9e8..4e5878e89f 100644
--- a/internal/tools/mssql/mssqlsql/mssqlsql.go
+++ b/internal/tools/mssql/mssqlsql/mssqlsql.go
@@ -18,20 +18,22 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 	"strings"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mssql-sql"
+const resourceType string = "mssql-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -62,8 +64,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,21 +96,21 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	namedArgs := make([]any, 0, len(newParams))
@@ -123,11 +125,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			namedArgs = append(namedArgs, value)
 		}
 	}
-	return source.RunSQL(ctx, newStatement, namedArgs)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, namedArgs)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -157,3 +159,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mssql/mssqlsql/mssqlsql_test.go b/internal/tools/mssql/mssqlsql/mssqlsql_test.go
index 3fb9b44d8c..043b97f0ce 100644
--- a/internal/tools/mssql/mssqlsql/mssqlsql_test.go
+++ b/internal/tools/mssql/mssqlsql/mssqlsql_test.go
@@ -17,7 +17,6 @@ package mssqlsql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlMssql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mssql-sql
-					source: my-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: mssql-sql
+            source: my-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mssqlsql.Config{
 					Name:         "example_tool",
-					Kind:         "mssql-sql",
+					Type:         "mssql-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -77,15 +76,12 @@ func TestParseFromYamlMssql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -105,41 +101,41 @@ func TestParseFromYamlWithTemplateMssql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mssql-sql
-					source: my-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: mssql-sql
+            source: my-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mssqlsql.Config{
 					Name:         "example_tool",
-					Kind:         "mssql-sql",
+					Type:         "mssql-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -159,15 +155,12 @@ func TestParseFromYamlWithTemplateMssql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql.go b/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql.go
index f09bee748f..4363ba2ed7 100644
--- a/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql.go
+++ b/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-execute-sql"
+const resourceType string = "mysql-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -89,29 +90,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
+	sqlStr, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -141,3 +142,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(_ tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql_test.go b/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql_test.go
index 9044c2575d..43b4324728 100644
--- a/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql_test.go
+++ b/internal/tools/mysql/mysqlexecutesql/mysqlexecutesql_test.go
@@ -17,7 +17,6 @@ package mysqlexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mysql-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqlexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-execute-sql",
+					Type:         "mysql-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan.go b/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan.go
index 07d4396cda..b2e6008af2 100644
--- a/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan.go
+++ b/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan.go
@@ -19,6 +19,7 @@ import (
 	"database/sql"
 	"encoding/json"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,11 +30,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-get-query-plan"
+const resourceType string = "mysql-get-query-plan"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -52,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -61,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -91,54 +92,50 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql_statement"].(string)
+	sqlStr, ok := paramsMap["sql_statement"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql_statement"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql_statement"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
 
-	query := fmt.Sprintf("EXPLAIN FORMAT=JSON %s", sql)
+	query := fmt.Sprintf("EXPLAIN FORMAT=JSON %s", sqlStr)
 	result, err := source.RunSQL(ctx, query, nil)
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGeneralError(err)
 	}
 	// extract and return only the query plan object
 	resSlice, ok := result.([]any)
 	if !ok || len(resSlice) == 0 {
-		return nil, fmt.Errorf("no query plan returned")
+		return nil, util.NewClientServerError("no query plan returned", http.StatusInternalServerError, nil)
 	}
 	row, ok := resSlice[0].(orderedmap.Row)
 	if !ok || len(row.Columns) == 0 {
-		return nil, fmt.Errorf("no query plan returned in row")
+		return nil, util.NewClientServerError("no query plan returned in row", http.StatusInternalServerError, nil)
 	}
 	plan, ok := row.Columns[0].Value.(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to convert plan object to string")
+		return nil, util.NewClientServerError("unable to convert plan object to string", http.StatusInternalServerError, nil)
 	}
 	var out map[string]any
 	if err := json.Unmarshal([]byte(plan), &out); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal query plan json: %w", err)
+		return nil, util.NewClientServerError("failed to unmarshal query plan json", http.StatusInternalServerError, err)
 	}
 	return out, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -166,3 +163,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(_ tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan_test.go b/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan_test.go
index b06248dbaf..43ed82aa35 100644
--- a/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan_test.go
+++ b/internal/tools/mysql/mysqlgetqueryplan/mysqlgetqueryplan_test.go
@@ -17,7 +17,6 @@ package mysqlgetqueryplan_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlGetQueryPlan(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-get-query-plan
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mysql-get-query-plan
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqlgetqueryplan.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-get-query-plan",
+					Type:         "mysql-get-query-plan",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlGetQueryPlan(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries.go b/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries.go
index 1cc564752b..3437657da6 100644
--- a/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries.go
+++ b/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -29,73 +30,73 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-list-active-queries"
+const resourceType string = "mysql-list-active-queries"
 
 const listActiveQueriesStatementMySQL = `
-	SELECT
-		p.id AS processlist_id,
-		substring(IFNULL(p.info, t.trx_query), 1, 100) AS query,
-		t.trx_started AS trx_started,
-		(UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_started)) AS trx_duration_seconds,
-		(UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_wait_started)) AS trx_wait_duration_seconds,
-		p.time AS query_time,
-		t.trx_state AS trx_state,
-		p.state AS process_state,
-		IF(p.host IS NULL OR p.host = '', p.user, concat(p.user, '@', SUBSTRING_INDEX(p.host, ':', 1))) AS user,
-		t.trx_rows_locked AS trx_rows_locked,
-		t.trx_rows_modified AS trx_rows_modified,
-		p.db AS db
-	FROM
-		information_schema.processlist p
-		LEFT OUTER JOIN
-		information_schema.innodb_trx t
-		ON p.id = t.trx_mysql_thread_id
-	WHERE
-		(? IS NULL OR p.time >= ?)
-		AND p.id != CONNECTION_ID()
-		AND Command NOT IN ('Binlog Dump', 'Binlog Dump GTID', 'Connect', 'Connect Out', 'Register Slave')
-		AND User NOT IN ('system user', 'event_scheduler')
-		AND (t.trx_id is NOT NULL OR command != 'Sleep')
-	ORDER BY
-		t.trx_started
-	LIMIT ?;
+    SELECT
+        p.id AS processlist_id,
+        substring(IFNULL(p.info, t.trx_query), 1, 100) AS query,
+        t.trx_started AS trx_started,
+        (UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_started)) AS trx_duration_seconds,
+        (UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_wait_started)) AS trx_wait_duration_seconds,
+        p.time AS query_time,
+        t.trx_state AS trx_state,
+        p.state AS process_state,
+        IF(p.host IS NULL OR p.host = '', p.user, concat(p.user, '@', SUBSTRING_INDEX(p.host, ':', 1))) AS user,
+        t.trx_rows_locked AS trx_rows_locked,
+        t.trx_rows_modified AS trx_rows_modified,
+        p.db AS db
+    FROM
+        information_schema.processlist p
+        LEFT OUTER JOIN
+        information_schema.innodb_trx t
+        ON p.id = t.trx_mysql_thread_id
+    WHERE
+        (? IS NULL OR p.time >= ?)
+        AND p.id != CONNECTION_ID()
+        AND Command NOT IN ('Binlog Dump', 'Binlog Dump GTID', 'Connect', 'Connect Out', 'Register Slave')
+        AND User NOT IN ('system user', 'event_scheduler')
+        AND (t.trx_id is NOT NULL OR command != 'Sleep')
+    ORDER BY
+        t.trx_started
+    LIMIT ?;
 `
 
 const listActiveQueriesStatementCloudSQLMySQL = `
-	SELECT
-		p.id AS processlist_id,
-		substring(IFNULL(p.info, t.trx_query), 1, 100) AS query,
-		t.trx_started AS trx_started,
-		(UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_started)) AS trx_duration_seconds,
-		(UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_wait_started)) AS trx_wait_duration_seconds,
-		p.time AS query_time,
-		t.trx_state AS trx_state,
-		p.state AS process_state,
-		IF(p.host IS NULL OR p.host = '', p.user, concat(p.user, '@', SUBSTRING_INDEX(p.host, ':', 1))) AS user,
-		t.trx_rows_locked AS trx_rows_locked,
-		t.trx_rows_modified AS trx_rows_modified,
-		p.db AS db
-	FROM
-		information_schema.processlist p
-		LEFT OUTER JOIN
-		information_schema.innodb_trx t
-		ON p.id = t.trx_mysql_thread_id
-	WHERE
-		(? IS NULL OR p.time >= ?)
-		AND p.id != CONNECTION_ID()
-		AND SUBSTRING_INDEX(IFNULL(p.host,''), ':', 1) NOT IN ('localhost', '127.0.0.1')
-		AND IFNULL(p.host,'') NOT LIKE '::1%'
-		AND Command NOT IN ('Binlog Dump', 'Binlog Dump GTID', 'Connect', 'Connect Out', 'Register Slave')
-		AND User NOT IN ('system user', 'event_scheduler')
-		AND (t.trx_id is NOT NULL OR command != 'sleep')
-	ORDER BY
-		t.trx_started
-	LIMIT ?;
+    SELECT
+        p.id AS processlist_id,
+        substring(IFNULL(p.info, t.trx_query), 1, 100) AS query,
+        t.trx_started AS trx_started,
+        (UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_started)) AS trx_duration_seconds,
+        (UNIX_TIMESTAMP(UTC_TIMESTAMP()) - UNIX_TIMESTAMP(t.trx_wait_started)) AS trx_wait_duration_seconds,
+        p.time AS query_time,
+        t.trx_state AS trx_state,
+        p.state AS process_state,
+        IF(p.host IS NULL OR p.host = '', p.user, concat(p.user, '@', SUBSTRING_INDEX(p.host, ':', 1))) AS user,
+        t.trx_rows_locked AS trx_rows_locked,
+        t.trx_rows_modified AS trx_rows_modified,
+        p.db AS db
+    FROM
+        information_schema.processlist p
+        LEFT OUTER JOIN
+        information_schema.innodb_trx t
+        ON p.id = t.trx_mysql_thread_id
+    WHERE
+        (? IS NULL OR p.time >= ?)
+        AND p.id != CONNECTION_ID()
+        AND SUBSTRING_INDEX(IFNULL(p.host,''), ':', 1) NOT IN ('localhost', '127.0.0.1')
+        AND IFNULL(p.host,'') NOT LIKE '::1%'
+        AND Command NOT IN ('Binlog Dump', 'Binlog Dump GTID', 'Connect', 'Connect Out', 'Register Slave')
+        AND User NOT IN ('system user', 'event_scheduler')
+        AND (t.trx_id is NOT NULL OR command != 'sleep')
+    ORDER BY
+        t.trx_started
+    LIMIT ?;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -114,7 +115,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -123,8 +124,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -136,7 +137,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// verify the source is compatible
 	_, ok = rawS.(compatibleSource)
 	if !ok {
-		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", kind, cfg.Source)
+		return nil, fmt.Errorf("invalid source for %q tool: source %q not compatible", resourceType, cfg.Source)
 	}
 
 	allParameters := parameters.Parameters{
@@ -146,14 +147,14 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
 	var statement string
-	sourceKind := rawS.SourceKind()
-	switch sourceKind {
-	case mysql.SourceKind:
+	sourceType := rawS.SourceType()
+	switch sourceType {
+	case mysql.SourceType:
 		statement = listActiveQueriesStatementMySQL
-	case cloudsqlmysql.SourceKind:
+	case cloudsqlmysql.SourceType:
 		statement = listActiveQueriesStatementCloudSQLMySQL
 	default:
-		return nil, fmt.Errorf("unsupported source kind: %s", cfg.Source)
+		return nil, fmt.Errorf("unsupported source type: %s", cfg.Source)
 	}
 	// finish tool setup
 	t := Tool{
@@ -177,34 +178,34 @@ type Tool struct {
 	statement   string
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	duration, ok := paramsMap["min_duration_secs"].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'min_duration_secs' parameter; expected an integer")
+		return nil, util.NewAgentError("invalid 'min_duration_secs' parameter; expected an integer", nil)
 	}
 	limit, ok := paramsMap["limit"].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'limit' parameter; expected an integer")
+		return nil, util.NewAgentError("invalid 'limit' parameter; expected an integer", nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, t.statement))
-	return source.RunSQL(ctx, t.statement, []any{duration, duration, limit})
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, t.statement))
+	resp, err := source.RunSQL(ctx, t.statement, []any{duration, duration, limit})
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -234,3 +235,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries_test.go b/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries_test.go
index cacc41c1ed..5351981f38 100644
--- a/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries_test.go
+++ b/internal/tools/mysql/mysqllistactivequeries/mysqllistactivequeries_test.go
@@ -17,7 +17,6 @@ package mysqllistactivequeries_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-list-active-queries
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mysql-list-active-queries
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqllistactivequeries.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-list-active-queries",
+					Type:         "mysql-list-active-queries",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation.go b/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation.go
index adadd806d0..4277a6379d 100644
--- a/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation.go
+++ b/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,33 +28,33 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-list-table-fragmentation"
+const resourceType string = "mysql-list-table-fragmentation"
 
 const listTableFragmentationStatement = `
-	SELECT
-		table_schema,
-		table_name,
-		data_length AS data_size,
-		index_length AS index_size,
-		data_free AS data_free,
-		ROUND((data_free / (data_length + index_length)) * 100, 2) AS fragmentation_percentage
-	FROM
-		information_schema.tables
-	WHERE
-		table_schema NOT IN ('sys', 'performance_schema', 'mysql', 'information_schema')
-		AND (COALESCE(?, '') = '' OR table_schema = ?)
-		AND (COALESCE(?, '') = '' OR table_name = ?)
-		AND data_free >= ?
-	ORDER BY
-		fragmentation_percentage DESC,
-		table_schema,
-		table_name
-	LIMIT ?;
+    SELECT
+        table_schema,
+        table_name,
+        data_length AS data_size,
+        index_length AS index_size,
+        data_free AS data_free,
+        ROUND((data_free / (data_length + index_length)) * 100, 2) AS fragmentation_percentage
+    FROM
+        information_schema.tables
+    WHERE
+        table_schema NOT IN ('sys', 'performance_schema', 'mysql', 'information_schema')
+        AND (COALESCE(?, '') = '' OR table_schema = ?)
+        AND (COALESCE(?, '') = '' OR table_name = ?)
+        AND data_free >= ?
+    ORDER BY
+        fragmentation_percentage DESC,
+        table_schema,
+        table_name
+    LIMIT ?;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -72,7 +73,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -81,8 +82,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -114,43 +115,43 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	table_schema, ok := paramsMap["table_schema"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'table_schema' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'table_schema' parameter; expected a string", nil)
 	}
 	table_name, ok := paramsMap["table_name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'table_name' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'table_name' parameter; expected a string", nil)
 	}
 	data_free_threshold_bytes, ok := paramsMap["data_free_threshold_bytes"].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'data_free_threshold_bytes' parameter; expected an integer")
+		return nil, util.NewAgentError("invalid 'data_free_threshold_bytes' parameter; expected an integer", nil)
 	}
 	limit, ok := paramsMap["limit"].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'limit' parameter; expected an integer")
+		return nil, util.NewAgentError("invalid 'limit' parameter; expected an integer", nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, listTableFragmentationStatement))
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, listTableFragmentationStatement))
 	sliceParams := []any{table_schema, table_schema, table_name, table_name, data_free_threshold_bytes, limit}
-	return source.RunSQL(ctx, listTableFragmentationStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listTableFragmentationStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -180,3 +181,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation_test.go b/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation_test.go
index 401f672e72..07867ae8b1 100644
--- a/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation_test.go
+++ b/internal/tools/mysql/mysqllisttablefragmentation/mysqllisttablefragmentation_test.go
@@ -17,7 +17,6 @@ package mysqllisttablefragmentation_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-list-table-fragmentation
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mysql-list-table-fragmentation
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqllisttablefragmentation.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-list-table-fragmentation",
+					Type:         "mysql-list-table-fragmentation",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqllisttables/mysqllisttables.go b/internal/tools/mysql/mysqllisttables/mysqllisttables.go
index 608ee5b524..cfca0f87c6 100644
--- a/internal/tools/mysql/mysqllisttables/mysqllisttables.go
+++ b/internal/tools/mysql/mysqllisttables/mysqllisttables.go
@@ -18,15 +18,17 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-list-tables"
+const resourceType string = "mysql-list-tables"
 
 const listTablesStatement = `
     SELECT
@@ -182,8 +184,8 @@ const listTablesStatement = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -202,7 +204,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -211,8 +213,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -244,36 +246,32 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	tableNames, ok := paramsMap["table_names"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid '%s' parameter; expected a string", tableNames)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid '%s' parameter; expected a string", tableNames), nil)
 	}
 	outputFormat, _ := paramsMap["output_format"].(string)
 	if outputFormat != "simple" && outputFormat != "detailed" {
-		return nil, fmt.Errorf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat), nil)
 	}
 	resp, err := source.RunSQL(ctx, listTablesStatement, []any{tableNames, outputFormat})
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGeneralError(err)
 	}
 	// if there's no results, return empty list instead of null
 	resSlice, ok := resp.([]any)
 	if !ok || len(resSlice) == 0 {
 		return []any{}, nil
 	}
-	return resp, err
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -303,3 +301,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mysql/mysqllisttables/mysqllisttables_test.go b/internal/tools/mysql/mysqllisttables/mysqllisttables_test.go
index c195e4f4e7..5112d88ed9 100644
--- a/internal/tools/mysql/mysqllisttables/mysqllisttables_test.go
+++ b/internal/tools/mysql/mysqllisttables/mysqllisttables_test.go
@@ -17,7 +17,6 @@ package mysqllisttables_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlMySQLListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-list-tables
-					source: my-mysql-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mysql-list-tables
+            source: my-mysql-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqllisttables.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-list-tables",
+					Type:         "mysql-list-tables",
 					Source:       "my-mysql-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlMySQLListTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes.go b/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes.go
index 025f0b4bdf..50954e6f83 100644
--- a/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes.go
+++ b/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,34 +28,34 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-list-tables-missing-unique-indexes"
+const resourceType string = "mysql-list-tables-missing-unique-indexes"
 
 const listTablesMissingUniqueIndexesStatement = `
-	SELECT
-		tab.table_schema AS table_schema,
-		tab.table_name AS table_name
-	FROM
-		information_schema.tables tab
-		LEFT JOIN
-		information_schema.table_constraints tco
-		ON
-			tab.table_schema = tco.table_schema
-			AND tab.table_name = tco.table_name
-			AND tco.constraint_type IN ('PRIMARY KEY', 'UNIQUE')
-	WHERE
-		tco.constraint_type IS NULL
-		AND tab.table_schema NOT IN('mysql', 'information_schema', 'performance_schema', 'sys')
-		AND tab.table_type = 'BASE TABLE'
-		AND (COALESCE(?, '') = '' OR tab.table_schema = ?)
-	ORDER BY
-		tab.table_schema,
-		tab.table_name
-	LIMIT ?;
+    SELECT
+        tab.table_schema AS table_schema,
+        tab.table_name AS table_name
+    FROM
+        information_schema.tables tab
+        LEFT JOIN
+        information_schema.table_constraints tco
+        ON
+            tab.table_schema = tco.table_schema
+            AND tab.table_name = tco.table_name
+            AND tco.constraint_type IN ('PRIMARY KEY', 'UNIQUE')
+    WHERE
+        tco.constraint_type IS NULL
+        AND tab.table_schema NOT IN('mysql', 'information_schema', 'performance_schema', 'sys')
+        AND tab.table_type = 'BASE TABLE'
+        AND (COALESCE(?, '') = '' OR tab.table_schema = ?)
+    ORDER BY
+        tab.table_schema,
+        tab.table_name
+    LIMIT ?;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -73,7 +74,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -82,8 +83,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -113,34 +114,34 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	table_schema, ok := paramsMap["table_schema"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'table_schema' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'table_schema' parameter; expected a string", nil)
 	}
 	limit, ok := paramsMap["limit"].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'limit' parameter; expected an integer")
+		return nil, util.NewAgentError("invalid 'limit' parameter; expected an integer", nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, listTablesMissingUniqueIndexesStatement))
-	return source.RunSQL(ctx, listTablesMissingUniqueIndexesStatement, []any{table_schema, table_schema, limit})
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, listTablesMissingUniqueIndexesStatement))
+	resp, err := source.RunSQL(ctx, listTablesMissingUniqueIndexesStatement, []any{table_schema, table_schema, limit})
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -170,3 +171,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes_test.go b/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes_test.go
index 6ee9c87347..3c1f0715cb 100644
--- a/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes_test.go
+++ b/internal/tools/mysql/mysqllisttablesmissinguniqueindexes/mysqllisttablesmissinguniqueindexes_test.go
@@ -17,7 +17,6 @@ package mysqllisttablesmissinguniqueindexes_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-list-tables-missing-unique-indexes
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: mysql-list-tables-missing-unique-indexes
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqllisttablesmissinguniqueindexes.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-list-tables-missing-unique-indexes",
+					Type:         "mysql-list-tables-missing-unique-indexes",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/mysql/mysqlsql/mysqlsql.go b/internal/tools/mysql/mysqlsql/mysqlsql.go
index 27a3c59716..e65e562128 100644
--- a/internal/tools/mysql/mysqlsql/mysqlsql.go
+++ b/internal/tools/mysql/mysqlsql/mysqlsql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "mysql-sql"
+const resourceType string = "mysql-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,29 +95,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -145,3 +147,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/mysql/mysqlsql/mysqlsql_test.go b/internal/tools/mysql/mysqlsql/mysqlsql_test.go
index 5863477f0b..d825720de0 100644
--- a/internal/tools/mysql/mysqlsql/mysqlsql_test.go
+++ b/internal/tools/mysql/mysqlsql/mysqlsql_test.go
@@ -17,7 +17,6 @@ package mysqlsql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlMySQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-sql
-					source: my-mysql-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: mysql-sql
+            source: my-mysql-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqlsql.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-sql",
+					Type:         "mysql-sql",
 					Source:       "my-mysql-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -77,15 +76,12 @@ func TestParseFromYamlMySQL(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -105,41 +101,41 @@ func TestParseFromYamlWithTemplateParamsMySQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: mysql-sql
-					source: my-mysql-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: mysql-sql
+            source: my-mysql-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": mysqlsql.Config{
 					Name:         "example_tool",
-					Kind:         "mysql-sql",
+					Type:         "mysql-sql",
 					Source:       "my-mysql-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -159,15 +155,12 @@ func TestParseFromYamlWithTemplateParamsMySQL(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/neo4j/neo4jcypher/neo4jcypher.go b/internal/tools/neo4j/neo4jcypher/neo4jcypher.go
index b783df5cde..fc4cb89f1b 100644
--- a/internal/tools/neo4j/neo4jcypher/neo4jcypher.go
+++ b/internal/tools/neo4j/neo4jcypher/neo4jcypher.go
@@ -17,20 +17,22 @@ package neo4jcypher
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "neo4j-cypher"
+const resourceType string = "neo4j-cypher"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	Statement    string                `yaml:"statement" validate:"required"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -85,18 +87,18 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	return source.RunQuery(ctx, t.Statement, paramsMap, false, false)
-}
-
-func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claimsMap)
+	resp, err := source.RunQuery(ctx, t.Statement, paramsMap, false, false)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -126,3 +128,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/neo4j/neo4jcypher/neo4jcypher_test.go b/internal/tools/neo4j/neo4jcypher/neo4jcypher_test.go
index 898583f961..d20cb1822c 100644
--- a/internal/tools/neo4j/neo4jcypher/neo4jcypher_test.go
+++ b/internal/tools/neo4j/neo4jcypher/neo4jcypher_test.go
@@ -17,7 +17,6 @@ package neo4jcypher
 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/testutils"
@@ -37,25 +36,25 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: neo4j-cypher
-					source: my-neo4j-instance
-					description: some tool description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					statement: |
-						MATCH (c:Country) WHERE c.name = $country RETURN c.id as id;
-					parameters:
-						- name: country
-						  type: string
-						  description: country parameter description
+            kind: tools
+            name: example_tool
+            type: neo4j-cypher
+            source: my-neo4j-instance
+            description: some tool description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            statement: |
+                MATCH (c:Country) WHERE c.name = $country RETURN c.id as id;
+            parameters:
+                - name: country
+                  type: string
+                  description: country parameter description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "neo4j-cypher",
+					Type:         "neo4j-cypher",
 					Source:       "my-neo4j-instance",
 					Description:  "some tool description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -69,15 +68,12 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher.go b/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher.go
index 316423da49..2ea2fd9681 100644
--- a/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher.go
+++ b/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher.go
@@ -17,19 +17,21 @@ package neo4jexecutecypher
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "neo4j-execute-cypher"
+const resourceType string = "neo4j-execute-cypher"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	ReadOnly     bool     `yaml:"readOnly"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,32 +96,32 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	cypherStr, ok := paramsMap["cypher"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast cypher parameter %s", paramsMap["cypher"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast cypher parameter %s", paramsMap["cypher"]), nil)
 	}
 
 	if cypherStr == "" {
-		return nil, fmt.Errorf("parameter 'cypher' must be a non-empty string")
+		return nil, util.NewAgentError("parameter 'cypher' must be a non-empty string", nil)
 	}
 
 	dryRun, ok := paramsMap["dry_run"].(bool)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast dry_run parameter %s", paramsMap["dry_run"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast dry_run parameter %s", paramsMap["dry_run"]), nil)
 	}
 
-	return source.RunQuery(ctx, cypherStr, nil, t.ReadOnly, dryRun)
-}
-
-func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claimsMap)
+	resp, err := source.RunQuery(ctx, cypherStr, nil, t.ReadOnly, dryRun)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -149,3 +151,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher_test.go b/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher_test.go
index a287292647..d45a7ba3d4 100644
--- a/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher_test.go
+++ b/internal/tools/neo4j/neo4jexecutecypher/neo4jexecutecypher_test.go
@@ -17,7 +17,6 @@ package neo4jexecutecypher
 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/testutils"
@@ -36,19 +35,19 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: neo4j-execute-cypher
-					source: my-neo4j-instance
-					description: some tool description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: neo4j-execute-cypher
+            source: my-neo4j-instance
+            description: some tool description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "neo4j-execute-cypher",
+					Type:         "neo4j-execute-cypher",
 					Source:       "my-neo4j-instance",
 					Description:  "some tool description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -58,20 +57,20 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 		{
 			desc: "readonly example",
 			in: `
-			tools:
-				example_tool:
-					kind: neo4j-execute-cypher
-					source: my-neo4j-instance
-					description: some tool description
-					readOnly: true
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: neo4j-execute-cypher
+            source: my-neo4j-instance
+            description: some tool description
+            readOnly: true
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:         "example_tool",
-					Kind:         "neo4j-execute-cypher",
+					Type:         "neo4j-execute-cypher",
 					Source:       "my-neo4j-instance",
 					ReadOnly:     true,
 					Description:  "some tool description",
@@ -82,15 +81,12 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/neo4j/neo4jschema/neo4jschema.go b/internal/tools/neo4j/neo4jschema/neo4jschema.go
index bb38122cee..9f217a2502 100644
--- a/internal/tools/neo4j/neo4jschema/neo4jschema.go
+++ b/internal/tools/neo4j/neo4jschema/neo4jschema.go
@@ -17,6 +17,7 @@ package neo4jschema
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"sync"
 	"time"
 
@@ -27,17 +28,18 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jschema/cache"
 	"github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jschema/helpers"
 	"github.com/googleapis/genai-toolbox/internal/tools/neo4j/neo4jschema/types"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/neo4j/neo4j-go-driver/v5/neo4j"
 )
 
-// kind defines the unique identifier for this tool.
-const kind string = "neo4j-schema"
+// type defines the unique identifier for this tool.
+const resourceType string = "neo4j-schema"
 
 // init registers the tool with the application's tool registry when the package is initialized.
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -62,7 +64,7 @@ type compatibleSource interface {
 // These settings are typically read from a YAML file.
 type Config struct {
 	Name               string   `yaml:"name" validate:"required"`
-	Kind               string   `yaml:"kind" validate:"required"`
+	Type               string   `yaml:"type" validate:"required"`
 	Source             string   `yaml:"source" validate:"required"`
 	Description        string   `yaml:"description" validate:"required"`
 	AuthRequired       []string `yaml:"authRequired"`
@@ -72,9 +74,9 @@ type Config struct {
 // Statically verify that Config implements the tools.ToolConfig interface.
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of this tool configuration.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of this tool configuration.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize sets up the tool with its dependencies and returns a ready-to-use Tool instance.
@@ -113,10 +115,10 @@ type Tool struct {
 
 // Invoke executes the tool's main logic: fetching the Neo4j schema.
 // It first checks the cache for a valid schema before extracting it from the database.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	// Check if a valid schema is already in the cache.
@@ -129,7 +131,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// If not cached, extract the schema from the database.
 	schema, err := t.extractSchema(ctx, source)
 	if err != nil {
-		return nil, fmt.Errorf("failed to extract database schema: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 
 	// Cache the newly extracted schema for future use.
@@ -139,11 +141,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return schema, nil
 }
 
-// ParseParams is a placeholder as this tool does not require input parameters.
-func (t Tool) ParseParams(data map[string]any, claimsMap map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParamValues{}, nil
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.ParamValues{}, nil
 }
@@ -377,14 +374,14 @@ func (t Tool) GetAPOCSchema(ctx context.Context, source compatibleSource) ([]typ
 			name: "apoc-relationships",
 			fn: func(session neo4j.SessionWithContext) error {
 				query := `
-					MATCH (startNode)-[rel]->(endNode)
-					WITH
-					  labels(startNode)[0] AS startNode,
-					  type(rel) AS relType,
-					  apoc.meta.cypher.types(rel) AS relProperties,
-					  labels(endNode)[0] AS endNode,
-					  count(*) AS count
-					RETURN relType, startNode, endNode, relProperties, count`
+                    MATCH (startNode)-[rel]->(endNode)
+                    WITH
+                      labels(startNode)[0] AS startNode,
+                      type(rel) AS relType,
+                      apoc.meta.cypher.types(rel) AS relProperties,
+                      labels(endNode)[0] AS endNode,
+                      count(*) AS count
+                    RETURN relType, startNode, endNode, relProperties, count`
 				result, err := session.Run(ctx, query, nil)
 				if err != nil {
 					return fmt.Errorf("failed to extract relationships: %w", err)
@@ -525,10 +522,10 @@ func (t Tool) GetSchemaWithoutAPOC(ctx context.Context, source compatibleSource,
 			name: "relationship-schema",
 			fn: func(session neo4j.SessionWithContext) error {
 				relQuery := `
-					MATCH (start)-[r]->(end)
-					WITH type(r) AS relType, labels(start) AS startLabels, labels(end) AS endLabels, count(*) AS count
-					RETURN relType, CASE WHEN size(startLabels) > 0 THEN startLabels[0] ELSE null END AS startLabel, CASE WHEN size(endLabels) > 0 THEN endLabels[0] ELSE null END AS endLabel, sum(count) AS totalCount
-					ORDER BY totalCount DESC`
+                    MATCH (start)-[r]->(end)
+                    WITH type(r) AS relType, labels(start) AS startLabels, labels(end) AS endLabels, count(*) AS count
+                    RETURN relType, CASE WHEN size(startLabels) > 0 THEN startLabels[0] ELSE null END AS startLabel, CASE WHEN size(endLabels) > 0 THEN endLabels[0] ELSE null END AS endLabel, sum(count) AS totalCount
+                    ORDER BY totalCount DESC`
 				relResult, err := session.Run(ctx, relQuery, nil)
 				if err != nil {
 					return fmt.Errorf("relationship count query failed: %w", err)
@@ -701,3 +698,8 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+// This tool does not have parameters, so return an empty set.
+func (t Tool) GetParameters() parameters.Parameters {
+	return parameters.Parameters{}
+}
diff --git a/internal/tools/neo4j/neo4jschema/neo4jschema_test.go b/internal/tools/neo4j/neo4jschema/neo4jschema_test.go
index 6960dd7c58..850e237245 100644
--- a/internal/tools/neo4j/neo4jschema/neo4jschema_test.go
+++ b/internal/tools/neo4j/neo4jschema/neo4jschema_test.go
@@ -18,7 +18,6 @@ package neo4jschema
 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/testutils"
@@ -39,19 +38,19 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 		{
 			desc: "basic example with default cache expiration",
 			in: `
-			tools:
-				example_tool:
-					kind: neo4j-schema
-					source: my-neo4j-instance
-					description: some tool description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: neo4j-schema
+            source: my-neo4j-instance
+            description: some tool description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:               "example_tool",
-					Kind:               "neo4j-schema",
+					Type:               "neo4j-schema",
 					Source:             "my-neo4j-instance",
 					Description:        "some tool description",
 					AuthRequired:       []string{"my-google-auth-service", "other-auth-service"},
@@ -62,17 +61,17 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 		{
 			desc: "cache expire minutes set explicitly",
 			in: `
-			tools:
-				example_tool:
-					kind: neo4j-schema
-					source: my-neo4j-instance
-					description: some tool description
-					cacheExpireMinutes: 30
+            kind: tools
+            name: example_tool
+            type: neo4j-schema
+            source: my-neo4j-instance
+            description: some tool description
+            cacheExpireMinutes: 30
 			`,
 			want: server.ToolConfigs{
 				"example_tool": Config{
 					Name:               "example_tool",
-					Kind:               "neo4j-schema",
+					Type:               "neo4j-schema",
 					Source:             "my-neo4j-instance",
 					Description:        "some tool description",
 					AuthRequired:       []string{}, // Expect an empty slice, not nil.
@@ -83,15 +82,12 @@ func TestParseFromYamlNeo4j(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql.go b/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql.go
index a962bc030c..173199daea 100644
--- a/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql.go
+++ b/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "oceanbase-execute-sql"
+const resourceType string = "oceanbase-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -41,7 +43,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +60,8 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 	return actual, nil
 }
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -89,23 +91,22 @@ type Tool struct {
 }
 
 // Invoke executes the SQL statement provided in the parameters.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	sliceParams := params.AsSlice()
 	sqlStr, ok := sliceParams[0].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", sliceParams[0])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", sliceParams[0]), nil)
 	}
-	return source.RunSQL(ctx, sqlStr, nil)
-}
-
-// ParseParams parses the input parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -138,3 +139,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql_test.go b/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql_test.go
index 0653765d2a..7b7f36e7a3 100644
--- a/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql_test.go
+++ b/internal/tools/oceanbase/oceanbaseexecutesql/oceanbaseexecutesql_test.go
@@ -17,7 +17,6 @@ package oceanbaseexecutesql_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"
@@ -38,19 +37,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: oceanbase-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: oceanbase-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": oceanbaseexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "oceanbase-execute-sql",
+					Type:         "oceanbase-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -60,15 +59,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/oceanbase/oceanbasesql/oceanbasesql.go b/internal/tools/oceanbase/oceanbasesql/oceanbasesql.go
index 0d9a0d9441..ddcc83fbc5 100644
--- a/internal/tools/oceanbase/oceanbasesql/oceanbasesql.go
+++ b/internal/tools/oceanbase/oceanbasesql/oceanbasesql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "oceanbase-sql"
+const resourceType string = "oceanbase-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -41,7 +43,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 	return actual, nil
 }
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,29 +96,28 @@ type Tool struct {
 }
 
 // Invoke executes the SQL statement with the provided parameters.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-// ParseParams parses the input parameters for the tool.
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -149,3 +150,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/oceanbase/oceanbasesql/oceanbasesql_test.go b/internal/tools/oceanbase/oceanbasesql/oceanbasesql_test.go
index 0b1806dd84..2df6c04ba1 100644
--- a/internal/tools/oceanbase/oceanbasesql/oceanbasesql_test.go
+++ b/internal/tools/oceanbase/oceanbasesql/oceanbasesql_test.go
@@ -17,7 +17,6 @@ package oceanbasesql_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"
@@ -39,21 +38,21 @@ func TestParseFromYamlOceanBaseSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: oceanbase-sql
-					source: my-instance
-					description: some description
-					statement: select * from t where id = ?
-					parameters:
-					  - name: id
-					    type: string
-					    description: id param
+            kind: tools
+            name: example_tool
+            type: oceanbase-sql
+            source: my-instance
+            description: some description
+            statement: select * from t where id = ?
+            parameters:
+              - name: id
+                type: string
+                description: id param
 			`,
 			want: server.ToolConfigs{
 				"example_tool": oceanbasesql.Config{
 					Name:         "example_tool",
-					Kind:         "oceanbase-sql",
+					Type:         "oceanbase-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					Statement:    "select * from t where id = ?",
@@ -67,15 +66,12 @@ func TestParseFromYamlOceanBaseSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/oracle/oracleexecutesql/oracleexecutesql.go b/internal/tools/oracle/oracleexecutesql/oracleexecutesql.go
index c0d7fb6374..1f7a047681 100644
--- a/internal/tools/oracle/oracleexecutesql/oracleexecutesql.go
+++ b/internal/tools/oracle/oracleexecutesql/oracleexecutesql.go
@@ -6,6 +6,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -15,11 +16,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "oracle-execute-sql"
+const resourceType string = "oracle-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -38,7 +39,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -47,8 +48,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -77,29 +78,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	sqlParam, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, "executing `%s` tool query: %s", kind, sqlParam)
-	return source.RunSQL(ctx, sqlParam, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	logger.DebugContext(ctx, "executing `%s` tool query: %s", resourceType, sqlParam)
+	resp, err := source.RunSQL(ctx, sqlParam, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -129,3 +130,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/oracle/oracleexecutesql/oracleexecutesql_test.go b/internal/tools/oracle/oracleexecutesql/oracleexecutesql_test.go
index 834d3d6981..1d416ca087 100644
--- a/internal/tools/oracle/oracleexecutesql/oracleexecutesql_test.go
+++ b/internal/tools/oracle/oracleexecutesql/oracleexecutesql_test.go
@@ -5,7 +5,6 @@ package oracleexecutesql_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"
@@ -25,18 +24,18 @@ func TestParseFromYamlOracleExecuteSql(t *testing.T) {
 		{
 			desc: "basic example with auth",
 			in: `
-            tools:
-                run_adhoc_query:
-                    kind: oracle-execute-sql
-                    source: my-oracle-instance
-                    description: Executes arbitrary SQL statements like INSERT or UPDATE.
-                    authRequired:
-                        - my-google-auth-service
+            kind: tools
+            name: run_adhoc_query
+            type: oracle-execute-sql
+            source: my-oracle-instance
+            description: Executes arbitrary SQL statements like INSERT or UPDATE.
+            authRequired:
+                - my-google-auth-service
             `,
 			want: server.ToolConfigs{
 				"run_adhoc_query": oracleexecutesql.Config{
 					Name:         "run_adhoc_query",
-					Kind:         "oracle-execute-sql",
+					Type:         "oracle-execute-sql",
 					Source:       "my-oracle-instance",
 					Description:  "Executes arbitrary SQL statements like INSERT or UPDATE.",
 					AuthRequired: []string{"my-google-auth-service"},
@@ -46,16 +45,16 @@ func TestParseFromYamlOracleExecuteSql(t *testing.T) {
 		{
 			desc: "example without authRequired",
 			in: `
-            tools:
-                run_simple_update:
-                    kind: oracle-execute-sql
-                    source: db-dev
-                    description: Runs a simple update operation.
+            kind: tools
+            name: run_simple_update
+            type: oracle-execute-sql
+            source: db-dev
+            description: Runs a simple update operation.
             `,
 			want: server.ToolConfigs{
 				"run_simple_update": oracleexecutesql.Config{
 					Name:         "run_simple_update",
-					Kind:         "oracle-execute-sql",
+					Type:         "oracle-execute-sql",
 					Source:       "db-dev",
 					Description:  "Runs a simple update operation.",
 					AuthRequired: []string{},
@@ -65,15 +64,12 @@ func TestParseFromYamlOracleExecuteSql(t *testing.T) {
 	}
 	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)
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/oracle/oraclesql/oraclesql.go b/internal/tools/oracle/oraclesql/oraclesql.go
index 949ed327f9..84041ce6b1 100644
--- a/internal/tools/oracle/oraclesql/oraclesql.go
+++ b/internal/tools/oracle/oraclesql/oraclesql.go
@@ -6,19 +6,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "oracle-sql"
+const resourceType string = "oracle-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -37,7 +39,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -49,8 +51,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -81,21 +83,21 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
@@ -103,11 +105,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		fmt.Printf("[%d]=%T ", i, p)
 	}
 	fmt.Printf("\n")
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -137,3 +139,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/oracle/oraclesql/oraclesql_test.go b/internal/tools/oracle/oraclesql/oraclesql_test.go
index 2ba0a7321c..190afc2594 100644
--- a/internal/tools/oracle/oraclesql/oraclesql_test.go
+++ b/internal/tools/oracle/oraclesql/oraclesql_test.go
@@ -4,7 +4,6 @@ package oraclesql_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"
@@ -24,19 +23,19 @@ func TestParseFromYamlOracleSql(t *testing.T) {
 		{
 			desc: "basic example with statement and auth",
 			in: `
-            tools:
-                get_user_by_id:
-                    kind: oracle-sql
-                    source: my-oracle-instance
-                    description: Retrieves user details by ID.
-                    statement: "SELECT id, name, email FROM users WHERE id = :1"
-                    authRequired:
-                        - my-google-auth-service
+            kind: tools
+            name: get_user_by_id
+            type: oracle-sql
+            source: my-oracle-instance
+            description: Retrieves user details by ID.
+            statement: "SELECT id, name, email FROM users WHERE id = :1"
+            authRequired:
+                - my-google-auth-service
             `,
 			want: server.ToolConfigs{
 				"get_user_by_id": oraclesql.Config{
 					Name:         "get_user_by_id",
-					Kind:         "oracle-sql",
+					Type:         "oracle-sql",
 					Source:       "my-oracle-instance",
 					Description:  "Retrieves user details by ID.",
 					Statement:    "SELECT id, name, email FROM users WHERE id = :1",
@@ -47,17 +46,17 @@ func TestParseFromYamlOracleSql(t *testing.T) {
 		{
 			desc: "example with parameters and template parameters",
 			in: `
-            tools:
-                get_orders:
-                    kind: oracle-sql
-                    source: db-prod
-                    description: Gets orders for a customer with optional filtering.
-                    statement: "SELECT * FROM ${SCHEMA}.ORDERS WHERE customer_id = :customer_id AND status = :status"
+            kind: tools
+            name: get_orders
+            type: oracle-sql
+            source: db-prod
+            description: Gets orders for a customer with optional filtering.
+            statement: "SELECT * FROM ${SCHEMA}.ORDERS WHERE customer_id = :customer_id AND status = :status"
             `,
 			want: server.ToolConfigs{
 				"get_orders": oraclesql.Config{
 					Name:         "get_orders",
-					Kind:         "oracle-sql",
+					Type:         "oracle-sql",
 					Source:       "db-prod",
 					Description:  "Gets orders for a customer with optional filtering.",
 					Statement:    "SELECT * FROM ${SCHEMA}.ORDERS WHERE customer_id = :customer_id AND status = :status",
@@ -68,15 +67,12 @@ func TestParseFromYamlOracleSql(t *testing.T) {
 	}
 	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)
+			// Parse contents
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview.go b/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview.go
index c2c89791c9..e621a142ff 100644
--- a/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview.go
+++ b/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview.go
@@ -17,25 +17,27 @@ package postgresdatabaseoverview
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-database-overview"
+const resourceType string = "postgres-database-overview"
 
 const databaseOverviewStatement = `
-	SELECT
+    SELECT
     current_setting('server_version') AS pg_version,
     pg_is_in_recovery() AS is_replica,
     (now() - pg_postmaster_start_time())::TEXT AS uptime,
     current_setting('max_connections')::int AS max_connections,
-	(SELECT count(*) FROM pg_stat_activity) AS current_connections,
-	(SELECT count(*) FROM pg_stat_activity WHERE state = 'active') AS active_connections,
+    (SELECT count(*) FROM pg_stat_activity) AS current_connections,
+    (SELECT count(*) FROM pg_stat_activity WHERE state = 'active') AS active_connections,
     round(
         (100.0 * (SELECT count(*) FROM pg_stat_activity) / current_setting('max_connections')::int),
         2
@@ -43,8 +45,8 @@ const databaseOverviewStatement = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -57,23 +59,22 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 }
 
 type compatibleSource interface {
-	PostgresPool() *pgxpool.Pool // keep this so that sources are postgres compatible
+	PostgresPool() *pgxpool.Pool
 	RunSQL(context.Context, string, []any) (any, error)
 }
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -83,7 +84,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -96,7 +96,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -110,24 +109,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, databaseOverviewStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, databaseOverviewStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -153,3 +152,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview_test.go b/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview_test.go
index 63ea550d2a..77c455733a 100644
--- a/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview_test.go
+++ b/internal/tools/postgres/postgresdatabaseoverview/postgresdatabaseoverview_test.go
@@ -17,7 +17,6 @@ package postgresdatabaseoverview_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresDatabaseOverview(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-database-overview
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-database-overview
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresdatabaseoverview.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-database-overview",
+					Type:         "postgres-database-overview",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresDatabaseOverview(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-database-overview
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-database-overview
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresdatabaseoverview.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-database-overview",
+					Type:         "postgres-database-overview",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresDatabaseOverview(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgresexecutesql/postgresexecutesql.go b/internal/tools/postgres/postgresexecutesql/postgresexecutesql.go
index aec0851759..7b81f9bfce 100644
--- a/internal/tools/postgres/postgresexecutesql/postgresexecutesql.go
+++ b/internal/tools/postgres/postgresexecutesql/postgresexecutesql.go
@@ -17,6 +17,7 @@ package postgresexecutesql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-execute-sql"
+const resourceType string = "postgres-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,17 +51,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -69,7 +69,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
 
-	// finish tool setup
 	t := Tool{
 		Config:      cfg,
 		Parameters:  params,
@@ -79,7 +78,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -89,29 +87,28 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	sql, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql"]), nil)
 	}
-	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sql))
 
-	return source.RunSQL(ctx, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sql, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -141,3 +138,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/postgres/postgresexecutesql/postgresexecutesql_test.go b/internal/tools/postgres/postgresexecutesql/postgresexecutesql_test.go
index 6351b54c64..9d4c61e929 100644
--- a/internal/tools/postgres/postgresexecutesql/postgresexecutesql_test.go
+++ b/internal/tools/postgres/postgresexecutesql/postgresexecutesql_test.go
@@ -17,7 +17,6 @@ package postgresexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-execute-sql",
+					Type:         "postgres-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality.go b/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality.go
index a104ea2858..b4358f439f 100644
--- a/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality.go
+++ b/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality.go
@@ -17,19 +17,21 @@ package postgresgetcolumncardinality
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-get-column-cardinality"
+const resourceType string = "postgres-get-column-cardinality"
 
 const getColumnCardinality = `
-	SELECT
+    SELECT
           s.attname AS column_name,
           ROUND(
               CASE
@@ -48,8 +50,8 @@ const getColumnCardinality = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -68,17 +70,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -95,7 +96,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -108,7 +108,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -122,24 +121,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, getColumnCardinality, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, getColumnCardinality, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -165,3 +164,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality_test.go b/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality_test.go
index e1ea31fe59..c9eef23c26 100644
--- a/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality_test.go
+++ b/internal/tools/postgres/postgresgetcolumncardinality/postgresgetcolumncardinality_test.go
@@ -17,7 +17,6 @@ package postgresgetcolumncardinality_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresGetColumnCardinality(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-get-column-cardinality
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-get-column-cardinality
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresgetcolumncardinality.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-get-column-cardinality",
+					Type:         "postgres-get-column-cardinality",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresGetColumnCardinality(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-get-column-cardinality
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-get-column-cardinality
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresgetcolumncardinality.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-get-column-cardinality",
+					Type:         "postgres-get-column-cardinality",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresGetColumnCardinality(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries.go b/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries.go
index 81cea0d42d..ab4b36c3a3 100644
--- a/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries.go
+++ b/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries.go
@@ -17,43 +17,45 @@ package postgreslistactivequeries
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-active-queries"
+const resourceType string = "postgres-list-active-queries"
 
 const listActiveQueriesStatement = `
-	SELECT
-		pid,
-		usename AS user,
-		datname,
-		application_name,
-		client_addr,
-		state,
-		wait_event_type,
-		wait_event,
-		backend_start,
-		xact_start,
-		query_start,
-		now() - query_start AS query_duration,
-		query
-	FROM pg_stat_activity
-	WHERE state = 'active'
-		AND ($1::INTERVAL IS NULL OR now() - query_start >= $1::INTERVAL)
-		AND ($2::text IS NULL OR application_name NOT IN (SELECT trim(app) FROM unnest(string_to_array($2, ',')) AS app))
-	ORDER BY query_duration DESC
-	LIMIT COALESCE($3::int, 50);
+    SELECT
+        pid,
+        usename AS user,
+        datname,
+        application_name,
+        client_addr,
+        state,
+        wait_event_type,
+        wait_event,
+        backend_start,
+        xact_start,
+        query_start,
+        now() - query_start AS query_duration,
+        query
+    FROM pg_stat_activity
+    WHERE state = 'active'
+        AND ($1::INTERVAL IS NULL OR now() - query_start >= $1::INTERVAL)
+        AND ($2::text IS NULL OR application_name NOT IN (SELECT trim(app) FROM unnest(string_to_array($2, ',')) AS app))
+    ORDER BY query_duration DESC
+    LIMIT COALESCE($3::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -72,17 +74,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,8 +95,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	paramManifest := allParameters.Manifest()
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
-	t := Tool{
+	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
 		manifest: tools.Manifest{
@@ -104,11 +104,9 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			AuthRequired: cfg.AuthRequired,
 		},
 		mcpManifest: mcpManifest,
-	}
-	return t, nil
+	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -118,25 +116,25 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
-	return source.RunSQL(ctx, listActiveQueriesStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listActiveQueriesStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -166,3 +164,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries_test.go b/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries_test.go
index 96a5caeb0e..1cf079d0d8 100644
--- a/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries_test.go
+++ b/internal/tools/postgres/postgreslistactivequeries/postgreslistactivequeries_test.go
@@ -17,7 +17,6 @@ package postgreslistactivequeries_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-active-queries
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-active-queries
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistactivequeries.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-active-queries",
+					Type:         "postgres-list-active-queries",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-active-queries
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-active-queries
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistactivequeries.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-active-queries",
+					Type:         "postgres-list-active-queries",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions.go b/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions.go
index 3cc764c460..6ecf06509d 100644
--- a/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions.go
+++ b/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions.go
@@ -17,30 +17,32 @@ package postgreslistavailableextensions
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-available-extensions"
+const resourceType string = "postgres-list-available-extensions"
 
 const listAvailableExtensionsQuery = `
-	SELECT
-		name,
-		default_version,
-		comment as description
-	FROM
-		pg_available_extensions
-	ORDER BY name;
+    SELECT
+        name,
+        default_version,
+        comment as description
+    FROM
+        pg_available_extensions
+    ORDER BY name;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -59,24 +61,22 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
 	params := parameters.Parameters{}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
 
-	// finish tool setup
 	t := Tool{
 		Config: cfg,
 		manifest: tools.Manifest{
@@ -85,29 +85,30 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 			AuthRequired: cfg.AuthRequired,
 		},
 		mcpManifest: mcpManifest,
+		Parameters:  params,
 	}
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
 	Config
 	manifest    tools.Manifest
 	mcpManifest tools.McpManifest
+	Parameters  parameters.Parameters
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
-	return source.RunSQL(ctx, listAvailableExtensionsQuery, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParamValues{}, nil
+	resp, err := source.RunSQL(ctx, listAvailableExtensionsQuery, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -137,3 +138,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions_test.go b/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions_test.go
index 8c26d59cdd..2a45d2b502 100644
--- a/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions_test.go
+++ b/internal/tools/postgres/postgreslistavailableextensions/postgreslistavailableextensions_test.go
@@ -17,7 +17,6 @@ package postgreslistavailableextensions_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-available-extensions
-					source: my-pg-instance
-					description: "some description"
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-available-extensions
+			source: my-pg-instance
+			description: "some description"
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistavailableextensions.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-available-extensions",
+					Type:         "postgres-list-available-extensions",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "basic example without authRequired",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-available-extensions
-					source: my-pg-instance
-					description: "some description"
+			kind: tools
+			name: example_tool
+			type: postgres-list-available-extensions
+			source: my-pg-instance
+			description: "some description"
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistavailableextensions.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-available-extensions",
+					Type:         "postgres-list-available-extensions",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgres(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats.go b/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats.go
index b6c3e987c1..f01fc002a6 100644
--- a/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats.go
+++ b/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats.go
@@ -17,87 +17,88 @@ package postgreslistdatabasestats
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-database-stats"
+const resourceType string = "postgres-list-database-stats"
 
-// SQL query to list database statistics
 const listDatabaseStats = `
-	WITH database_stats AS (
-		SELECT
-			s.datname AS database_name, 
-			-- Database Metadata 
-			d.datallowconn AS is_connectable,
-			pg_get_userbyid(d.datdba) AS database_owner, 
-			ts.spcname AS default_tablespace,             
+    WITH database_stats AS (
+        SELECT
+            s.datname AS database_name, 
+            -- Database Metadata 
+            d.datallowconn AS is_connectable,
+            pg_get_userbyid(d.datdba) AS database_owner, 
+            ts.spcname AS default_tablespace,             
 
-			-- Cache Performance
-			CASE
-				WHEN (s.blks_hit + s.blks_read) = 0 THEN 0
-				ELSE round((s.blks_hit * 100.0) / (s.blks_hit + s.blks_read), 2)
-			END AS cache_hit_ratio_percent,
-			s.blks_read AS blocks_read_from_disk,
-			s.blks_hit AS blocks_hit_in_cache,
+            -- Cache Performance
+            CASE
+                WHEN (s.blks_hit + s.blks_read) = 0 THEN 0
+                ELSE round((s.blks_hit * 100.0) / (s.blks_hit + s.blks_read), 2)
+            END AS cache_hit_ratio_percent,
+            s.blks_read AS blocks_read_from_disk,
+            s.blks_hit AS blocks_hit_in_cache,
 
-			-- Transaction Throughput
-			s.xact_commit,
-			s.xact_rollback,
-			round(s.xact_rollback * 100.0 / (s.xact_commit + s.xact_rollback + 1), 2) AS rollback_ratio_percent,
+            -- Transaction Throughput
+            s.xact_commit,
+            s.xact_rollback,
+            round(s.xact_rollback * 100.0 / (s.xact_commit + s.xact_rollback + 1), 2) AS rollback_ratio_percent,
 
-			-- Tuple Activity
-			s.tup_returned AS rows_returned_by_queries,
-			s.tup_fetched AS rows_fetched_by_scans,
-			s.tup_inserted,
-			s.tup_updated,
-			s.tup_deleted,
+            -- Tuple Activity
+            s.tup_returned AS rows_returned_by_queries,
+            s.tup_fetched AS rows_fetched_by_scans,
+            s.tup_inserted,
+            s.tup_updated,
+            s.tup_deleted,
 
-			-- Temporary File Usage
-			s.temp_files,
-			s.temp_bytes AS temp_size_bytes,
+            -- Temporary File Usage
+            s.temp_files,
+            s.temp_bytes AS temp_size_bytes,
 
-			-- Conflicts & Deadlocks
-			s.conflicts,
-			s.deadlocks,
+            -- Conflicts & Deadlocks
+            s.conflicts,
+            s.deadlocks,
 
-			-- General Info
-			s.numbackends AS active_connections,
-			s.stats_reset AS statistics_last_reset,
-			pg_database_size(s.datid) AS database_size_bytes 
-		FROM
-			pg_stat_database s
-		JOIN
-			pg_database d ON d.oid = s.datid
-		JOIN
-			pg_tablespace ts ON ts.oid = d.dattablespace
-		WHERE
-			-- Exclude cloudsql internal databases
-			s.datname NOT IN ('cloudsqladmin')
-			-- Exclude template databases if not requested
-			AND ( $2::boolean IS TRUE OR d.datistemplate IS FALSE )
-	)
-	SELECT *
-	FROM database_stats
-	WHERE
-		($1::text IS NULL OR database_name LIKE '%' || $1::text || '%')
-		AND ($3::text IS NULL OR database_owner LIKE '%' || $3::text || '%')
-		AND ($4::text IS NULL OR default_tablespace LIKE '%' || $4::text || '%')
-	ORDER BY
-		CASE WHEN $5::text = 'size' THEN database_size_bytes END DESC,
-		CASE WHEN $5::text = 'commit' THEN xact_commit END DESC,
-		database_name
-	LIMIT COALESCE($6::int, 10);
+            -- General Info
+            s.numbackends AS active_connections,
+            s.stats_reset AS statistics_last_reset,
+            pg_database_size(s.datid) AS database_size_bytes 
+        FROM
+            pg_stat_database s
+        JOIN
+            pg_database d ON d.oid = s.datid
+        JOIN
+            pg_tablespace ts ON ts.oid = d.dattablespace
+        WHERE
+            -- Exclude cloudsql internal databases
+            s.datname NOT IN ('cloudsqladmin')
+            -- Exclude template databases if not requested
+            AND ( $2::boolean IS TRUE OR d.datistemplate IS FALSE )
+    )
+    SELECT *
+    FROM database_stats
+    WHERE
+        ($1::text IS NULL OR database_name LIKE '%' || $1::text || '%')
+        AND ($3::text IS NULL OR database_owner LIKE '%' || $3::text || '%')
+        AND ($4::text IS NULL OR default_tablespace LIKE '%' || $4::text || '%')
+    ORDER BY
+        CASE WHEN $5::text = 'size' THEN database_size_bytes END DESC,
+        CASE WHEN $5::text = 'commit' THEN xact_commit END DESC,
+        database_name
+    LIMIT COALESCE($6::int, 10);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -116,17 +117,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -164,7 +164,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -177,7 +176,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -187,25 +185,25 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
-	return source.RunSQL(ctx, listDatabaseStats, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listDatabaseStats, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -235,3 +233,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats_test.go b/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats_test.go
index 760370f630..d90211e9e4 100644
--- a/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats_test.go
+++ b/internal/tools/postgres/postgreslistdatabasestats/postgreslistdatabasestats_test.go
@@ -17,7 +17,6 @@ package postgreslistdatabasestats_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListDatabaseStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-database-stats
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-database-stats
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistdatabasestats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-database-stats",
+					Type:         "postgres-list-database-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListDatabaseStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-database-stats
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-database-stats
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistdatabasestats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-database-stats",
+					Type:         "postgres-list-database-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListDatabaseStats(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistindexes/postgreslistindexes.go b/internal/tools/postgres/postgreslistindexes/postgreslistindexes.go
index ac5a9b1d40..10f8b92327 100644
--- a/internal/tools/postgres/postgreslistindexes/postgreslistindexes.go
+++ b/internal/tools/postgres/postgreslistindexes/postgreslistindexes.go
@@ -17,66 +17,68 @@ package postgreslistindexes
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-indexes"
+const resourceType string = "postgres-list-indexes"
 
 const listIndexesStatement = `
-	WITH IndexDetails AS (
-		SELECT
-			s.schemaname AS schema_name,
-			t.relname AS table_name,
-			i.relname AS index_name,
-			am.amname AS index_type,
-			ix.indisunique AS is_unique,
-			ix.indisprimary AS is_primary,
-			pg_get_indexdef(i.oid) AS index_definition,
-			pg_relation_size(i.oid) AS index_size_bytes,
-			s.idx_scan AS index_scans,
-			s.idx_tup_read AS tuples_read,
-			s.idx_tup_fetch AS tuples_fetched,
-			CASE 
-				WHEN s.idx_scan > 0 THEN true 
-				ELSE false 
-			END AS is_used
-		FROM pg_catalog.pg_class t
-		JOIN pg_catalog.pg_index ix
-			ON t.oid = ix.indrelid
-		JOIN pg_catalog.pg_class i
-			ON i.oid = ix.indexrelid
-		JOIN pg_catalog.pg_am am
-			ON i.relam = am.oid
-		JOIN pg_catalog.pg_stat_all_indexes s
-			ON i.oid = s.indexrelid
-		WHERE
-			t.relkind = 'r'
-			AND s.schemaname NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
-			AND s.schemaname NOT LIKE 'pg_temp_%'
-	)
-	SELECT *
-	FROM IndexDetails
-	WHERE
-		($1::text IS NULL OR schema_name LIKE '%' || $1 || '%')
-		AND ($2::text IS NULL OR table_name LIKE '%' || $2 || '%')
-		AND ($3::text IS NULL OR index_name LIKE '%' || $3 || '%')
-		AND ($4::boolean IS NOT TRUE OR is_used IS FALSE)
-	ORDER BY
-		schema_name,
-		table_name,
-		index_name
-	LIMIT COALESCE($5::int, 50);
+    WITH IndexDetails AS (
+        SELECT
+            s.schemaname AS schema_name,
+            t.relname AS table_name,
+            i.relname AS index_name,
+            am.amname AS index_type,
+            ix.indisunique AS is_unique,
+            ix.indisprimary AS is_primary,
+            pg_get_indexdef(i.oid) AS index_definition,
+            pg_relation_size(i.oid) AS index_size_bytes,
+            s.idx_scan AS index_scans,
+            s.idx_tup_read AS tuples_read,
+            s.idx_tup_fetch AS tuples_fetched,
+            CASE 
+                WHEN s.idx_scan > 0 THEN true 
+                ELSE false 
+            END AS is_used
+        FROM pg_catalog.pg_class t
+        JOIN pg_catalog.pg_index ix
+            ON t.oid = ix.indrelid
+        JOIN pg_catalog.pg_class i
+            ON i.oid = ix.indexrelid
+        JOIN pg_catalog.pg_am am
+            ON i.relam = am.oid
+        JOIN pg_catalog.pg_stat_all_indexes s
+            ON i.oid = s.indexrelid
+        WHERE
+            t.relkind = 'r'
+            AND s.schemaname NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+            AND s.schemaname NOT LIKE 'pg_temp_%'
+    )
+    SELECT *
+    FROM IndexDetails
+    WHERE
+        ($1::text IS NULL OR schema_name LIKE '%' || $1 || '%')
+        AND ($2::text IS NULL OR table_name LIKE '%' || $2 || '%')
+        AND ($3::text IS NULL OR index_name LIKE '%' || $3 || '%')
+        AND ($4::boolean IS NOT TRUE OR is_used IS FALSE)
+    ORDER BY
+        schema_name,
+        table_name,
+        index_name
+    LIMIT COALESCE($5::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -95,17 +97,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -122,7 +123,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -135,7 +135,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -149,25 +148,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
-	return source.RunSQL(ctx, listIndexesStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listIndexesStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -193,3 +192,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistindexes/postgreslistindexes_test.go b/internal/tools/postgres/postgreslistindexes/postgreslistindexes_test.go
index c5aaacfab7..7c0da6e6a1 100644
--- a/internal/tools/postgres/postgreslistindexes/postgreslistindexes_test.go
+++ b/internal/tools/postgres/postgreslistindexes/postgreslistindexes_test.go
@@ -17,7 +17,6 @@ package postgreslistindexes_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListIndexes(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-indexes
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-indexes
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistindexes.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-indexes",
+					Type:         "postgres-list-indexes",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListIndexes(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-indexes
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-list-indexes
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistindexes.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-indexes",
+					Type:         "postgres-list-indexes",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresListIndexes(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions.go b/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions.go
index f9e5773329..cdac40ab0e 100644
--- a/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions.go
+++ b/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions.go
@@ -17,41 +17,43 @@ package postgreslistinstalledextensions
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-installed-extensions"
+const resourceType string = "postgres-list-installed-extensions"
 
 const listAvailableExtensionsQuery = `
-	SELECT
-		e.extname AS name,
-		e.extversion AS version,
-		n.nspname AS schema,
-		pg_get_userbyid(e.extowner) AS owner,
-		c.description AS description
-	FROM
-		pg_catalog.pg_extension e
-	LEFT JOIN
-		pg_catalog.pg_namespace n
-	ON
-		n.oid = e.extnamespace
-	LEFT JOIN
-		pg_catalog.pg_description c
-	ON
-		c.objoid = e.oid
-		AND c.classoid = 'pg_catalog.pg_extension'::pg_catalog.regclass
-	ORDER BY 1;
+    SELECT
+        e.extname AS name,
+        e.extversion AS version,
+        n.nspname AS schema,
+        pg_get_userbyid(e.extowner) AS owner,
+        c.description AS description
+    FROM
+        pg_catalog.pg_extension e
+    LEFT JOIN
+        pg_catalog.pg_namespace n
+    ON
+        n.oid = e.extnamespace
+    LEFT JOIN
+        pg_catalog.pg_description c
+    ON
+        c.objoid = e.oid
+        AND c.classoid = 'pg_catalog.pg_extension'::pg_catalog.regclass
+    ORDER BY 1;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -70,24 +72,22 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
 	params := parameters.Parameters{}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, params, nil)
 
-	// finish tool setup
 	t := Tool{
 		Config: cfg,
 		manifest: tools.Manifest{
@@ -100,7 +100,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -109,16 +108,16 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
-	return source.RunSQL(ctx, listAvailableExtensionsQuery, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParamValues{}, nil
+	resp, err := source.RunSQL(ctx, listAvailableExtensionsQuery, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -148,3 +147,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return parameters.Parameters{}
+}
diff --git a/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions_test.go b/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions_test.go
index 8fb6b1e2a3..5ca5dbe3c0 100644
--- a/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions_test.go
+++ b/internal/tools/postgres/postgreslistinstalledextensions/postgreslistinstalledextensions_test.go
@@ -17,7 +17,6 @@ package postgreslistinstalledextensions_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-installed-extensions
-					source: my-pg-instance
-					description: "some description"
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-installed-extensions
+            source: my-pg-instance
+            description: "some description"
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistinstalledextensions.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-installed-extensions",
+					Type:         "postgres-list-installed-extensions",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "basic example without authRequired",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-installed-extensions
-					source: my-pg-instance
-					description: "some description"
+            kind: tools
+            name: example_tool
+            type: postgres-list-installed-extensions
+            source: my-pg-instance
+            description: "some description"
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistinstalledextensions.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-installed-extensions",
+					Type:         "postgres-list-installed-extensions",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgres(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistlocks/postgreslistlocks.go b/internal/tools/postgres/postgreslistlocks/postgreslistlocks.go
index b7cd44054c..bac4b6a01b 100644
--- a/internal/tools/postgres/postgreslistlocks/postgreslistlocks.go
+++ b/internal/tools/postgres/postgreslistlocks/postgreslistlocks.go
@@ -17,19 +17,21 @@ package postgreslistlocks
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-locks"
+const resourceType string = "postgres-list-locks"
 
 const listLocks = `
-	SELECT
+    SELECT
         locked.pid,
         locked.usename,
         locked.query,
@@ -50,8 +52,8 @@ const listLocks = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -70,17 +72,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,7 +94,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -106,7 +106,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -120,25 +119,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
-	return source.RunSQL(ctx, listLocks, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listLocks, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -164,3 +163,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistlocks/postgreslistlocks_test.go b/internal/tools/postgres/postgreslistlocks/postgreslistlocks_test.go
index 1615e4870b..d34352e484 100644
--- a/internal/tools/postgres/postgreslistlocks/postgreslistlocks_test.go
+++ b/internal/tools/postgres/postgreslistlocks/postgreslistlocks_test.go
@@ -17,7 +17,6 @@ package postgreslistlocks_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListLocks(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-locks
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-locks
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistlocks.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-locks",
+					Type:         "postgres-list-locks",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListLocks(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-locks
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-list-locks
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistlocks.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-locks",
+					Type:         "postgres-list-locks",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresListLocks(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings.go b/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings.go
index 707c5f299b..85d9dd0e35 100644
--- a/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings.go
+++ b/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings.go
@@ -17,19 +17,21 @@ package postgreslistpgsettings
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-pg-settings"
+const resourceType string = "postgres-list-pg-settings"
 
 const listPgSettingsStatement = `
-	SELECT
+    SELECT
         name,
         setting AS current_value,
         unit,
@@ -41,15 +43,15 @@ const listPgSettingsStatement = `
           ELSE 'No'
           END
           AS requires_restart
-	FROM pg_settings
-	WHERE ($1::text IS NULL OR name LIKE '%' || $1::text || '%')
-	ORDER BY name
-	LIMIT COALESCE($2::int, 50);
+    FROM pg_settings
+    WHERE ($1::text IS NULL OR name LIKE '%' || $1::text || '%')
+    ORDER BY name
+    LIMIT COALESCE($2::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -68,17 +70,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -92,7 +93,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -105,7 +105,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -115,23 +114,23 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listPgSettingsStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listPgSettingsStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -161,3 +160,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings_test.go b/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings_test.go
index a2aa9fe78b..eb98a8e370 100644
--- a/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings_test.go
+++ b/internal/tools/postgres/postgreslistpgsettings/postgreslistpgsettings_test.go
@@ -17,7 +17,6 @@ package postgreslistpgsettings_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgreslistPgSettings(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-pg-settings
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-pg-settings
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistpgsettings.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-pg-settings",
+					Type:         "postgres-list-pg-settings",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgreslistPgSettings(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-pg-settings
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-pg-settings
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistpgsettings.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-pg-settings",
+					Type:         "postgres-list-pg-settings",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgreslistPgSettings(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables.go b/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables.go
index b9d57c44e7..a5ee63db16 100644
--- a/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables.go
+++ b/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables.go
@@ -17,50 +17,52 @@ package postgreslistpublicationtables
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-publication-tables"
+const resourceType string = "postgres-list-publication-tables"
 
 const listPublicationTablesStatement = `
-	WITH
-	publication_details AS (
-		SELECT
-			pt.pubname AS publication_name,
-			pt.schemaname AS schema_name,
-			pt.tablename AS table_name,
-			-- Definition details
-			p.puballtables AS publishes_all_tables,
-			p.pubinsert AS publishes_inserts,
-			p.pubupdate AS publishes_updates,
-			p.pubdelete AS publishes_deletes,
-			p.pubtruncate AS publishes_truncates,
-			-- Owner information
-			pg_catalog.pg_get_userbyid(p.pubowner) AS publication_owner
-		FROM pg_catalog.pg_publication_tables pt
-		JOIN pg_catalog.pg_publication p
-			ON pt.pubname = p.pubname
-	)
-	SELECT *
-	FROM publication_details
-	WHERE
-		(NULLIF(TRIM($1::text), '') IS NULL OR table_name = ANY(regexp_split_to_array(TRIM($1::text), '\s*,\s*')))
-    	AND (NULLIF(TRIM($2::text), '') IS NULL OR publication_name = ANY(regexp_split_to_array(TRIM($2::text), '\s*,\s*')))
-	    AND (NULLIF(TRIM($3::text), '') IS NULL OR schema_name = ANY(regexp_split_to_array(TRIM($3::text), '\s*,\s*')))
-	ORDER BY
-		publication_name, schema_name, table_name
-	LIMIT COALESCE($4::int, 50);
+    WITH
+    publication_details AS (
+        SELECT
+            pt.pubname AS publication_name,
+            pt.schemaname AS schema_name,
+            pt.tablename AS table_name,
+            -- Definition details
+            p.puballtables AS publishes_all_tables,
+            p.pubinsert AS publishes_inserts,
+            p.pubupdate AS publishes_updates,
+            p.pubdelete AS publishes_deletes,
+            p.pubtruncate AS publishes_truncates,
+            -- Owner information
+            pg_catalog.pg_get_userbyid(p.pubowner) AS publication_owner
+        FROM pg_catalog.pg_publication_tables pt
+        JOIN pg_catalog.pg_publication p
+            ON pt.pubname = p.pubname
+    )
+    SELECT *
+    FROM publication_details
+    WHERE
+        (NULLIF(TRIM($1::text), '') IS NULL OR table_name = ANY(regexp_split_to_array(TRIM($1::text), '\s*,\s*')))
+        AND (NULLIF(TRIM($2::text), '') IS NULL OR publication_name = ANY(regexp_split_to_array(TRIM($2::text), '\s*,\s*')))
+        AND (NULLIF(TRIM($3::text), '') IS NULL OR schema_name = ANY(regexp_split_to_array(TRIM($3::text), '\s*,\s*')))
+    ORDER BY
+        publication_name, schema_name, table_name
+    LIMIT COALESCE($4::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -79,17 +81,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -105,7 +106,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -118,7 +118,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -128,24 +127,24 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listPublicationTablesStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listPublicationTablesStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -175,3 +174,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables_test.go b/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables_test.go
index 211567c4a8..96e4db1b95 100644
--- a/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables_test.go
+++ b/internal/tools/postgres/postgreslistpublicationtables/postgreslistpublicationtables_test.go
@@ -17,7 +17,6 @@ package postgreslistpublicationtables_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListPublicationTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-publication-tables
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-publication-tables
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistpublicationtables.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-publication-tables",
+					Type:         "postgres-list-publication-tables",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListPublicationTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-publication-tables
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-publication-tables
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistpublicationtables.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-publication-tables",
+					Type:         "postgres-list-publication-tables",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListPublicationTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats.go b/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats.go
index d07dd4001e..f54c3dc554 100644
--- a/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats.go
+++ b/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats.go
@@ -17,19 +17,21 @@ package postgreslistquerystats
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-query-stats"
+const resourceType string = "postgres-list-query-stats"
 
 const listQueryStats = `
-	SELECT
+    SELECT
           d.datname,
           s.query,
           s.calls,
@@ -49,8 +51,8 @@ const listQueryStats = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -69,17 +71,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -95,7 +96,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -108,7 +108,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -122,23 +121,23 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listQueryStats, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listQueryStats, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -164,3 +163,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats_test.go b/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats_test.go
index c8408aa952..694a780d80 100644
--- a/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats_test.go
+++ b/internal/tools/postgres/postgreslistquerystats/postgreslistquerystats_test.go
@@ -17,7 +17,6 @@ package postgreslistquerystats_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListQueryStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-query-stats
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-query-stats
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistquerystats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-query-stats",
+					Type:         "postgres-list-query-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListQueryStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-query-stats
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-query-stats
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistquerystats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-query-stats",
+					Type:         "postgres-list-query-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListQueryStats(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistroles/postgreslistroles.go b/internal/tools/postgres/postgreslistroles/postgreslistroles.go
index b180e0451c..20cf87c20f 100644
--- a/internal/tools/postgres/postgreslistroles/postgreslistroles.go
+++ b/internal/tools/postgres/postgreslistroles/postgreslistroles.go
@@ -17,62 +17,64 @@ package postgreslistroles
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-roles"
+const resourceType string = "postgres-list-roles"
 
 const listRolesStatement = `
-	WITH RoleDetails AS (
-		SELECT
-			r.rolname AS role_name,
-			r.oid AS oid,
-			r.rolconnlimit AS connection_limit,
-			r.rolsuper AS is_superuser,
-			r.rolinherit AS inherits_privileges,
-			r.rolcreaterole AS can_create_roles,
-			r.rolcreatedb AS can_create_db,
-			r.rolcanlogin AS can_login,
-			r.rolreplication AS is_replication_role, 
-			r.rolbypassrls AS bypass_rls,          
-			r.rolvaliduntil AS valid_until,         
-			-- List of roles that belong to this role (Direct Members)
-			ARRAY(
-				SELECT m_r.rolname
-				FROM pg_auth_members pam
-				JOIN pg_roles m_r ON pam.member = m_r.oid
-				WHERE pam.roleid = r.oid
-			) AS direct_members,
-			-- List of roles that this role belongs to (Member Of)
-			ARRAY(
-				SELECT g_r.rolname
-				FROM pg_auth_members pam
-				JOIN pg_roles g_r ON pam.roleid = g_r.oid
-				WHERE pam.member = r.oid
-			) AS member_of
-		FROM pg_roles r
-	-- Exclude system and internal roles
-		WHERE r.rolname NOT LIKE 'cloudsql%' 
-		AND r.rolname NOT LIKE 'alloydb_%'
-		AND r.rolname NOT LIKE 'pg_%'
-	)
-	SELECT *
-	FROM RoleDetails
-	WHERE
-		($1::text IS NULL OR role_name LIKE '%' || $1 || '%')
-	ORDER BY role_name
-	LIMIT COALESCE($2::int, 50);
+    WITH RoleDetails AS (
+        SELECT
+            r.rolname AS role_name,
+            r.oid AS oid,
+            r.rolconnlimit AS connection_limit,
+            r.rolsuper AS is_superuser,
+            r.rolinherit AS inherits_privileges,
+            r.rolcreaterole AS can_create_roles,
+            r.rolcreatedb AS can_create_db,
+            r.rolcanlogin AS can_login,
+            r.rolreplication AS is_replication_role, 
+            r.rolbypassrls AS bypass_rls,          
+            r.rolvaliduntil AS valid_until,         
+            -- List of roles that belong to this role (Direct Members)
+            ARRAY(
+                SELECT m_r.rolname
+                FROM pg_auth_members pam
+                JOIN pg_roles m_r ON pam.member = m_r.oid
+                WHERE pam.roleid = r.oid
+            ) AS direct_members,
+            -- List of roles that this role belongs to (Member Of)
+            ARRAY(
+                SELECT g_r.rolname
+                FROM pg_auth_members pam
+                JOIN pg_roles g_r ON pam.roleid = g_r.oid
+                WHERE pam.member = r.oid
+            ) AS member_of
+        FROM pg_roles r
+    -- Exclude system and internal roles
+        WHERE r.rolname NOT LIKE 'cloudsql%' 
+        AND r.rolname NOT LIKE 'alloydb_%'
+        AND r.rolname NOT LIKE 'pg_%'
+    )
+    SELECT *
+    FROM RoleDetails
+    WHERE
+        ($1::text IS NULL OR role_name LIKE '%' || $1 || '%')
+    ORDER BY role_name
+    LIMIT COALESCE($2::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -91,17 +93,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -116,7 +117,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -129,7 +129,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -143,24 +142,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listRolesStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listRolesStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -186,3 +185,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistroles/postgreslistroles_test.go b/internal/tools/postgres/postgreslistroles/postgreslistroles_test.go
index cf4249f6ff..1d3c89f056 100644
--- a/internal/tools/postgres/postgreslistroles/postgreslistroles_test.go
+++ b/internal/tools/postgres/postgreslistroles/postgreslistroles_test.go
@@ -17,7 +17,6 @@ package postgreslistroles_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListRoles(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-roles
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-roles
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistroles.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-roles",
+					Type:         "postgres-list-roles",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListRoles(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-roles
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-roles
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistroles.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-roles",
+					Type:         "postgres-list-roles",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListRoles(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistschemas/postgreslistschemas.go b/internal/tools/postgres/postgreslistschemas/postgreslistschemas.go
index d97976a7e3..b1ff208f08 100644
--- a/internal/tools/postgres/postgreslistschemas/postgreslistschemas.go
+++ b/internal/tools/postgres/postgreslistschemas/postgreslistschemas.go
@@ -17,19 +17,21 @@ package postgreslistschemas
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-schemas"
+const resourceType string = "postgres-list-schemas"
 
 const listSchemasStatement = `
-	WITH
+    WITH
     schema_grants AS (
         SELECT schema_oid, jsonb_object_agg(grantee, privileges) AS grants
         FROM
@@ -52,27 +54,27 @@ const listSchemasStatement = `
         SELECT
         n.nspname AS schema_name,
         pg_catalog.pg_get_userbyid(n.nspowner) AS owner,
-		COALESCE(sg.grants, '{}'::jsonb) AS grants,
-		(
-			SELECT COUNT(*)
-			FROM pg_catalog.pg_class c
-			WHERE c.relnamespace = n.oid AND c.relkind = 'r'
-		) AS tables,
-		(
-			SELECT COUNT(*)
-			FROM pg_catalog.pg_class c
-			WHERE c.relnamespace = n.oid AND c.relkind = 'v'
-		) AS views,
-		(SELECT COUNT(*) FROM pg_catalog.pg_proc p WHERE p.pronamespace = n.oid)
-			AS functions
+        COALESCE(sg.grants, '{}'::jsonb) AS grants,
+        (
+            SELECT COUNT(*)
+            FROM pg_catalog.pg_class c
+            WHERE c.relnamespace = n.oid AND c.relkind = 'r'
+        ) AS tables,
+        (
+            SELECT COUNT(*)
+            FROM pg_catalog.pg_class c
+            WHERE c.relnamespace = n.oid AND c.relkind = 'v'
+        ) AS views,
+        (SELECT COUNT(*) FROM pg_catalog.pg_proc p WHERE p.pronamespace = n.oid)
+            AS functions
         FROM pg_catalog.pg_namespace n
         LEFT JOIN schema_grants sg
         ON n.oid = sg.schema_oid
     )
-	SELECT *
-	FROM all_schemas
-    -- Exclude system schemas and temporary schemas created per session.
-	WHERE
+    SELECT *
+    FROM all_schemas
+    -- Exclude system and temporary schemas created per session.
+    WHERE
         schema_name NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
         AND schema_name NOT LIKE 'pg_temp_%'
         AND schema_name NOT LIKE 'pg_toast_temp_%'
@@ -83,8 +85,8 @@ const listSchemasStatement = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -103,17 +105,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -128,7 +129,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -141,7 +141,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -151,24 +150,24 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listSchemasStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listSchemasStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -198,3 +197,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistschemas/postgreslistschemas_test.go b/internal/tools/postgres/postgreslistschemas/postgreslistschemas_test.go
index a416d584bd..62332b7e7d 100644
--- a/internal/tools/postgres/postgreslistschemas/postgreslistschemas_test.go
+++ b/internal/tools/postgres/postgreslistschemas/postgreslistschemas_test.go
@@ -17,7 +17,6 @@ package postgreslistschemas_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgreslistSchemas(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-schemas
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-schemas
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistschemas.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-schemas",
+					Type:         "postgres-list-schemas",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgreslistSchemas(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-schemas
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-schemas
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistschemas.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-schemas",
+					Type:         "postgres-list-schemas",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgreslistSchemas(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistsequences/postgreslistsequences.go b/internal/tools/postgres/postgreslistsequences/postgreslistsequences.go
index fb55b9208c..aca352317c 100644
--- a/internal/tools/postgres/postgreslistsequences/postgreslistsequences.go
+++ b/internal/tools/postgres/postgreslistsequences/postgreslistsequences.go
@@ -17,40 +17,42 @@ package postgreslistsequences
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-sequences"
+const resourceType string = "postgres-list-sequences"
 
 const listSequencesStatement = `
-	SELECT
-		sequencename as sequence_name,
-		schemaname as schema_name,
-		sequenceowner as sequence_owner,
-		data_type,
-		start_value,
-		min_value,
-		max_value,
-		increment_by,
-		last_value
-	FROM pg_sequences
-	WHERE
-		($1::text IS NULL OR schemaname LIKE '%' || $1 || '%')
-		AND ($2::text IS NULL OR sequencename LIKE '%' || $2 || '%')
-	ORDER BY schema_name, sequence_name
-	LIMIT COALESCE($3::int, 50);
+    SELECT
+        sequencename as sequence_name,
+        schemaname as schema_name,
+        sequenceowner as sequence_owner,
+        data_type,
+        start_value,
+        min_value,
+        max_value,
+        increment_by,
+        last_value
+    FROM pg_sequences
+    WHERE
+        ($1::text IS NULL OR schemaname LIKE '%' || $1 || '%')
+        AND ($2::text IS NULL OR sequencename LIKE '%' || $2 || '%')
+    ORDER BY schema_name, sequence_name
+    LIMIT COALESCE($3::int, 50);
 
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -69,17 +71,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -94,7 +95,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -107,7 +107,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -121,25 +120,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
-	return source.RunSQL(ctx, listSequencesStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listSequencesStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -165,3 +164,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistsequences/postgreslistsequences_test.go b/internal/tools/postgres/postgreslistsequences/postgreslistsequences_test.go
index 566da0ef7b..5491eec275 100644
--- a/internal/tools/postgres/postgreslistsequences/postgreslistsequences_test.go
+++ b/internal/tools/postgres/postgreslistsequences/postgreslistsequences_test.go
@@ -17,7 +17,6 @@ package postgreslistsequences_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListSequences(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-sequences
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-sequences
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistsequences.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-sequences",
+					Type:         "postgres-list-sequences",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListSequences(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-sequences
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-sequences
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistsequences.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-sequences",
+					Type:         "postgres-list-sequences",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListSequences(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure.go b/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure.go
index 54d32ade0c..96c727a020 100644
--- a/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure.go
+++ b/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure.go
@@ -17,6 +17,7 @@ package postgresliststoredprocedure
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -25,14 +26,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/sources/cloudsqlpg"
 	"github.com/googleapis/genai-toolbox/internal/sources/postgres"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-stored-procedure"
+const resourceType string = "postgres-list-stored-procedure"
 
 const listStoredProcedure = `
-	SELECT
+    SELECT
           n.nspname AS schema_name,
           p.proname AS name,
           r.rolname AS owner,
@@ -53,8 +55,8 @@ const listStoredProcedure = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -75,21 +77,20 @@ var _ compatibleSource = &alloydbpg.Source{}
 var _ compatibleSource = &cloudsqlpg.Source{}
 var _ compatibleSource = &postgres.Source{}
 
-var compatibleSources = [...]string{alloydbpg.SourceKind, cloudsqlpg.SourceKind, postgres.SourceKind}
+var compatibleSources = [...]string{alloydbpg.SourceType, cloudsqlpg.SourceType, postgres.SourceType}
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -102,7 +103,7 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	// 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)
+		return nil, fmt.Errorf("invalid source for %q tool: source type must be one of %q", resourceType, compatibleSources)
 	}
 
 	allParameters := parameters.Parameters{
@@ -118,13 +119,10 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
-		name:         cfg.Name,
-		kind:         cfg.Kind,
-		authRequired: cfg.AuthRequired,
-		allParams:    allParameters,
-		pool:         s.PostgresPool(),
+		Config:    cfg,
+		allParams: allParameters,
+		pool:      s.PostgresPool(),
 		manifest: tools.Manifest{
 			Description:  cfg.Description,
 			Parameters:   paramManifest,
@@ -134,36 +132,32 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
 	Config
-	name         string                `yaml:"name"`
-	kind         string                `yaml:"kind"`
-	authRequired []string              `yaml:"authRequired"`
-	allParams    parameters.Parameters `yaml:"allParams"`
-	pool         *pgxpool.Pool
-	manifest     tools.Manifest
-	mcpManifest  tools.McpManifest
+	allParams   parameters.Parameters `yaml:"allParams"`
+	pool        *pgxpool.Pool
+	manifest    tools.Manifest
+	mcpManifest tools.McpManifest
 }
 
 func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
 	results, err := t.pool.Query(ctx, listStoredProcedure, sliceParams...)
 	if err != nil {
-		return nil, fmt.Errorf("unable to execute query: %w", err)
+		return nil, util.ProcessGeneralError(err)
 	}
 	defer results.Close()
 
@@ -173,7 +167,7 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	for results.Next() {
 		values, err := results.Values()
 		if err != nil {
-			return nil, fmt.Errorf("unable to parse row: %w", err)
+			return nil, util.NewClientServerError("unable to parse row", http.StatusInternalServerError, err)
 		}
 		rowMap := make(map[string]any)
 		for i, field := range fields {
@@ -185,10 +179,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return out, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.allParams, paramValues, embeddingModelsMap, nil)
 }
@@ -202,7 +192,7 @@ func (t Tool) McpManifest() tools.McpManifest {
 }
 
 func (t Tool) Authorized(verifiedAuthServices []string) bool {
-	return tools.IsAuthorized(t.authRequired, verifiedAuthServices)
+	return tools.IsAuthorized(t.AuthRequired, verifiedAuthServices)
 }
 
 func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (bool, error) {
@@ -212,3 +202,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure_test.go b/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure_test.go
index 0ded95f2d5..63593bd0ec 100644
--- a/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure_test.go
+++ b/internal/tools/postgres/postgresliststoredprocedure/postgresliststoredprocedure_test.go
@@ -17,7 +17,6 @@ package postgresliststoredprocedure_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListStoredProcedure(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-stored-procedure
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-stored-procedure
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresliststoredprocedure.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-stored-procedure",
+					Type:         "postgres-list-stored-procedure",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListStoredProcedure(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-stored-procedure
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-stored-procedure
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresliststoredprocedure.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-stored-procedure",
+					Type:         "postgres-list-stored-procedure",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListStoredProcedure(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslisttables/postgreslisttables.go b/internal/tools/postgres/postgreslisttables/postgreslisttables.go
index 3f10551edd..70a4b594e9 100644
--- a/internal/tools/postgres/postgreslisttables/postgreslisttables.go
+++ b/internal/tools/postgres/postgreslisttables/postgreslisttables.go
@@ -17,98 +17,100 @@ package postgreslisttables
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-tables"
+const resourceType string = "postgres-list-tables"
 
 const listTablesStatement = `
-	WITH desired_relkinds AS (
-		SELECT ARRAY['r', 'p']::char[] AS kinds -- Always consider both 'TABLE' and 'PARTITIONED TABLE'
-	),
-	table_info AS (
-		SELECT
-			t.oid AS table_oid,
-			ns.nspname AS schema_name,
-			t.relname AS table_name,
-			pg_get_userbyid(t.relowner) AS table_owner,
-			obj_description(t.oid, 'pg_class') AS table_comment,
-			t.relkind AS object_kind
-		FROM
-			pg_class t
-		JOIN
-			pg_namespace ns ON ns.oid = t.relnamespace
-		CROSS JOIN desired_relkinds dk
-		WHERE
-			t.relkind = ANY(dk.kinds) -- Filter by selected table relkinds ('r', 'p')
-			AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(string_to_array($1,','))) -- $1 is object_names
-			AND ns.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast','google_ml')
-			AND ns.nspname NOT LIKE 'pg_temp_%' AND ns.nspname NOT LIKE 'pg_toast_temp_%'
-	),
-	columns_info AS (
-		SELECT
-			att.attrelid AS table_oid, att.attname AS column_name, format_type(att.atttypid, att.atttypmod) AS data_type,
-			att.attnum AS column_ordinal_position, att.attnotnull AS is_not_nullable,
-			pg_get_expr(ad.adbin, ad.adrelid) AS column_default, col_description(att.attrelid, att.attnum) AS column_comment
-		FROM pg_attribute att LEFT JOIN pg_attrdef ad ON att.attrelid = ad.adrelid AND att.attnum = ad.adnum
-		JOIN table_info ti ON att.attrelid = ti.table_oid WHERE att.attnum > 0 AND NOT att.attisdropped
-	),
-	constraints_info AS (
-		SELECT
-			con.conrelid AS table_oid, con.conname AS constraint_name, pg_get_constraintdef(con.oid) AS constraint_definition,
-			CASE con.contype WHEN 'p' THEN 'PRIMARY KEY' WHEN 'f' THEN 'FOREIGN KEY' WHEN 'u' THEN 'UNIQUE' WHEN 'c' THEN 'CHECK' ELSE con.contype::text END AS constraint_type,
-			(SELECT array_agg(att.attname ORDER BY u.attposition) FROM unnest(con.conkey) WITH ORDINALITY AS u(attnum, attposition) JOIN pg_attribute att ON att.attrelid = con.conrelid AND att.attnum = u.attnum) AS constraint_columns,
-			NULLIF(con.confrelid, 0)::regclass AS foreign_key_referenced_table,
-			(SELECT array_agg(att.attname ORDER BY u.attposition) FROM unnest(con.confkey) WITH ORDINALITY AS u(attnum, attposition) JOIN pg_attribute att ON att.attrelid = con.confrelid AND att.attnum = u.attnum WHERE con.contype = 'f') AS foreign_key_referenced_columns
-		FROM pg_constraint con JOIN table_info ti ON con.conrelid = ti.table_oid
-	),
-	indexes_info AS (
-		SELECT
-			idx.indrelid AS table_oid, ic.relname AS index_name, pg_get_indexdef(idx.indexrelid) AS index_definition,
-			idx.indisunique AS is_unique, idx.indisprimary AS is_primary, am.amname AS index_method,
-			(SELECT array_agg(att.attname ORDER BY u.ord) FROM unnest(idx.indkey::int[]) WITH ORDINALITY AS u(colidx, ord) LEFT JOIN pg_attribute att ON att.attrelid = idx.indrelid AND att.attnum = u.colidx WHERE u.colidx <> 0) AS index_columns
-		FROM pg_index idx JOIN pg_class ic ON ic.oid = idx.indexrelid JOIN pg_am am ON am.oid = ic.relam JOIN table_info ti ON idx.indrelid = ti.table_oid
-	),
-	triggers_info AS (
-		SELECT tg.tgrelid AS table_oid, tg.tgname AS trigger_name, pg_get_triggerdef(tg.oid) AS trigger_definition, tg.tgenabled AS trigger_enabled_state
-		FROM pg_trigger tg JOIN table_info ti ON tg.tgrelid = ti.table_oid WHERE NOT tg.tgisinternal
-	)
-	SELECT
-		ti.schema_name,
-		ti.table_name AS object_name,
-		CASE
-		  WHEN $2 = 'simple' THEN
-			  -- IF format is 'simple', return basic JSON
-			  json_build_object('name', ti.table_name)
-		  ELSE
-			json_build_object(
-				'schema_name', ti.schema_name,
-				'object_name', ti.table_name,
-				'object_type', CASE ti.object_kind
-								WHEN 'r' THEN 'TABLE'
-								WHEN 'p' THEN 'PARTITIONED TABLE'
-								ELSE ti.object_kind::text -- Should not happen due to WHERE clause
-							END,
-				'owner', ti.table_owner,
-				'comment', ti.table_comment,
-				'columns', COALESCE((SELECT json_agg(json_build_object('column_name',ci.column_name,'data_type',ci.data_type,'ordinal_position',ci.column_ordinal_position,'is_not_nullable',ci.is_not_nullable,'column_default',ci.column_default,'column_comment',ci.column_comment) ORDER BY ci.column_ordinal_position) FROM columns_info ci WHERE ci.table_oid = ti.table_oid), '[]'::json),
-				'constraints', COALESCE((SELECT json_agg(json_build_object('constraint_name',cons.constraint_name,'constraint_type',cons.constraint_type,'constraint_definition',cons.constraint_definition,'constraint_columns',cons.constraint_columns,'foreign_key_referenced_table',cons.foreign_key_referenced_table,'foreign_key_referenced_columns',cons.foreign_key_referenced_columns)) FROM constraints_info cons WHERE cons.table_oid = ti.table_oid), '[]'::json),
-				'indexes', COALESCE((SELECT json_agg(json_build_object('index_name',ii.index_name,'index_definition',ii.index_definition,'is_unique',ii.is_unique,'is_primary',ii.is_primary,'index_method',ii.index_method,'index_columns',ii.index_columns)) FROM indexes_info ii WHERE ii.table_oid = ti.table_oid), '[]'::json),
-				'triggers', COALESCE((SELECT json_agg(json_build_object('trigger_name',tri.trigger_name,'trigger_definition',tri.trigger_definition,'trigger_enabled_state',tri.trigger_enabled_state)) FROM triggers_info tri WHERE tri.table_oid = ti.table_oid), '[]'::json)
-			) 
-		END AS object_details
-	FROM table_info ti ORDER BY ti.schema_name, ti.table_name;
+    WITH desired_relkinds AS (
+        SELECT ARRAY['r', 'p']::char[] AS kinds -- Always consider both 'TABLE' and 'PARTITIONED TABLE'
+    ),
+    table_info AS (
+        SELECT
+            t.oid AS table_oid,
+            ns.nspname AS schema_name,
+            t.relname AS table_name,
+            pg_get_userbyid(t.relowner) AS table_owner,
+            obj_description(t.oid, 'pg_class') AS table_comment,
+            t.relkind AS object_kind
+        FROM
+            pg_class t
+        JOIN
+            pg_namespace ns ON ns.oid = t.relnamespace
+        CROSS JOIN desired_relkinds dk
+        WHERE
+            t.relkind = ANY(dk.kinds) -- Filter by selected table relkinds ('r', 'p')
+            AND (NULLIF(TRIM($1), '') IS NULL OR t.relname = ANY(string_to_array($1,','))) -- $1 is object_names
+            AND ns.nspname NOT IN ('pg_catalog', 'information_schema', 'pg_toast','google_ml')
+            AND ns.nspname NOT LIKE 'pg_temp_%' AND ns.nspname NOT LIKE 'pg_toast_temp_%'
+    ),
+    columns_info AS (
+        SELECT
+            att.attrelid AS table_oid, att.attname AS column_name, format_type(att.atttypid, att.atttypmod) AS data_type,
+            att.attnum AS column_ordinal_position, att.attnotnull AS is_not_nullable,
+            pg_get_expr(ad.adbin, ad.adrelid) AS column_default, col_description(att.attrelid, att.attnum) AS column_comment
+        FROM pg_attribute att LEFT JOIN pg_attrdef ad ON att.attrelid = ad.adrelid AND att.attnum = ad.adnum
+        JOIN table_info ti ON att.attrelid = ti.table_oid WHERE att.attnum > 0 AND NOT att.attisdropped
+    ),
+    constraints_info AS (
+        SELECT
+            con.conrelid AS table_oid, con.conname AS constraint_name, pg_get_constraintdef(con.oid) AS constraint_definition,
+            CASE con.contype WHEN 'p' THEN 'PRIMARY KEY' WHEN 'f' THEN 'FOREIGN KEY' WHEN 'u' THEN 'UNIQUE' WHEN 'c' THEN 'CHECK' ELSE con.contype::text END AS constraint_type,
+            (SELECT array_agg(att.attname ORDER BY u.attposition) FROM unnest(con.conkey) WITH ORDINALITY AS u(attnum, attposition) JOIN pg_attribute att ON att.attrelid = con.conrelid AND att.attnum = u.attnum) AS constraint_columns,
+            NULLIF(con.confrelid, 0)::regclass AS foreign_key_referenced_table,
+            (SELECT array_agg(att.attname ORDER BY u.attposition) FROM unnest(con.confkey) WITH ORDINALITY AS u(attnum, attposition) JOIN pg_attribute att ON att.attrelid = con.confrelid AND att.attnum = u.attnum WHERE con.contype = 'f') AS foreign_key_referenced_columns
+        FROM pg_constraint con JOIN table_info ti ON con.conrelid = ti.table_oid
+    ),
+    indexes_info AS (
+        SELECT
+            idx.indrelid AS table_oid, ic.relname AS index_name, pg_get_indexdef(idx.indexrelid) AS index_definition,
+            idx.indisunique AS is_unique, idx.indisprimary AS is_primary, am.amname AS index_method,
+            (SELECT array_agg(att.attname ORDER BY u.ord) FROM unnest(idx.indkey::int[]) WITH ORDINALITY AS u(colidx, ord) LEFT JOIN pg_attribute att ON att.attrelid = idx.indrelid AND att.attnum = u.colidx WHERE u.colidx <> 0) AS index_columns
+        FROM pg_index idx JOIN pg_class ic ON ic.oid = idx.indexrelid JOIN pg_am am ON am.oid = ic.relam JOIN table_info ti ON idx.indrelid = ti.table_oid
+    ),
+    triggers_info AS (
+        SELECT tg.tgrelid AS table_oid, tg.tgname AS trigger_name, pg_get_triggerdef(tg.oid) AS trigger_definition, tg.tgenabled AS trigger_enabled_state
+        FROM pg_trigger tg JOIN table_info ti ON tg.tgrelid = ti.table_oid WHERE NOT tg.tgisinternal
+    )
+    SELECT
+        ti.schema_name,
+        ti.table_name AS object_name,
+        CASE
+          WHEN $2 = 'simple' THEN
+              -- IF format is 'simple', return basic JSON
+              json_build_object('name', ti.table_name)
+          ELSE
+            json_build_object(
+                'schema_name', ti.schema_name,
+                'object_name', ti.table_name,
+                'object_type', CASE ti.object_kind
+                                WHEN 'r' THEN 'TABLE'
+                                WHEN 'p' THEN 'PARTITIONED TABLE'
+                                ELSE ti.object_kind::text -- Should not happen due to WHERE clause
+                            END,
+                'owner', ti.table_owner,
+                'comment', ti.table_comment,
+                'columns', COALESCE((SELECT json_agg(json_build_object('column_name',ci.column_name,'data_type',ci.data_type,'ordinal_position',ci.column_ordinal_position,'is_not_nullable',ci.is_not_nullable,'column_default',ci.column_default,'column_comment',ci.column_comment) ORDER BY ci.column_ordinal_position) FROM columns_info ci WHERE ci.table_oid = ti.table_oid), '[]'::json),
+                'constraints', COALESCE((SELECT json_agg(json_build_object('constraint_name',cons.constraint_name,'constraint_type',cons.constraint_type,'constraint_definition',cons.constraint_definition,'constraint_columns',cons.constraint_columns,'foreign_key_referenced_table',cons.foreign_key_referenced_table,'foreign_key_referenced_columns',cons.foreign_key_referenced_columns)) FROM constraints_info cons WHERE cons.table_oid = ti.table_oid), '[]'::json),
+                'indexes', COALESCE((SELECT json_agg(json_build_object('index_name',ii.index_name,'index_definition',ii.index_definition,'is_unique',ii.is_unique,'is_primary',ii.is_primary,'index_method',ii.index_method,'index_columns',ii.index_columns)) FROM indexes_info ii WHERE ii.table_oid = ti.table_oid), '[]'::json),
+                'triggers', COALESCE((SELECT json_agg(json_build_object('trigger_name',tri.trigger_name,'trigger_definition',tri.trigger_definition,'trigger_enabled_state',tri.trigger_enabled_state)) FROM triggers_info tri WHERE tri.table_oid = ti.table_oid), '[]'::json)
+            ) 
+        END AS object_details
+    FROM table_info ti ORDER BY ti.schema_name, ti.table_name;
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -127,17 +129,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" 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) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -158,7 +159,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -168,35 +168,31 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	tableNames, ok := paramsMap["table_names"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'table_names' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'table_names' parameter; expected a string", nil)
 	}
 	outputFormat, _ := paramsMap["output_format"].(string)
 	if outputFormat != "simple" && outputFormat != "detailed" {
-		return nil, fmt.Errorf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid value for output_format: must be 'simple' or 'detailed', but got %q", outputFormat), nil)
 	}
 	resp, err := source.RunSQL(ctx, listTablesStatement, []any{tableNames, outputFormat})
 	if err != nil {
-		return nil, err
+		return nil, util.ProcessGeneralError(err)
 	}
 	resSlice, ok := resp.([]any)
 	if !ok || len(resSlice) == 0 {
 		return []any{}, nil
 	}
-	return resp, err
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -226,3 +222,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/postgres/postgreslisttables/postgreslisttables_test.go b/internal/tools/postgres/postgreslisttables/postgreslisttables_test.go
index ded7f9e4cb..fdb66825c9 100644
--- a/internal/tools/postgres/postgreslisttables/postgreslisttables_test.go
+++ b/internal/tools/postgres/postgreslisttables/postgreslisttables_test.go
@@ -17,7 +17,6 @@ package postgreslisttables_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-tables
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-tables
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttables.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-tables",
+					Type:         "postgres-list-tables",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlPostgresListTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces.go b/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces.go
index 51d7b61f45..a5a3296dec 100644
--- a/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces.go
+++ b/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces.go
@@ -17,46 +17,48 @@ package postgreslisttablespaces
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-tablespaces"
+const resourceType string = "postgres-list-tablespaces"
 
 const listTableSpacesStatement = `
-	WITH
-	tablespace_info AS (
-		SELECT
-		spcname AS tablespace_name,
-		pg_catalog.pg_get_userbyid(spcowner) AS owner_name,
-		CASE
-			WHEN pg_catalog.has_tablespace_privilege(oid, 'CREATE') THEN pg_tablespace_size(oid)
-			ELSE NULL
-			END AS size_in_bytes,
-		oid,
-		spcacl,
-		spcoptions
-		FROM
-		pg_tablespace
-	)
-	SELECT *
-	FROM
-		tablespace_info
-	WHERE
-		($1::text IS NULL OR tablespace_name LIKE '%' || $1::text || '%')
-	ORDER BY
-		tablespace_name
-	LIMIT COALESCE($2::int, 50);
+    WITH
+    tablespace_info AS (
+        SELECT
+        spcname AS tablespace_name,
+        pg_catalog.pg_get_userbyid(spcowner) AS owner_name,
+        CASE
+            WHEN pg_catalog.has_tablespace_privilege(oid, 'CREATE') THEN pg_tablespace_size(oid)
+            ELSE NULL
+            END AS size_in_bytes,
+        oid,
+        spcacl,
+        spcoptions
+        FROM
+        pg_tablespace
+    )
+    SELECT *
+    FROM
+        tablespace_info
+    WHERE
+        ($1::text IS NULL OR tablespace_name LIKE '%' || $1::text || '%')
+    ORDER BY
+        tablespace_name
+    LIMIT COALESCE($2::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -75,17 +77,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -99,7 +100,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -112,7 +112,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -126,28 +125,28 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	tablespaceName, ok := paramsMap["tablespace_name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'tablespace_name' parameter; expected a string")
+		return nil, util.NewAgentError("invalid 'tablespace_name' parameter; expected a string", nil)
 	}
 	limit, ok := paramsMap["limit"].(int)
 	if !ok {
-		return nil, fmt.Errorf("invalid 'limit' parameter; expected an integer")
+		return nil, util.NewAgentError("invalid 'limit' parameter; expected an integer", nil)
 	}
 
-	return source.RunSQL(ctx, listTableSpacesStatement, []any{tablespaceName, limit})
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listTableSpacesStatement, []any{tablespaceName, limit})
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -173,3 +172,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces_test.go b/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces_test.go
index 0d28d5abf3..88e134221a 100644
--- a/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces_test.go
+++ b/internal/tools/postgres/postgreslisttablespaces/postgreslisttablespaces_test.go
@@ -17,7 +17,6 @@ package postgreslisttablespaces_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListTablespaces(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-tablespaces
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-tablespaces
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttablespaces.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-tablespaces",
+					Type:         "postgres-list-tablespaces",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListTablespaces(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-tablespaces
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-list-tablespaces
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttablespaces.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-tablespaces",
+					Type:         "postgres-list-tablespaces",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresListTablespaces(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats.go b/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats.go
index c4f8b34729..13c4a9b05c 100644
--- a/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats.go
+++ b/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats.go
@@ -17,19 +17,21 @@ package postgreslisttablestats
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-table-stats"
+const resourceType string = "postgres-list-table-stats"
 
 const listTableStats = `
-	WITH table_stats AS (
+    WITH table_stats AS (
         SELECT
             s.schemaname AS schema_name,
             s.relname AS table_name,
@@ -76,8 +78,8 @@ const listTableStats = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -96,17 +98,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -121,19 +122,18 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	if cfg.Description == "" {
 		cfg.Description = `Lists the user table statistics in the database ordered by number of
-		sequential scans with a default limit of 50 rows. Returns the following
-		columns: schema name, table name, table size in bytes, number of
-		sequential scans, number of index scans, idx_scan_ratio_percent (showing
-		the percentage of total scans that utilized an index, where a low ratio
-		indicates missing or ineffective indexes), number of live rows, number
-		of dead rows, dead_row_ratio_percent (indicating potential table bloat),
-		total number of rows inserted, updated, and deleted, the timestamps
-		for the last_vacuum, last_autovacuum, and last_autoanalyze operations.`
+        sequential scans with a default limit of 50 rows. Returns the following
+        columns: schema name, table name, table size in bytes, number of
+        sequential scans, number of index scans, idx_scan_ratio_percent (showing
+        the percentage of total scans that utilized an index, where a low ratio
+        indicates missing or ineffective indexes), number of live rows, number
+        of dead rows, dead_row_ratio_percent (indicating potential table bloat),
+        total number of rows inserted, updated, and deleted, the timestamps
+        for the last_vacuum, last_autovacuum, and last_autoanalyze operations.`
 	}
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -146,7 +146,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -160,25 +159,25 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
 
-	return source.RunSQL(ctx, listTableStats, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listTableStats, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -204,3 +203,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats_test.go b/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats_test.go
index cfaac3eda5..c0c71c4924 100644
--- a/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats_test.go
+++ b/internal/tools/postgres/postgreslisttablestats/postgreslisttablestats_test.go
@@ -17,7 +17,6 @@ package postgreslisttablestats_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListTableStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-table-stats
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-list-table-stats
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttablestats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-table-stats",
+					Type:         "postgres-list-table-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListTableStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-table-stats
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-list-table-stats
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttablestats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-table-stats",
+					Type:         "postgres-list-table-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresListTableStats(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers.go b/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers.go
index d92261ea9f..63889bfb46 100644
--- a/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers.go
+++ b/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers.go
@@ -17,66 +17,68 @@ package postgreslisttriggers
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-triggers"
+const resourceType string = "postgres-list-triggers"
 
 const listTriggersStatement = `
-	WITH
-	trigger_list AS (
-		SELECT
-			t.tgname AS trigger_name,
-			n.nspname AS schema_name,
-			c.relname AS table_name,
-			CASE t.tgenabled
-				WHEN 'O' THEN 'ENABLED'
-				WHEN 'D' THEN 'DISABLED'
-				WHEN 'R' THEN 'REPLICA'
-				WHEN 'A' THEN 'ALWAYS'
-				END AS status,
-			CASE
-				WHEN (t.tgtype::int & 2) = 2 THEN 'BEFORE'
-				WHEN (t.tgtype::int & 64) = 64 THEN 'INSTEAD OF'
-				ELSE 'AFTER'
-				END AS timing,
-			concat_ws(
-				', ',
-				CASE WHEN (t.tgtype::int & 4) = 4 THEN 'INSERT' END,
-				CASE WHEN (t.tgtype::int & 16) = 16 THEN 'UPDATE' END,
-				CASE WHEN (t.tgtype::int & 8) = 8 THEN 'DELETE' END,
-				CASE WHEN (t.tgtype::int & 32) = 32 THEN 'TRUNCATE' END) AS events,
-			CASE WHEN (t.tgtype::int & 1) = 1 THEN 'ROW' ELSE 'STATEMENT' END AS activation_level,
-			p.proname AS function_name,
-			pg_get_triggerdef(t.oid) AS definition
-		FROM pg_trigger t
-		JOIN pg_class c
-			ON t.tgrelid = c.oid
-		JOIN pg_namespace n
-			ON c.relnamespace = n.oid
-		LEFT JOIN pg_proc p
-			ON t.tgfoid = p.oid
-		WHERE NOT t.tgisinternal
-	)
-	SELECT *
-	FROM trigger_list
-	WHERE
-		($1::text IS NULL OR trigger_name LIKE '%' || $1::text || '%')
-		AND ($2::text IS NULL OR schema_name LIKE '%' || $2::text || '%')
-		AND ($3::text IS NULL OR table_name LIKE '%' || $3::text || '%')
-	ORDER BY schema_name, table_name, trigger_name
-	LIMIT COALESCE($4::int, 50);
+    WITH
+    trigger_list AS (
+        SELECT
+            t.tgname AS trigger_name,
+            n.nspname AS schema_name,
+            c.relname AS table_name,
+            CASE t.tgenabled
+                WHEN 'O' THEN 'ENABLED'
+                WHEN 'D' THEN 'DISABLED'
+                WHEN 'R' THEN 'REPLICA'
+                WHEN 'A' THEN 'ALWAYS'
+                END AS status,
+            CASE
+                WHEN (t.tgtype::int & 2) = 2 THEN 'BEFORE'
+                WHEN (t.tgtype::int & 64) = 64 THEN 'INSTEAD OF'
+                ELSE 'AFTER'
+                END AS timing,
+            concat_ws(
+                ', ',
+                CASE WHEN (t.tgtype::int & 4) = 4 THEN 'INSERT' END,
+                CASE WHEN (t.tgtype::int & 16) = 16 THEN 'UPDATE' END,
+                CASE WHEN (t.tgtype::int & 8) = 8 THEN 'DELETE' END,
+                CASE WHEN (t.tgtype::int & 32) = 32 THEN 'TRUNCATE' END) AS events,
+            CASE WHEN (t.tgtype::int & 1) = 1 THEN 'ROW' ELSE 'STATEMENT' END AS activation_level,
+            p.proname AS function_name,
+            pg_get_triggerdef(t.oid) AS definition
+        FROM pg_trigger t
+        JOIN pg_class c
+            ON t.tgrelid = c.oid
+        JOIN pg_namespace n
+            ON c.relnamespace = n.oid
+        LEFT JOIN pg_proc p
+            ON t.tgfoid = p.oid
+        WHERE NOT t.tgisinternal
+    )
+    SELECT *
+    FROM trigger_list
+    WHERE
+        ($1::text IS NULL OR trigger_name LIKE '%' || $1::text || '%')
+        AND ($2::text IS NULL OR schema_name LIKE '%' || $2::text || '%')
+        AND ($3::text IS NULL OR table_name LIKE '%' || $3::text || '%')
+    ORDER BY schema_name, table_name, trigger_name
+    LIMIT COALESCE($4::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -95,17 +97,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -121,7 +122,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -134,7 +134,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -148,24 +147,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listTriggersStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listTriggersStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -191,3 +190,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers_test.go b/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers_test.go
index ac3efb4337..ecec935040 100644
--- a/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers_test.go
+++ b/internal/tools/postgres/postgreslisttriggers/postgreslisttriggers_test.go
@@ -17,7 +17,6 @@ package postgreslisttriggers_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgreslistTriggers(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-triggers
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-triggers
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttriggers.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-triggers",
+					Type:         "postgres-list-triggers",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgreslistTriggers(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-triggers
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-list-triggers
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslisttriggers.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-triggers",
+					Type:         "postgres-list-triggers",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgreslistTriggers(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslistviews/postgreslistviews.go b/internal/tools/postgres/postgreslistviews/postgreslistviews.go
index fa4c897da1..e4359b9759 100644
--- a/internal/tools/postgres/postgreslistviews/postgreslistviews.go
+++ b/internal/tools/postgres/postgreslistviews/postgreslistviews.go
@@ -17,41 +17,43 @@ package postgreslistviews
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-list-views"
+const resourceType string = "postgres-list-views"
 
 const listViewsStatement = `
-	WITH list_views AS (
-		SELECT
-			schemaname AS schema_name,
-			viewname AS view_name,
-			viewowner AS owner_name,
-			definition
-		FROM pg_views
-	)
-	SELECT *
-	FROM list_views
-	WHERE
-		schema_name NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
-		AND schema_name NOT LIKE 'pg_temp_%'
-		AND ($1::text IS NULL OR view_name ILIKE '%' || $1::text || '%')
-		AND ($2::text IS NULL OR schema_name ILIKE '%' || $2::text || '%')
-	ORDER BY
-		schema_name, view_name
-	LIMIT COALESCE($3::int, 50);
+    WITH list_views AS (
+        SELECT
+            schemaname AS schema_name,
+            viewname AS view_name,
+            viewowner AS owner_name,
+            definition
+        FROM pg_views
+    )
+    SELECT *
+    FROM list_views
+    WHERE
+        schema_name NOT IN ('pg_catalog', 'information_schema', 'pg_toast')
+        AND schema_name NOT LIKE 'pg_temp_%'
+        AND ($1::text IS NULL OR view_name ILIKE '%' || $1::text || '%')
+        AND ($2::text IS NULL OR schema_name ILIKE '%' || $2::text || '%')
+    ORDER BY
+        schema_name, view_name
+    LIMIT COALESCE($3::int, 50);
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -70,17 +72,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -95,7 +96,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -108,7 +108,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -118,24 +117,24 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, listViewsStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, listViewsStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -165,3 +164,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslistviews/postgreslistviews_test.go b/internal/tools/postgres/postgreslistviews/postgreslistviews_test.go
index ffa234569f..660a77a431 100644
--- a/internal/tools/postgres/postgreslistviews/postgreslistviews_test.go
+++ b/internal/tools/postgres/postgreslistviews/postgreslistviews_test.go
@@ -17,7 +17,6 @@ package postgreslistviews_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresListViews(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-views
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-list-views
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistviews.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-views",
+					Type:         "postgres-list-views",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresListViews(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-list-views
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-list-views
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslistviews.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-list-views",
+					Type:         "postgres-list-views",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresListViews(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions.go b/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions.go
index 2faa16d2a0..2664c2e419 100644
--- a/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions.go
+++ b/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions.go
@@ -17,19 +17,21 @@ package postgreslongrunningtransactions
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-long-running-transactions"
+const resourceType string = "postgres-long-running-transactions"
 
 const longRunningTransactions = `
-	SELECT
+    SELECT
         pid,
         datname,
         usename,
@@ -57,8 +59,8 @@ const longRunningTransactions = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -77,17 +79,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -103,7 +104,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -116,7 +116,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -130,24 +129,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, longRunningTransactions, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, longRunningTransactions, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -173,3 +172,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions_test.go b/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions_test.go
index d1809933da..58fc3c8454 100644
--- a/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions_test.go
+++ b/internal/tools/postgres/postgreslongrunningtransactions/postgreslongrunningtransactions_test.go
@@ -17,7 +17,6 @@ package postgreslongrunningtransactions_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresLongRunningTransactions(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-long-running-transactions
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: postgres-long-running-transactions
+			source: my-postgres-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslongrunningtransactions.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-long-running-transactions",
+					Type:         "postgres-long-running-transactions",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresLongRunningTransactions(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-long-running-transactions
-					source: my-postgres-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: postgres-long-running-transactions
+			source: my-postgres-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgreslongrunningtransactions.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-long-running-transactions",
+					Type:         "postgres-long-running-transactions",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,11 @@ func TestParseFromYamlPostgresLongRunningTransactions(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats.go b/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats.go
index b30f41e2b9..495c640140 100644
--- a/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats.go
+++ b/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats.go
@@ -17,23 +17,25 @@ package postgresreplicationstats
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-replication-stats"
+const resourceType string = "postgres-replication-stats"
 
 const replicationStats = `
-	SELECT
-		pid,
-		usename,
+    SELECT
+        pid,
+        usename,
         application_name,
-		backend_xmin,
+        backend_xmin,
         client_addr,
         state,
         sync_state,
@@ -47,8 +49,8 @@ const replicationStats = `
 `
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -67,17 +69,16 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -90,7 +91,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	return Tool{
 		Config:    cfg,
 		allParams: allParameters,
@@ -103,7 +103,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	}, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -117,24 +116,24 @@ func (t Tool) ToConfig() tools.ToolConfig {
 	return t.Config
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 
 	newParams, err := parameters.GetParams(t.allParams, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, replicationStats, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.allParams, data, claims)
+	resp, err := source.RunSQL(ctx, replicationStats, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -160,3 +159,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.allParams
+}
diff --git a/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats_test.go b/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats_test.go
index 1958d42895..87952ecee6 100644
--- a/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats_test.go
+++ b/internal/tools/postgres/postgresreplicationstats/postgresreplicationstats_test.go
@@ -17,7 +17,6 @@ package postgresreplicationstats_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlPostgresReplicationStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-replication-stats
-					source: my-postgres-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: postgres-replication-stats
+            source: my-postgres-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresreplicationstats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-replication-stats",
+					Type:         "postgres-replication-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,16 +58,16 @@ func TestParseFromYamlPostgresReplicationStats(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-replication-stats
-					source: my-postgres-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: postgres-replication-stats
+            source: my-postgres-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgresreplicationstats.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-replication-stats",
+					Type:         "postgres-replication-stats",
 					Source:       "my-postgres-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlPostgresReplicationStats(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/postgres/postgressql/postgressql.go b/internal/tools/postgres/postgressql/postgressql.go
index ab2464ddf9..ece775a356 100644
--- a/internal/tools/postgres/postgressql/postgressql.go
+++ b/internal/tools/postgres/postgressql/postgressql.go
@@ -17,20 +17,22 @@ package postgressql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jackc/pgx/v5/pgxpool"
 )
 
-const kind string = "postgres-sql"
+const resourceType string = "postgres-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -58,11 +60,10 @@ type Config struct {
 	TemplateParameters parameters.Parameters `yaml:"templateParameters"`
 }
 
-// validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -73,7 +74,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 
 	mcpManifest := tools.GetMcpManifest(cfg.Name, cfg.Description, cfg.AuthRequired, allParameters, nil)
 
-	// finish tool setup
 	t := Tool{
 		Config:      cfg,
 		AllParams:   allParameters,
@@ -83,7 +83,6 @@ func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error)
 	return t, nil
 }
 
-// validate interface
 var _ tools.Tool = Tool{}
 
 type Tool struct {
@@ -93,28 +92,28 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -144,3 +143,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/postgres/postgressql/postgressql_test.go b/internal/tools/postgres/postgressql/postgressql_test.go
index c29152ad9b..76d8b88f76 100644
--- a/internal/tools/postgres/postgressql/postgressql_test.go
+++ b/internal/tools/postgres/postgressql/postgressql_test.go
@@ -17,7 +17,6 @@ package postgressql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlPostgres(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: postgres-sql
+            source: my-pg-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgressql.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-sql",
+					Type:         "postgres-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -77,15 +76,12 @@ func TestParseFromYamlPostgres(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -106,33 +102,33 @@ func TestParseFromYamlWithTemplateParamsPostgres(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: postgres-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: name
-						  type: string
-						  description: some description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: postgres-sql
+            source: my-pg-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: name
+                  type: string
+                  description: some description
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": postgressql.Config{
 					Name:         "example_tool",
-					Kind:         "postgres-sql",
+					Type:         "postgres-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -150,15 +146,12 @@ func TestParseFromYamlWithTemplateParamsPostgres(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/redis/redis.go b/internal/tools/redis/redis.go
index e322306bab..3aa3154354 100644
--- a/internal/tools/redis/redis.go
+++ b/internal/tools/redis/redis.go
@@ -16,20 +16,22 @@ package redis
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	redissrc "github.com/googleapis/genai-toolbox/internal/sources/redis"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "redis"
+const resourceType string = "redis"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	Commands     [][]string            `yaml:"commands" validate:"required"`
@@ -59,8 +61,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -84,21 +86,21 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	cmds, err := replaceCommandsParams(t.Commands, t.Parameters, params)
 	if err != nil {
-		return nil, fmt.Errorf("error replacing commands' parameters: %s", err)
+		return nil, util.NewAgentError("error replacing commands' parameters", err)
 	}
-	return source.RunCommand(ctx, cmds)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunCommand(ctx, cmds)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -162,3 +164,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/redis/redis_test.go b/internal/tools/redis/redis_test.go
index 5ee4ce3841..88b50d8274 100644
--- a/internal/tools/redis/redis_test.go
+++ b/internal/tools/redis/redis_test.go
@@ -17,7 +17,6 @@ package redis_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"
@@ -38,23 +37,23 @@ func TestParseFromYamlRedis(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				redis_tool:
-					kind: redis
-					source: my-redis-instance
-					description: some description
-					commands:
-						- [SET, greeting, "hello, {{.name}}"]
-						- [GET, id]
-					parameters:
-						- name: name
-						  type: string
-						  description: user name
+			kind: tools
+			name: redis_tool
+			type: redis
+			source: my-redis-instance
+			description: some description
+			commands:
+				- [SET, greeting, "hello, {{.name}}"]
+				- [GET, id]
+			parameters:
+				- name: name
+				  type: string
+				  description: user name
 			`,
 			want: server.ToolConfigs{
 				"redis_tool": redis.Config{
 					Name:         "redis_tool",
-					Kind:         "redis",
+					Type:         "redis",
 					Source:       "my-redis-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -68,15 +67,11 @@ func TestParseFromYamlRedis(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/serverlessspark/createbatch/config.go b/internal/tools/serverlessspark/createbatch/config.go
index bcbf611584..229ddef936 100644
--- a/internal/tools/serverlessspark/createbatch/config.go
+++ b/internal/tools/serverlessspark/createbatch/config.go
@@ -43,7 +43,7 @@ type compatibleSource interface {
 // Initialize implementation.
 type Config struct {
 	Name              string                        `yaml:"name" validate:"required"`
-	Kind              string                        `yaml:"kind" validate:"required"`
+	Type              string                        `yaml:"type" validate:"required"`
 	Source            string                        `yaml:"source" validate:"required"`
 	Description       string                        `yaml:"description"`
 	RuntimeConfig     *dataprocpb.RuntimeConfig     `yaml:"runtimeConfig"`
@@ -56,7 +56,7 @@ func NewConfig(ctx context.Context, name string, decoder *yaml.Decoder) (Config,
 	// conversion for RuntimeConfig and EnvironmentConfig.
 	var ymlCfg struct {
 		Name              string   `yaml:"name"`
-		Kind              string   `yaml:"kind"`
+		Type              string   `yaml:"type"`
 		Source            string   `yaml:"source"`
 		Description       string   `yaml:"description"`
 		RuntimeConfig     any      `yaml:"runtimeConfig"`
@@ -70,7 +70,7 @@ func NewConfig(ctx context.Context, name string, decoder *yaml.Decoder) (Config,
 
 	cfg := Config{
 		Name:         name,
-		Kind:         ymlCfg.Kind,
+		Type:         ymlCfg.Type,
 		Source:       ymlCfg.Source,
 		Description:  ymlCfg.Description,
 		AuthRequired: ymlCfg.AuthRequired,
diff --git a/internal/tools/serverlessspark/createbatch/tool.go b/internal/tools/serverlessspark/createbatch/tool.go
index dca7081aa6..cbbbc4c920 100644
--- a/internal/tools/serverlessspark/createbatch/tool.go
+++ b/internal/tools/serverlessspark/createbatch/tool.go
@@ -17,11 +17,13 @@ package createbatch
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	dataprocpb "cloud.google.com/go/dataproc/v2/apiv1/dataprocpb"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"google.golang.org/protobuf/proto"
 )
@@ -34,7 +36,7 @@ type BatchBuilder interface {
 func NewTool(cfg Config, originalCfg tools.ToolConfig, srcs map[string]sources.Source, builder BatchBuilder) (*Tool, error) {
 	desc := cfg.Description
 	if desc == "" {
-		desc = fmt.Sprintf("Creates a Serverless Spark (aka Dataproc Serverless) %s operation.", cfg.Kind)
+		desc = fmt.Sprintf("Creates a Serverless Spark (aka Dataproc Serverless) %s operation.", cfg.Type)
 	}
 
 	allParameters := builder.Parameters()
@@ -65,15 +67,18 @@ type Tool struct {
 	Parameters     parameters.Parameters
 }
 
-func (t *Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t *Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	batch, err := t.Builder.BuildBatch(params)
 	if err != nil {
-		return nil, fmt.Errorf("failed to build batch: %w", err)
+		if tbErr, ok := err.(util.ToolboxError); ok {
+			return nil, tbErr
+		}
+		return nil, util.NewAgentError("failed to build batch", err)
 	}
 
 	if t.RuntimeConfig != nil {
@@ -92,15 +97,20 @@ func (t *Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, par
 		}
 		batch.RuntimeConfig.Version = version
 	}
-	return source.CreateBatch(ctx, batch)
-}
 
-func (t *Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.CreateBatch(ctx, batch)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
-	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
+	newParamValues, err := parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
+	if err != nil {
+		return nil, util.NewClientServerError(fmt.Sprintf("error embedding parameters: %v", err), http.StatusInternalServerError, err)
+	}
+	return newParamValues, nil
 }
 
 func (t *Tool) Manifest() tools.Manifest {
@@ -126,3 +136,7 @@ func (t *Tool) ToConfig() tools.ToolConfig {
 func (t *Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t *Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch.go b/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch.go
index fe072f0760..6aeb901f73 100644
--- a/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch.go
+++ b/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch.go
@@ -17,6 +17,7 @@ package serverlesssparkcancelbatch
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	dataproc "cloud.google.com/go/dataproc/v2/apiv1"
@@ -24,14 +25,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind = "serverless-spark-cancel-batch"
+const resourceType = "serverless-spark-cancel-batch"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the unique name for this tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the unique name for this tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance.
@@ -99,24 +101,26 @@ type Tool struct {
 }
 
 // Invoke executes the tool's operation.
-func (t *Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t *Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
+
 	paramMap := params.AsMap()
 	operation, ok := paramMap["operation"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing required parameter: operation")
+		return nil, util.NewAgentError("missing required parameter: operation", nil)
 	}
 	if strings.Contains(operation, "/") {
-		return nil, fmt.Errorf("operation must be a short operation name without '/': %s", operation)
+		return nil, util.NewAgentError(fmt.Sprintf("operation must be a short operation name without '/': %s", operation), nil)
 	}
-	return source.CancelOperation(ctx, operation)
-}
 
-func (t *Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.CancelOperation(ctx, operation)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -147,3 +151,7 @@ func (t *Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t *Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch_test.go b/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch_test.go
index 5348399a32..463fbf33e1 100644
--- a/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch_test.go
+++ b/internal/tools/serverlessspark/serverlesssparkcancelbatch/serverlesssparkcancelbatch_test.go
@@ -17,7 +17,6 @@ package serverlesssparkcancelbatch_test
 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/testutils"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: serverless-spark-cancel-batch
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: serverless-spark-cancel-batch
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": serverlesssparkcancelbatch.Config{
 					Name:         "example_tool",
-					Kind:         "serverless-spark-cancel-batch",
+					Type:         "serverless-spark-cancel-batch",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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, yaml.Strict())
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
 
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch/serverlesssparkcreatepysparkbatch.go b/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch/serverlesssparkcreatepysparkbatch.go
index d07fa01b92..c0801059f8 100644
--- a/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch/serverlesssparkcreatepysparkbatch.go
+++ b/internal/tools/serverlessspark/serverlesssparkcreatepysparkbatch/serverlesssparkcreatepysparkbatch.go
@@ -26,11 +26,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind = "serverless-spark-create-pyspark-batch"
+const resourceType = "serverless-spark-create-pyspark-batch"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,9 +49,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the unique name for this tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the unique name for this tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance.
diff --git a/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch/serverlesssparkcreatesparkbatch.go b/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch/serverlesssparkcreatesparkbatch.go
index e16b1904e2..403ea1573a 100644
--- a/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch/serverlesssparkcreatesparkbatch.go
+++ b/internal/tools/serverlessspark/serverlesssparkcreatesparkbatch/serverlesssparkcreatesparkbatch.go
@@ -26,11 +26,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind = "serverless-spark-create-spark-batch"
+const resourceType = "serverless-spark-create-spark-batch"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,9 +49,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the unique name for this tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the unique name for this tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance.
diff --git a/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch.go b/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch.go
index 85d1247fff..f00772dadd 100644
--- a/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch.go
+++ b/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch.go
@@ -17,6 +17,7 @@ package serverlesssparkgetbatch
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	dataproc "cloud.google.com/go/dataproc/v2/apiv1"
@@ -24,14 +25,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind = "serverless-spark-get-batch"
+const resourceType = "serverless-spark-get-batch"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the unique name for this tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the unique name for this tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance.
@@ -99,23 +101,25 @@ type Tool struct {
 }
 
 // Invoke executes the tool's operation.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 	paramMap := params.AsMap()
 	name, ok := paramMap["name"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing required parameter: name")
+		return nil, util.NewAgentError("missing required parameter: name", nil)
 	}
 	if strings.Contains(name, "/") {
-		return nil, fmt.Errorf("name must be a short batch name without '/': %s", name)
+		return nil, util.NewAgentError(fmt.Sprintf("name must be a short batch name without '/': %s", name), nil)
 	}
-	return source.GetBatch(ctx, name)
-}
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+
+	resp, err := source.GetBatch(ctx, name)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -146,3 +150,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch_test.go b/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch_test.go
index f7589f7b07..e47ec519fb 100644
--- a/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch_test.go
+++ b/internal/tools/serverlessspark/serverlesssparkgetbatch/serverlesssparkgetbatch_test.go
@@ -17,7 +17,6 @@ package serverlesssparkgetbatch_test
 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/testutils"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: serverless-spark-get-batch
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: serverless-spark-get-batch
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": serverlesssparkgetbatch.Config{
 					Name:         "example_tool",
-					Kind:         "serverless-spark-get-batch",
+					Type:         "serverless-spark-get-batch",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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, yaml.Strict())
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
 
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches.go b/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches.go
index 3757b9a6e6..0c820d4950 100644
--- a/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches.go
+++ b/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches.go
@@ -17,20 +17,22 @@ package serverlesssparklistbatches
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	dataproc "cloud.google.com/go/dataproc/v2/apiv1"
 	"github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind = "serverless-spark-list-batches"
+const resourceType = "serverless-spark-list-batches"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,9 +60,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the unique name for this tool.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the unique name for this tool.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize creates a new Tool instance.
@@ -100,27 +102,39 @@ type Tool struct {
 }
 
 // Invoke executes the tool's operation.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
+
 	paramMap := params.AsMap()
 	var pageSize *int
 	if ps, ok := paramMap["pageSize"]; ok && ps != nil {
-		pageSizeV := ps.(int)
+		pageSizeV, ok := ps.(int)
+		if !ok {
+			// Handle float64 case if unmarshaled from JSON usually
+			if f, ok := ps.(float64); ok {
+				pageSizeV = int(f)
+			} else {
+				return nil, util.NewAgentError("pageSize must be an integer", nil)
+			}
+		}
+
 		if pageSizeV <= 0 {
-			return nil, fmt.Errorf("pageSize must be positive: %d", pageSizeV)
+			return nil, util.NewAgentError(fmt.Sprintf("pageSize must be positive: %d", pageSizeV), nil)
 		}
 		pageSize = &pageSizeV
 	}
+
 	pt, _ := paramMap["pageToken"].(string)
 	filter, _ := paramMap["filter"].(string)
-	return source.ListBatches(ctx, pageSize, pt, filter)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.ListBatches(ctx, pageSize, pt, filter)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -151,3 +165,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches_test.go b/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches_test.go
index 95a1123740..5b465baaa4 100644
--- a/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches_test.go
+++ b/internal/tools/serverlessspark/serverlesssparklistbatches/serverlesssparklistbatches_test.go
@@ -17,7 +17,6 @@ package serverlesssparklistbatches_test
 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/testutils"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: serverless-spark-list-batches
-					source: my-instance
-					description: some description
+			kind: tools
+			name: example_tool
+			type: serverless-spark-list-batches
+			source: my-instance
+			description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": serverlesssparklistbatches.Config{
 					Name:         "example_tool",
-					Kind:         "serverless-spark-list-batches",
+					Type:         "serverless-spark-list-batches",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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, yaml.Strict())
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
 
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/serverlessspark/testutils/testutils.go b/internal/tools/serverlessspark/testutils/testutils.go
index a8a2cfc5a3..d9ff086445 100644
--- a/internal/tools/serverlessspark/testutils/testutils.go
+++ b/internal/tools/serverlessspark/testutils/testutils.go
@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	dataproc "cloud.google.com/go/dataproc/v2/apiv1/dataprocpb"
-	"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"
@@ -30,7 +29,7 @@ import (
 )
 
 // RunParseFromYAMLTests runs a suite of tests for parsing tool configurations from YAML.
-func RunParseFromYAMLTests(t *testing.T, kind string, newConfig func(c createbatch.Config) tools.ToolConfig) {
+func RunParseFromYAMLTests(t *testing.T, resourceType string, newConfig func(c createbatch.Config) tools.ToolConfig) {
 	t.Helper()
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
@@ -46,16 +45,16 @@ func RunParseFromYAMLTests(t *testing.T, kind string, newConfig func(c createbat
 		{
 			desc: "basic example",
 			in: fmt.Sprintf(`
-			tools:
-				example_tool:
-					kind: %s
-					source: my-instance
-					description: some description
-			`, kind),
+			kind: tools
+			name: example_tool
+			type: %s
+			source: my-instance
+			description: some description
+			`, resourceType),
 			want: server.ToolConfigs{
 				"example_tool": newConfig(createbatch.Config{
 					Name:         "example_tool",
-					Kind:         kind,
+					Type:         resourceType,
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -65,22 +64,22 @@ func RunParseFromYAMLTests(t *testing.T, kind string, newConfig func(c createbat
 		{
 			desc: "detailed config",
 			in: fmt.Sprintf(`
-			tools:
-				example_tool:
-					kind: %s
-					source: my-instance
-					description: some description
-					runtimeConfig:
-					  properties:
-						  "spark.driver.memory": "1g"
-					environmentConfig:
-					  executionConfig:
-						  networkUri: "my-network"
-			`, kind),
+			kind: tools
+			name: example_tool
+			type: %s
+			source: my-instance
+			description: some description
+			runtimeConfig:
+			  properties:
+				  "spark.driver.memory": "1g"
+			environmentConfig:
+			  executionConfig:
+				  networkUri: "my-network"
+			`, resourceType),
 			want: server.ToolConfigs{
 				"example_tool": newConfig(createbatch.Config{
 					Name:        "example_tool",
-					Kind:        kind,
+					Type:        resourceType,
 					Source:      "my-instance",
 					Description: "some description",
 					RuntimeConfig: &dataproc.RuntimeConfig{
@@ -98,36 +97,33 @@ func RunParseFromYAMLTests(t *testing.T, kind string, newConfig func(c createbat
 		{
 			desc: "invalid runtime config",
 			in: fmt.Sprintf(`
-			tools:
-				example_tool:
-					kind: %s
-					source: my-instance
-					description: some description
-					runtimeConfig:
-					  invalidField: true
-			`, kind),
+			kind: tools
+			name: example_tool
+			type: %s
+			source: my-instance
+			description: some description
+			runtimeConfig:
+			  invalidField: true
+			`, resourceType),
 			wantErr: "unmarshal runtimeConfig",
 		},
 		{
 			desc: "invalid environment config",
 			in: fmt.Sprintf(`
-			tools:
-				example_tool:
-					kind: %s
-					source: my-instance
-					description: some description
-					environmentConfig:
-					  invalidField: true
-			`, kind),
+			kind: tools
+			name: example_tool
+			type: %s
+			source: my-instance
+			description: some description
+			environmentConfig:
+			  invalidField: true
+			`, resourceType),
 			wantErr: "unmarshal environmentConfig",
 		},
 	}
 	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, yaml.Strict())
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if tc.wantErr != "" {
 				if err == nil {
 					t.Fatal("expected error, got nil")
@@ -141,7 +137,7 @@ func RunParseFromYAMLTests(t *testing.T, kind string, newConfig func(c createbat
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
 
-			if diff := cmp.Diff(tc.want, got.Tools, protocmp.Transform()); diff != "" {
+			if diff := cmp.Diff(tc.want, got, protocmp.Transform()); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql.go b/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql.go
index dda577f2eb..c10e0e375e 100644
--- a/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql.go
+++ b/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "singlestore-execute-sql"
+const resourceType string = "singlestore-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +52,7 @@ type compatibleSource interface {
 // Config represents the configuration for the singlestore-execute-sql tool.
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,9 +61,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool configuration.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool configuration.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize sets up the Tool using the provided sources map.
@@ -98,29 +99,30 @@ func (t Tool) ToConfig() tools.ToolConfig {
 }
 
 // Invoke executes the provided SQL query using the tool's database connection and returns the results.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
+	sqlStr, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast parameter 'sql' to string: %v", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, "executing `%s` tool query: %s", kind, sql)
-	return source.RunSQL(ctx, sql, nil)
-}
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -146,3 +148,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql_test.go b/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql_test.go
index f68455cf42..208a369342 100644
--- a/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql_test.go
+++ b/internal/tools/singlestore/singlestoreexecutesql/singlestoreexecutesql_test.go
@@ -17,14 +17,13 @@ package singlestoreexecutesql_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/singlestore/singlestoreexecutesql"
 )
 
-func TestParseFromYamlExecuteSql(t *testing.T) {
+func TestParseFromYaml(t *testing.T) {
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: singlestore-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: singlestore-execute-sql
+			source: my-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": singlestoreexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "singlestore-execute-sql",
+					Type:         "singlestore-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,11 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/singlestore/singlestoresql/singlestoresql.go b/internal/tools/singlestore/singlestoresql/singlestoresql.go
index ff5862ef26..3350390c7d 100644
--- a/internal/tools/singlestore/singlestoresql/singlestoresql.go
+++ b/internal/tools/singlestore/singlestoresql/singlestoresql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "singlestore-sql"
+const resourceType string = "singlestore-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +52,7 @@ type compatibleSource interface {
 // Config defines the configuration for a SingleStore SQL tool.
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -62,9 +64,9 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-// ToolConfigKind returns the kind of the tool configuration.
-func (cfg Config) ToolConfigKind() string {
-	return kind
+// ToolConfigType returns the type of the tool configuration.
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 // Initialize sets up and returns a new Tool instance based on the provided configuration and available sources.
@@ -126,29 +128,29 @@ func (t Tool) ToConfig() tools.ToolConfig {
 // Returns:
 //   - A slice of maps, where each map represents a row with column names as keys.
 //   - An error if template resolution, parameter extraction, query execution, or result processing fails.
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -174,3 +176,7 @@ func (t Tool) RequiresClientAuthorization(resourceMgr tools.SourceProvider) (boo
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/singlestore/singlestoresql/singlestoresql_test.go b/internal/tools/singlestore/singlestoresql/singlestoresql_test.go
index a4c7559cf4..e6204d8552 100644
--- a/internal/tools/singlestore/singlestoresql/singlestoresql_test.go
+++ b/internal/tools/singlestore/singlestoresql/singlestoresql_test.go
@@ -17,7 +17,6 @@ package singlestoresql_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"
@@ -25,7 +24,7 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-func TestParseFromYamlSingleStore(t *testing.T) {
+func TestParseFromYaml(t *testing.T) {
 	ctx, err := testutils.ContextWithNewLogger()
 	if err != nil {
 		t.Fatalf("unexpected error: %s", err)
@@ -38,30 +37,30 @@ func TestParseFromYamlSingleStore(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: singlestore-sql
-					source: my-singlestore-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+			kind: tools
+			name: example_tool
+			type: singlestore-sql
+			source: my-singlestore-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			parameters:
+				- name: country
+				  type: string
+				  description: some description
+				  authServices:
+					- name: my-google-auth-service
+					  field: user_id
+					- name: other-auth-service
+					  field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": singlestoresql.Config{
 					Name:         "example_tool",
-					Kind:         "singlestore-sql",
+					Type:         "singlestore-sql",
 					Source:       "my-singlestore-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -74,72 +73,44 @@ func TestParseFromYamlSingleStore(t *testing.T) {
 				},
 			},
 		},
-	}
-	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)
-			}
-		})
-	}
-}
-
-func TestParseFromYamlWithTemplateParamsSingleStore(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",
+			desc: "with template params",
 			in: `
-			tools:
-				example_tool:
-					kind: singlestore-sql
-					source: my-singlestore-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+			kind: tools
+			name: example_tool
+			type: singlestore-sql
+			source: my-singlestore-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			parameters:
+				- name: country
+				  type: string
+				  description: some description
+				  authServices:
+					- name: my-google-auth-service
+					  field: user_id
+					- name: other-auth-service
+					  field: user_id
+			templateParameters:
+				- name: tableName
+				  type: string
+				  description: The table to select hotels from.
+				- name: fieldArray
+				  type: array
+				  description: The columns to return for the query.
+				  items: 
+						name: column
+						type: string
+						description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": singlestoresql.Config{
 					Name:         "example_tool",
-					Kind:         "singlestore-sql",
+					Type:         "singlestore-sql",
 					Source:       "my-singlestore-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -159,15 +130,11 @@ func TestParseFromYamlWithTemplateParamsSingleStore(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql.go b/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql.go
index ce089a87cb..6a85001d0d 100644
--- a/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql.go
+++ b/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql.go
@@ -17,6 +17,7 @@ package snowflakeexecutesql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/jmoiron/sqlx"
 )
 
-const kind string = "snowflake-execute-sql"
+const resourceType string = "snowflake-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -89,29 +90,30 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	mapParams := params.AsMap()
-	sql, ok := mapParams["sql"].(string)
+	sqlStr, ok := mapParams["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("invalid parameters: sql parameter is not a string")
+		return nil, util.NewAgentError("invalid parameters: sql parameter is not a string", nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, sql, nil)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
 
-}
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -141,3 +143,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql_test.go b/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql_test.go
index b9cd5da63b..9805012701 100644
--- a/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql_test.go
+++ b/internal/tools/snowflake/snowflakeexecutesql/snowflakeexecutesql_test.go
@@ -17,7 +17,6 @@ package snowflakeexecutesql_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"
@@ -37,16 +36,16 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-				tools:
-					my-snowflake-tool:
-						kind: snowflake-execute-sql
-						source: my-snowflake-source
-						description: Execute SQL on Snowflake
+			kind: tools
+			name: my-snowflake-tool
+			type: snowflake-execute-sql
+			source: my-snowflake-source
+			description: Execute SQL on Snowflake
 			`,
 			want: server.ToolConfigs{
 				"my-snowflake-tool": snowflakeexecutesql.Config{
 					Name:         "my-snowflake-tool",
-					Kind:         "snowflake-execute-sql",
+					Type:         "snowflake-execute-sql",
 					Source:       "my-snowflake-source",
 					Description:  "Execute SQL on Snowflake",
 					AuthRequired: []string{},
@@ -56,15 +55,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -84,21 +80,18 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "missing required field",
 			in: `
-				tools:
-					my-snowflake-tool:
-						kind: snowflake-execute-sql
-						source: my-snowflake-source
+			kind: tools
+			name: my-snowflake-tool
+			type: snowflake-execute-sql
+			source: my-snowflake-source
 			`,
-			err: "unable to parse tool \"my-snowflake-tool\" as kind \"snowflake-execute-sql\": Key: 'Config.Description' Error:Field validation for 'Description' failed on the 'required' tag",
+			err: "error unmarshaling tools: unable to parse tool \"my-snowflake-tool\" as type \"snowflake-execute-sql\": Key: 'Config.Description' Error:Field validation for 'Description' failed on the 'required' tag",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/snowflake/snowflakesql/snowflakesql.go b/internal/tools/snowflake/snowflakesql/snowflakesql.go
index c53e265a3a..e5a9835d98 100644
--- a/internal/tools/snowflake/snowflakesql/snowflakesql.go
+++ b/internal/tools/snowflake/snowflakesql/snowflakesql.go
@@ -17,20 +17,22 @@ package snowflakesql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/jmoiron/sqlx"
 )
 
-const kind string = "snowflake-sql"
+const resourceType string = "snowflake-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,29 +95,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -145,3 +147,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/snowflake/snowflakesql/snowflakesql_test.go b/internal/tools/snowflake/snowflakesql/snowflakesql_test.go
index 3432108482..520cae3207 100644
--- a/internal/tools/snowflake/snowflakesql/snowflakesql_test.go
+++ b/internal/tools/snowflake/snowflakesql/snowflakesql_test.go
@@ -17,7 +17,6 @@ package snowflakesql_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"
@@ -37,17 +36,17 @@ func TestParseFromYaml(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-				tools:
-					my-snowflake-tool:
-						kind: snowflake-sql
-						source: my-snowflake-source
-						description: Execute parameterized SQL on Snowflake
-						statement: SELECT * FROM my_table WHERE id = $1
+				kind: tools
+				name: my-snowflake-tool
+				type: snowflake-sql
+				source: my-snowflake-source
+				description: Execute parameterized SQL on Snowflake
+				statement: SELECT * FROM my_table WHERE id = $1
 			`,
 			want: server.ToolConfigs{
 				"my-snowflake-tool": snowflakesql.Config{
 					Name:               "my-snowflake-tool",
-					Kind:               "snowflake-sql",
+					Type:               "snowflake-sql",
 					Source:             "my-snowflake-source",
 					Description:        "Execute parameterized SQL on Snowflake",
 					Statement:          "SELECT * FROM my_table WHERE id = $1",
@@ -60,15 +59,12 @@ func TestParseFromYaml(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -88,22 +84,19 @@ func TestFailParseFromYaml(t *testing.T) {
 		{
 			desc: "missing required field",
 			in: `
-				tools:
-					my-snowflake-tool:
-						kind: snowflake-sql
-						source: my-snowflake-source
-						description: Execute parameterized SQL on Snowflake
+				kind: tools
+				name: my-snowflake-tool
+				type: snowflake-sql
+				source: my-snowflake-source
+				description: Execute parameterized SQL on Snowflake
 			`,
-			err: "unable to parse tool \"my-snowflake-tool\" as kind \"snowflake-sql\": Key: 'Config.Statement' Error:Field validation for 'Statement' failed on the 'required' tag",
+			err: "error unmarshaling tools: unable to parse tool \"my-snowflake-tool\" as type \"snowflake-sql\": Key: 'Config.Statement' Error:Field validation for 'Statement' failed on the 'required' tag",
 		},
 	}
 	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)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expect parsing to fail")
 			}
diff --git a/internal/tools/spanner/spannerexecutesql/spannerexecutesql.go b/internal/tools/spanner/spannerexecutesql/spannerexecutesql.go
index 8a5f6c6d0c..94f5b1e7c5 100644
--- a/internal/tools/spanner/spannerexecutesql/spannerexecutesql.go
+++ b/internal/tools/spanner/spannerexecutesql/spannerexecutesql.go
@@ -17,6 +17,7 @@ package spannerexecutesql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	"cloud.google.com/go/spanner"
 	yaml "github.com/goccy/go-yaml"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "spanner-execute-sql"
+const resourceType string = "spanner-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +52,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -61,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -91,29 +92,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	sql, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to get cast %s", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, t.ReadOnly, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sql))
+	resp, err := source.RunSQL(ctx, t.ReadOnly, sql, nil)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -143,3 +144,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/spanner/spannerexecutesql/spannerexecutesql_test.go b/internal/tools/spanner/spannerexecutesql/spannerexecutesql_test.go
index a406b37880..76e98e8346 100644
--- a/internal/tools/spanner/spannerexecutesql/spannerexecutesql_test.go
+++ b/internal/tools/spanner/spannerexecutesql/spannerexecutesql_test.go
@@ -17,7 +17,6 @@ package spannerexecutesql_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-execute-sql
-					source: my-spanner-instance
-					description: some description
+            kind: tools
+            name: example_tool
+            type: spanner-execute-sql
+            source: my-spanner-instance
+            description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-execute-sql",
+					Type:         "spanner-execute-sql",
 					Source:       "my-spanner-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -57,17 +56,17 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "read only set to true",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-execute-sql
-					source: my-spanner-instance
-					description: some description
-					readOnly: true
+            kind: tools
+            name: example_tool
+            type: spanner-execute-sql
+            source: my-spanner-instance
+            description: some description
+            readOnly: true
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-execute-sql",
+					Type:         "spanner-execute-sql",
 					Source:       "my-spanner-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -78,15 +77,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs.go b/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs.go
index 6db7da58f9..ed8d74a08e 100644
--- a/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs.go
+++ b/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs.go
@@ -17,6 +17,7 @@ package spannerlistgraphs
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"cloud.google.com/go/spanner"
@@ -24,14 +25,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "spanner-list-graphs"
+const resourceType string = "spanner-list-graphs"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -105,15 +107,15 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	// Check dialect here at RUNTIME instead of startup
 	if strings.ToLower(source.DatabaseDialect()) != "googlesql" {
-		return nil, fmt.Errorf("operation not supported: The 'spanner-list-graphs' tool is only available for GoogleSQL dialect databases. Your current database dialect is '%s'", source.DatabaseDialect())
+		return nil, util.NewAgentError(fmt.Sprintf("operation not supported: The 'spanner-list-graphs' tool is only available for GoogleSQL dialect databases. Your current database dialect is '%s'", source.DatabaseDialect()), nil)
 	}
 
 	paramsMap := params.AsMap()
@@ -128,11 +130,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		"graph_names":   graphNames,
 		"output_format": outputFormat,
 	}
-	return source.RunSQL(ctx, true, googleSQLStatement, stmtParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, true, googleSQLStatement, stmtParams)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -163,6 +165,10 @@ func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string,
 	return "Authorization", nil
 }
 
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
+
 // GoogleSQL statement for listing graphs
 const googleSQLStatement = `
 WITH FilterGraphNames AS (
diff --git a/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs_test.go b/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs_test.go
index eb4cca9e95..1dbdd8caad 100644
--- a/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs_test.go
+++ b/internal/tools/spanner/spannerlistgraphs/spannerlistgraphs_test.go
@@ -17,7 +17,6 @@ package spannerlistgraphs_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlListGraphs(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-list-graphs
-					source: my-spanner-instance
-					description: Lists graphs in the database
+            kind: tools
+            name: example_tool
+            type: spanner-list-graphs
+            source: my-spanner-instance
+            description: Lists graphs in the database
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerlistgraphs.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-list-graphs",
+					Type:         "spanner-list-graphs",
 					Source:       "my-spanner-instance",
 					Description:  "Lists graphs in the database",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlListGraphs(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-list-graphs
-					source: my-spanner-instance
-					description: Lists graphs in the database
-					authRequired:
-						- auth1
-						- auth2
+            kind: tools
+            name: example_tool
+            type: spanner-list-graphs
+            source: my-spanner-instance
+            description: Lists graphs in the database
+            authRequired:
+                - auth1
+                - auth2
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerlistgraphs.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-list-graphs",
+					Type:         "spanner-list-graphs",
 					Source:       "my-spanner-instance",
 					Description:  "Lists graphs in the database",
 					AuthRequired: []string{"auth1", "auth2"},
@@ -78,15 +77,15 @@ func TestParseFromYamlListGraphs(t *testing.T) {
 		{
 			desc: "minimal config",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-list-graphs
-					source: my-spanner-instance
+            kind: tools
+            name: example_tool
+            type: spanner-list-graphs
+            source: my-spanner-instance
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerlistgraphs.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-list-graphs",
+					Type:         "spanner-list-graphs",
 					Source:       "my-spanner-instance",
 					Description:  "",
 					AuthRequired: []string{},
@@ -96,15 +95,12 @@ func TestParseFromYamlListGraphs(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/spanner/spannerlisttables/spannerlisttables.go b/internal/tools/spanner/spannerlisttables/spannerlisttables.go
index 9c9d1322c6..f301183903 100644
--- a/internal/tools/spanner/spannerlisttables/spannerlisttables.go
+++ b/internal/tools/spanner/spannerlisttables/spannerlisttables.go
@@ -17,6 +17,7 @@ package spannerlisttables
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"cloud.google.com/go/spanner"
@@ -24,14 +25,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "spanner-list-tables"
+const resourceType string = "spanner-list-tables"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -60,8 +62,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -117,10 +119,10 @@ func getStatement(dialect string) string {
 	}
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
@@ -131,8 +133,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	// Prepare parameters based on dialect
 	var stmtParams map[string]interface{}
 
-	tableNames, _ := paramsMap["table_names"].(string)
-	outputFormat, _ := paramsMap["output_format"].(string)
+	tableNames, ok := paramsMap["table_names"].(string)
+	if !ok {
+		return nil, util.NewAgentError("unable to get cast table_names", nil)
+	}
+	outputFormat, ok := paramsMap["output_format"].(string)
+	if !ok {
+		return nil, util.NewAgentError("unable to get cast output_format", nil)
+	}
 	if outputFormat == "" {
 		outputFormat = "detailed"
 	}
@@ -151,14 +159,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 			"output_format": outputFormat,
 		}
 	default:
-		return nil, fmt.Errorf("unsupported dialect: %s", source.DatabaseDialect())
+		return nil, util.NewAgentError(fmt.Sprintf("unsupported dialect: %s", source.DatabaseDialect()), nil)
 	}
 
-	return source.RunSQL(ctx, true, statement, stmtParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, true, statement, stmtParams)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -189,6 +197,10 @@ func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string,
 	return "Authorization", nil
 }
 
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
+
 // PostgreSQL statement for listing tables
 const postgresqlStatement = `
 WITH table_info_cte AS (
diff --git a/internal/tools/spanner/spannerlisttables/spannerlisttables_test.go b/internal/tools/spanner/spannerlisttables/spannerlisttables_test.go
index da4a9885c5..0bc6fce5cd 100644
--- a/internal/tools/spanner/spannerlisttables/spannerlisttables_test.go
+++ b/internal/tools/spanner/spannerlisttables/spannerlisttables_test.go
@@ -17,7 +17,6 @@ package spannerlisttables_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"
@@ -37,16 +36,16 @@ func TestParseFromYamlListTables(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-list-tables
-					source: my-spanner-instance
-					description: Lists tables in the database
+            kind: tools
+            name: example_tool
+            type: spanner-list-tables
+            source: my-spanner-instance
+            description: Lists tables in the database
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerlisttables.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-list-tables",
+					Type:         "spanner-list-tables",
 					Source:       "my-spanner-instance",
 					Description:  "Lists tables in the database",
 					AuthRequired: []string{},
@@ -56,19 +55,19 @@ func TestParseFromYamlListTables(t *testing.T) {
 		{
 			desc: "with auth required",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-list-tables
-					source: my-spanner-instance
-					description: Lists tables in the database
-					authRequired:
-						- auth1
-						- auth2
+            kind: tools
+            name: example_tool
+            type: spanner-list-tables
+            source: my-spanner-instance
+            description: Lists tables in the database
+            authRequired:
+                - auth1
+                - auth2
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerlisttables.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-list-tables",
+					Type:         "spanner-list-tables",
 					Source:       "my-spanner-instance",
 					Description:  "Lists tables in the database",
 					AuthRequired: []string{"auth1", "auth2"},
@@ -78,15 +77,15 @@ func TestParseFromYamlListTables(t *testing.T) {
 		{
 			desc: "minimal config",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-list-tables
-					source: my-spanner-instance
+            kind: tools
+            name: example_tool
+            type: spanner-list-tables
+            source: my-spanner-instance
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannerlisttables.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-list-tables",
+					Type:         "spanner-list-tables",
 					Source:       "my-spanner-instance",
 					Description:  "",
 					AuthRequired: []string{},
@@ -96,15 +95,12 @@ func TestParseFromYamlListTables(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/spanner/spannersql/spanner_test.go b/internal/tools/spanner/spannersql/spanner_test.go
index 5f86bcae6f..227c21b68a 100644
--- a/internal/tools/spanner/spannersql/spanner_test.go
+++ b/internal/tools/spanner/spannersql/spanner_test.go
@@ -17,7 +17,6 @@ package spannersql_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"
@@ -38,22 +37,22 @@ func TestParseFromYamlSpanner(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
+            kind: tools
+            name: example_tool
+            type: spanner-sql
+            source: my-pg-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannersql.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-sql",
+					Type:         "spanner-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -67,23 +66,23 @@ func TestParseFromYamlSpanner(t *testing.T) {
 		{
 			desc: "read only set to true",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-sql
-					source: my-pg-instance
-					description: some description
-					readOnly: true
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
+            kind: tools
+            name: example_tool
+            type: spanner-sql
+            source: my-pg-instance
+            description: some description
+            readOnly: true
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannersql.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-sql",
+					Type:         "spanner-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -98,15 +97,12 @@ func TestParseFromYamlSpanner(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -127,33 +123,33 @@ func TestParseFromYamlWithTemplateParamsSpanner(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-sql
-					source: my-pg-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: spanner-sql
+            source: my-pg-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannersql.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-sql",
+					Type:         "spanner-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -171,23 +167,23 @@ func TestParseFromYamlWithTemplateParamsSpanner(t *testing.T) {
 		{
 			desc: "read only set to true",
 			in: `
-			tools:
-				example_tool:
-					kind: spanner-sql
-					source: my-pg-instance
-					description: some description
-					readOnly: true
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
+            kind: tools
+            name: example_tool
+            type: spanner-sql
+            source: my-pg-instance
+            description: some description
+            readOnly: true
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
 			`,
 			want: server.ToolConfigs{
 				"example_tool": spannersql.Config{
 					Name:         "example_tool",
-					Kind:         "spanner-sql",
+					Type:         "spanner-sql",
 					Source:       "my-pg-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -202,15 +198,12 @@ func TestParseFromYamlWithTemplateParamsSpanner(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/spanner/spannersql/spannersql.go b/internal/tools/spanner/spannersql/spannersql.go
index 7da22f5562..810d1d2d09 100644
--- a/internal/tools/spanner/spannersql/spannersql.go
+++ b/internal/tools/spanner/spannersql/spannersql.go
@@ -17,6 +17,7 @@ package spannersql
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strings"
 
 	"cloud.google.com/go/spanner"
@@ -24,14 +25,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "spanner-sql"
+const resourceType string = "spanner-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -51,7 +53,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -64,8 +66,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -103,25 +105,25 @@ func getMapParams(params parameters.ParamValues, dialect string) (map[string]int
 	case "postgresql":
 		return params.AsMapByOrderedKeys(), nil
 	default:
-		return nil, fmt.Errorf("invalid dialect %s", dialect)
+		return nil, util.NewAgentError(fmt.Sprintf("invalid dialect %s", dialect), nil)
 	}
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("unable to extract template params: %v", err), http.StatusInternalServerError, err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewClientServerError(fmt.Sprintf("unable to extract standard params: %v", err), http.StatusInternalServerError, err)
 	}
 
 	for i, p := range t.Parameters {
@@ -135,13 +137,13 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 		case *parameters.ArrayParameter:
 			arrayParamValue, ok := value.([]any)
 			if !ok {
-				return nil, fmt.Errorf("unable to convert parameter `%s` to []any %w", name, err)
+				return nil, util.NewClientServerError(fmt.Sprintf("unable to convert parameter `%s` to []any", name), http.StatusInternalServerError, err)
 			}
 			itemType := arrayParam.GetItems().GetType()
-			var err error
-			value, err = parameters.ConvertAnySliceToTyped(arrayParamValue, itemType)
-			if err != nil {
-				return nil, fmt.Errorf("unable to convert parameter `%s` from []any to typed slice: %w", name, err)
+			var convertErr error
+			value, convertErr = parameters.ConvertAnySliceToTyped(arrayParamValue, itemType)
+			if convertErr != nil {
+				return nil, util.NewClientServerError(fmt.Sprintf("unable to convert parameter `%s` from []any to typed slice: %v", name, convertErr), http.StatusInternalServerError, convertErr)
 			}
 		}
 		newParams[i] = parameters.ParamValue{Name: name, Value: value}
@@ -149,13 +151,14 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 
 	mapParams, err := getMapParams(newParams, source.DatabaseDialect())
 	if err != nil {
-		return nil, fmt.Errorf("fail to get map params: %w", err)
+		return nil, util.NewAgentError("fail to get map params", err)
 	}
-	return source.RunSQL(ctx, t.ReadOnly, newStatement, mapParams)
-}
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, t.ReadOnly, newStatement, mapParams)
+	if err != nil {
+		return nil, util.ProcessGcpError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -185,3 +188,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql.go b/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql.go
index 682959d045..32ae860bfe 100644
--- a/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql.go
+++ b/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "sqlite-execute-sql"
+const resourceType string = "sqlite-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -88,31 +89,32 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
-	sql, ok := params.AsMap()["sql"].(string)
+	sqlStr, ok := params.AsMap()["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("missing or invalid 'sql' parameter")
+		return nil, util.NewAgentError("missing or invalid 'sql' parameter", nil)
 	}
-	if sql == "" {
-		return nil, fmt.Errorf("sql parameter cannot be empty")
+	if sqlStr == "" {
+		return nil, util.NewAgentError("sql parameter cannot be empty", nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, sql, nil)
-}
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -142,3 +144,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql_test.go b/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql_test.go
index 63079a883e..f45402c86d 100644
--- a/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql_test.go
+++ b/internal/tools/sqlite/sqliteexecutesql/sqliteexecutesql_test.go
@@ -17,7 +17,6 @@ package sqliteexecutesql_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"
@@ -38,19 +37,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: sqlite-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: sqlite-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": sqliteexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "sqlite-execute-sql",
+					Type:         "sqlite-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -60,15 +59,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/sqlite/sqlitesql/sqlitesql.go b/internal/tools/sqlite/sqlitesql/sqlitesql.go
index f582c20841..9f9e06f499 100644
--- a/internal/tools/sqlite/sqlitesql/sqlitesql.go
+++ b/internal/tools/sqlite/sqlitesql/sqlitesql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "sqlite-sql"
+const resourceType string = "sqlite-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,27 +95,27 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
-	return source.RunSQL(ctx, newStatement, newParams.AsSlice())
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	resp, err := source.RunSQL(ctx, newStatement, newParams.AsSlice())
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -143,3 +145,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/sqlite/sqlitesql/sqlitesql_test.go b/internal/tools/sqlite/sqlitesql/sqlitesql_test.go
index eea6fddf4f..6aa2968534 100644
--- a/internal/tools/sqlite/sqlitesql/sqlitesql_test.go
+++ b/internal/tools/sqlite/sqlitesql/sqlitesql_test.go
@@ -17,7 +17,6 @@ package sqlitesql_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"
@@ -39,30 +38,30 @@ func TestParseFromYamlSQLite(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: sqlite-sql
-					source: my-sqlite-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: sqlite-sql
+            source: my-sqlite-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": sqlitesql.Config{
 					Name:         "example_tool",
-					Kind:         "sqlite-sql",
+					Type:         "sqlite-sql",
 					Source:       "my-sqlite-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -78,15 +77,12 @@ func TestParseFromYamlSQLite(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -107,41 +103,41 @@ func TestParseFromYamlWithTemplateSqlite(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: sqlite-sql
-					source: my-sqlite-db
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: sqlite-sql
+            source: my-sqlite-db
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": sqlitesql.Config{
 					Name:         "example_tool",
-					Kind:         "sqlite-sql",
+					Type:         "sqlite-sql",
 					Source:       "my-sqlite-db",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -161,15 +157,12 @@ func TestParseFromYamlWithTemplateSqlite(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/tidb/tidbexecutesql/tidbexecutesql.go b/internal/tools/tidb/tidbexecutesql/tidbexecutesql.go
index b530399d39..8bb246ffb0 100644
--- a/internal/tools/tidb/tidbexecutesql/tidbexecutesql.go
+++ b/internal/tools/tidb/tidbexecutesql/tidbexecutesql.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
@@ -27,11 +28,11 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "tidb-execute-sql"
+const resourceType string = "tidb-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -50,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -59,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -89,29 +90,30 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source used is not compatible with the tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
-	sql, ok := paramsMap["sql"].(string)
+	sqlStr, ok := paramsMap["sql"].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to get cast %s", paramsMap["sql"])
+		return nil, util.NewAgentError(fmt.Sprintf("unable to cast parameter 'sql' to string: %v", paramsMap["sql"]), nil)
 	}
 
 	// Log the query executed for debugging.
 	logger, err := util.LoggerFromContext(ctx)
 	if err != nil {
-		return nil, fmt.Errorf("error getting logger: %s", err)
+		return nil, util.NewClientServerError("error getting logger", http.StatusInternalServerError, err)
 	}
-	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", kind, sql))
-	return source.RunSQL(ctx, sql, nil)
-}
+	logger.DebugContext(ctx, fmt.Sprintf("executing `%s` tool query: %s", resourceType, sqlStr))
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	resp, err := source.RunSQL(ctx, sqlStr, nil)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return resp, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -141,3 +143,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/tidb/tidbexecutesql/tidbexecutesql_test.go b/internal/tools/tidb/tidbexecutesql/tidbexecutesql_test.go
index 432743dbd9..a8742d373b 100644
--- a/internal/tools/tidb/tidbexecutesql/tidbexecutesql_test.go
+++ b/internal/tools/tidb/tidbexecutesql/tidbexecutesql_test.go
@@ -17,7 +17,6 @@ package tidbexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: tidb-execute-sql
-					source: my-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+            kind: tools
+            name: example_tool
+            type: tidb-execute-sql
+            source: my-instance
+            description: some description
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": tidbexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "tidb-execute-sql",
+					Type:         "tidb-execute-sql",
 					Source:       "my-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,12 @@ func TestParseFromYamlExecuteSql(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/tidb/tidbsql/tidbsql.go b/internal/tools/tidb/tidbsql/tidbsql.go
index 421db27527..4e9abbc890 100644
--- a/internal/tools/tidb/tidbsql/tidbsql.go
+++ b/internal/tools/tidb/tidbsql/tidbsql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "tidb-sql"
+const resourceType string = "tidb-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,29 +95,29 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source not compatible with this tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	res, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return res, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -145,3 +147,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.AllParams
+}
diff --git a/internal/tools/tidb/tidbsql/tidbsql_test.go b/internal/tools/tidb/tidbsql/tidbsql_test.go
index 4a5c425d03..65ae5a83aa 100644
--- a/internal/tools/tidb/tidbsql/tidbsql_test.go
+++ b/internal/tools/tidb/tidbsql/tidbsql_test.go
@@ -17,7 +17,6 @@ package tidbsql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlTiDB(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: tidb-sql
-					source: my-tidb-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+            kind: tools
+            name: example_tool
+            type: tidb-sql
+            source: my-tidb-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": tidbsql.Config{
 					Name:         "example_tool",
-					Kind:         "tidb-sql",
+					Type:         "tidb-sql",
 					Source:       "my-tidb-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -77,15 +76,12 @@ func TestParseFromYamlTiDB(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -105,41 +101,41 @@ func TestParseFromYamlWithTemplateParamsTiDB(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: tidb-sql
-					source: my-tidb-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+            kind: tools
+            name: example_tool
+            type: tidb-sql
+            source: my-tidb-instance
+            description: some description
+            statement: |
+                SELECT * FROM SQL_STATEMENT;
+            authRequired:
+                - my-google-auth-service
+                - other-auth-service
+            parameters:
+                - name: country
+                  type: string
+                  description: some description
+                  authServices:
+                    - name: my-google-auth-service
+                      field: user_id
+                    - name: other-auth-service
+                      field: user_id
+            templateParameters:
+                - name: tableName
+                  type: string
+                  description: The table to select hotels from.
+                - name: fieldArray
+                  type: array
+                  description: The columns to return for the query.
+                  items: 
+                    name: column
+                    type: string
+                    description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": tidbsql.Config{
 					Name:         "example_tool",
-					Kind:         "tidb-sql",
+					Type:         "tidb-sql",
 					Source:       "my-tidb-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -159,15 +155,12 @@ func TestParseFromYamlWithTemplateParamsTiDB(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/tools.go b/internal/tools/tools.go
index daadf385b7..93f2654c85 100644
--- a/internal/tools/tools.go
+++ b/internal/tools/tools.go
@@ -17,6 +17,7 @@ package tools
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"slices"
 	"strings"
 
@@ -36,34 +37,34 @@ var toolRegistry = make(map[string]ToolConfigFactory)
 
 // Register allows individual tool packages to register their configuration
 // factory function. This is typically called from an init() function in the
-// tool's package. It associates a 'kind' string with a function that can
+// tool's package. It associates a 'type' string with a function that can
 // produce the specific ToolConfig type. It returns true if the registration was
-// successful, and false if a tool with the same kind was already registered.
-func Register(kind string, factory ToolConfigFactory) bool {
-	if _, exists := toolRegistry[kind]; exists {
-		// Tool with this kind already exists, do not overwrite.
+// successful, and false if a tool with the same type was already registered.
+func Register(resourceType string, factory ToolConfigFactory) bool {
+	if _, exists := toolRegistry[resourceType]; exists {
+		// Tool with this type already exists, do not overwrite.
 		return false
 	}
-	toolRegistry[kind] = factory
+	toolRegistry[resourceType] = factory
 	return true
 }
 
-// DecodeConfig looks up the registered factory for the given kind and uses it
+// DecodeConfig looks up the registered factory for the given type and uses it
 // to decode the tool configuration.
-func DecodeConfig(ctx context.Context, kind string, name string, decoder *yaml.Decoder) (ToolConfig, error) {
-	factory, found := toolRegistry[kind]
+func DecodeConfig(ctx context.Context, resourceType string, name string, decoder *yaml.Decoder) (ToolConfig, error) {
+	factory, found := toolRegistry[resourceType]
 	if !found {
-		return nil, fmt.Errorf("unknown tool kind: %q", kind)
+		return nil, fmt.Errorf("unknown tool type: %q", resourceType)
 	}
 	toolConfig, err := factory(ctx, name, decoder)
 	if err != nil {
-		return nil, fmt.Errorf("unable to parse tool %q as kind %q: %w", name, kind, err)
+		return nil, fmt.Errorf("unable to parse tool %q as type %q: %w", name, resourceType, err)
 	}
 	return toolConfig, nil
 }
 
 type ToolConfig interface {
-	ToolConfigKind() string
+	ToolConfigType() string
 	Initialize(map[string]sources.Source) (Tool, error)
 }
 
@@ -80,14 +81,13 @@ type AccessToken string
 func (token AccessToken) ParseBearerToken() (string, error) {
 	headerParts := strings.Split(string(token), " ")
 	if len(headerParts) != 2 || strings.ToLower(headerParts[0]) != "bearer" {
-		return "", fmt.Errorf("authorization header must be in the format 'Bearer <token>': %w", util.ErrUnauthorized)
+		return "", util.NewClientServerError("authorization header must be in the format 'Bearer <token>'", http.StatusUnauthorized, nil)
 	}
 	return headerParts[1], nil
 }
 
 type Tool interface {
-	Invoke(context.Context, SourceProvider, parameters.ParamValues, AccessToken) (any, error)
-	ParseParams(map[string]any, map[string]map[string]any) (parameters.ParamValues, error)
+	Invoke(context.Context, SourceProvider, parameters.ParamValues, AccessToken) (any, util.ToolboxError)
 	EmbedParams(context.Context, parameters.ParamValues, map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error)
 	Manifest() Manifest
 	McpManifest() McpManifest
@@ -95,6 +95,7 @@ type Tool interface {
 	RequiresClientAuthorization(SourceProvider) (bool, error)
 	ToConfig() ToolConfig
 	GetAuthTokenHeaderName(SourceProvider) (string, error)
+	GetParameters() parameters.Parameters
 }
 
 // SourceProvider defines the minimal view of the server.ResourceManager
@@ -160,7 +161,7 @@ func IsAuthorized(authRequiredSources []string, verifiedAuthServices []string) b
 	return false
 }
 
-func GetCompatibleSource[T any](resourceMgr SourceProvider, sourceName, toolName, toolKind string) (T, error) {
+func GetCompatibleSource[T any](resourceMgr SourceProvider, sourceName, toolName, toolType string) (T, error) {
 	var zero T
 	s, ok := resourceMgr.GetSource(sourceName)
 	if !ok {
@@ -168,7 +169,7 @@ func GetCompatibleSource[T any](resourceMgr SourceProvider, sourceName, toolName
 	}
 	source, ok := s.(T)
 	if !ok {
-		return zero, fmt.Errorf("invalid source for %q tool: source %q is not a compatible type", toolKind, sourceName)
+		return zero, fmt.Errorf("invalid source for %q tool: source %q is not a compatible type", toolType, sourceName)
 	}
 	return source, nil
 }
diff --git a/internal/tools/trino/trinoexecutesql/trinoexecutesql.go b/internal/tools/trino/trinoexecutesql/trinoexecutesql.go
index 529590e35e..2ea25f9e2e 100644
--- a/internal/tools/trino/trinoexecutesql/trinoexecutesql.go
+++ b/internal/tools/trino/trinoexecutesql/trinoexecutesql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "trino-execute-sql"
+const resourceType string = "trino-execute-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Source       string   `yaml:"source" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -58,8 +60,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -88,22 +90,22 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source not compatible with this tool", http.StatusInternalServerError, err)
 	}
 
 	sliceParams := params.AsSlice()
 	sql, ok := sliceParams[0].(string)
 	if !ok {
-		return nil, fmt.Errorf("unable to cast sql parameter: %v", sliceParams[0])
+		return nil, util.NewAgentError("unable to cast the `sql` input parameter into string", nil)
 	}
-	return source.RunSQL(ctx, sql, nil)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
+	res, err := source.RunSQL(ctx, sql, []any{})
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return res, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -133,3 +135,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/trino/trinoexecutesql/trinoexecutesql_test.go b/internal/tools/trino/trinoexecutesql/trinoexecutesql_test.go
index 0af7ce1762..372654d0ee 100644
--- a/internal/tools/trino/trinoexecutesql/trinoexecutesql_test.go
+++ b/internal/tools/trino/trinoexecutesql/trinoexecutesql_test.go
@@ -17,7 +17,6 @@ package trinoexecutesql_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"
@@ -37,19 +36,19 @@ func TestParseFromYamlTrinoExecuteSQL(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: trino-execute-sql
-					source: my-trino-instance
-					description: some description
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
+			kind: tools
+			name: example_tool
+			type: trino-execute-sql
+			source: my-trino-instance
+			description: some description
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": trinoexecutesql.Config{
 					Name:         "example_tool",
-					Kind:         "trino-execute-sql",
+					Type:         "trino-execute-sql",
 					Source:       "my-trino-instance",
 					Description:  "some description",
 					AuthRequired: []string{"my-google-auth-service", "other-auth-service"},
@@ -59,15 +58,11 @@ func TestParseFromYamlTrinoExecuteSQL(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/trino/trinosql/trinosql.go b/internal/tools/trino/trinosql/trinosql.go
index eb75db07ee..3641d22cf0 100644
--- a/internal/tools/trino/trinosql/trinosql.go
+++ b/internal/tools/trino/trinosql/trinosql.go
@@ -18,19 +18,21 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "trino-sql"
+const resourceType string = "trino-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,27 +95,27 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source not compatible with this tool", http.StatusInternalServerError, err)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	res, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return res, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -143,3 +145,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/trino/trinosql/trinosql_test.go b/internal/tools/trino/trinosql/trinosql_test.go
index 2974e0dd04..50908a9350 100644
--- a/internal/tools/trino/trinosql/trinosql_test.go
+++ b/internal/tools/trino/trinosql/trinosql_test.go
@@ -17,7 +17,6 @@ package trinosql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlTrino(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: trino-sql
-					source: my-trino-instance
-					description: some description
-					statement: |
-						SELECT * FROM catalog.schema.table WHERE id = ?;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: id
-						  type: string
-						  description: ID to filter by
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
+			kind: tools
+			name: example_tool
+			type: trino-sql
+			source: my-trino-instance
+			description: some description
+			statement: |
+				SELECT * FROM catalog.schema.table WHERE id = ?;
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			parameters:
+				- name: id
+				  type: string
+				  description: ID to filter by
+				  authServices:
+					- name: my-google-auth-service
+					  field: user_id
+					- name: other-auth-service
+					  field: user_id
 			`,
 			want: server.ToolConfigs{
 				"example_tool": trinosql.Config{
 					Name:         "example_tool",
-					Kind:         "trino-sql",
+					Type:         "trino-sql",
 					Source:       "my-trino-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM catalog.schema.table WHERE id = ?;\n",
@@ -77,15 +76,11 @@ func TestParseFromYamlTrino(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -105,47 +100,47 @@ func TestParseFromYamlWithTemplateParamsTrino(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: trino-sql
-					source: my-trino-instance
-					description: some description
-					statement: |
-						SELECT * FROM {{ .catalog }}.{{ .schema }}.{{ .tableName }} WHERE country = ?;
-					authRequired:
-						- my-google-auth-service
-						- other-auth-service
-					parameters:
-						- name: country
-						  type: string
-						  description: some description
-						  authServices:
-							- name: my-google-auth-service
-							  field: user_id
-							- name: other-auth-service
-							  field: user_id
-					templateParameters:
-						- name: catalog
-						  type: string
-						  description: The catalog to query from.
-						- name: schema
-						  type: string
-						  description: The schema to query from.
-						- name: tableName
-						  type: string
-						  description: The table to select data from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+			kind: tools
+			name: example_tool
+			type: trino-sql
+			source: my-trino-instance
+			description: some description
+			statement: |
+				SELECT * FROM {{ .catalog }}.{{ .schema }}.{{ .tableName }} WHERE country = ?;
+			authRequired:
+				- my-google-auth-service
+				- other-auth-service
+			parameters:
+				- name: country
+				  type: string
+				  description: some description
+				  authServices:
+					- name: my-google-auth-service
+					  field: user_id
+					- name: other-auth-service
+					  field: user_id
+			templateParameters:
+				- name: catalog
+				  type: string
+				  description: The catalog to query from.
+				- name: schema
+				  type: string
+				  description: The schema to query from.
+				- name: tableName
+				  type: string
+				  description: The table to select data from.
+				- name: fieldArray
+				  type: array
+				  description: The columns to return for the query.
+				  items: 
+						name: column
+						type: string
+						description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": trinosql.Config{
 					Name:         "example_tool",
-					Kind:         "trino-sql",
+					Type:         "trino-sql",
 					Source:       "my-trino-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM {{ .catalog }}.{{ .schema }}.{{ .tableName }} WHERE country = ?;\n",
@@ -167,15 +162,11 @@ func TestParseFromYamlWithTemplateParamsTrino(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/utility/wait/wait.go b/internal/tools/utility/wait/wait.go
index a5724fdac9..32e752d113 100644
--- a/internal/tools/utility/wait/wait.go
+++ b/internal/tools/utility/wait/wait.go
@@ -23,14 +23,15 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 )
 
-const kind string = "wait"
+const resourceType string = "wait"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -44,7 +45,7 @@ func newConfig(ctx context.Context, name string, decoder *yaml.Decoder) (tools.T
 
 type Config struct {
 	Name         string   `yaml:"name" validate:"required"`
-	Kind         string   `yaml:"kind" validate:"required"`
+	Type         string   `yaml:"type" validate:"required"`
 	Description  string   `yaml:"description" validate:"required"`
 	Timeout      string   `yaml:"timeout" validate:"required"`
 	AuthRequired []string `yaml:"authRequired"`
@@ -52,8 +53,8 @@ type Config struct {
 
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(_ map[string]sources.Source) (tools.Tool, error) {
@@ -81,17 +82,17 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
 	paramsMap := params.AsMap()
 
 	durationStr, ok := paramsMap["duration"].(string)
 	if !ok {
-		return nil, fmt.Errorf("duration parameter is not a string")
+		return nil, util.NewAgentError("duration parameter is not a string", nil)
 	}
 
 	totalDuration, err := time.ParseDuration(durationStr)
 	if err != nil {
-		return nil, fmt.Errorf("invalid duration format: %w", err)
+		return nil, util.NewAgentError("invalid duration format", err)
 	}
 
 	time.Sleep(totalDuration)
@@ -99,10 +100,6 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return fmt.Sprintf("Wait for %v completed successfully.", totalDuration), nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
@@ -131,3 +128,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/utility/wait/wait_test.go b/internal/tools/utility/wait/wait_test.go
index fcd060ac6b..fb3db875cd 100644
--- a/internal/tools/utility/wait/wait_test.go
+++ b/internal/tools/utility/wait/wait_test.go
@@ -17,7 +17,6 @@ package wait_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"
@@ -38,18 +37,18 @@ func TestParseFromYamlWait(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: wait
-					description: some description
-					timeout: 10s
-					authRequired:
-						- my-google-auth-service
+			kind: tools
+			name: example_tool
+			type: wait
+			description: some description
+			timeout: 10s
+			authRequired:
+				- my-google-auth-service
 			`,
 			want: server.ToolConfigs{
 				"example_tool": wait.Config{
 					Name:         "example_tool",
-					Kind:         "wait",
+					Type:         "wait",
 					Description:  "some description",
 					Timeout:      "10s",
 					AuthRequired: []string{"my-google-auth-service"},
@@ -59,15 +58,11 @@ func TestParseFromYamlWait(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/valkey/valkey.go b/internal/tools/valkey/valkey.go
index 6d3a8effc1..95c7674832 100644
--- a/internal/tools/valkey/valkey.go
+++ b/internal/tools/valkey/valkey.go
@@ -16,20 +16,22 @@ package valkey
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/valkey-io/valkey-go"
 )
 
-const kind string = "valkey"
+const resourceType string = "valkey"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -48,7 +50,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name         string                `yaml:"name" validate:"required"`
-	Kind         string                `yaml:"kind" validate:"required"`
+	Type         string                `yaml:"type" validate:"required"`
 	Source       string                `yaml:"source" validate:"required"`
 	Description  string                `yaml:"description" validate:"required"`
 	Commands     [][]string            `yaml:"commands" validate:"required"`
@@ -59,8 +61,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -84,18 +86,22 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source not compatible with this tool", http.StatusInternalServerError, nil)
 	}
 
 	// Replace parameters
 	commands, err := replaceCommandsParams(t.Commands, t.Parameters, params)
 	if err != nil {
-		return nil, fmt.Errorf("error replacing commands' parameters: %s", err)
+		return nil, util.NewAgentError("error replacing commands' parameters", err)
 	}
-	return source.RunCommand(ctx, commands)
+	res, err := source.RunCommand(ctx, commands)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return res, nil
 }
 
 // replaceCommandsParams is a helper function to replace parameters in the commands
@@ -132,10 +138,6 @@ func replaceCommandsParams(commands [][]string, params parameters.Parameters, pa
 	return newCommands, nil
 }
 
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.Parameters, data, claims)
-}
-
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
 	return parameters.EmbedParams(ctx, t.Parameters, paramValues, embeddingModelsMap, nil)
 }
@@ -163,3 +165,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/valkey/valkey_test.go b/internal/tools/valkey/valkey_test.go
index 8b99471806..2bafe4c3d1 100644
--- a/internal/tools/valkey/valkey_test.go
+++ b/internal/tools/valkey/valkey_test.go
@@ -17,7 +17,6 @@ package valkey_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"
@@ -38,23 +37,23 @@ func TestParseFromYamlvalkey(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				valkey_tool:
-					kind: valkey
-					source: my-valkey-instance
-					description: some description
-					commands:
-						- [SET, greeting, "hello, {{.name}}"]
-						- [GET, id]
-					parameters:
-						- name: name
-						  type: string
-						  description: user name
+			kind: tools
+			name: valkey_tool
+			type: valkey
+			source: my-valkey-instance
+			description: some description
+			commands:
+				- [SET, greeting, "hello, {{.name}}"]
+				- [GET, id]
+			parameters:
+				- name: name
+				  type: string
+				  description: user name
 			`,
 			want: server.ToolConfigs{
 				"valkey_tool": valkey.Config{
 					Name:         "valkey_tool",
-					Kind:         "valkey",
+					Type:         "valkey",
 					Source:       "my-valkey-instance",
 					Description:  "some description",
 					AuthRequired: []string{},
@@ -68,15 +67,11 @@ func TestParseFromYamlvalkey(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/tools/yugabytedbsql/yugabytedbsql.go b/internal/tools/yugabytedbsql/yugabytedbsql.go
index 53e05dcc99..6eb3f51f6c 100644
--- a/internal/tools/yugabytedbsql/yugabytedbsql.go
+++ b/internal/tools/yugabytedbsql/yugabytedbsql.go
@@ -17,20 +17,22 @@ package yugabytedbsql
 import (
 	"context"
 	"fmt"
+	"net/http"
 
 	yaml "github.com/goccy/go-yaml"
 	embeddingmodels "github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/sources"
 	"github.com/googleapis/genai-toolbox/internal/tools"
+	"github.com/googleapis/genai-toolbox/internal/util"
 	"github.com/googleapis/genai-toolbox/internal/util/parameters"
 	"github.com/yugabyte/pgx/v5/pgxpool"
 )
 
-const kind string = "yugabytedb-sql"
+const resourceType string = "yugabytedb-sql"
 
 func init() {
-	if !tools.Register(kind, newConfig) {
-		panic(fmt.Sprintf("tool kind %q already registered", kind))
+	if !tools.Register(resourceType, newConfig) {
+		panic(fmt.Sprintf("tool type %q already registered", resourceType))
 	}
 }
 
@@ -49,7 +51,7 @@ type compatibleSource interface {
 
 type Config struct {
 	Name               string                `yaml:"name" validate:"required"`
-	Kind               string                `yaml:"kind" validate:"required"`
+	Type               string                `yaml:"type" validate:"required"`
 	Source             string                `yaml:"source" validate:"required"`
 	Description        string                `yaml:"description" validate:"required"`
 	Statement          string                `yaml:"statement" validate:"required"`
@@ -61,8 +63,8 @@ type Config struct {
 // validate interface
 var _ tools.ToolConfig = Config{}
 
-func (cfg Config) ToolConfigKind() string {
-	return kind
+func (cfg Config) ToolConfigType() string {
+	return resourceType
 }
 
 func (cfg Config) Initialize(srcs map[string]sources.Source) (tools.Tool, error) {
@@ -93,28 +95,28 @@ type Tool struct {
 	mcpManifest tools.McpManifest
 }
 
-func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Kind)
+func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, params parameters.ParamValues, accessToken tools.AccessToken) (any, util.ToolboxError) {
+	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
 	if err != nil {
-		return nil, err
+		return nil, util.NewClientServerError("source not compatible with this tool", http.StatusInternalServerError, nil)
 	}
 
 	paramsMap := params.AsMap()
 	newStatement, err := parameters.ResolveTemplateParams(t.TemplateParameters, t.Statement, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract template params %w", err)
+		return nil, util.NewAgentError("unable to extract template params", err)
 	}
 
 	newParams, err := parameters.GetParams(t.Parameters, paramsMap)
 	if err != nil {
-		return nil, fmt.Errorf("unable to extract standard params %w", err)
+		return nil, util.NewAgentError("unable to extract standard params", err)
 	}
 	sliceParams := newParams.AsSlice()
-	return source.RunSQL(ctx, newStatement, sliceParams)
-}
-
-func (t Tool) ParseParams(data map[string]any, claims map[string]map[string]any) (parameters.ParamValues, error) {
-	return parameters.ParseParams(t.AllParams, data, claims)
+	res, err := source.RunSQL(ctx, newStatement, sliceParams)
+	if err != nil {
+		return nil, util.ProcessGeneralError(err)
+	}
+	return res, nil
 }
 
 func (t Tool) EmbedParams(ctx context.Context, paramValues parameters.ParamValues, embeddingModelsMap map[string]embeddingmodels.EmbeddingModel) (parameters.ParamValues, error) {
@@ -144,3 +146,7 @@ func (t Tool) ToConfig() tools.ToolConfig {
 func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string, error) {
 	return "Authorization", nil
 }
+
+func (t Tool) GetParameters() parameters.Parameters {
+	return t.Parameters
+}
diff --git a/internal/tools/yugabytedbsql/yugabytedbsql_test.go b/internal/tools/yugabytedbsql/yugabytedbsql_test.go
index e0a9cd1d04..24ff000153 100644
--- a/internal/tools/yugabytedbsql/yugabytedbsql_test.go
+++ b/internal/tools/yugabytedbsql/yugabytedbsql_test.go
@@ -17,7 +17,6 @@ package yugabytedbsql_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"
@@ -38,30 +37,30 @@ func TestParseFromYamlYugabyteDBSQL(t *testing.T) {
 		{
 			desc: "basic valid config",
 			in: `
-			tools:
-			  hotel_search:
-			    kind: yugabytedb-sql
-			    source: yb-source
-			    description: search hotels by city
-			    statement: |
-			      SELECT * FROM hotels WHERE city = $1;
-			    authRequired:
-			      - auth-service-a
-			      - auth-service-b
-			    parameters:
-			      - name: city
-			        type: string
-			        description: city name
-			        authServices:
-			          - name: auth-service-a
-			            field: user_id
-			          - name: auth-service-b
-			            field: user_id
+			kind: tools
+			name: hotel_search
+			type: yugabytedb-sql
+			source: yb-source
+			description: search hotels by city
+			statement: |
+			  SELECT * FROM hotels WHERE city = $1;
+			authRequired:
+			  - auth-service-a
+			  - auth-service-b
+			parameters:
+			  - name: city
+			    type: string
+			    description: city name
+			    authServices:
+			      - name: auth-service-a
+			        field: user_id
+			      - name: auth-service-b
+			        field: user_id
 			`,
 			want: server.ToolConfigs{
 				"hotel_search": yugabytedbsql.Config{
 					Name:         "hotel_search",
-					Kind:         "yugabytedb-sql",
+					Type:         "yugabytedb-sql",
 					Source:       "yb-source",
 					Description:  "search hotels by city",
 					Statement:    "SELECT * FROM hotels WHERE city = $1;\n",
@@ -81,14 +80,11 @@ func TestParseFromYamlYugabyteDBSQL(t *testing.T) {
 
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
@@ -107,32 +103,29 @@ func TestFailParseFromYamlYugabyteDBSQL(t *testing.T) {
 		{
 			desc: "missing required field (statement)",
 			in: `
-			tools:
-			  tool1:
-			    kind: yugabytedb-sql
-			    source: yb-source
-			    description: incomplete config
+			kind: tools
+			name: tool1
+			type: yugabytedb-sql
+			source: yb-source
+			description: incomplete config
 			`,
 		},
 		{
 			desc: "unknown field (foo)",
 			in: `
-			tools:
-			  tool2:
-			    kind: yugabytedb-sql
-			    source: yb-source
-			    description: test
-			    statement: SELECT 1;
-			    foo: bar
+			kind: tools
+			name: tool2
+			type: yugabytedb-sql
+			source: yb-source
+			description: test
+			statement: SELECT 1;
+			foo: bar
 			`,
 		},
 	}
 	for _, tc := range cases {
 		t.Run(tc.desc, func(t *testing.T) {
-			cfg := struct {
-				Tools server.ToolConfigs `yaml:"tools"`
-			}{}
-			err := yaml.UnmarshalContext(ctx, testutils.FormatYaml(tc.in), &cfg)
+			_, _, _, _, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err == nil {
 				t.Fatalf("expected error but got none")
 			}
@@ -153,33 +146,33 @@ func TestParseFromYamlWithTemplateParamsYugabyteDB(t *testing.T) {
 		{
 			desc: "basic example",
 			in: `
-			tools:
-				example_tool:
-					kind: yugabytedb-sql
-					source: my-yb-instance
-					description: some description
-					statement: |
-						SELECT * FROM SQL_STATEMENT;
-					parameters:
-						- name: name
-						  type: string
-						  description: some description
-					templateParameters:
-						- name: tableName
-						  type: string
-						  description: The table to select hotels from.
-						- name: fieldArray
-						  type: array
-						  description: The columns to return for the query.
-						  items: 
-								name: column
-								type: string
-								description: A column name that will be returned from the query.
+			kind: tools
+			name: example_tool
+			type: yugabytedb-sql
+			source: my-yb-instance
+			description: some description
+			statement: |
+				SELECT * FROM SQL_STATEMENT;
+			parameters:
+				- name: name
+				  type: string
+				  description: some description
+			templateParameters:
+				- name: tableName
+				  type: string
+				  description: The table to select hotels from.
+				- name: fieldArray
+				  type: array
+				  description: The columns to return for the query.
+				  items: 
+						name: column
+						type: string
+						description: A column name that will be returned from the query.
 			`,
 			want: server.ToolConfigs{
 				"example_tool": yugabytedbsql.Config{
 					Name:         "example_tool",
-					Kind:         "yugabytedb-sql",
+					Type:         "yugabytedb-sql",
 					Source:       "my-yb-instance",
 					Description:  "some description",
 					Statement:    "SELECT * FROM SQL_STATEMENT;\n",
@@ -197,15 +190,11 @@ func TestParseFromYamlWithTemplateParamsYugabyteDB(t *testing.T) {
 	}
 	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)
+			_, _, _, got, _, _, err := server.UnmarshalResourceConfig(ctx, testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if diff := cmp.Diff(tc.want, got.Tools); diff != "" {
+			if diff := cmp.Diff(tc.want, got); diff != "" {
 				t.Fatalf("incorrect parse: diff %v", diff)
 			}
 		})
diff --git a/internal/util/errors.go b/internal/util/errors.go
new file mode 100644
index 0000000000..e8d5328bda
--- /dev/null
+++ b/internal/util/errors.go
@@ -0,0 +1,140 @@
+// Copyright 2026 Google LLC
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package util
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"strings"
+
+	"google.golang.org/api/googleapi"
+)
+
+type ErrorCategory string
+
+const (
+	CategoryAgent  ErrorCategory = "AGENT_ERROR"
+	CategoryServer ErrorCategory = "SERVER_ERROR"
+)
+
+// ToolboxError is the interface all custom errors must satisfy
+type ToolboxError interface {
+	error
+	Category() ErrorCategory
+	Error() string
+	Unwrap() error
+}
+
+// Agent Errors return 200 to the sender
+type AgentError struct {
+	Msg   string
+	Cause error
+}
+
+var _ ToolboxError = &AgentError{}
+
+func (e *AgentError) Error() string {
+	if e.Cause != nil {
+		return fmt.Sprintf("%s: %v", e.Msg, e.Cause)
+	}
+	return e.Msg
+}
+
+func (e *AgentError) Category() ErrorCategory { return CategoryAgent }
+
+func (e *AgentError) Unwrap() error { return e.Cause }
+
+func NewAgentError(msg string, cause error) *AgentError {
+	return &AgentError{Msg: msg, Cause: cause}
+}
+
+var _ ToolboxError = &AgentError{}
+
+// ClientServerError returns 4XX/5XX error code
+type ClientServerError struct {
+	Msg   string
+	Code  int
+	Cause error
+}
+
+var _ ToolboxError = &ClientServerError{}
+
+func (e *ClientServerError) Error() string {
+	if e.Cause != nil {
+		return fmt.Sprintf("%s: %v", e.Msg, e.Cause)
+	}
+	return e.Msg
+}
+
+func (e *ClientServerError) Category() ErrorCategory { return CategoryServer }
+
+func (e *ClientServerError) Unwrap() error { return e.Cause }
+
+func NewClientServerError(msg string, code int, cause error) *ClientServerError {
+	return &ClientServerError{Msg: msg, Code: code, Cause: cause}
+}
+
+// ProcessGcpError catches auth related errors in GCP requests results and return 401/403 error codes
+// Returns AgentError for all other errors
+func ProcessGcpError(err error) ToolboxError {
+	var gErr *googleapi.Error
+	if errors.As(err, &gErr) {
+		if gErr.Code == 401 {
+			return NewClientServerError(
+				"failed to access GCP resource",
+				http.StatusUnauthorized,
+				err,
+			)
+		}
+		if gErr.Code == 403 {
+			return NewClientServerError(
+				"failed to access GCP resource",
+				http.StatusForbidden,
+				err,
+			)
+		}
+	}
+	return NewAgentError("error processing GCP request", err)
+}
+
+// ProcessGeneralError handles generic errors by inspecting the error string
+// for common status code patterns.
+func ProcessGeneralError(err error) ToolboxError {
+	if err == nil {
+		return nil
+	}
+
+	errStr := err.Error()
+
+	// Check for Unauthorized
+	if strings.Contains(errStr, "Error 401") || strings.Contains(errStr, "status 401") {
+		return NewClientServerError(
+			"failed to access resource",
+			http.StatusUnauthorized,
+			err,
+		)
+	}
+
+	// Check for Forbidden
+	if strings.Contains(errStr, "Error 403") || strings.Contains(errStr, "status 403") {
+		return NewClientServerError(
+			"failed to access resource",
+			http.StatusForbidden,
+			err,
+		)
+	}
+
+	// Default to AgentError for logical failures (task execution failed)
+	return NewAgentError("error processing request", err)
+}
diff --git a/internal/util/parameters/parameters.go b/internal/util/parameters/parameters.go
index f75da04a5d..7c991f61be 100644
--- a/internal/util/parameters/parameters.go
+++ b/internal/util/parameters/parameters.go
@@ -19,6 +19,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"reflect"
 	"regexp"
 	"slices"
@@ -118,7 +119,7 @@ func parseFromAuthService(paramAuthServices []ParamAuthService, claimsMap map[st
 		}
 		return v, nil
 	}
-	return nil, fmt.Errorf("missing or invalid authentication header: %w", util.ErrUnauthorized)
+	return nil, util.NewClientServerError("missing or invalid authentication header", http.StatusUnauthorized, nil)
 }
 
 // CheckParamRequired checks if a parameter is required based on the required and default field.
@@ -147,20 +148,20 @@ func ParseParams(ps Parameters, data map[string]any, claimsMap map[string]map[st
 				v = p.GetDefault()
 				// if the parameter is required and no value given, throw an error
 				if CheckParamRequired(p.GetRequired(), v) {
-					return nil, fmt.Errorf("parameter %q is required", name)
+					return nil, util.NewAgentError(fmt.Sprintf("parameter %q is required", name), nil)
 				}
 			}
 		} else {
 			// parse authenticated parameter
 			v, err = parseFromAuthService(paramAuthServices, claimsMap)
 			if err != nil {
-				return nil, fmt.Errorf("error parsing authenticated parameter %q: %w", name, err)
+				return nil, util.NewClientServerError(fmt.Sprintf("error parsing authenticated parameter %q", name), http.StatusUnauthorized, err)
 			}
 		}
 		if v != nil {
 			newV, err = p.Parse(v)
 			if err != nil {
-				return nil, fmt.Errorf("unable to parse value for %q: %w", name, err)
+				return nil, util.NewAgentError(fmt.Sprintf("unable to parse value for %q", name), err)
 			}
 		}
 		params = append(params, ParamValue{Name: name, Value: newV})
diff --git a/internal/util/util.go b/internal/util/util.go
index 657fe8bf29..0b38a225b7 100644
--- a/internal/util/util.go
+++ b/internal/util/util.go
@@ -17,7 +17,6 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -29,6 +28,9 @@ import (
 	"github.com/googleapis/genai-toolbox/internal/telemetry"
 )
 
+// GDAClientID is the client ID for Gemini Data Analytics
+const GDAClientID = "GENAI_TOOLBOX"
+
 // DecodeJSON decodes a given reader into an interface using the json decoder.
 func DecodeJSON(r io.Reader, v interface{}) error {
 	defer io.Copy(io.Discard, r) //nolint:errcheck
@@ -188,5 +190,3 @@ func InstrumentationFromContext(ctx context.Context) (*telemetry.Instrumentation
 	}
 	return nil, fmt.Errorf("unable to retrieve instrumentation")
 }
-
-var ErrUnauthorized = errors.New("unauthorized")
diff --git a/server.json b/server.json
index 542bbffa1f..f87582cd90 100644
--- a/server.json
+++ b/server.json
@@ -14,11 +14,11 @@
         "url": "https://github.com/googleapis/genai-toolbox",
         "source": "github"
     },
-    "version": "0.26.0",
+    "version": "0.27.0",
     "packages": [
         {
             "registryType": "oci",
-            "identifier": "us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:0.26.0",
+            "identifier": "us-central1-docker.pkg.dev/database-toolbox/toolbox/toolbox:0.27.0",
             "transport": {
                 "type": "streamable-http",
                 "url": "http://{host}:{port}/mcp"
diff --git a/tests/alloydb/alloydb_integration_test.go b/tests/alloydb/alloydb_integration_test.go
index 0c2c3bb2e2..0cad64ba74 100644
--- a/tests/alloydb/alloydb_integration_test.go
+++ b/tests/alloydb/alloydb_integration_test.go
@@ -74,71 +74,71 @@ func getAlloyDBToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"alloydb-admin-source": map[string]any{
-				"kind": "alloydb-admin",
+				"type": "alloydb-admin",
 			},
 		},
 		"tools": map[string]any{
 			// Tool for RunAlloyDBToolGetTest
 			"my-simple-tool": map[string]any{
-				"kind":        "alloydb-list-clusters",
+				"type":        "alloydb-list-clusters",
 				"source":      "alloydb-admin-source",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			// Tool for MCP test
 			"my-param-tool": map[string]any{
-				"kind":        "alloydb-list-clusters",
+				"type":        "alloydb-list-clusters",
 				"source":      "alloydb-admin-source",
 				"description": "Tool to list clusters",
 			},
 			// Tool for MCP test that fails
 			"my-fail-tool": map[string]any{
-				"kind":        "alloydb-list-clusters",
+				"type":        "alloydb-list-clusters",
 				"source":      "alloydb-admin-source",
 				"description": "Tool that will fail",
 			},
 			// AlloyDB specific tools
 			"alloydb-list-clusters": map[string]any{
-				"kind":        "alloydb-list-clusters",
+				"type":        "alloydb-list-clusters",
 				"source":      "alloydb-admin-source",
 				"description": "Lists all AlloyDB clusters in a given project and location.",
 			},
 			"alloydb-list-users": map[string]any{
-				"kind":        "alloydb-list-users",
+				"type":        "alloydb-list-users",
 				"source":      "alloydb-admin-source",
 				"description": "Lists all AlloyDB users within a specific cluster.",
 			},
 			"alloydb-list-instances": map[string]any{
-				"kind":        "alloydb-list-instances",
+				"type":        "alloydb-list-instances",
 				"source":      "alloydb-admin-source",
 				"description": "Lists all AlloyDB instances within a specific cluster.",
 			},
 			"alloydb-get-cluster": map[string]any{
-				"kind":        "alloydb-get-cluster",
+				"type":        "alloydb-get-cluster",
 				"source":      "alloydb-admin-source",
 				"description": "Retrieves details of a specific AlloyDB cluster.",
 			},
 			"alloydb-get-instance": map[string]any{
-				"kind":        "alloydb-get-instance",
+				"type":        "alloydb-get-instance",
 				"source":      "alloydb-admin-source",
 				"description": "Retrieves details of a specific AlloyDB instance.",
 			},
 			"alloydb-get-user": map[string]any{
-				"kind":        "alloydb-get-user",
+				"type":        "alloydb-get-user",
 				"source":      "alloydb-admin-source",
 				"description": "Retrieves details of a specific AlloyDB user.",
 			},
 			"alloydb-create-cluster": map[string]any{
-				"kind":        "alloydb-create-cluster",
+				"type":        "alloydb-create-cluster",
 				"description": "create cluster",
 				"source":      "alloydb-admin-source",
 			},
 			"alloydb-create-instance": map[string]any{
-				"kind":        "alloydb-create-instance",
+				"type":        "alloydb-create-instance",
 				"description": "create instance",
 				"source":      "alloydb-admin-source",
 			},
 			"alloydb-create-user": map[string]any{
-				"kind":        "alloydb-create-user",
+				"type":        "alloydb-create-user",
 				"description": "create user",
 				"source":      "alloydb-admin-source",
 			},
@@ -402,7 +402,7 @@ func runAlloyDBListClustersTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "list clusters missing project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"location": "%s"}`, vars["location"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "list clusters non-existent location",
@@ -417,12 +417,12 @@ func runAlloyDBListClustersTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "list clusters empty project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "", "location": "%s"}`, vars["location"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "list clusters empty location",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": ""}`, vars["project"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -489,42 +489,42 @@ func runAlloyDBListUsersTest(t *testing.T, vars map[string]string) {
 		requestBody    io.Reader
 		wantContains   string
 		wantStatusCode int
+		expectAgentErr bool
 	}{
 		{
 			name:           "list users success",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "%s"}`, vars["project"], vars["location"], vars["cluster"])),
 			wantContains:   fmt.Sprintf("projects/%s/locations/%s/clusters/%s/users/%s", vars["project"], vars["location"], vars["cluster"], AlloyDBUser),
 			wantStatusCode: http.StatusOK,
+			expectAgentErr: false,
 		},
 		{
 			name:           "list users missing project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"location": "%s", "cluster": "%s"}`, vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			wantContains:   `parameter \"project\" is required`,
+			expectAgentErr: true,
 		},
 		{
 			name:           "list users missing location",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "cluster": "%s"}`, vars["project"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			wantContains:   `parameter \"location\" is required`,
+			expectAgentErr: true,
 		},
 		{
 			name:           "list users missing cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s"}`, vars["project"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
-		},
-		{
-			name:           "list users non-existent project",
-			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "non-existent-project", "location": "%s", "cluster": "%s"}`, vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusInternalServerError,
-		},
-		{
-			name:           "list users non-existent location",
-			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "non-existent-location", "cluster": "%s"}`, vars["project"], vars["cluster"])),
-			wantStatusCode: http.StatusInternalServerError,
+			wantStatusCode: http.StatusOK,
+			wantContains:   `parameter \"cluster\" is required`,
+			expectAgentErr: true,
 		},
 		{
 			name:           "list users non-existent cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "non-existent-cluster"}`, vars["project"], vars["location"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			wantContains:   `was not found`,
+			expectAgentErr: true,
 		},
 	}
 
@@ -544,7 +544,7 @@ func runAlloyDBListUsersTest(t *testing.T, vars map[string]string) {
 
 			if resp.StatusCode != tc.wantStatusCode {
 				bodyBytes, _ := io.ReadAll(resp.Body)
-				t.Fatalf("response status code is not %d, got %d: %s", tc.wantStatusCode, resp.StatusCode, string(bodyBytes))
+				t.Fatalf("response status code: got %d, want %d: %s", resp.StatusCode, tc.wantStatusCode, string(bodyBytes))
 			}
 
 			if tc.wantStatusCode == http.StatusOK {
@@ -553,27 +553,28 @@ func runAlloyDBListUsersTest(t *testing.T, vars map[string]string) {
 					t.Fatalf("error parsing outer response body: %v", err)
 				}
 
-				var usersData UsersResponse
-				if err := json.Unmarshal([]byte(body.Result), &usersData); err != nil {
-					t.Fatalf("error parsing nested result JSON: %v", err)
-				}
-
-				var got []string
-				for _, user := range usersData.Users {
-					got = append(got, user.Name)
-				}
-
-				sort.Strings(got)
-
-				found := false
-				for _, g := range got {
-					if g == tc.wantContains {
-						found = true
-						break
+				if tc.expectAgentErr {
+					// Logic for checking wrapped error messages
+					if !strings.Contains(body.Result, tc.wantContains) {
+						t.Errorf("expected agent error message not found:\n got: %s\nwant: %s", body.Result, tc.wantContains)
+					}
+				} else {
+					// Logic for checking successful resource lists
+					var usersData UsersResponse
+					if err := json.Unmarshal([]byte(body.Result), &usersData); err != nil {
+						t.Fatalf("error parsing nested result JSON: %v. Result was: %s", err, body.Result)
+					}
+
+					found := false
+					for _, user := range usersData.Users {
+						if user.Name == tc.wantContains {
+							found = true
+							break
+						}
+					}
+					if !found {
+						t.Errorf("expected user name %q not found in response", tc.wantContains)
 					}
-				}
-				if !found {
-					t.Errorf("wantContains not found in response:\n got: %v\nwant: %v", got, tc.wantContains)
 				}
 			}
 		})
@@ -636,7 +637,7 @@ func runAlloyDBListInstancesTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "list instances missing project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"location": "%s", "cluster": "%s"}`, vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "list instances non-existent project",
@@ -651,7 +652,7 @@ func runAlloyDBListInstancesTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "list instances non-existent cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "non-existent-cluster"}`, vars["project"], vars["location"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -725,22 +726,22 @@ func runAlloyDBGetClusterTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "get cluster missing project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"location": "%s", "cluster": "%s"}`, vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get cluster missing location",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "cluster": "%s"}`, vars["project"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get cluster missing cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s"}`, vars["project"], vars["location"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get cluster non-existent cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "non-existent-cluster"}`, vars["project"], vars["location"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -815,27 +816,27 @@ func runAlloyDBGetInstanceTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "get instance missing project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"location": "%s", "cluster": "%s", "instance": "%s"}`, vars["location"], vars["cluster"], vars["instance"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get instance missing location",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "cluster": "%s", "instance": "%s"}`, vars["project"], vars["cluster"], vars["instance"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get instance missing cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "instance": "%s"}`, vars["project"], vars["location"], vars["instance"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get instance missing instance",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "%s"}`, vars["project"], vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get instance non-existent instance",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "%s", "instance": "non-existent-instance"}`, vars["project"], vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -910,27 +911,27 @@ func runAlloyDBGetUserTest(t *testing.T, vars map[string]string) {
 		{
 			name:           "get user missing project",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"location": "%s", "cluster": "%s", "user": "%s"}`, vars["location"], vars["cluster"], vars["user"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get user missing location",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "cluster": "%s", "user": "%s"}`, vars["project"], vars["cluster"], vars["user"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get user missing cluster",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "user": "%s"}`, vars["project"], vars["location"], vars["user"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get user missing user",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "%s"}`, vars["project"], vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "get non-existent user",
 			requestBody:    bytes.NewBufferString(fmt.Sprintf(`{"project": "%s", "location": "%s", "cluster": "%s", "user": "non-existent-user"}`, vars["project"], vars["location"], vars["cluster"])),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -1129,26 +1130,26 @@ func TestAlloyDBCreateCluster(t *testing.T) {
 		{
 			name:           "api failure",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c2-api-failure", "password": "p1"}`,
-			want:           "internal api error",
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"error processing GCP request: error creating AlloyDB cluster: googleapi: Error 500: internal api error"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing project",
 			body:           `{"location": "l1", "cluster": "c1", "password": "p1"}`,
-			want:           `parameter \"project\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"project\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing cluster",
 			body:           `{"project": "p1", "location": "l1", "password": "p1"}`,
-			want:           `parameter \"cluster\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"cluster\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing password",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1"}`,
-			want:           `parameter \"password\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"password\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -1239,38 +1240,38 @@ func TestAlloyDBCreateInstance(t *testing.T) {
 		{
 			name:           "api failure",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "instance": "i2-api-failure", "instanceType": "PRIMARY", "displayName": "i1-success"}`,
-			want:           "internal api error",
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"error processing GCP request: error creating AlloyDB instance: googleapi: Error 500: internal api error"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing project",
 			body:           `{"location": "l1", "cluster": "c1", "instance": "i1", "instanceType": "PRIMARY"}`,
-			want:           `parameter \"project\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"project\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing cluster",
 			body:           `{"project": "p1", "location": "l1", "instance": "i1", "instanceType": "PRIMARY"}`,
-			want:           `parameter \"cluster\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"cluster\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing location",
 			body:           `{"project": "p1", "cluster": "c1", "instance": "i1", "instanceType": "PRIMARY"}`,
-			want:           `parameter \"location\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"location\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing instance",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "instanceType": "PRIMARY"}`,
-			want:           `parameter \"instance\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"instance\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "invalid instanceType",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "instance": "i1", "instanceType": "INVALID", "displayName": "invalid"}`,
-			want:           `invalid 'instanceType' parameter; expected 'PRIMARY' or 'READ_POOL'`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"invalid 'instanceType' parameter; expected 'PRIMARY' or 'READ_POOL'"}`,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -1371,50 +1372,50 @@ func TestAlloyDBCreateUser(t *testing.T) {
 		{
 			name:           "api failure",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u3-api-failure", "userType": "ALLOYDB_IAM_USER"}`,
-			want:           "user internal api error",
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"error processing GCP request: error creating AlloyDB user: googleapi: Error 500: user internal api error"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing project",
 			body:           `{"location": "l1", "cluster": "c1", "user": "u-fail", "userType": "ALLOYDB_IAM_USER"}`,
-			want:           `parameter \"project\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"project\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing cluster",
 			body:           `{"project": "p1", "location": "l1", "user": "u-fail", "userType": "ALLOYDB_IAM_USER"}`,
-			want:           `parameter \"cluster\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"cluster\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing location",
 			body:           `{"project": "p1", "cluster": "c1", "user": "u-fail", "userType": "ALLOYDB_IAM_USER"}`,
-			want:           `parameter \"location\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"location\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing user",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "userType": "ALLOYDB_IAM_USER"}`,
-			want:           `parameter \"user\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"user\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing userType",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u-fail"}`,
-			want:           `parameter \"userType\" is required`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"parameter \"userType\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "missing password for builtin user",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u-fail", "userType": "ALLOYDB_BUILT_IN"}`,
-			want:           `password is required when userType is ALLOYDB_BUILT_IN`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"password is required when userType is ALLOYDB_BUILT_IN"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "invalid userType",
 			body:           `{"project": "p1", "location": "l1", "cluster": "c1", "user": "u-fail", "userType": "invalid"}`,
-			want:           `invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'`,
-			wantStatusCode: http.StatusBadRequest,
+			want:           `{"error":"invalid or missing 'userType' parameter; expected 'ALLOYDB_BUILT_IN' or 'ALLOYDB_IAM_USER'"}`,
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
diff --git a/tests/alloydb/alloydb_wait_for_operation_test.go b/tests/alloydb/alloydb_wait_for_operation_test.go
index 1f027f5568..c82ab9e1c8 100644
--- a/tests/alloydb/alloydb_wait_for_operation_test.go
+++ b/tests/alloydb/alloydb_wait_for_operation_test.go
@@ -23,7 +23,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"reflect"
 	"regexp"
 	"strings"
 	"sync"
@@ -37,7 +36,7 @@ import (
 )
 
 var (
-	waitToolKind = "alloydb-wait-for-operation"
+	waitToolType = "alloydb-wait-for-operation"
 )
 
 type waitForOperationTransport struct {
@@ -165,13 +164,13 @@ func TestWaitToolEndpoints(t *testing.T) {
 			name:     "successful operation",
 			toolName: "wait-for-op1",
 			body:     `{"project": "p1", "location": "l1", "operation": "op1"}`,
-			want:     `{"name":"op1","done":true,"response":"success"}`,
+			want:     `{"done":true,"name":"op1","response":"success"}`,
 		},
 		{
-			name:        "failed operation",
-			toolName:    "wait-for-op2",
-			body:        `{"project": "p1", "location": "l1", "operation": "op2"}`,
-			expectError: true,
+			name:     "failed operation",
+			toolName: "wait-for-op2",
+			body:     `{"project": "p1", "location": "l1", "operation": "op2"}`,
+			want:     `{"error":"error processing request: operation finished with error: {\"code\":1,\"message\":\"failed\"}"}`,
 		},
 	}
 
@@ -189,48 +188,42 @@ func TestWaitToolEndpoints(t *testing.T) {
 			}
 			defer resp.Body.Close()
 
-			if tc.expectError {
-				if resp.StatusCode == http.StatusOK {
-					t.Fatal("expected error but got status 200")
-				}
-				return
-			}
-
 			if resp.StatusCode != http.StatusOK {
 				bodyBytes, _ := io.ReadAll(resp.Body)
 				t.Fatalf("response status code is not 200, got %d: %s", resp.StatusCode, string(bodyBytes))
 			}
-
-			var result struct {
-				Result string `json:"result"`
+			var response struct {
+				Result any `json:"result"`
 			}
-			if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
+			if err := json.NewDecoder(resp.Body).Decode(&response); err != nil {
 				t.Fatalf("failed to decode response: %v", err)
 			}
 
+			var got string
+			// Check if the result is a string (which contains JSON)
+			if s, ok := response.Result.(string); ok {
+				got = s
+			} else {
+				b, err := json.Marshal(response.Result)
+				if err != nil {
+					t.Fatalf("failed to marshal result object: %v", err)
+				}
+				got = string(b)
+			}
+
+			// Clean up both strings to ignore whitespace differences
+			got = strings.ReplaceAll(strings.ReplaceAll(got, " ", ""), "\n", "")
+			want := strings.ReplaceAll(strings.ReplaceAll(tc.want, " ", ""), "\n", "")
+
 			if tc.wantSubstring {
-				if !bytes.Contains([]byte(result.Result), []byte(tc.want)) {
-					t.Fatalf("unexpected result: got %q, want substring %q", result.Result, tc.want)
+				if !strings.Contains(got, want) {
+					t.Fatalf("unexpected result: got %q, want substring %q", got, want)
 				}
 				return
 			}
 
-			// The result is a JSON-encoded string, so we need to unmarshal it twice.
-			var tempString string
-			if err := json.Unmarshal([]byte(result.Result), &tempString); err != nil {
-				t.Fatalf("failed to unmarshal result string: %v", err)
-			}
-
-			var got, want map[string]any
-			if err := json.Unmarshal([]byte(tempString), &got); err != nil {
-				t.Fatalf("failed to unmarshal result: %v", err)
-			}
-			if err := json.Unmarshal([]byte(tc.want), &want); err != nil {
-				t.Fatalf("failed to unmarshal want: %v", err)
-			}
-
-			if !reflect.DeepEqual(got, want) {
-				t.Fatalf("unexpected result: got %+v, want %+v", got, want)
+			if got != want {
+				t.Fatalf("unexpected result: \ngot:  %s\nwant: %s", got, want)
 			}
 		})
 	}
@@ -240,17 +233,17 @@ func getWaitToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-alloydb-source": map[string]any{
-				"kind": "alloydb-admin",
+				"type": "alloydb-admin",
 			},
 		},
 		"tools": map[string]any{
 			"wait-for-op1": map[string]any{
-				"kind":        waitToolKind,
+				"type":        waitToolType,
 				"source":      "my-alloydb-source",
 				"description": "wait for op1",
 			},
 			"wait-for-op2": map[string]any{
-				"kind":        waitToolKind,
+				"type":        waitToolType,
 				"source":      "my-alloydb-source",
 				"description": "wait for op2",
 			},
diff --git a/tests/alloydbainl/alloydb_ai_nl_integration_test.go b/tests/alloydbainl/alloydb_ai_nl_integration_test.go
index 4c8754fdf4..1756eeb3f0 100644
--- a/tests/alloydbainl/alloydb_ai_nl_integration_test.go
+++ b/tests/alloydbainl/alloydb_ai_nl_integration_test.go
@@ -33,8 +33,8 @@ import (
 )
 
 var (
-	AlloyDBAINLSourceKind = "alloydb-postgres"
-	AlloyDBAINLToolKind   = "alloydb-ai-nl"
+	AlloyDBAINLSourceType = "alloydb-postgres"
+	AlloyDBAINLToolType   = "alloydb-ai-nl"
 	AlloyDBAINLProject    = os.Getenv("ALLOYDB_AI_NL_PROJECT")
 	AlloyDBAINLRegion     = os.Getenv("ALLOYDB_AI_NL_REGION")
 	AlloyDBAINLCluster    = os.Getenv("ALLOYDB_AI_NL_CLUSTER")
@@ -62,7 +62,7 @@ func getAlloyDBAINLVars(t *testing.T) map[string]any {
 		t.Fatal("'ALLOYDB_AI_NL_PASS' not set")
 	}
 	return map[string]any{
-		"kind":     AlloyDBAINLSourceKind,
+		"type":     AlloyDBAINLSourceType,
 		"project":  AlloyDBAINLProject,
 		"cluster":  AlloyDBAINLCluster,
 		"instance": AlloyDBAINLInstance,
@@ -285,19 +285,19 @@ func getAINLToolsConfig(sourceConfig map[string]any) map[string]any {
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        AlloyDBAINLToolKind,
+				"type":        AlloyDBAINLToolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"nlConfig":    "my_nl_config",
 			},
 			"my-auth-tool": map[string]any{
-				"kind":        AlloyDBAINLToolKind,
+				"type":        AlloyDBAINLToolType,
 				"source":      "my-instance",
 				"description": "Tool to test authenticated parameters.",
 				"nlConfig":    "my_nl_config",
@@ -316,7 +316,7 @@ func getAINLToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":        AlloyDBAINLToolKind,
+				"type":        AlloyDBAINLToolType,
 				"source":      "my-instance",
 				"description": "Tool to test auth required invocation.",
 				"nlConfig":    "my_nl_config",
diff --git a/tests/alloydbomni/alloydb_omni_integration_test.go b/tests/alloydbomni/alloydb_omni_integration_test.go
new file mode 100644
index 0000000000..b634789ce9
--- /dev/null
+++ b/tests/alloydbomni/alloydb_omni_integration_test.go
@@ -0,0 +1,157 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package alloydbomni
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"os"
+	"regexp"
+	"testing"
+	"time"
+
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+	"github.com/googleapis/genai-toolbox/tests"
+	"github.com/jackc/pgx/v5/pgxpool"
+	"github.com/testcontainers/testcontainers-go"
+	"github.com/testcontainers/testcontainers-go/wait"
+)
+
+var (
+	AlloyDBUser     = "postgres"
+	AlloyDBPass     = "mysecretpassword"
+	AlloyDBDatabase = "postgres"
+)
+
+// Copied over from postgres.go
+func initPostgresConnectionPool(host, port, user, pass, dbname string) (*pgxpool.Pool, error) {
+	// urlExample := "postgres:dd//username:password@localhost:5432/database_name"
+	url := &url.URL{
+		Scheme: "postgres",
+		User:   url.UserPassword(user, pass),
+		Host:   fmt.Sprintf("%s:%s", host, port),
+		Path:   dbname,
+	}
+	pool, err := pgxpool.New(context.Background(), url.String())
+	if err != nil {
+		return nil, fmt.Errorf("Unable to create connection pool: %w", err)
+	}
+
+	return pool, nil
+}
+
+func setupAlloyDBContainer(ctx context.Context, t *testing.T) (string, string, func()) {
+	t.Helper()
+
+	req := testcontainers.ContainerRequest{
+		Image:        "google/alloydbomni:16.9.0-ubi9", // Pinning version for stability
+		ExposedPorts: []string{"5432/tcp"},
+		Env: map[string]string{
+			"POSTGRES_PASSWORD": AlloyDBPass,
+		},
+		WaitingFor: wait.ForAll(
+			wait.ForLog("Post Startup: Successfully reinstalled extensions"),
+			wait.ForExposedPort(),
+		),
+	}
+
+	container, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
+		ContainerRequest: req,
+		Started:          true,
+	})
+	if err != nil {
+		t.Fatalf("failed to start alloydb container: %s", err)
+	}
+
+	cleanup := func() {
+		if err := container.Terminate(ctx); err != nil {
+			t.Fatalf("failed to terminate container: %s", err)
+		}
+	}
+
+	host, err := container.Host(ctx)
+	if err != nil {
+		cleanup()
+		t.Fatalf("failed to get container host: %s", err)
+	}
+
+	mappedPort, err := container.MappedPort(ctx, "5432")
+	if err != nil {
+		cleanup()
+		t.Fatalf("failed to get container mapped port: %s", err)
+	}
+
+	return host, mappedPort.Port(), cleanup
+}
+
+func TestAlloyDBOmni(t *testing.T) {
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
+	defer cancel()
+
+	AlloyDBHost, AlloyDBPort, containerCleanup := setupAlloyDBContainer(ctx, t)
+	defer containerCleanup()
+
+	os.Setenv("ALLOYDB_OMNI_HOST", AlloyDBHost)
+	os.Setenv("ALLOYDB_OMNI_PORT", AlloyDBPort)
+	os.Setenv("ALLOYDB_OMNI_USER", AlloyDBUser)
+	os.Setenv("ALLOYDB_OMNI_PASSWORD", AlloyDBPass)
+	os.Setenv("ALLOYDB_OMNI_DATABASE", AlloyDBDatabase)
+
+	args := []string{"--prebuilt", "alloydb-omni"}
+
+	pool, err := initPostgresConnectionPool(AlloyDBHost, AlloyDBPort, AlloyDBUser, AlloyDBPass, AlloyDBDatabase)
+	if err != nil {
+		t.Fatalf("unable to create alloydb connection pool: %s", err)
+	}
+
+	cmd, cleanup, err := tests.StartCmd(ctx, map[string]any{}, args...)
+	if err != nil {
+		t.Fatalf("command initialization returned an error: %s", err)
+	}
+	defer cleanup()
+
+	// Wait for server to be ready
+	waitCtx, waitCancel := context.WithTimeout(ctx, 30*time.Second)
+	defer waitCancel()
+
+	out, err := testutils.WaitForString(waitCtx, regexp.MustCompile(`Server ready to serve`), cmd.Out)
+	if err != nil {
+		t.Logf("toolbox command logs: \n%s", out)
+		t.Fatalf("toolbox didn't start successfully: %s", err)
+	}
+
+	// Run Postgres prebuilt tool tests
+	tests.RunPostgresListViewsTest(t, ctx, pool)
+	tests.RunPostgresListSchemasTest(t, ctx, pool)
+	tests.RunPostgresListActiveQueriesTest(t, ctx, pool)
+	tests.RunPostgresListAvailableExtensionsTest(t)
+	tests.RunPostgresListInstalledExtensionsTest(t)
+	tests.RunPostgresDatabaseOverviewTest(t, ctx, pool)
+	tests.RunPostgresListTriggersTest(t, ctx, pool)
+	tests.RunPostgresListIndexesTest(t, ctx, pool)
+	tests.RunPostgresListSequencesTest(t, ctx, pool)
+	tests.RunPostgresLongRunningTransactionsTest(t, ctx, pool)
+	tests.RunPostgresListLocksTest(t, ctx, pool)
+	tests.RunPostgresReplicationStatsTest(t, ctx, pool)
+	tests.RunPostgresGetColumnCardinalityTest(t, ctx, pool)
+	tests.RunPostgresListTableStatsTest(t, ctx, pool)
+	tests.RunPostgresListPublicationTablesTest(t, ctx, pool)
+	tests.RunPostgresListTableSpacesTest(t)
+	tests.RunPostgresListPgSettingsTest(t, ctx, pool)
+	tests.RunPostgresListDatabaseStatsTest(t, ctx, pool)
+	tests.RunPostgresListRolesTest(t, ctx, pool)
+	tests.RunPostgresListStoredProcedureTest(t, ctx, pool)
+}
diff --git a/tests/alloydbpg/alloydb_pg_integration_test.go b/tests/alloydbpg/alloydb_pg_integration_test.go
index 32463f1ea0..9254256790 100644
--- a/tests/alloydbpg/alloydb_pg_integration_test.go
+++ b/tests/alloydbpg/alloydb_pg_integration_test.go
@@ -32,8 +32,8 @@ import (
 )
 
 var (
-	AlloyDBPostgresSourceKind = "alloydb-postgres"
-	AlloyDBPostgresToolKind   = "postgres-sql"
+	AlloyDBPostgresSourceType = "alloydb-postgres"
+	AlloyDBPostgresToolType   = "postgres-sql"
 	AlloyDBPostgresProject    = os.Getenv("ALLOYDB_POSTGRES_PROJECT")
 	AlloyDBPostgresRegion     = os.Getenv("ALLOYDB_POSTGRES_REGION")
 	AlloyDBPostgresCluster    = os.Getenv("ALLOYDB_POSTGRES_CLUSTER")
@@ -61,7 +61,7 @@ func getAlloyDBPgVars(t *testing.T) map[string]any {
 		t.Fatal("'ALLOYDB_POSTGRES_PASS' not set")
 	}
 	return map[string]any{
-		"kind":     AlloyDBPostgresSourceKind,
+		"type":     AlloyDBPostgresSourceType,
 		"project":  AlloyDBPostgresProject,
 		"cluster":  AlloyDBPostgresCluster,
 		"instance": AlloyDBPostgresInstance,
@@ -152,14 +152,14 @@ func TestAlloyDBPgToolEndpoints(t *testing.T) {
 	defer tearDownVectorTable(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, AlloyDBPostgresToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, AlloyDBPostgresToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddExecuteSqlConfig(t, toolsFile, "postgres-execute-sql")
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetPostgresSQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, AlloyDBPostgresToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, AlloyDBPostgresToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	// Add semantic search tool config
 	insertStmt, searchStmt := tests.GetPostgresVectorSearchStmts(vectorTableName)
-	toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, AlloyDBPostgresToolKind, insertStmt, searchStmt)
+	toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, AlloyDBPostgresToolType, insertStmt, searchStmt)
 
 	toolsFile = tests.AddPostgresPrebuiltConfig(t, toolsFile)
 
@@ -232,7 +232,7 @@ func TestAlloyDBPgIpConnection(t *testing.T) {
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
 			sourceConfig["ipType"] = tc.ipType
-			err := tests.RunSourceConnectionTest(t, sourceConfig, AlloyDBPostgresToolKind)
+			err := tests.RunSourceConnectionTest(t, sourceConfig, AlloyDBPostgresToolType)
 			if err != nil {
 				t.Fatalf("Connection test failure: %s", err)
 			}
@@ -247,7 +247,7 @@ func TestAlloyDBPgIAMConnection(t *testing.T) {
 	serviceAccountEmail := strings.TrimSuffix(tests.ServiceAccountEmail, ".gserviceaccount.com")
 
 	noPassSourceConfig := map[string]any{
-		"kind":     AlloyDBPostgresSourceKind,
+		"type":     AlloyDBPostgresSourceType,
 		"project":  AlloyDBPostgresProject,
 		"cluster":  AlloyDBPostgresCluster,
 		"instance": AlloyDBPostgresInstance,
@@ -257,7 +257,7 @@ func TestAlloyDBPgIAMConnection(t *testing.T) {
 	}
 
 	noUserSourceConfig := map[string]any{
-		"kind":     AlloyDBPostgresSourceKind,
+		"type":     AlloyDBPostgresSourceType,
 		"project":  AlloyDBPostgresProject,
 		"cluster":  AlloyDBPostgresCluster,
 		"instance": AlloyDBPostgresInstance,
@@ -267,7 +267,7 @@ func TestAlloyDBPgIAMConnection(t *testing.T) {
 	}
 
 	noUserNoPassSourceConfig := map[string]any{
-		"kind":     AlloyDBPostgresSourceKind,
+		"type":     AlloyDBPostgresSourceType,
 		"project":  AlloyDBPostgresProject,
 		"cluster":  AlloyDBPostgresCluster,
 		"instance": AlloyDBPostgresInstance,
@@ -297,7 +297,7 @@ func TestAlloyDBPgIAMConnection(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tests.RunSourceConnectionTest(t, tc.sourceConfig, AlloyDBPostgresToolKind)
+			err := tests.RunSourceConnectionTest(t, tc.sourceConfig, AlloyDBPostgresToolType)
 			if err != nil {
 				if tc.isErr {
 					return
diff --git a/tests/bigquery/bigquery_integration_test.go b/tests/bigquery/bigquery_integration_test.go
index de5126cd24..30307296f1 100644
--- a/tests/bigquery/bigquery_integration_test.go
+++ b/tests/bigquery/bigquery_integration_test.go
@@ -41,8 +41,8 @@ import (
 )
 
 var (
-	BigquerySourceKind = "bigquery"
-	BigqueryToolKind   = "bigquery-sql"
+	BigquerySourceType = "bigquery"
+	BigqueryToolType   = "bigquery-sql"
 	BigqueryProject    = os.Getenv("BIGQUERY_PROJECT")
 )
 
@@ -53,7 +53,7 @@ func getBigQueryVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":    BigquerySourceKind,
+		"type":    BigquerySourceType,
 		"project": BigqueryProject,
 	}
 }
@@ -146,12 +146,12 @@ func TestBigQueryToolEndpoints(t *testing.T) {
 	defer teardownTable5(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, BigqueryToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, BigqueryToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addClientAuthSourceConfig(t, toolsFile)
 	toolsFile = addBigQuerySqlToolConfig(t, toolsFile, dataTypeToolStmt, arrayDataTypeToolStmt)
 	toolsFile = addBigQueryPrebuiltToolsConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getBigQueryTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, BigqueryToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, BigqueryToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -175,7 +175,7 @@ func TestBigQueryToolEndpoints(t *testing.T) {
 	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":"query validation failed: failed to insert dry run job: googleapi: Error 400: Syntax error: Unexpected identifier \"SELEC\" at [1:1]`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing GCP request: 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."`
@@ -286,42 +286,42 @@ func TestBigQueryToolWithDatasetRestriction(t *testing.T) {
 	// Configure tool
 	toolsConfig := map[string]any{
 		"list-dataset-ids-restricted": map[string]any{
-			"kind":        "bigquery-list-dataset-ids",
+			"type":        "bigquery-list-dataset-ids",
 			"source":      "my-instance",
 			"description": "Tool to list dataset ids",
 		},
 		"list-table-ids-restricted": map[string]any{
-			"kind":        "bigquery-list-table-ids",
+			"type":        "bigquery-list-table-ids",
 			"source":      "my-instance",
 			"description": "Tool to list table within a dataset",
 		},
 		"get-dataset-info-restricted": map[string]any{
-			"kind":        "bigquery-get-dataset-info",
+			"type":        "bigquery-get-dataset-info",
 			"source":      "my-instance",
 			"description": "Tool to get dataset info",
 		},
 		"get-table-info-restricted": map[string]any{
-			"kind":        "bigquery-get-table-info",
+			"type":        "bigquery-get-table-info",
 			"source":      "my-instance",
 			"description": "Tool to get table info",
 		},
 		"execute-sql-restricted": map[string]any{
-			"kind":        "bigquery-execute-sql",
+			"type":        "bigquery-execute-sql",
 			"source":      "my-instance",
 			"description": "Tool to execute SQL",
 		},
 		"conversational-analytics-restricted": map[string]any{
-			"kind":        "bigquery-conversational-analytics",
+			"type":        "bigquery-conversational-analytics",
 			"source":      "my-instance",
 			"description": "Tool to ask BigQuery conversational analytics",
 		},
 		"forecast-restricted": map[string]any{
-			"kind":        "bigquery-forecast",
+			"type":        "bigquery-forecast",
 			"source":      "my-instance",
 			"description": "Tool to forecast",
 		},
 		"analyze-contribution-restricted": map[string]any{
-			"kind":        "bigquery-analyze-contribution",
+			"type":        "bigquery-analyze-contribution",
 			"source":      "my-instance",
 			"description": "Tool to analyze contribution",
 		},
@@ -398,7 +398,7 @@ func TestBigQueryWriteModeAllowed(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"my-exec-sql-tool": map[string]any{
-				"kind":        "bigquery-execute-sql",
+				"type":        "bigquery-execute-sql",
 				"source":      "my-instance",
 				"description": "Tool to execute sql",
 			},
@@ -444,7 +444,7 @@ func TestBigQueryWriteModeBlocked(t *testing.T) {
 	toolsFile := map[string]any{
 		"sources": map[string]any{"my-instance": sourceConfig},
 		"tools": map[string]any{
-			"my-exec-sql-tool": map[string]any{"kind": "bigquery-execute-sql", "source": "my-instance", "description": "Tool to execute sql"},
+			"my-exec-sql-tool": map[string]any{"type": "bigquery-execute-sql", "source": "my-instance", "description": "Tool to execute sql"},
 		},
 	}
 
@@ -490,20 +490,20 @@ func TestBigQueryWriteModeProtected(t *testing.T) {
 	toolsFile := map[string]any{
 		"sources": map[string]any{"my-instance": sourceConfig},
 		"tools": map[string]any{
-			"my-exec-sql-tool": map[string]any{"kind": "bigquery-execute-sql", "source": "my-instance", "description": "Tool to execute sql"},
+			"my-exec-sql-tool": map[string]any{"type": "bigquery-execute-sql", "source": "my-instance", "description": "Tool to execute sql"},
 			"my-sql-tool-protected": map[string]any{
-				"kind":        "bigquery-sql",
+				"type":        "bigquery-sql",
 				"source":      "my-instance",
 				"description": "Tool to query from the session",
 				"statement":   "SELECT * FROM my_shared_temp_table",
 			},
 			"my-forecast-tool-protected": map[string]any{
-				"kind":        "bigquery-forecast",
+				"type":        "bigquery-forecast",
 				"source":      "my-instance",
 				"description": "Tool to forecast from session temp table",
 			},
 			"my-analyze-contribution-tool-protected": map[string]any{
-				"kind":        "bigquery-analyze-contribution",
+				"type":        "bigquery-analyze-contribution",
 				"source":      "my-instance",
 				"description": "Tool to analyze contribution from session temp table",
 			},
@@ -527,7 +527,7 @@ func TestBigQueryWriteModeProtected(t *testing.T) {
 	runBigQueryWriteModeProtectedTest(t, permanentDatasetName)
 }
 
-// getBigQueryParamToolInfo returns statements and param for my-tool for bigquery kind
+// getBigQueryParamToolInfo returns statements and param for my-tool for bigquery type
 func getBigQueryParamToolInfo(tableName string) (string, string, string, string, string, string, []bigqueryapi.QueryParameter) {
 	createStatement := fmt.Sprintf(`
 		CREATE TABLE IF NOT EXISTS %s (id INT64, name STRING);`, tableName)
@@ -546,7 +546,7 @@ func getBigQueryParamToolInfo(tableName string) (string, string, string, string,
 	return createStatement, insertStatement, toolStatement, idToolStatement, nameToolStatement, arrayToolStatememt, params
 }
 
-// getBigQueryAuthToolInfo returns statements and param of my-auth-tool for bigquery kind
+// getBigQueryAuthToolInfo returns statements and param of my-auth-tool for bigquery type
 func getBigQueryAuthToolInfo(tableName string) (string, string, string, []bigqueryapi.QueryParameter) {
 	createStatement := fmt.Sprintf(`
 		CREATE TABLE IF NOT EXISTS %s (id INT64, name STRING, email STRING)`, tableName)
@@ -616,7 +616,7 @@ func getBigQueryAnalyzeContributionToolInfo(tableName string) (string, string, [
 	return createStatement, insertStatement, params
 }
 
-// getBigQueryTmplToolStatement returns statements for template parameter test cases for bigquery kind
+// getBigQueryTmplToolStatement returns statements for template parameter test cases for bigquery type
 func getBigQueryTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = ? ORDER BY id"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = ? ORDER BY id"
@@ -708,12 +708,12 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "bigquery-execute-sql",
+		"type":        "bigquery-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "bigquery-execute-sql",
+		"type":        "bigquery-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -721,17 +721,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "bigquery-execute-sql",
+		"type":        "bigquery-execute-sql",
 		"source":      "my-client-auth-source",
 		"description": "Tool to execute sql",
 	}
 	tools["my-forecast-tool"] = map[string]any{
-		"kind":        "bigquery-forecast",
+		"type":        "bigquery-forecast",
 		"source":      "my-instance",
 		"description": "Tool to forecast time series data.",
 	}
 	tools["my-auth-forecast-tool"] = map[string]any{
-		"kind":        "bigquery-forecast",
+		"type":        "bigquery-forecast",
 		"source":      "my-instance",
 		"description": "Tool to forecast time series data with auth.",
 		"authRequired": []string{
@@ -739,17 +739,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-forecast-tool"] = map[string]any{
-		"kind":        "bigquery-forecast",
+		"type":        "bigquery-forecast",
 		"source":      "my-client-auth-source",
 		"description": "Tool to forecast time series data with auth.",
 	}
 	tools["my-analyze-contribution-tool"] = map[string]any{
-		"kind":        "bigquery-analyze-contribution",
+		"type":        "bigquery-analyze-contribution",
 		"source":      "my-instance",
 		"description": "Tool to analyze contribution.",
 	}
 	tools["my-auth-analyze-contribution-tool"] = map[string]any{
-		"kind":        "bigquery-analyze-contribution",
+		"type":        "bigquery-analyze-contribution",
 		"source":      "my-instance",
 		"description": "Tool to analyze contribution with auth.",
 		"authRequired": []string{
@@ -757,17 +757,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-analyze-contribution-tool"] = map[string]any{
-		"kind":        "bigquery-analyze-contribution",
+		"type":        "bigquery-analyze-contribution",
 		"source":      "my-client-auth-source",
 		"description": "Tool to analyze contribution with auth.",
 	}
 	tools["my-list-dataset-ids-tool"] = map[string]any{
-		"kind":        "bigquery-list-dataset-ids",
+		"type":        "bigquery-list-dataset-ids",
 		"source":      "my-instance",
 		"description": "Tool to list dataset",
 	}
 	tools["my-auth-list-dataset-ids-tool"] = map[string]any{
-		"kind":        "bigquery-list-dataset-ids",
+		"type":        "bigquery-list-dataset-ids",
 		"source":      "my-instance",
 		"description": "Tool to list dataset",
 		"authRequired": []string{
@@ -775,17 +775,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-list-dataset-ids-tool"] = map[string]any{
-		"kind":        "bigquery-list-dataset-ids",
+		"type":        "bigquery-list-dataset-ids",
 		"source":      "my-client-auth-source",
 		"description": "Tool to list dataset",
 	}
 	tools["my-get-dataset-info-tool"] = map[string]any{
-		"kind":        "bigquery-get-dataset-info",
+		"type":        "bigquery-get-dataset-info",
 		"source":      "my-instance",
 		"description": "Tool to show dataset metadata",
 	}
 	tools["my-auth-get-dataset-info-tool"] = map[string]any{
-		"kind":        "bigquery-get-dataset-info",
+		"type":        "bigquery-get-dataset-info",
 		"source":      "my-instance",
 		"description": "Tool to show dataset metadata",
 		"authRequired": []string{
@@ -793,17 +793,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-get-dataset-info-tool"] = map[string]any{
-		"kind":        "bigquery-get-dataset-info",
+		"type":        "bigquery-get-dataset-info",
 		"source":      "my-client-auth-source",
 		"description": "Tool to show dataset metadata",
 	}
 	tools["my-list-table-ids-tool"] = map[string]any{
-		"kind":        "bigquery-list-table-ids",
+		"type":        "bigquery-list-table-ids",
 		"source":      "my-instance",
 		"description": "Tool to list table within a dataset",
 	}
 	tools["my-auth-list-table-ids-tool"] = map[string]any{
-		"kind":        "bigquery-list-table-ids",
+		"type":        "bigquery-list-table-ids",
 		"source":      "my-instance",
 		"description": "Tool to list table within a dataset",
 		"authRequired": []string{
@@ -811,17 +811,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-list-table-ids-tool"] = map[string]any{
-		"kind":        "bigquery-list-table-ids",
+		"type":        "bigquery-list-table-ids",
 		"source":      "my-client-auth-source",
 		"description": "Tool to list table within a dataset",
 	}
 	tools["my-get-table-info-tool"] = map[string]any{
-		"kind":        "bigquery-get-table-info",
+		"type":        "bigquery-get-table-info",
 		"source":      "my-instance",
 		"description": "Tool to show dataset metadata",
 	}
 	tools["my-auth-get-table-info-tool"] = map[string]any{
-		"kind":        "bigquery-get-table-info",
+		"type":        "bigquery-get-table-info",
 		"source":      "my-instance",
 		"description": "Tool to show dataset metadata",
 		"authRequired": []string{
@@ -829,17 +829,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-get-table-info-tool"] = map[string]any{
-		"kind":        "bigquery-get-table-info",
+		"type":        "bigquery-get-table-info",
 		"source":      "my-client-auth-source",
 		"description": "Tool to show dataset metadata",
 	}
 	tools["my-conversational-analytics-tool"] = map[string]any{
-		"kind":        "bigquery-conversational-analytics",
+		"type":        "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",
+		"type":        "bigquery-conversational-analytics",
 		"source":      "my-instance",
 		"description": "Tool to ask BigQuery conversational analytics",
 		"authRequired": []string{
@@ -847,17 +847,17 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-conversational-analytics-tool"] = map[string]any{
-		"kind":        "bigquery-conversational-analytics",
+		"type":        "bigquery-conversational-analytics",
 		"source":      "my-client-auth-source",
 		"description": "Tool to ask BigQuery conversational analytics",
 	}
 	tools["my-search-catalog-tool"] = map[string]any{
-		"kind":        "bigquery-search-catalog",
+		"type":        "bigquery-search-catalog",
 		"source":      "my-instance",
 		"description": "Tool to search the BiqQuery catalog",
 	}
 	tools["my-auth-search-catalog-tool"] = map[string]any{
-		"kind":        "bigquery-search-catalog",
+		"type":        "bigquery-search-catalog",
 		"source":      "my-instance",
 		"description": "Tool to search the BiqQuery catalog",
 		"authRequired": []string{
@@ -865,7 +865,7 @@ func addBigQueryPrebuiltToolsConfig(t *testing.T, config map[string]any) map[str
 		},
 	}
 	tools["my-client-auth-search-catalog-tool"] = map[string]any{
-		"kind":        "bigquery-search-catalog",
+		"type":        "bigquery-search-catalog",
 		"source":      "my-client-auth-source",
 		"description": "Tool to search the BiqQuery catalog",
 	}
@@ -879,7 +879,7 @@ func addClientAuthSourceConfig(t *testing.T, config map[string]any) map[string]a
 		t.Fatalf("unable to get sources from config")
 	}
 	sources["my-client-auth-source"] = map[string]any{
-		"kind":           BigquerySourceKind,
+		"type":           BigquerySourceType,
 		"project":        BigqueryProject,
 		"useClientOAuth": true,
 	}
@@ -893,7 +893,7 @@ func addBigQuerySqlToolConfig(t *testing.T, config map[string]any, toolStatement
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-scalar-datatype-tool"] = map[string]any{
-		"kind":        "bigquery-sql",
+		"type":        "bigquery-sql",
 		"source":      "my-instance",
 		"description": "Tool to test various scalar data types.",
 		"statement":   toolStatement,
@@ -905,7 +905,7 @@ func addBigQuerySqlToolConfig(t *testing.T, config map[string]any, toolStatement
 		},
 	}
 	tools["my-array-datatype-tool"] = map[string]any{
-		"kind":        "bigquery-sql",
+		"type":        "bigquery-sql",
 		"source":      "my-instance",
 		"description": "Tool to test various array data types.",
 		"statement":   arrayToolStatement,
@@ -917,7 +917,7 @@ func addBigQuerySqlToolConfig(t *testing.T, config map[string]any, toolStatement
 		},
 	}
 	tools["my-client-auth-tool"] = map[string]any{
-		"kind":        "bigquery-sql",
+		"type":        "bigquery-sql",
 		"source":      "my-client-auth-source",
 		"description": "Tool to test client authorization.",
 		"statement":   "SELECT 1",
@@ -954,7 +954,8 @@ func runBigQueryExecuteSqlToolInvokeTest(t *testing.T, select1Want, invokeParamW
 			api:           "http://127.0.0.1:5000/api/tool/my-exec-sql-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{}`)),
-			isErr:         true,
+			want:          `{"error":"parameter \"sql\" is required"}`,
+			isErr:         false,
 		},
 		{
 			name:          "invoke my-exec-sql-tool",
@@ -1009,6 +1010,7 @@ func runBigQueryExecuteSqlToolInvokeTest(t *testing.T, select1Want, invokeParamW
 			api:           "http://127.0.0.1:5000/api/tool/my-exec-sql-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{}`)),
+			want:          `{"error":"parameter \"sql\" is required"}`,
 			isErr:         true,
 		},
 		{
@@ -1161,12 +1163,11 @@ func runBigQueryWriteModeBlockedTest(t *testing.T, tableNameParam, datasetName s
 		name           string
 		sql            string
 		wantStatusCode int
-		wantInError    string
 		wantResult     string
 	}{
-		{"SELECT statement should succeed", fmt.Sprintf("SELECT id, name FROM %s WHERE id = 1", tableNameParam), http.StatusOK, "", `[{"id":1,"name":"Alice"}]`},
-		{"INSERT statement should fail", fmt.Sprintf("INSERT INTO %s (id, name) VALUES (10, 'test')", tableNameParam), http.StatusBadRequest, "write mode is 'blocked', only SELECT statements are allowed", ""},
-		{"CREATE TABLE statement should fail", fmt.Sprintf("CREATE TABLE %s.new_table (x INT64)", datasetName), http.StatusBadRequest, "write mode is 'blocked', only SELECT statements are allowed", ""},
+		{"SELECT statement should succeed", fmt.Sprintf("SELECT id, name FROM %s WHERE id = 1", tableNameParam), http.StatusOK, `[{"id":1,"name":"Alice"}]`},
+		{"INSERT statement should fail", fmt.Sprintf("INSERT INTO %s (id, name) VALUES (10, 'test')", tableNameParam), http.StatusOK, "{\"error\":\"write mode is 'blocked', only SELECT statements are allowed\"}"},
+		{"CREATE TABLE statement should fail", fmt.Sprintf("CREATE TABLE %s.new_table (x INT64)", datasetName), http.StatusOK, "{\"error\":\"write mode is 'blocked', only SELECT statements are allowed\"}"},
 	}
 
 	for _, tc := range testCases {
@@ -1180,15 +1181,6 @@ func runBigQueryWriteModeBlockedTest(t *testing.T, tableNameParam, datasetName s
 				t.Fatalf("unexpected status code: got %d, want %d. Body: %s", resp.StatusCode, tc.wantStatusCode, string(bodyBytes))
 			}
 
-			if tc.wantInError != "" {
-				errStr, ok := result["error"].(string)
-				if !ok {
-					t.Fatalf("expected 'error' field in response, got %v", result)
-				}
-				if !strings.Contains(errStr, tc.wantInError) {
-					t.Fatalf("expected error message to contain %q, but got %q", tc.wantInError, errStr)
-				}
-			}
 			if tc.wantResult != "" {
 				resStr, ok := result["result"].(string)
 				if !ok {
@@ -1215,9 +1207,9 @@ func runBigQueryWriteModeProtectedTest(t *testing.T, permanentDatasetName string
 			name:           "CREATE TABLE to permanent dataset should fail",
 			toolName:       "my-exec-sql-tool",
 			requestBody:    fmt.Sprintf(`{"sql": "CREATE TABLE %s.new_table (x INT64)"}`, permanentDatasetName),
-			wantStatusCode: http.StatusBadRequest,
-			wantInError:    "protected write mode only supports SELECT statements, or write operations in the anonymous dataset",
-			wantResult:     "",
+			wantStatusCode: http.StatusOK,
+			wantInError:    "",
+			wantResult:     "protected write mode only supports SELECT statements, or write operations in the anonymous dataset",
 		},
 		{
 			name:           "CREATE TEMP TABLE should succeed",
@@ -1709,7 +1701,8 @@ func runBigQueryDataTypeTests(t *testing.T) {
 			api:           "http://127.0.0.1:5000/api/tool/my-scalar-datatype-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{"int_val": 123}`)),
-			isErr:         true,
+			want:          `{"error":"parameter \"string_val\" is required"}`,
+			isErr:         false,
 		},
 		{
 			name:          "invoke my-array-datatype-tool",
@@ -2578,7 +2571,7 @@ func runListTableIdsWithRestriction(t *testing.T, allowedDatasetName, disallowed
 		{
 			name:           "invoke on disallowed dataset",
 			dataset:        disallowedDatasetName,
-			wantStatusCode: http.StatusBadRequest, // Or the specific error code returned
+			wantStatusCode: http.StatusOK,
 			wantInError:    fmt.Sprintf("access denied to dataset '%s'", disallowedDatasetName),
 		},
 	}
@@ -2652,7 +2645,7 @@ func runGetDatasetInfoWithRestriction(t *testing.T, allowedDatasetName, disallow
 		{
 			name:           "invoke on disallowed dataset",
 			dataset:        disallowedDatasetName,
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    fmt.Sprintf("access denied to dataset '%s'", disallowedDatasetName),
 		},
 	}
@@ -2704,8 +2697,7 @@ func runGetTableInfoWithRestriction(t *testing.T, allowedDatasetName, disallowed
 			name:           "invoke on disallowed table",
 			dataset:        disallowedDatasetName,
 			table:          disallowedTableName,
-			wantStatusCode: http.StatusBadRequest,
-			wantInError:    fmt.Sprintf("access denied to dataset '%s'", disallowedDatasetName),
+			wantStatusCode: http.StatusOK,
 		},
 	}
 
@@ -2759,7 +2751,7 @@ func runExecuteSqlWithRestriction(t *testing.T, allowedTableFullName, disallowed
 		{
 			name:           "invoke on disallowed table",
 			sql:            fmt.Sprintf("SELECT * FROM %s", disallowedTableFullName),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError: fmt.Sprintf("query accesses dataset '%s', which is not in the allowed list",
 				strings.Join(
 					strings.Split(strings.Trim(disallowedTableFullName, "`"), ".")[0:2],
@@ -2768,31 +2760,31 @@ func runExecuteSqlWithRestriction(t *testing.T, allowedTableFullName, disallowed
 		{
 			name:           "disallowed create schema",
 			sql:            "CREATE SCHEMA another_dataset",
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    "dataset-level operations like 'CREATE_SCHEMA' are not allowed",
 		},
 		{
 			name:           "disallowed alter schema",
 			sql:            fmt.Sprintf("ALTER SCHEMA %s SET OPTIONS(description='new one')", allowedDatasetID),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    "dataset-level operations like 'ALTER_SCHEMA' are not allowed",
 		},
 		{
 			name:           "disallowed create function",
 			sql:            fmt.Sprintf("CREATE FUNCTION %s.my_func() RETURNS INT64 AS (1)", allowedDatasetID),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    "creating stored routines ('CREATE_FUNCTION') is not allowed",
 		},
 		{
 			name:           "disallowed create procedure",
 			sql:            fmt.Sprintf("CREATE PROCEDURE %s.my_proc() BEGIN SELECT 1; END", allowedDatasetID),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    "unanalyzable statements like 'CREATE PROCEDURE' are not allowed",
 		},
 		{
 			name:           "disallowed execute immediate",
 			sql:            "EXECUTE IMMEDIATE 'SELECT 1'",
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    "EXECUTE IMMEDIATE is not allowed when dataset restrictions are in place",
 		},
 	}
@@ -2846,7 +2838,7 @@ func runConversationalAnalyticsWithRestriction(t *testing.T, allowedDatasetName,
 		{
 			name:           "invoke with disallowed table",
 			tableRefs:      disallowedTableRefsJSON,
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    fmt.Sprintf("access to dataset '%s.%s' (from table '%s') is not allowed", BigqueryProject, disallowedDatasetName, disallowedTableName),
 		},
 	}
@@ -3030,12 +3022,24 @@ func runBigQuerySearchCatalogToolInvokeTest(t *testing.T, datasetName string, ta
 				}
 				t.Fatalf("expected 'result' field to be a string, got %T", result["result"])
 			}
+
+			var errorCheck map[string]any
+			if err := json.Unmarshal([]byte(resultStr), &errorCheck); err == nil {
+				if _, hasError := errorCheck["error"]; hasError {
+					if tc.isErr {
+						return
+					}
+					t.Fatalf("unexpected error object in result: %s", resultStr)
+				}
+			}
+
 			if tc.isErr && (resultStr == "" || resultStr == "[]") {
 				return
 			}
-			var entries []interface{}
+
+			var entries []any
 			if err := json.Unmarshal([]byte(resultStr), &entries); err != nil {
-				t.Fatalf("error unmarshalling result string: %v", err)
+				t.Fatalf("error unmarshalling result string: %v. Raw string: %s", err, resultStr)
 			}
 
 			if !tc.isErr {
@@ -3083,7 +3087,7 @@ func runForecastWithRestriction(t *testing.T, allowedTableFullName, disallowedTa
 		{
 			name:           "invoke with disallowed table name",
 			historyData:    disallowedTableUnquoted,
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    fmt.Sprintf("access to dataset '%s' (from table '%s') is not allowed", disallowedDatasetFQN, disallowedTableUnquoted),
 		},
 		{
@@ -3095,7 +3099,7 @@ func runForecastWithRestriction(t *testing.T, allowedTableFullName, disallowedTa
 		{
 			name:           "invoke with query on disallowed table",
 			historyData:    fmt.Sprintf("SELECT * FROM %s", disallowedTableFullName),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			wantInError:    fmt.Sprintf("query in history_data accesses dataset '%s', which is not in the allowed list", disallowedDatasetFQN),
 		},
 	}
@@ -3174,8 +3178,8 @@ func runAnalyzeContributionWithRestriction(t *testing.T, allowedTableFullName, d
 		{
 			name:           "invoke with disallowed table name",
 			inputData:      disallowedTableUnquoted,
-			wantStatusCode: http.StatusBadRequest,
-			wantInError:    fmt.Sprintf("access to dataset '%s' (from table '%s') is not allowed", disallowedDatasetFQN, disallowedTableUnquoted),
+			wantStatusCode: http.StatusOK,
+			wantInResult:   fmt.Sprintf("access to dataset '%s' (from table '%s') is not allowed", disallowedDatasetFQN, disallowedTableUnquoted),
 		},
 		{
 			name:           "invoke with query on allowed table",
@@ -3186,8 +3190,8 @@ func runAnalyzeContributionWithRestriction(t *testing.T, allowedTableFullName, d
 		{
 			name:           "invoke with query on disallowed table",
 			inputData:      fmt.Sprintf("SELECT * FROM %s", disallowedTableFullName),
-			wantStatusCode: http.StatusBadRequest,
-			wantInError:    fmt.Sprintf("query in input_data accesses dataset '%s', which is not in the allowed list", disallowedDatasetFQN),
+			wantStatusCode: http.StatusOK,
+			wantInResult:   fmt.Sprintf("query in input_data accesses dataset '%s', which is not in the allowed list", disallowedDatasetFQN),
 		},
 	}
 
diff --git a/tests/bigtable/bigtable_integration_test.go b/tests/bigtable/bigtable_integration_test.go
index 12246cf398..d2ee4cad09 100644
--- a/tests/bigtable/bigtable_integration_test.go
+++ b/tests/bigtable/bigtable_integration_test.go
@@ -35,8 +35,8 @@ import (
 )
 
 var (
-	BigtableSourceKind = "bigtable"
-	BigtableToolKind   = "bigtable-sql"
+	BigtableSourceType = "bigtable"
+	BigtableToolType   = "bigtable-sql"
 	BigtableProject    = os.Getenv("BIGTABLE_PROJECT")
 	BigtableInstance   = os.Getenv("BIGTABLE_INSTANCE")
 )
@@ -50,7 +50,7 @@ func getBigtableVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     BigtableSourceKind,
+		"type":     BigtableSourceType,
 		"project":  BigtableProject,
 		"instance": BigtableInstance,
 	}
@@ -99,7 +99,7 @@ func TestBigtableToolEndpoints(t *testing.T) {
 	defer teardownTableTmpl(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, BigtableToolKind, paramTestStatement, idParamTestStatement, nameParamTestStatement, arrayTestStatement, authToolStatement)
+	toolsFile := tests.GetToolsConfig(sourceConfig, BigtableToolType, paramTestStatement, idParamTestStatement, nameParamTestStatement, arrayTestStatement, authToolStatement)
 	toolsFile = addTemplateParamConfig(t, toolsFile)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
@@ -120,7 +120,7 @@ func TestBigtableToolEndpoints(t *testing.T) {
 	// Actual test parameters are set in https://github.com/googleapis/genai-toolbox/blob/52b09a67cb40ac0c5f461598b4673136699a3089/tests/tool_test.go#L250
 	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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing GCP request: 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)"
@@ -291,7 +291,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		t.Fatalf("unable to get tools from config")
 	}
 	toolsMap["select-templateParams-tool"] = map[string]any{
-		"kind":        "bigtable-sql",
+		"type":        "bigtable-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT TO_INT64(cf['age']) as age, TO_INT64(cf['id']) as id, CAST(cf['name'] AS string) as name, FROM {{.tableName}};",
@@ -300,7 +300,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-templateParams-combined-tool"] = map[string]any{
-		"kind":        "bigtable-sql",
+		"type":        "bigtable-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT TO_INT64(cf['age']) as age, TO_INT64(cf['id']) as id, CAST(cf['name'] AS string) as name, FROM {{.tableName}} WHERE TO_INT64(cf['id']) = @id;",
@@ -310,7 +310,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-fields-templateParams-tool"] = map[string]any{
-		"kind":        "bigtable-sql",
+		"type":        "bigtable-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT {{array .fields}}, FROM {{.tableName}};",
@@ -320,7 +320,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-filter-templateParams-combined-tool"] = map[string]any{
-		"kind":        "bigtable-sql",
+		"type":        "bigtable-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT TO_INT64(cf['age']) as age, TO_INT64(cf['id']) as id, CAST(cf['name'] AS string) as name, FROM {{.tableName}} WHERE {{.columnFilter}} = @name;",
diff --git a/tests/cassandra/cassandra_integration_test.go b/tests/cassandra/cassandra_integration_test.go
index 21d41beb5f..2f833999cc 100644
--- a/tests/cassandra/cassandra_integration_test.go
+++ b/tests/cassandra/cassandra_integration_test.go
@@ -31,8 +31,8 @@ import (
 )
 
 var (
-	CassandraSourceKind = "cassandra"
-	CassandraToolKind   = "cassandra-cql"
+	CassandraSourceType = "cassandra"
+	CassandraToolType   = "cassandra-cql"
 	Hosts               = os.Getenv("CASSANDRA_HOST")
 	Keyspace            = "example_keyspace"
 	Username            = os.Getenv("CASSANDRA_USER")
@@ -49,7 +49,7 @@ func getCassandraVars(t *testing.T) map[string]any {
 		t.Fatal("'Password' not set")
 	}
 	return map[string]any{
-		"kind":     CassandraSourceKind,
+		"type":     CassandraSourceType,
 		"hosts":    strings.Split(Hosts, ","),
 		"keyspace": Keyspace,
 		"username": Username,
@@ -204,12 +204,12 @@ func TestCassandra(t *testing.T) {
 
 	paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt := createParamToolInfo(paramTableName)
 	_, _, authToolStmt := getCassandraAuthToolInfo(tableNameAuth)
-	toolsFile := tests.GetToolsConfig(sourceConfig, CassandraToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, CassandraToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 
 	tmplSelectCombined, tmplSelectFilterCombined := getCassandraTmplToolInfo()
 	tmpSelectAll := "SELECT * FROM {{.tableName}} where id = 1"
 
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CassandraToolKind, tmplSelectCombined, tmplSelectFilterCombined, tmpSelectAll)
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CassandraToolType, tmplSelectCombined, tmplSelectFilterCombined, tmpSelectAll)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -271,7 +271,7 @@ func getCassandraWants() (string, string, string, string, string, string) {
 	selectIdNameWant := "[{\"id\":3,\"name\":\"Alice\"}]"
 	selectIdNullWant := "[{\"id\":4,\"name\":\"\"}]"
 	selectArrayParamWant := "[{\"id\":1,\"name\":\"Sid\"},{\"id\":3,\"name\":\"Alice\"}]"
-	mcpMyFailToolWant := "{\"jsonrpc\":\"2.0\",\"id\":\"invoke-fail-tool\",\"result\":{\"content\":[{\"type\":\"text\",\"text\":\"unable to parse rows: line 1:0 no viable alternative at input 'SELEC' ([SELEC]...)\"}],\"isError\":true}}"
+	mcpMyFailToolWant := "{\"jsonrpc\":\"2.0\",\"id\":\"invoke-fail-tool\",\"result\":{\"content\":[{\"type\":\"text\",\"text\":\"error processing request: unable to parse rows: line 1:0 no viable alternative at input 'SELEC' ([SELEC]...)\"}],\"isError\":true}}"
 	mcpMyToolIdWant := "{\"jsonrpc\":\"2.0\",\"id\":\"my-tool\",\"result\":{\"content\":[{\"type\":\"text\",\"text\":\"[{\\\"id\\\":3,\\\"name\\\":\\\"Alice\\\"}]\"}]}}"
 	return selectIdNameWant, selectIdNullWant, selectArrayParamWant, mcpMyFailToolWant, "nil", mcpMyToolIdWant
 }
diff --git a/tests/clickhouse/clickhouse_integration_test.go b/tests/clickhouse/clickhouse_integration_test.go
index 058e4d1b1a..6b0ae8d961 100644
--- a/tests/clickhouse/clickhouse_integration_test.go
+++ b/tests/clickhouse/clickhouse_integration_test.go
@@ -35,8 +35,8 @@ import (
 )
 
 var (
-	ClickHouseSourceKind = "clickhouse"
-	ClickHouseToolKind   = "clickhouse-sql"
+	ClickHouseSourceType = "clickhouse"
+	ClickHouseToolType   = "clickhouse-sql"
 	ClickHouseDatabase   = os.Getenv("CLICKHOUSE_DATABASE")
 	ClickHouseHost       = os.Getenv("CLICKHOUSE_HOST")
 	ClickHousePort       = os.Getenv("CLICKHOUSE_PORT")
@@ -64,7 +64,7 @@ func getClickHouseVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     ClickHouseSourceKind,
+		"type":     ClickHouseSourceType,
 		"host":     ClickHouseHost,
 		"port":     ClickHousePort,
 		"database": ClickHouseDatabase,
@@ -126,10 +126,10 @@ func TestClickHouse(t *testing.T) {
 	teardownTable2 := setupClickHouseSQLTable(t, ctx, pool, createAuthTableStmt, insertAuthTableStmt, tableNameAuth, authTestParams)
 	defer teardownTable2(t)
 
-	toolsFile := tests.GetToolsConfig(sourceConfig, ClickHouseToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, ClickHouseToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addClickHouseExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getClickHouseSQLTmplToolStatement()
-	toolsFile = addClickHouseTemplateParamConfig(t, toolsFile, ClickHouseToolKind, tmplSelectCombined, tmplSelectFilterCombined)
+	toolsFile = addClickHouseTemplateParamConfig(t, toolsFile, ClickHouseToolType, tmplSelectCombined, tmplSelectFilterCombined)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -162,12 +162,12 @@ func addClickHouseExecuteSqlConfig(t *testing.T, config map[string]any) map[stri
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "clickhouse-execute-sql",
+		"type":        "clickhouse-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "clickhouse-execute-sql",
+		"type":        "clickhouse-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -178,7 +178,7 @@ func addClickHouseExecuteSqlConfig(t *testing.T, config map[string]any) map[stri
 	return config
 }
 
-func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplSelectCombined, tmplSelectFilterCombined string) map[string]any {
+func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolType, tmplSelectCombined, tmplSelectFilterCombined string) map[string]any {
 	toolsMap, ok := config["tools"].(map[string]any)
 	if !ok {
 		t.Fatalf("unable to get tools from config")
@@ -186,7 +186,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 
 	// ClickHouse-specific template parameter tools with compatible syntax
 	toolsMap["create-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "CREATE TABLE {{.tableName}} ({{array .columns}}) ORDER BY id",
@@ -196,7 +196,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 		},
 	}
 	toolsMap["insert-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Insert table tool with template parameters",
 		"statement":   "INSERT INTO {{.tableName}} ({{array .columns}}) VALUES ({{.values}})",
@@ -207,7 +207,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 		},
 	}
 	toolsMap["select-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select table tool with template parameters",
 		"statement":   "SELECT id AS \"id\", name AS \"name\", age AS \"age\" FROM {{.tableName}} ORDER BY id",
@@ -216,7 +216,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 		},
 	}
 	toolsMap["select-templateParams-combined-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select table tool with combined template parameters",
 		"statement":   tmplSelectCombined,
@@ -228,7 +228,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 		},
 	}
 	toolsMap["select-fields-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select specific fields tool with template parameters",
 		"statement":   "SELECT name AS \"name\" FROM {{.tableName}} ORDER BY id",
@@ -237,7 +237,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 		},
 	}
 	toolsMap["select-filter-templateParams-combined-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select table tool with filter template parameters",
 		"statement":   tmplSelectFilterCombined,
@@ -251,7 +251,7 @@ func addClickHouseTemplateParamConfig(t *testing.T, config map[string]any, toolK
 	}
 	// Firebird uses simple DROP TABLE syntax without IF EXISTS
 	toolsMap["drop-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Drop table tool with template parameters",
 		"statement":   "DROP TABLE {{.tableName}}",
@@ -310,7 +310,7 @@ func TestClickHouseBasicConnection(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        ClickHouseToolKind,
+				"type":        ClickHouseToolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"statement":   "SELECT 1;",
@@ -339,7 +339,7 @@ func TestClickHouseBasicConnection(t *testing.T) {
 func getClickHouseWants() (string, string, string, string, string) {
 	select1Want := "[{\"1\":1}]"
 	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"1\":1}"}]}}`
-	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: sendQuery: [HTTP 400] response body: \"Code: 62. DB::Exception: Syntax error: failed at position 1 (SELEC): SELEC 1;. Expected one of: Query, Query with output, EXPLAIN, EXPLAIN, SELECT query, possibly with UNION, list of union elements, SELECT query, subquery, possibly with UNION, SELECT subquery, SELECT query, WITH, FROM, SELECT, SHOW CREATE QUOTA query, SHOW CREATE, SHOW [FULL] [TEMPORARY] TABLES|DATABASES|CLUSTERS|CLUSTER|MERGES 'name' [[NOT] [I]LIKE 'str'] [LIMIT expr], SHOW, SHOW COLUMNS query, SHOW ENGINES query, SHOW ENGINES, SHOW FUNCTIONS query, SHOW FUNCTIONS, SHOW INDEXES query, SHOW SETTING query, SHOW SETTING, EXISTS or SHOW CREATE query, EXISTS, DESCRIBE FILESYSTEM CACHE query, DESCRIBE, DESC, DESCRIBE query, SHOW PROCESSLIST query, SHOW PROCESSLIST, CREATE TABLE or ATTACH TABLE query, CREATE, ATTACH, REPLACE, CREATE DATABASE query, CREATE VIEW query, CREATE DICTIONARY, CREATE LIVE VIEW query, CREATE WINDOW VIEW query, ALTER query, ALTER TABLE, ALTER TEMPORARY TABLE, ALTER DATABASE, RENAME query, RENAME DATABASE, RENAME TABLE, EXCHANGE TABLES, RENAME DICTIONARY, EXCHANGE DICTIONARIES, RENAME, DROP query, DROP, DETACH, TRUNCATE, UNDROP query, UNDROP, CHECK ALL TABLES, CHECK TABLE, KILL QUERY query, KILL, OPTIMIZE query, OPTIMIZE TABLE, WATCH query, WATCH, SHOW ACCESS query, SHOW ACCESS, ShowAccessEntitiesQuery, SHOW GRANTS query, SHOW GRANTS, SHOW PRIVILEGES query, SHOW PRIVILEGES, BACKUP or RESTORE query, BACKUP, RESTORE, INSERT query, INSERT INTO, USE query, USE, SET ROLE or SET DEFAULT ROLE query, SET ROLE DEFAULT, SET ROLE, SET DEFAULT ROLE, SET query, SET, SYSTEM query, SYSTEM, CREATE USER or ALTER USER query, ALTER USER, CREATE USER, CREATE ROLE or ALTER ROLE query, ALTER ROLE, CREATE ROLE, CREATE QUOTA or ALTER QUOTA query, ALTER QUOTA, CREATE QUOTA, CREATE ROW POLICY or ALTER ROW POLICY query, ALTER POLICY, ALTER ROW POLICY, CREATE POLICY, CREATE ROW POLICY, CREATE SETTINGS PROFILE or ALTER SETTINGS PROFILE query, ALTER SETTINGS PROFILE, ALTER PROFILE, CREATE SETTINGS PROFILE, CREATE PROFILE, CREATE FUNCTION query, DROP FUNCTION query, CREATE WORKLOAD query, DROP WORKLOAD query, CREATE RESOURCE query, DROP RESOURCE query, CREATE NAMED COLLECTION, DROP NAMED COLLECTION query, Alter NAMED COLLECTION query, ALTER, CREATE INDEX query, DROP INDEX query, DROP access entity query, MOVE access entity query, MOVE, GRANT or REVOKE query, REVOKE, GRANT, CHECK GRANT, CHECK GRANT, EXTERNAL DDL query, EXTERNAL DDL FROM, TCL query, BEGIN TRANSACTION, START TRANSACTION, COMMIT, ROLLBACK, SET TRANSACTION SNAPSHOT, Delete query, DELETE, Update query, UPDATE. (SYNTAX_ERROR) (version 25.7.5.34 (official build))\n\""}],"isError":true}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: sendQuery: [HTTP 400] response body: \"Code: 62. DB::Exception: Syntax error: failed at position 1 (SELEC): SELEC 1;. Expected one of: Query, Query with output, EXPLAIN, EXPLAIN, SELECT query, possibly with UNION, list of union elements, SELECT query, subquery, possibly with UNION, SELECT subquery, SELECT query, WITH, FROM, SELECT, SHOW CREATE QUOTA query, SHOW CREATE, SHOW [FULL] [TEMPORARY] TABLES|DATABASES|CLUSTERS|CLUSTER|MERGES 'name' [[NOT] [I]LIKE 'str'] [LIMIT expr], SHOW, SHOW COLUMNS query, SHOW ENGINES query, SHOW ENGINES, SHOW FUNCTIONS query, SHOW FUNCTIONS, SHOW INDEXES query, SHOW SETTING query, SHOW SETTING, EXISTS or SHOW CREATE query, EXISTS, DESCRIBE FILESYSTEM CACHE query, DESCRIBE, DESC, DESCRIBE query, SHOW PROCESSLIST query, SHOW PROCESSLIST, CREATE TABLE or ATTACH TABLE query, CREATE, ATTACH, REPLACE, CREATE DATABASE query, CREATE VIEW query, CREATE DICTIONARY, CREATE LIVE VIEW query, CREATE WINDOW VIEW query, ALTER query, ALTER TABLE, ALTER TEMPORARY TABLE, ALTER DATABASE, RENAME query, RENAME DATABASE, RENAME TABLE, EXCHANGE TABLES, RENAME DICTIONARY, EXCHANGE DICTIONARIES, RENAME, DROP query, DROP, DETACH, TRUNCATE, UNDROP query, UNDROP, CHECK ALL TABLES, CHECK TABLE, KILL QUERY query, KILL, OPTIMIZE query, OPTIMIZE TABLE, WATCH query, WATCH, SHOW ACCESS query, SHOW ACCESS, ShowAccessEntitiesQuery, SHOW GRANTS query, SHOW GRANTS, SHOW PRIVILEGES query, SHOW PRIVILEGES, BACKUP or RESTORE query, BACKUP, RESTORE, INSERT query, INSERT INTO, USE query, USE, SET ROLE or SET DEFAULT ROLE query, SET ROLE DEFAULT, SET ROLE, SET DEFAULT ROLE, SET query, SET, SYSTEM query, SYSTEM, CREATE USER or ALTER USER query, ALTER USER, CREATE USER, CREATE ROLE or ALTER ROLE query, ALTER ROLE, CREATE ROLE, CREATE QUOTA or ALTER QUOTA query, ALTER QUOTA, CREATE QUOTA, CREATE ROW POLICY or ALTER ROW POLICY query, ALTER POLICY, ALTER ROW POLICY, CREATE POLICY, CREATE ROW POLICY, CREATE SETTINGS PROFILE or ALTER SETTINGS PROFILE query, ALTER SETTINGS PROFILE, ALTER PROFILE, CREATE SETTINGS PROFILE, CREATE PROFILE, CREATE FUNCTION query, DROP FUNCTION query, CREATE WORKLOAD query, DROP WORKLOAD query, CREATE RESOURCE query, DROP RESOURCE query, CREATE NAMED COLLECTION, DROP NAMED COLLECTION query, Alter NAMED COLLECTION query, ALTER, CREATE INDEX query, DROP INDEX query, DROP access entity query, MOVE access entity query, MOVE, GRANT or REVOKE query, REVOKE, GRANT, CHECK GRANT, CHECK GRANT, EXTERNAL DDL query, EXTERNAL DDL FROM, TCL query, BEGIN TRANSACTION, START TRANSACTION, COMMIT, ROLLBACK, SET TRANSACTION SNAPSHOT, Delete query, DELETE, Update query, UPDATE. (SYNTAX_ERROR) (version 25.7.5.34 (official build))\n\""}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id UInt32, name String) ENGINE = Memory"`
 	nullWant := `[{"id":4,"name":""}]`
 	return select1Want, mcpSelect1Want, mcpMyFailToolWant, createTableStatement, nullWant
@@ -386,13 +386,13 @@ func TestClickHouseSQLTool(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"test-select": map[string]any{
-				"kind":        ClickHouseToolKind,
+				"type":        ClickHouseToolType,
 				"source":      "my-instance",
 				"description": "Test select query",
 				"statement":   fmt.Sprintf("SELECT * FROM %s ORDER BY id", tableName),
 			},
 			"test-param-query": map[string]any{
-				"kind":        ClickHouseToolKind,
+				"type":        ClickHouseToolType,
 				"source":      "my-instance",
 				"description": "Test parameterized query",
 				"statement":   fmt.Sprintf("SELECT * FROM %s WHERE age > ? ORDER BY id", tableName),
@@ -401,7 +401,7 @@ func TestClickHouseSQLTool(t *testing.T) {
 				},
 			},
 			"test-empty-result": map[string]any{
-				"kind":        ClickHouseToolKind,
+				"type":        ClickHouseToolType,
 				"source":      "my-instance",
 				"description": "Test query with no results",
 				"statement":   fmt.Sprintf("SELECT * FROM %s WHERE id = ?", tableName),
@@ -410,7 +410,7 @@ func TestClickHouseSQLTool(t *testing.T) {
 				},
 			},
 			"test-invalid-sql": map[string]any{
-				"kind":        ClickHouseToolKind,
+				"type":        ClickHouseToolType,
 				"source":      "my-instance",
 				"description": "Test invalid SQL",
 				"statement":   "SELEC * FROM nonexistent_table", // Typo in SELECT
@@ -522,7 +522,7 @@ func TestClickHouseExecuteSQLTool(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"execute-sql-tool": map[string]any{
-				"kind":        "clickhouse-execute-sql",
+				"type":        "clickhouse-execute-sql",
 				"source":      "my-instance",
 				"description": "Test create table",
 			},
@@ -548,6 +548,7 @@ func TestClickHouseExecuteSQLTool(t *testing.T) {
 		sql            string
 		resultSliceLen int
 		isErr          bool
+		isAgentErr     bool
 	}{
 		{
 			name:           "CreateTable",
@@ -570,15 +571,15 @@ func TestClickHouseExecuteSQLTool(t *testing.T) {
 			resultSliceLen: 0,
 		},
 		{
-			name:  "MissingSQL",
-			sql:   "",
-			isErr: true,
+			name:       "MissingSQL",
+			sql:        "",
+			isAgentErr: true,
 		},
 
 		{
-			name:  "SQLInjectionAttempt",
-			sql:   "SELECT 1; DROP TABLE system.users; SELECT 2",
-			isErr: true,
+			name:       "SQLInjectionAttempt",
+			sql:        "SELECT 1; DROP TABLE system.users; SELECT 2",
+			isAgentErr: true,
 		},
 	}
 	for _, tc := range tcs {
@@ -595,6 +596,9 @@ func TestClickHouseExecuteSQLTool(t *testing.T) {
 			if tc.isErr {
 				t.Fatalf("expecting an error from server")
 			}
+			if tc.isAgentErr {
+				return
+			}
 
 			var body map[string]interface{}
 			err := json.Unmarshal(respBody, &body)
@@ -640,18 +644,18 @@ func TestClickHouseEdgeCases(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"execute-sql-tool": map[string]any{
-				"kind":        "clickhouse-execute-sql",
+				"type":        "clickhouse-execute-sql",
 				"source":      "my-instance",
 				"description": "Test create table",
 			},
 			"test-null-values": map[string]any{
-				"kind":        "clickhouse-sql",
+				"type":        "clickhouse-sql",
 				"source":      "my-instance",
 				"description": "Test null values",
 				"statement":   fmt.Sprintf("SELECT * FROM %s ORDER BY id", tableName),
 			},
 			"test-concurrent": map[string]any{
-				"kind":        "clickhouse-sql",
+				"type":        "clickhouse-sql",
 				"source":      "my-instance",
 				"description": "Test concurrent queries",
 				"statement":   "SELECT number FROM system.numbers LIMIT ?",
@@ -818,7 +822,7 @@ func TestClickHouseEdgeCases(t *testing.T) {
 	t.Logf("✅ Edge case tests completed successfully")
 }
 
-// getClickHouseSQLParamToolInfo returns statements and param for my-tool clickhouse-sql kind
+// getClickHouseSQLParamToolInfo returns statements and param for my-tool clickhouse-sql type
 func getClickHouseSQLParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id UInt32, name String) ENGINE = Memory", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name) VALUES (?, ?), (?, ?), (?, ?), (?, ?)", tableName)
@@ -830,7 +834,7 @@ func getClickHouseSQLParamToolInfo(tableName string) (string, string, string, st
 	return createStatement, insertStatement, paramStatement, idParamStatement, nameParamStatement, arrayStatement, params
 }
 
-// getClickHouseSQLAuthToolInfo returns statements and param of my-auth-tool for clickhouse-sql kind
+// getClickHouseSQLAuthToolInfo returns statements and param of my-auth-tool for clickhouse-sql type
 func getClickHouseSQLAuthToolInfo(tableName string) (string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id UInt32, name String, email String) ENGINE = Memory", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name, email) VALUES (?, ?, ?), (?, ?, ?)", tableName)
@@ -839,7 +843,7 @@ func getClickHouseSQLAuthToolInfo(tableName string) (string, string, string, []a
 	return createStatement, insertStatement, authStatement, params
 }
 
-// getClickHouseSQLTmplToolStatement returns statements and param for template parameter test cases for clickhouse-sql kind
+// getClickHouseSQLTmplToolStatement returns statements and param for template parameter test cases for clickhouse-sql type
 func getClickHouseSQLTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = ?"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = ?"
@@ -902,12 +906,12 @@ func TestClickHouseListDatabasesTool(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"test-list-databases": map[string]any{
-				"kind":        "clickhouse-list-databases",
+				"type":        "clickhouse-list-databases",
 				"source":      "my-instance",
 				"description": "Test listing databases",
 			},
 			"test-invalid-source": map[string]any{
-				"kind":        "clickhouse-list-databases",
+				"type":        "clickhouse-list-databases",
 				"source":      "non-existent-source",
 				"description": "Test with invalid source",
 			},
@@ -1031,12 +1035,12 @@ func TestClickHouseListTablesTool(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"test-list-tables": map[string]any{
-				"kind":        "clickhouse-list-tables",
+				"type":        "clickhouse-list-tables",
 				"source":      "my-instance",
 				"description": "Test listing tables",
 			},
 			"test-invalid-source": map[string]any{
-				"kind":        "clickhouse-list-tables",
+				"type":        "clickhouse-list-tables",
 				"source":      "non-existent-source",
 				"description": "Test with invalid source",
 			},
@@ -1119,16 +1123,16 @@ func TestClickHouseListTablesTool(t *testing.T) {
 	t.Run("ListTablesWithMissingDatabase", func(t *testing.T) {
 		api := "http://127.0.0.1:5000/api/tool/test-list-tables/invoke"
 		resp, _ := tests.RunRequest(t, http.MethodPost, api, bytes.NewBuffer([]byte(`{}`)), nil)
-		if resp.StatusCode == http.StatusOK {
-			t.Error("Expected error for missing database parameter, but got 200 OK")
+		if resp.StatusCode != http.StatusOK {
+			t.Errorf("Expected 200 OK for missing database parameter, but got %d", resp.StatusCode)
 		}
 	})
 
 	t.Run("ListTablesWithInvalidSource", func(t *testing.T) {
 		api := "http://127.0.0.1:5000/api/tool/test-invalid-source/invoke"
 		resp, _ := tests.RunRequest(t, http.MethodPost, api, bytes.NewBuffer([]byte(`{}`)), nil)
-		if resp.StatusCode == http.StatusOK {
-			t.Error("Expected error for non-existent source, but got 200 OK")
+		if resp.StatusCode != http.StatusOK {
+			t.Errorf("Expected 200 OK for non-existent source, but got %d", resp.StatusCode)
 		}
 	})
 
diff --git a/tests/cloudgda/cloud_gda_integration_test.go b/tests/cloudgda/cloud_gda_integration_test.go
index 343973f147..24c0cab1cb 100644
--- a/tests/cloudgda/cloud_gda_integration_test.go
+++ b/tests/cloudgda/cloud_gda_integration_test.go
@@ -33,7 +33,7 @@ import (
 )
 
 var (
-	cloudGdaToolKind = "cloud-gemini-data-analytics-query"
+	cloudGdaToolType = "cloud-gemini-data-analytics-query"
 )
 
 type cloudGdaTransport struct {
@@ -205,13 +205,13 @@ func getCloudGdaToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-gda-source": map[string]any{
-				"kind":      "cloud-gemini-data-analytics",
+				"type":      "cloud-gemini-data-analytics",
 				"projectId": "test-project",
 			},
 		},
 		"tools": map[string]any{
 			"cloud-gda-query": map[string]any{
-				"kind":        cloudGdaToolKind,
+				"type":        cloudGdaToolType,
 				"source":      "my-gda-source",
 				"description": "Test GDA Tool",
 				"location":    "us-central1",
diff --git a/tests/cloudhealthcare/cloud_healthcare_integration_test.go b/tests/cloudhealthcare/cloud_healthcare_integration_test.go
index 4fdddcb84a..4ffeee85d9 100644
--- a/tests/cloudhealthcare/cloud_healthcare_integration_test.go
+++ b/tests/cloudhealthcare/cloud_healthcare_integration_test.go
@@ -41,22 +41,22 @@ import (
 )
 
 var (
-	healthcareSourceKind                  = "cloud-healthcare"
-	getDatasetToolKind                    = "cloud-healthcare-get-dataset"
-	listFHIRStoresToolKind                = "cloud-healthcare-list-fhir-stores"
-	listDICOMStoresToolKind               = "cloud-healthcare-list-dicom-stores"
-	getFHIRStoreToolKind                  = "cloud-healthcare-get-fhir-store"
-	getFHIRStoreMetricsToolKind           = "cloud-healthcare-get-fhir-store-metrics"
-	getFHIRResourceToolKind               = "cloud-healthcare-get-fhir-resource"
-	fhirPatientSearchToolKind             = "cloud-healthcare-fhir-patient-search"
-	fhirPatientEverythingToolKind         = "cloud-healthcare-fhir-patient-everything"
-	fhirFetchPageToolKind                 = "cloud-healthcare-fhir-fetch-page"
-	getDICOMStoreToolKind                 = "cloud-healthcare-get-dicom-store"
-	getDICOMStoreMetricsToolKind          = "cloud-healthcare-get-dicom-store-metrics"
-	searchDICOMStudiesToolKind            = "cloud-healthcare-search-dicom-studies"
-	searchDICOMSeriesToolKind             = "cloud-healthcare-search-dicom-series"
-	searchDICOMInstancesToolKind          = "cloud-healthcare-search-dicom-instances"
-	retrieveRenderedDICOMInstanceToolKind = "cloud-healthcare-retrieve-rendered-dicom-instance"
+	healthcareSourceType                  = "cloud-healthcare"
+	getDatasetToolType                    = "cloud-healthcare-get-dataset"
+	listFHIRStoresToolType                = "cloud-healthcare-list-fhir-stores"
+	listDICOMStoresToolType               = "cloud-healthcare-list-dicom-stores"
+	getFHIRStoreToolType                  = "cloud-healthcare-get-fhir-store"
+	getFHIRStoreMetricsToolType           = "cloud-healthcare-get-fhir-store-metrics"
+	getFHIRResourceToolType               = "cloud-healthcare-get-fhir-resource"
+	fhirPatientSearchToolType             = "cloud-healthcare-fhir-patient-search"
+	fhirPatientEverythingToolType         = "cloud-healthcare-fhir-patient-everything"
+	fhirFetchPageToolType                 = "cloud-healthcare-fhir-fetch-page"
+	getDICOMStoreToolType                 = "cloud-healthcare-get-dicom-store"
+	getDICOMStoreMetricsToolType          = "cloud-healthcare-get-dicom-store-metrics"
+	searchDICOMStudiesToolType            = "cloud-healthcare-search-dicom-studies"
+	searchDICOMSeriesToolType             = "cloud-healthcare-search-dicom-series"
+	searchDICOMInstancesToolType          = "cloud-healthcare-search-dicom-instances"
+	retrieveRenderedDICOMInstanceToolType = "cloud-healthcare-retrieve-rendered-dicom-instance"
 	healthcareProject                     = os.Getenv("HEALTHCARE_PROJECT")
 	healthcareRegion                      = os.Getenv("HEALTHCARE_REGION")
 	healthcareDataset                     = os.Getenv("HEALTHCARE_DATASET")
@@ -92,7 +92,7 @@ func getHealthcareVars(t *testing.T) map[string]any {
 		t.Fatal("'HEALTHCARE_PREPOPULATED_DICOM_STORE' not set")
 	}
 	return map[string]any{
-		"kind":    healthcareSourceKind,
+		"type":    healthcareSourceType,
 		"project": healthcareProject,
 		"region":  healthcareRegion,
 		"dataset": healthcareDataset,
@@ -182,12 +182,12 @@ func TestHealthcareToolWithStoreRestriction(t *testing.T) {
 	// Configure tool
 	toolsConfig := map[string]any{
 		"list-fhir-stores-restricted": map[string]any{
-			"kind":        "cloud-healthcare-list-fhir-stores",
+			"type":        "cloud-healthcare-list-fhir-stores",
 			"source":      "my-instance",
 			"description": "Tool to list fhir stores",
 		},
 		"list-dicom-stores-restricted": map[string]any{
-			"kind":        "cloud-healthcare-list-dicom-stores",
+			"type":        "cloud-healthcare-list-dicom-stores",
 			"source":      "my-instance",
 			"description": "Tool to list dicom stores",
 		},
@@ -336,157 +336,157 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 		},
 		"tools": map[string]any{
 			"my-get-dataset-tool": map[string]any{
-				"kind":        getDatasetToolKind,
+				"type":        getDatasetToolType,
 				"source":      "my-instance",
 				"description": "Tool to get a healthcare dataset",
 			},
 			"my-list-fhir-stores-tool": map[string]any{
-				"kind":        listFHIRStoresToolKind,
+				"type":        listFHIRStoresToolType,
 				"source":      "my-instance",
 				"description": "Tool to list FHIR stores",
 			},
 			"my-list-dicom-stores-tool": map[string]any{
-				"kind":        listDICOMStoresToolKind,
+				"type":        listDICOMStoresToolType,
 				"source":      "my-instance",
 				"description": "Tool to list DICOM stores",
 			},
 			"my-get-fhir-store-tool": map[string]any{
-				"kind":        getFHIRStoreToolKind,
+				"type":        getFHIRStoreToolType,
 				"source":      "my-instance",
 				"description": "Tool to get a FHIR store",
 			},
 			"my-get-fhir-store-metrics-tool": map[string]any{
-				"kind":        getFHIRStoreMetricsToolKind,
+				"type":        getFHIRStoreMetricsToolType,
 				"source":      "my-instance",
 				"description": "Tool to get FHIR store metrics",
 			},
 			"my-get-fhir-resource-tool": map[string]any{
-				"kind":        getFHIRResourceToolKind,
+				"type":        getFHIRResourceToolType,
 				"source":      "my-instance",
 				"description": "Tool to get FHIR resource",
 			},
 			"my-fhir-patient-search-tool": map[string]any{
-				"kind":        fhirPatientSearchToolKind,
+				"type":        fhirPatientSearchToolType,
 				"source":      "my-instance",
 				"description": "Tool to search for patients",
 			},
 			"my-fhir-patient-everything-tool": map[string]any{
-				"kind":        fhirPatientEverythingToolKind,
+				"type":        fhirPatientEverythingToolType,
 				"source":      "my-instance",
 				"description": "Tool for patient everything",
 			},
 			"my-fhir-fetch-page-tool": map[string]any{
-				"kind":        fhirFetchPageToolKind,
+				"type":        fhirFetchPageToolType,
 				"source":      "my-instance",
 				"description": "Tool to fetch a page of FHIR resources",
 			},
 			"my-get-dicom-store-tool": map[string]any{
-				"kind":        getDICOMStoreToolKind,
+				"type":        getDICOMStoreToolType,
 				"source":      "my-instance",
 				"description": "Tool to get a DICOM store",
 			},
 			"my-get-dicom-store-metrics-tool": map[string]any{
-				"kind":        getDICOMStoreMetricsToolKind,
+				"type":        getDICOMStoreMetricsToolType,
 				"source":      "my-instance",
 				"description": "Tool to get DICOM store metrics",
 			},
 			"my-search-dicom-studies-tool": map[string]any{
-				"kind":        searchDICOMStudiesToolKind,
+				"type":        searchDICOMStudiesToolType,
 				"source":      "my-instance",
 				"description": "Tool to search DICOM studies",
 			},
 			"my-search-dicom-series-tool": map[string]any{
-				"kind":        searchDICOMSeriesToolKind,
+				"type":        searchDICOMSeriesToolType,
 				"source":      "my-instance",
 				"description": "Tool to search DICOM series",
 			},
 			"my-search-dicom-instances-tool": map[string]any{
-				"kind":        searchDICOMInstancesToolKind,
+				"type":        searchDICOMInstancesToolType,
 				"source":      "my-instance",
 				"description": "Tool to search DICOM instances",
 			},
 			"my-retrieve-rendered-dicom-instance-tool": map[string]any{
-				"kind":        retrieveRenderedDICOMInstanceToolKind,
+				"type":        retrieveRenderedDICOMInstanceToolType,
 				"source":      "my-instance",
 				"description": "Tool to retrieve rendered DICOM instance",
 			},
 			"my-client-auth-get-dataset-tool": map[string]any{
-				"kind":        getDatasetToolKind,
+				"type":        getDatasetToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to get a healthcare dataset",
 			},
 			"my-client-auth-list-fhir-stores-tool": map[string]any{
-				"kind":        listFHIRStoresToolKind,
+				"type":        listFHIRStoresToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to list FHIR stores",
 			},
 			"my-client-auth-list-dicom-stores-tool": map[string]any{
-				"kind":        listDICOMStoresToolKind,
+				"type":        listDICOMStoresToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to list DICOM stores",
 			},
 			"my-client-auth-get-fhir-store-tool": map[string]any{
-				"kind":        getFHIRStoreToolKind,
+				"type":        getFHIRStoreToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to get a FHIR store",
 			},
 			"my-client-auth-get-fhir-store-metrics-tool": map[string]any{
-				"kind":        getFHIRStoreMetricsToolKind,
+				"type":        getFHIRStoreMetricsToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to get FHIR store metrics",
 			},
 			"my-client-auth-get-fhir-resource-tool": map[string]any{
-				"kind":        getFHIRResourceToolKind,
+				"type":        getFHIRResourceToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to get FHIR resource",
 			},
 			"my-client-auth-fhir-patient-search-tool": map[string]any{
-				"kind":        fhirPatientSearchToolKind,
+				"type":        fhirPatientSearchToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to search for patients",
 			},
 			"my-client-auth-fhir-patient-everything-tool": map[string]any{
-				"kind":        fhirPatientEverythingToolKind,
+				"type":        fhirPatientEverythingToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool for patient everything",
 			},
 			"my-client-auth-fhir-fetch-page-tool": map[string]any{
-				"kind":        fhirFetchPageToolKind,
+				"type":        fhirFetchPageToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to fetch a page of FHIR resources",
 			},
 			"my-client-auth-get-dicom-store-tool": map[string]any{
-				"kind":        getDICOMStoreToolKind,
+				"type":        getDICOMStoreToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to get a DICOM store",
 			},
 			"my-client-auth-get-dicom-store-metrics-tool": map[string]any{
-				"kind":        getDICOMStoreMetricsToolKind,
+				"type":        getDICOMStoreMetricsToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to get DICOM store metrics",
 			},
 			"my-client-auth-search-dicom-studies-tool": map[string]any{
-				"kind":        searchDICOMStudiesToolKind,
+				"type":        searchDICOMStudiesToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to search DICOM studies",
 			},
 			"my-client-auth-search-dicom-series-tool": map[string]any{
-				"kind":        searchDICOMSeriesToolKind,
+				"type":        searchDICOMSeriesToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to search DICOM series",
 			},
 			"my-client-auth-search-dicom-instances-tool": map[string]any{
-				"kind":        searchDICOMInstancesToolKind,
+				"type":        searchDICOMInstancesToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to search DICOM instances",
 			},
 			"my-client-auth-retrieve-rendered-dicom-instance-tool": map[string]any{
-				"kind":        retrieveRenderedDICOMInstanceToolKind,
+				"type":        retrieveRenderedDICOMInstanceToolType,
 				"source":      "my-client-auth-source",
 				"description": "Tool to retrieve rendered DICOM instance",
 			},
 			"my-auth-get-dataset-tool": map[string]any{
-				"kind":        getDatasetToolKind,
+				"type":        getDatasetToolType,
 				"source":      "my-instance",
 				"description": "Tool to get a healthcare dataset with auth",
 				"authRequired": []string{
@@ -494,7 +494,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-list-fhir-stores-tool": map[string]any{
-				"kind":        listFHIRStoresToolKind,
+				"type":        listFHIRStoresToolType,
 				"source":      "my-instance",
 				"description": "Tool to list FHIR stores with auth",
 				"authRequired": []string{
@@ -502,7 +502,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-list-dicom-stores-tool": map[string]any{
-				"kind":        listDICOMStoresToolKind,
+				"type":        listDICOMStoresToolType,
 				"source":      "my-instance",
 				"description": "Tool to list DICOM stores with auth",
 				"authRequired": []string{
@@ -510,7 +510,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-get-fhir-store-tool": map[string]any{
-				"kind":        getFHIRStoreToolKind,
+				"type":        getFHIRStoreToolType,
 				"source":      "my-instance",
 				"description": "Tool to get a FHIR store",
 				"authRequired": []string{
@@ -518,7 +518,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-get-fhir-store-metrics-tool": map[string]any{
-				"kind":        getFHIRStoreMetricsToolKind,
+				"type":        getFHIRStoreMetricsToolType,
 				"source":      "my-instance",
 				"description": "Tool to get FHIR store metrics",
 				"authRequired": []string{
@@ -526,7 +526,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-get-fhir-resource-tool": map[string]any{
-				"kind":        getFHIRResourceToolKind,
+				"type":        getFHIRResourceToolType,
 				"source":      "my-instance",
 				"description": "Tool to get FHIR resource",
 				"authRequired": []string{
@@ -534,7 +534,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-fhir-patient-search-tool": map[string]any{
-				"kind":        fhirPatientSearchToolKind,
+				"type":        fhirPatientSearchToolType,
 				"source":      "my-instance",
 				"description": "Tool to search for patients",
 				"authRequired": []string{
@@ -542,7 +542,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-fhir-patient-everything-tool": map[string]any{
-				"kind":        fhirPatientEverythingToolKind,
+				"type":        fhirPatientEverythingToolType,
 				"source":      "my-instance",
 				"description": "Tool for patient everything",
 				"authRequired": []string{
@@ -550,7 +550,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-fhir-fetch-page-tool": map[string]any{
-				"kind":        fhirFetchPageToolKind,
+				"type":        fhirFetchPageToolType,
 				"source":      "my-instance",
 				"description": "Tool to fetch a page of FHIR resources",
 				"authRequired": []string{
@@ -558,7 +558,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-get-dicom-store-tool": map[string]any{
-				"kind":        getDICOMStoreToolKind,
+				"type":        getDICOMStoreToolType,
 				"source":      "my-instance",
 				"description": "Tool to get a DICOM store",
 				"authRequired": []string{
@@ -566,7 +566,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-get-dicom-store-metrics-tool": map[string]any{
-				"kind":        getDICOMStoreMetricsToolKind,
+				"type":        getDICOMStoreMetricsToolType,
 				"source":      "my-instance",
 				"description": "Tool to get DICOM store metrics",
 				"authRequired": []string{
@@ -574,7 +574,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-search-dicom-studies-tool": map[string]any{
-				"kind":        searchDICOMStudiesToolKind,
+				"type":        searchDICOMStudiesToolType,
 				"source":      "my-instance",
 				"description": "Tool to search DICOM studies",
 				"authRequired": []string{
@@ -582,7 +582,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-search-dicom-series-tool": map[string]any{
-				"kind":        searchDICOMSeriesToolKind,
+				"type":        searchDICOMSeriesToolType,
 				"source":      "my-instance",
 				"description": "Tool to search DICOM series",
 				"authRequired": []string{
@@ -590,7 +590,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-search-dicom-instances-tool": map[string]any{
-				"kind":        searchDICOMInstancesToolKind,
+				"type":        searchDICOMInstancesToolType,
 				"source":      "my-instance",
 				"description": "Tool to search DICOM instances",
 				"authRequired": []string{
@@ -598,7 +598,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 				},
 			},
 			"my-auth-retrieve-rendered-dicom-instance-tool": map[string]any{
-				"kind":        retrieveRenderedDICOMInstanceToolKind,
+				"type":        retrieveRenderedDICOMInstanceToolType,
 				"source":      "my-instance",
 				"description": "Tool to retrieve rendered DICOM instance",
 				"authRequired": []string{
@@ -608,7 +608,7 @@ func getToolsConfig(sourceConfig map[string]any) map[string]any {
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
@@ -622,7 +622,7 @@ func addClientAuthSourceConfig(t *testing.T, config map[string]any) map[string]a
 		t.Fatalf("unable to get sources from config")
 	}
 	sources["my-client-auth-source"] = map[string]any{
-		"kind":           healthcareSourceKind,
+		"type":           healthcareSourceType,
 		"project":        healthcareProject,
 		"region":         healthcareRegion,
 		"dataset":        healthcareDataset,
@@ -717,8 +717,8 @@ func runGetDatasetToolInvokeTest(t *testing.T, want string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -915,8 +915,8 @@ func runListDICOMStoresToolInvokeTest(t *testing.T, want string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1021,8 +1021,8 @@ func runGetFHIRStoreToolInvokeTest(t *testing.T, fhirStoreID, want string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1127,8 +1127,8 @@ func runGetFHIRStoreMetricsToolInvokeTest(t *testing.T, fhirStoreID, want string
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1240,8 +1240,8 @@ func runGetFHIRResourceToolInvokeTest(t *testing.T, storeID, resType, resID, wan
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1394,8 +1394,8 @@ func runFHIRPatientSearchToolInvokeTest(t *testing.T, fhirStoreID string, patien
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1531,8 +1531,8 @@ func runFHIRPatientEverythingToolInvokeTest(t *testing.T, fhirStoreID, patientID
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1637,8 +1637,8 @@ func runFHIRFetchPageToolInvokeTest(t *testing.T, pageURL, want string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1710,6 +1710,9 @@ func runTest(t *testing.T, api string, requestHeader map[string]string, requestB
 
 	got, ok := body["result"].(string)
 	if !ok {
+		if errMsg, ok := body["error"].(string); ok {
+			return errMsg, http.StatusOK
+		}
 		t.Fatalf("unable to find result in response body")
 	}
 	return got, http.StatusOK
@@ -1837,8 +1840,8 @@ func runGetDICOMStoreToolInvokeTest(t *testing.T, dicomStoreID, want string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -1943,8 +1946,8 @@ func runGetDICOMStoreMetricsToolInvokeTest(t *testing.T, dicomStoreID, want stri
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -2065,8 +2068,8 @@ func runSearchDICOMStudiesToolInvokeTest(t *testing.T, dicomStoreID string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -2187,8 +2190,8 @@ func runSearchDICOMSeriesToolInvokeTest(t *testing.T, dicomStoreID string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -2309,8 +2312,8 @@ func runSearchDICOMInstancesToolInvokeTest(t *testing.T, dicomStoreID string) {
 		t.Run(tc.name, func(t *testing.T) {
 			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
@@ -2422,10 +2425,10 @@ func runRetrieveRenderedDICOMInstanceToolInvokeTest(t *testing.T, dicomStoreID s
 	}
 	for _, tc := range invokeTcs {
 		t.Run(tc.name, func(t *testing.T) {
-			_, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
+			got, status := runTest(t, tc.api, tc.requestHeader, tc.requestBody)
 			if tc.isErr {
-				if status == http.StatusOK {
-					t.Errorf("expected error but got success")
+				if status == http.StatusOK && !strings.Contains(got, "error") {
+					t.Errorf("expected error but got success: %s", got)
 				}
 				return
 			}
diff --git a/tests/cloudloggingadmin/cloud_logging_admin_integration_test.go b/tests/cloudloggingadmin/cloud_logging_admin_integration_test.go
new file mode 100644
index 0000000000..68c3227621
--- /dev/null
+++ b/tests/cloudloggingadmin/cloud_logging_admin_integration_test.go
@@ -0,0 +1,339 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// To run these tests, set the following environment variables:
+// LOGADMIN_PROJECT: Google Cloud project ID.
+package cloudloggingadmin
+
+import (
+	"bytes"
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"os"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+
+	"cloud.google.com/go/logging"
+	"cloud.google.com/go/logging/logadmin"
+	"github.com/google/uuid"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+	"github.com/googleapis/genai-toolbox/tests"
+	"golang.org/x/oauth2/google"
+	"google.golang.org/api/option"
+)
+
+var (
+	LogAdminSourceType = "cloud-logging-admin"
+	LogAdminProject    = os.Getenv("LOGADMIN_PROJECT")
+)
+
+func getLogAdminVars(t *testing.T) map[string]any {
+	switch "" {
+	case LogAdminProject:
+		t.Fatal("'LOGADMIN_PROJECT' not set")
+	}
+
+	return map[string]any{
+		"type":    LogAdminSourceType,
+		"project": LogAdminProject,
+	}
+}
+
+// Copied over from cloud_logging_admin.go
+func initLogAdminConnection(project string) (*logadmin.Client, error) {
+	ctx := context.Background()
+	cred, err := google.FindDefaultCredentials(ctx, logging.AdminScope)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find default Google Cloud credentials with scope %q: %w", logging.AdminScope, err)
+	}
+	client, err := logadmin.NewClient(ctx, project, option.WithCredentials(cred))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create Cloud Logging Admin client for project %q: %w", project, err)
+	}
+	return client, nil
+}
+
+// This client will be used to add logs to the project
+func initLogConnection(project string) (*logging.Client, error) {
+	ctx := context.Background()
+	cred, err := google.FindDefaultCredentials(ctx, logging.WriteScope)
+	if err != nil {
+		return nil, fmt.Errorf("failed to find default Google Cloud credentials with scope %q: %w", logging.WriteScope, err)
+	}
+	client, err := logging.NewClient(ctx, project, option.WithCredentials(cred))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create Cloud Logging client for project %q: %w", project, err)
+	}
+	return client, nil
+}
+
+func TestLogAdminToolEndpoints(t *testing.T) {
+	sourceConfig := getLogAdminVars(t)
+	ctx, cancel := context.WithTimeout(context.Background(), 7*time.Minute)
+	defer cancel()
+
+	var args []string
+
+	_, err := initLogAdminConnection(LogAdminProject)
+	if err != nil {
+		t.Fatalf("unable to connect to logs: %s", err)
+	}
+
+	loggingClient, err := initLogConnection(LogAdminProject)
+	if err != nil {
+		t.Fatalf("unable to connect to logging: %s", err)
+	}
+	defer loggingClient.Close()
+
+	testUUID := strings.ReplaceAll(uuid.New().String(), "-", "")
+	logName := fmt.Sprintf("toolbox-integration-test-%s", testUUID)
+
+	// set up test logs and wait for logs to be injested.
+	setupTestLogs(t, loggingClient, logName)
+	t.Logf("Waiting 15 seconds for log ingestion...")
+	time.Sleep(15 * time.Second)
+
+	// Delete test logs once test is over
+	defer teardownTestLogs(t, ctx, LogAdminProject, logName)
+
+	toolsFile := getCloudLoggingAdminToolsConfig(sourceConfig)
+	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
+	if err != nil {
+		t.Fatalf("command initialization returned an error: %s", err)
+	}
+	defer cleanup()
+
+	waitCtx, waitCancel := context.WithTimeout(ctx, 10*time.Second)
+	defer waitCancel()
+	out, err := testutils.WaitForString(waitCtx, regexp.MustCompile(`Server ready to serve`), cmd.Out)
+	if err != nil {
+		t.Logf("toolbox command logs:\n%s", out)
+		t.Fatalf("toolbox didn't start successfully: %s", err)
+	}
+
+	runListLogNamesTest(t, logName)
+	runAuthListLogNamesTest(t, logName)
+	runListResourceTypesTest(t)
+	runQueryLogsTest(t, logName)
+	runQueryLogsErrorTest(t)
+}
+
+func setupTestLogs(t *testing.T, client *logging.Client, logName string) {
+	logger := client.Logger(logName)
+	logger.Log(logging.Entry{
+		Payload:  map[string]string{"test_id": logName, "message": "test entry 1"},
+		Severity: logging.Info,
+		Labels:   map[string]string{"env": "test", "run_id": "1"},
+	})
+
+	logger.Log(logging.Entry{
+		Payload:  map[string]string{"test_id": logName, "message": "test entry 2"},
+		Severity: logging.Warning,
+	})
+
+	logger.Log(logging.Entry{
+		Payload:  map[string]string{"test_id": logName, "message": "test entry 3"},
+		Severity: logging.Error,
+	})
+	if err := logger.Flush(); err != nil {
+		t.Fatalf("failed to flush logs: %v", err)
+	}
+}
+
+func teardownTestLogs(t *testing.T, ctx context.Context, projectID, logName string) {
+	adminClient, err := logadmin.NewClient(ctx, projectID)
+	if err != nil {
+		t.Errorf("failed to create admin client for cleanup: %v", err)
+		return
+	}
+	defer adminClient.Close()
+
+	if err := adminClient.DeleteLog(ctx, logName); err != nil {
+		t.Logf("failed to delete test log %s: %v", logName, err)
+	}
+}
+
+func getCloudLoggingAdminToolsConfig(sourceConfig map[string]any) map[string]any {
+	return map[string]any{
+		"sources": map[string]any{
+			"my-logging-instance": sourceConfig,
+		},
+		"authServices": map[string]any{
+			"my-google-auth": map[string]any{
+				"type":     "google",
+				"clientId": tests.ClientId,
+			},
+		},
+		"tools": map[string]any{
+			"list-log-names": map[string]any{
+				"type":        "cloud-logging-admin-list-log-names",
+				"source":      "my-logging-instance",
+				"description": "Lists log names in the project",
+			},
+			"list-resource-types": map[string]any{
+				"type":        "cloud-logging-admin-list-resource-types",
+				"source":      "my-logging-instance",
+				"description": "Lists monitored resource types",
+			},
+			"query-logs": map[string]any{
+				"type":        "cloud-logging-admin-query-logs",
+				"source":      "my-logging-instance",
+				"description": "Queries log entries",
+			},
+			"auth-list-log-names": map[string]any{
+				"type":         "cloud-logging-admin-list-log-names",
+				"source":       "my-logging-instance",
+				"authRequired": []string{"my-google-auth"},
+				"description":  "Lists log names with authentication",
+			},
+		},
+	}
+}
+
+func runListLogNamesTest(t *testing.T, expectedLogName string) {
+	t.Run("list-log-names", func(t *testing.T) {
+		resp, respBody := tests.RunRequest(t, http.MethodPost, "http://127.0.0.1:5000/api/tool/list-log-names/invoke", bytes.NewBuffer([]byte(`{}`)), nil)
+		defer resp.Body.Close()
+
+		if resp.StatusCode != 200 {
+			t.Fatalf("expected status 200, got %d", resp.StatusCode)
+		}
+
+		var body map[string]interface{}
+		if err := json.Unmarshal(respBody, &body); err != nil {
+			t.Fatalf("error parsing response body")
+		}
+
+		result, ok := body["result"].(string)
+		if !ok {
+			t.Fatalf("expected result to be string")
+		}
+
+		if !strings.Contains(result, expectedLogName) {
+			t.Errorf("expected log name %s not found in result: %s", expectedLogName, result)
+		}
+	})
+}
+
+func runListResourceTypesTest(t *testing.T) {
+	t.Run("list-resource-types", func(t *testing.T) {
+		resp, respBody := tests.RunRequest(t, http.MethodPost, "http://127.0.0.1:5000/api/tool/list-resource-types/invoke", bytes.NewBuffer([]byte(`{}`)), nil)
+
+		if resp.StatusCode != 200 {
+			t.Fatalf("expected status 200, got %d", resp.StatusCode)
+		}
+
+		var body map[string]interface{}
+		if err := json.Unmarshal(respBody, &body); err != nil {
+			t.Fatalf("error parsing response body")
+		}
+
+		result, ok := body["result"].(string)
+		if !ok {
+			t.Fatalf("expected result to be string")
+		}
+
+		expectedTypes := []string{"global", "gce_instance", "gcs_bucket", "project"}
+		for _, resourceType := range expectedTypes {
+			if !strings.Contains(result, resourceType) {
+				t.Errorf("expected '%s' resource type in result, but it was missing", resourceType)
+			}
+		}
+	})
+}
+
+func runQueryLogsTest(t *testing.T, logName string) {
+	baseFilter := fmt.Sprintf(`logName="projects/%s/logs/%s"`, LogAdminProject, logName)
+
+	t.Run("query-logs-simple", func(t *testing.T) {
+		requestBody := fmt.Sprintf(`{"filter": %q, "limit": 10}`, baseFilter)
+		result := invokeQueryTool(t, requestBody)
+
+		if !strings.Contains(result, "test entry") {
+			t.Errorf("expected test entries in result: %s", result)
+		}
+	})
+
+	t.Run("query-logs-newest-first", func(t *testing.T) {
+		requestBody := fmt.Sprintf(`{"filter": %q, "limit": 10, "newestFirst": true}`, baseFilter)
+		result := invokeQueryTool(t, requestBody)
+
+		idx3 := strings.Index(result, "test entry 3")
+		idx1 := strings.Index(result, "test entry 1")
+
+		if idx3 == -1 || idx1 == -1 {
+			t.Fatalf("missing expected entries in result: %s", result)
+		}
+
+		if idx3 > idx1 {
+			t.Errorf("expected entry 3 to appear before entry 1 with newestFirst=true, but got: ...%s... then ...%s...", "test entry 3", "test entry 1")
+		}
+	})
+
+	t.Run("query-logs-verbose", func(t *testing.T) {
+		requestBody := fmt.Sprintf(`{"filter": %q, "limit": 10, "verbose": true}`, baseFilter)
+		result := invokeQueryTool(t, requestBody)
+
+		if !strings.Contains(result, `"labels":`) {
+			t.Errorf("expected 'labels' field in verbose output, got: %s", result)
+		}
+		if !strings.Contains(result, `"env":"test"`) && !strings.Contains(result, `"env": "test"`) {
+			t.Errorf("expected label 'env: test' in verbose output, got: %s", result)
+		}
+	})
+}
+
+func invokeQueryTool(t *testing.T, requestBody string) string {
+	t.Helper()
+	resp, respBody := tests.RunRequest(t, http.MethodPost, "http://127.0.0.1:5000/api/tool/query-logs/invoke", bytes.NewBuffer([]byte(requestBody)), nil)
+	defer resp.Body.Close()
+
+	if resp.StatusCode != 200 {
+		t.Fatalf("expected status 200, got %d", resp.StatusCode)
+	}
+
+	var body map[string]interface{}
+	if err := json.Unmarshal(respBody, &body); err != nil {
+		t.Fatalf("error parsing response body")
+	}
+
+	result, ok := body["result"].(string)
+	if !ok {
+		t.Fatalf("expected result to be string")
+	}
+	return result
+}
+
+func runAuthListLogNamesTest(t *testing.T, expectedLogName string) {
+	t.Run("auth-list-log-names", func(t *testing.T) {
+		resp, _ := tests.RunRequest(t, http.MethodPost, "http://127.0.0.1:5000/api/tool/auth-list-log-names/invoke", bytes.NewBuffer([]byte(`{}`)), nil)
+		if resp.StatusCode != 401 {
+			t.Fatalf("expected status 401 (Unauthorized), got %d", resp.StatusCode)
+		}
+	})
+}
+
+func runQueryLogsErrorTest(t *testing.T) {
+	t.Run("query-logs-error", func(t *testing.T) {
+		requestBody := `{"filter": "INVALID_FILTER_SYNTAX :::", "limit": 10}`
+		resp, _ := tests.RunRequest(t, http.MethodPost, "http://127.0.0.1:5000/api/tool/query-logs/invoke", bytes.NewBuffer([]byte(requestBody)), nil)
+		if resp.StatusCode != 200 {
+			t.Errorf("expected 200 OK")
+		}
+	})
+}
diff --git a/tests/cloudmonitoring/cloud_monitoring_integration_test.go b/tests/cloudmonitoring/cloud_monitoring_integration_test.go
index f5833244a6..54295cf5fb 100644
--- a/tests/cloudmonitoring/cloud_monitoring_integration_test.go
+++ b/tests/cloudmonitoring/cloud_monitoring_integration_test.go
@@ -49,7 +49,7 @@ func TestTool_Invoke(t *testing.T) {
 	tool := cloudmonitoring.Tool{
 		Config: cloudmonitoring.Config{
 			Name:        "test-cloudmonitoring",
-			Kind:        "cloud-monitoring-query-prometheus",
+			Type:        "cloud-monitoring-query-prometheus",
 			Description: "Test Cloudmonitoring Tool",
 		},
 		AllParams: parameters.Parameters{},
@@ -93,7 +93,7 @@ func TestTool_Invoke_Error(t *testing.T) {
 	tool := cloudmonitoring.Tool{
 		Config: cloudmonitoring.Config{
 			Name:        "test-cloudmonitoring",
-			Kind:        "clou-monitoring-query-prometheus",
+			Type:        "clou-monitoring-query-prometheus",
 			Description: "Test Cloudmonitoring Tool",
 		},
 		AllParams: parameters.Parameters{},
diff --git a/tests/cloudsql/cloud_sql_clone_instance_test.go b/tests/cloudsql/cloud_sql_clone_instance_test.go
index f41062cb9a..ac504b2a98 100644
--- a/tests/cloudsql/cloud_sql_clone_instance_test.go
+++ b/tests/cloudsql/cloud_sql_clone_instance_test.go
@@ -38,7 +38,7 @@ import (
 )
 
 var (
-	cloneInstanceToolKind = "cloud-sql-clone-instance"
+	cloneInstanceToolType = "cloud-sql-clone-instance"
 )
 
 type cloneInstanceTransport struct {
@@ -169,11 +169,10 @@ func TestCloneInstanceToolEndpoints(t *testing.T) {
 			want:     `{"name":"op2","status":"PENDING"}`,
 		},
 		{
-			name:        "missing destination instance name",
-			toolName:    "clone-instance",
-			body:        `{"project": "p1", "sourceInstanceName": "source-instance"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing destination instance name",
+			toolName: "clone-instance",
+			body:     `{"project": "p1", "sourceInstanceName": "source-instance"}`,
+			want:     `{"error":"parameter \"destinationInstanceName\" is required"}`,
 		},
 	}
 
@@ -231,12 +230,12 @@ func getCloneInstanceToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"clone-instance": map[string]any{
-				"kind":   cloneInstanceToolKind,
+				"type":   cloneInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsql/cloud_sql_create_backup_test.go b/tests/cloudsql/cloud_sql_create_backup_test.go
index d9b7d05264..7155e5e964 100644
--- a/tests/cloudsql/cloud_sql_create_backup_test.go
+++ b/tests/cloudsql/cloud_sql_create_backup_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 var (
-	createBackupToolKind = "cloud-sql-create-backup"
+	createBackupToolType = "cloud-sql-create-backup"
 )
 
 type createBackupTransport struct {
@@ -158,11 +158,10 @@ func TestCreateBackupToolEndpoints(t *testing.T) {
 			want:     `{"name":"op1","status":"PENDING"}`,
 		},
 		{
-			name:        "missing instance name",
-			toolName:    "create-backup",
-			body:        `{"project": "p1", "escription": "invalid"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing instance name",
+			toolName: "create-backup",
+			body:     `{"project": "p1", "escription": "invalid"}`,
+			want:     `{"error":"parameter \"instance\" is required"}`,
 		},
 	}
 
@@ -219,12 +218,12 @@ func getCreateBackupToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"create-backup": map[string]any{
-				"kind":   createBackupToolKind,
+				"type":   createBackupToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsql/cloud_sql_create_database_test.go b/tests/cloudsql/cloud_sql_create_database_test.go
index a87bc8200b..a9ef3ff2fb 100644
--- a/tests/cloudsql/cloud_sql_create_database_test.go
+++ b/tests/cloudsql/cloud_sql_create_database_test.go
@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	createDatabaseToolKind = "cloud-sql-create-database"
+	createDatabaseToolType = "cloud-sql-create-database"
 )
 
 type createDatabaseTransport struct {
@@ -155,11 +155,10 @@ func TestCreateDatabaseToolEndpoints(t *testing.T) {
 			want:     `{"name":"op1","status":"PENDING"}`,
 		},
 		{
-			name:        "missing name",
-			toolName:    "create-database",
-			body:        `{"project": "p1", "instance": "i1"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing name",
+			toolName: "create-database",
+			body:     `{"project": "p1", "instance": "i1"}`,
+			want:     `{"error":"parameter \"name\" is required"}`,
 		},
 	}
 
@@ -217,12 +216,12 @@ func getCreateDatabaseToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"create-database": map[string]any{
-				"kind":   createDatabaseToolKind,
+				"type":   createDatabaseToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsql/cloud_sql_create_users_test.go b/tests/cloudsql/cloud_sql_create_users_test.go
index 39cc4320f1..e4b8bd0b2c 100644
--- a/tests/cloudsql/cloud_sql_create_users_test.go
+++ b/tests/cloudsql/cloud_sql_create_users_test.go
@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	createUserToolKind = "cloud-sql-create-users"
+	createUserToolType = "cloud-sql-create-users"
 )
 
 type createUsersTransport struct {
@@ -167,11 +167,10 @@ func TestCreateUsersToolEndpoints(t *testing.T) {
 			want:     `{"name":"op2","status":"PENDING"}`,
 		},
 		{
-			name:        "missing password for built-in user",
-			toolName:    "create-user",
-			body:        `{"project": "p1", "instance": "i1", "name": "test-user", "iamUser": false}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing password for built-in user",
+			toolName: "create-user",
+			body:     `{"project": "p1", "instance": "i1", "name": "test-user", "iamUser": false}`,
+			want:     `{"error":"missing 'password' parameter for non-IAM user"}`,
 		},
 	}
 
@@ -229,12 +228,12 @@ func getCreateUsersToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"create-user": map[string]any{
-				"kind":   createUserToolKind,
+				"type":   createUserToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsql/cloud_sql_get_instances_test.go b/tests/cloudsql/cloud_sql_get_instances_test.go
index dc920a80dd..709a501450 100644
--- a/tests/cloudsql/cloud_sql_get_instances_test.go
+++ b/tests/cloudsql/cloud_sql_get_instances_test.go
@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	getInstancesToolKind = "cloud-sql-get-instance"
+	getInstancesToolType = "cloud-sql-get-instance"
 )
 
 type getInstancesTransport struct {
@@ -231,21 +231,21 @@ func getToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 			"my-invalid-cloud-sql-source": map[string]any{
-				"kind":           "cloud-sql-admin",
+				"type":           "cloud-sql-admin",
 				"useClientOAuth": true,
 			},
 		},
 		"tools": map[string]any{
 			"get-instance-1": map[string]any{
-				"kind":        getInstancesToolKind,
+				"type":        getInstancesToolType,
 				"description": "get instance 1",
 				"source":      "my-cloud-sql-source",
 			},
 			"get-instance-2": map[string]any{
-				"kind":        getInstancesToolKind,
+				"type":        getInstancesToolType,
 				"description": "get instance 2",
 				"source":      "my-invalid-cloud-sql-source",
 			},
diff --git a/tests/cloudsql/cloud_sql_list_databases_test.go b/tests/cloudsql/cloud_sql_list_databases_test.go
index 6ee0f9b9eb..9d49f45d25 100644
--- a/tests/cloudsql/cloud_sql_list_databases_test.go
+++ b/tests/cloudsql/cloud_sql_list_databases_test.go
@@ -34,7 +34,7 @@ import (
 )
 
 var (
-	listDatabasesToolKind = "cloud-sql-list-databases"
+	listDatabasesToolType = "cloud-sql-list-databases"
 )
 
 type listDatabasesTransport struct {
@@ -138,11 +138,10 @@ func TestListDatabasesToolEndpoints(t *testing.T) {
 			want:     `[{"name":"db1","charset":"utf8","collation":"utf8_general_ci"},{"name":"db2","charset":"utf8mb4","collation":"utf8mb4_unicode_ci"}]`,
 		},
 		{
-			name:        "missing instance",
-			toolName:    "list-databases",
-			body:        `{"project": "p1"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing instance",
+			toolName: "list-databases",
+			body:     `{"project": "p1"}`,
+			want:     `{"error":"parameter \"instance\" is required"}`,
 		},
 	}
 
@@ -181,12 +180,26 @@ func TestListDatabasesToolEndpoints(t *testing.T) {
 				t.Fatalf("failed to decode response: %v", err)
 			}
 
+			if strings.Contains(result.Result, `"error":`) {
+				var gotMap, wantMap map[string]any
+				if err := json.Unmarshal([]byte(result.Result), &gotMap); err != nil {
+					t.Fatalf("failed to unmarshal result error object: %v", err)
+				}
+				if err := json.Unmarshal([]byte(tc.want), &wantMap); err != nil {
+					t.Fatalf("failed to unmarshal want error object: %v", err)
+				}
+				if !reflect.DeepEqual(gotMap, wantMap) {
+					t.Fatalf("unexpected error result: got %+v, want %+v", gotMap, wantMap)
+				}
+				return
+			}
+
 			var got, want []map[string]any
 			if err := json.Unmarshal([]byte(result.Result), &got); err != nil {
-				t.Fatalf("failed to unmarshal result: %v", err)
+				t.Fatalf("failed to unmarshal result array: %v. Result was: %s", err, result.Result)
 			}
 			if err := json.Unmarshal([]byte(tc.want), &want); err != nil {
-				t.Fatalf("failed to unmarshal want: %v", err)
+				t.Fatalf("failed to unmarshal want array: %v", err)
 			}
 
 			if !reflect.DeepEqual(got, want) {
@@ -200,12 +213,12 @@ func getListDatabasesToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"list-databases": map[string]any{
-				"kind":   listDatabasesToolKind,
+				"type":   listDatabasesToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsql/cloud_sql_restore_backup_test.go b/tests/cloudsql/cloud_sql_restore_backup_test.go
index 970ad16164..47a0411945 100644
--- a/tests/cloudsql/cloud_sql_restore_backup_test.go
+++ b/tests/cloudsql/cloud_sql_restore_backup_test.go
@@ -23,7 +23,6 @@ import (
 	"net/http"
 	"net/http/httptest"
 	"net/url"
-	"reflect"
 	"regexp"
 	"strings"
 	"testing"
@@ -95,7 +94,11 @@ func (h *masterRestoreBackupHandler) ServeHTTP(w http.ResponseWriter, r *http.Re
 		response = map[string]any{"name": "op1", "status": "PENDING"}
 		statusCode = http.StatusOK
 	default:
-		http.Error(w, fmt.Sprintf("unhandled restore request body: %v", body), http.StatusInternalServerError)
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusOK)
+		_ = json.NewEncoder(w).Encode(map[string]string{
+			"error": `oaraneter "backup_id" is required`,
+		})
 		return
 	}
 
@@ -178,25 +181,22 @@ func TestRestoreBackupToolEndpoints(t *testing.T) {
 			want:     `{"name":"op1","status":"PENDING"}`,
 		},
 		{
-			name:        "missing source instance info for standard backup",
-			toolName:    "restore-backup",
-			body:        `{"target_project": "p1", "target_instance": "instance-project-level", "backup_id": "12345"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing source instance info for standard backup",
+			toolName: "restore-backup",
+			body:     `{"target_project": "p1", "target_instance": "instance-project-level", "backup_id": "12345"}`,
+			want:     `{"error":"error processing GCP request: source project and instance are required when restoring via backup ID"}`,
 		},
 		{
-			name:        "missing backup identifier",
-			toolName:    "restore-backup",
-			body:        `{"target_project": "p1", "target_instance": "instance-project-level"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing backup identifier",
+			toolName: "restore-backup",
+			body:     `{"target_project": "p1", "target_instance": "instance-project-level"}`,
+			want:     `{"error":"parameter \"backup_id\" is required"}`,
 		},
 		{
-			name:        "missing target instance info",
-			toolName:    "restore-backup",
-			body:        `{"backup_id": "12345"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing target instance info",
+			toolName: "restore-backup",
+			body:     `{"backup_id": "12345"}`,
+			want:     `{"error":"parameter \"target_project\" is required"}`,
 		},
 	}
 
@@ -232,19 +232,14 @@ func TestRestoreBackupToolEndpoints(t *testing.T) {
 				Result string `json:"result"`
 			}
 			if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
-				t.Fatalf("failed to decode response: %v", err)
+				t.Fatalf("failed to decode response envelope: %v", err)
 			}
 
-			var got, want map[string]any
-			if err := json.Unmarshal([]byte(result.Result), &got); err != nil {
-				t.Fatalf("failed to unmarshal result: %v", err)
-			}
-			if err := json.Unmarshal([]byte(tc.want), &want); err != nil {
-				t.Fatalf("failed to unmarshal want: %v", err)
-			}
+			got := strings.TrimSpace(result.Result)
+			want := strings.TrimSpace(tc.want)
 
-			if !reflect.DeepEqual(got, want) {
-				t.Fatalf("unexpected result: got %+v, want %+v", got, want)
+			if got != want {
+				t.Fatalf("unexpected result string:\n got: %s\nwant: %s", got, want)
 			}
 		})
 	}
diff --git a/tests/cloudsql/cloudsql_list_instances_test.go b/tests/cloudsql/cloudsql_list_instances_test.go
index 093765dfeb..7978fa5f65 100644
--- a/tests/cloudsql/cloudsql_list_instances_test.go
+++ b/tests/cloudsql/cloudsql_list_instances_test.go
@@ -171,20 +171,20 @@ func getListInstanceToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 			"my-invalid-cloud-sql-source": map[string]any{
-				"kind":           "cloud-sql-admin",
+				"type":           "cloud-sql-admin",
 				"useClientOAuth": true,
 			},
 		},
 		"tools": map[string]any{
 			"list-instances": map[string]any{
-				"kind":   "cloud-sql-list-instances",
+				"type":   "cloud-sql-list-instances",
 				"source": "my-cloud-sql-source",
 			},
 			"list-instances-fail": map[string]any{
-				"kind":        "cloud-sql-list-instances",
+				"type":        "cloud-sql-list-instances",
 				"description": "list instances",
 				"source":      "my-invalid-cloud-sql-source",
 			},
diff --git a/tests/cloudsql/cloudsql_wait_for_operation_test.go b/tests/cloudsql/cloudsql_wait_for_operation_test.go
index ab8cab808e..e8225f8380 100644
--- a/tests/cloudsql/cloudsql_wait_for_operation_test.go
+++ b/tests/cloudsql/cloudsql_wait_for_operation_test.go
@@ -37,7 +37,7 @@ import (
 )
 
 var (
-	cloudsqlWaitToolKind = "cloud-sql-wait-for-operation"
+	cloudsqlWaitToolType = "cloud-sql-wait-for-operation"
 )
 
 type waitForOperationTransport struct {
@@ -206,10 +206,10 @@ func TestCloudSQLWaitToolEndpoints(t *testing.T) {
 			wantSubstring: true,
 		},
 		{
-			name:        "failed operation",
-			toolName:    "wait-for-op2",
-			body:        `{"project": "p1", "operation": "op2"}`,
-			expectError: true,
+			name:          "failed operation - agent error",
+			toolName:      "wait-for-op2",
+			body:          `{"project": "p1", "operation": "op2"}`,
+			wantSubstring: true,
 		},
 		{
 			name:     "non-database create operation",
@@ -291,22 +291,22 @@ func getCloudSQLWaitToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"wait-for-op1": map[string]any{
-				"kind":        cloudsqlWaitToolKind,
+				"type":        cloudsqlWaitToolType,
 				"source":      "my-cloud-sql-source",
 				"description": "wait for op1",
 			},
 			"wait-for-op2": map[string]any{
-				"kind":        cloudsqlWaitToolKind,
+				"type":        cloudsqlWaitToolType,
 				"source":      "my-cloud-sql-source",
 				"description": "wait for op2",
 			},
 			"wait-for-op3": map[string]any{
-				"kind":        cloudsqlWaitToolKind,
+				"type":        cloudsqlWaitToolType,
 				"source":      "my-cloud-sql-source",
 				"description": "wait for op3",
 			},
diff --git a/tests/cloudsqlmssql/cloud_sql_mssql_create_instance_integration_test.go b/tests/cloudsqlmssql/cloud_sql_mssql_create_instance_integration_test.go
index 05bbe2d8e5..4ae8c0a7e9 100644
--- a/tests/cloudsqlmssql/cloud_sql_mssql_create_instance_integration_test.go
+++ b/tests/cloudsqlmssql/cloud_sql_mssql_create_instance_integration_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 var (
-	createInstanceToolKind = "cloud-sql-mssql-create-instance"
+	createInstanceToolType = "cloud-sql-mssql-create-instance"
 )
 
 type createInstanceTransport struct {
@@ -198,11 +198,10 @@ func TestCreateInstanceToolEndpoints(t *testing.T) {
 			want:     `{"name":"op2","status":"RUNNING"}`,
 		},
 		{
-			name:        "missing required parameter",
-			toolName:    "create-instance-prod",
-			body:        `{"name": "instance1"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing required parameter",
+			toolName: "create-instance-prod",
+			body:     `{"name": "instance1"}`,
+			want:     `{"error":"parameter \"project\" is required"}`,
 		},
 	}
 
@@ -260,16 +259,16 @@ func getCreateInstanceToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"create-instance-prod": map[string]any{
-				"kind":   createInstanceToolKind,
+				"type":   createInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 			"create-instance-dev": map[string]any{
-				"kind":   createInstanceToolKind,
+				"type":   createInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsqlmssql/cloud_sql_mssql_integration_test.go b/tests/cloudsqlmssql/cloud_sql_mssql_integration_test.go
index b53ca030ce..aac0819715 100644
--- a/tests/cloudsqlmssql/cloud_sql_mssql_integration_test.go
+++ b/tests/cloudsqlmssql/cloud_sql_mssql_integration_test.go
@@ -34,8 +34,8 @@ import (
 )
 
 var (
-	CloudSQLMSSQLSourceKind = "cloud-sql-mssql"
-	CloudSQLMSSQLToolKind   = "mssql-sql"
+	CloudSQLMSSQLSourceType = "cloud-sql-mssql"
+	CloudSQLMSSQLToolType   = "mssql-sql"
 	CloudSQLMSSQLProject    = os.Getenv("CLOUD_SQL_MSSQL_PROJECT")
 	CloudSQLMSSQLRegion     = os.Getenv("CLOUD_SQL_MSSQL_REGION")
 	CloudSQLMSSQLInstance   = os.Getenv("CLOUD_SQL_MSSQL_INSTANCE")
@@ -61,7 +61,7 @@ func getCloudSQLMSSQLVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     CloudSQLMSSQLSourceKind,
+		"type":     CloudSQLMSSQLSourceType,
 		"project":  CloudSQLMSSQLProject,
 		"instance": CloudSQLMSSQLInstance,
 		"region":   CloudSQLMSSQLRegion,
@@ -137,10 +137,10 @@ func TestCloudSQLMSSQLToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLMSSQLToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLMSSQLToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddMSSQLExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMSSQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLMSSQLToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLMSSQLToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 	toolsFile = tests.AddMSSQLPrebuiltToolConfig(t, toolsFile)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
@@ -191,7 +191,7 @@ func TestCloudSQLMSSQLIpConnection(t *testing.T) {
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
 			sourceConfig["ipType"] = tc.ipType
-			err := tests.RunSourceConnectionTest(t, sourceConfig, CloudSQLMSSQLToolKind)
+			err := tests.RunSourceConnectionTest(t, sourceConfig, CloudSQLMSSQLToolType)
 			if err != nil {
 				t.Fatalf("Connection test failure: %s", err)
 			}
diff --git a/tests/cloudsqlmysql/cloud_sql_mysql_create_instance_integration_test.go b/tests/cloudsqlmysql/cloud_sql_mysql_create_instance_integration_test.go
index 7ddec92faa..45975103aa 100644
--- a/tests/cloudsqlmysql/cloud_sql_mysql_create_instance_integration_test.go
+++ b/tests/cloudsqlmysql/cloud_sql_mysql_create_instance_integration_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 var (
-	createInstanceToolKind = "cloud-sql-mysql-create-instance"
+	createInstanceToolType = "cloud-sql-mysql-create-instance"
 )
 
 type createInstanceTransport struct {
@@ -199,11 +199,10 @@ func TestCreateInstanceToolEndpoints(t *testing.T) {
 			want:     `{"name":"op2","status":"RUNNING"}`,
 		},
 		{
-			name:        "missing required parameter",
-			toolName:    "create-instance-prod",
-			body:        `{"name": "instance1"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing required parameter",
+			toolName: "create-instance-prod",
+			body:     `{"name": "instance1"}`,
+			want:     `{"error":"parameter \"project\" is required"}`,
 		},
 	}
 
@@ -261,16 +260,16 @@ func getCreateInstanceToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"create-instance-prod": map[string]any{
-				"kind":   createInstanceToolKind,
+				"type":   createInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 			"create-instance-dev": map[string]any{
-				"kind":   createInstanceToolKind,
+				"type":   createInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsqlmysql/cloud_sql_mysql_integration_test.go b/tests/cloudsqlmysql/cloud_sql_mysql_integration_test.go
index 55b3035868..b60e78fc72 100644
--- a/tests/cloudsqlmysql/cloud_sql_mysql_integration_test.go
+++ b/tests/cloudsqlmysql/cloud_sql_mysql_integration_test.go
@@ -33,8 +33,8 @@ import (
 )
 
 var (
-	CloudSQLMySQLSourceKind = "cloud-sql-mysql"
-	CloudSQLMySQLToolKind   = "mysql-sql"
+	CloudSQLMySQLSourceType = "cloud-sql-mysql"
+	CloudSQLMySQLToolType   = "mysql-sql"
 	CloudSQLMySQLProject    = os.Getenv("CLOUD_SQL_MYSQL_PROJECT")
 	CloudSQLMySQLRegion     = os.Getenv("CLOUD_SQL_MYSQL_REGION")
 	CloudSQLMySQLInstance   = os.Getenv("CLOUD_SQL_MYSQL_INSTANCE")
@@ -60,7 +60,7 @@ func getCloudSQLMySQLVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     CloudSQLMySQLSourceKind,
+		"type":     CloudSQLMySQLSourceType,
 		"project":  CloudSQLMySQLProject,
 		"instance": CloudSQLMySQLInstance,
 		"region":   CloudSQLMySQLRegion,
@@ -129,10 +129,10 @@ func TestCloudSQLMySQLToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLMySQLToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLMySQLToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddMySqlExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMySQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLMySQLToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLMySQLToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 	toolsFile = tests.AddMySQLPrebuiltToolConfig(t, toolsFile)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
@@ -186,7 +186,7 @@ func TestCloudSQLMySQLIpConnection(t *testing.T) {
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
 			sourceConfig["ipType"] = tc.ipType
-			err := tests.RunSourceConnectionTest(t, sourceConfig, CloudSQLMySQLToolKind)
+			err := tests.RunSourceConnectionTest(t, sourceConfig, CloudSQLMySQLToolType)
 			if err != nil {
 				t.Fatalf("Connection test failure: %s", err)
 			}
@@ -200,7 +200,7 @@ func TestCloudSQLMySQLIAMConnection(t *testing.T) {
 	serviceAccountEmail, _, _ := strings.Cut(tests.ServiceAccountEmail, "@")
 
 	noPassSourceConfig := map[string]any{
-		"kind":     CloudSQLMySQLSourceKind,
+		"type":     CloudSQLMySQLSourceType,
 		"project":  CloudSQLMySQLProject,
 		"instance": CloudSQLMySQLInstance,
 		"region":   CloudSQLMySQLRegion,
@@ -208,7 +208,7 @@ func TestCloudSQLMySQLIAMConnection(t *testing.T) {
 		"user":     serviceAccountEmail,
 	}
 	noUserSourceConfig := map[string]any{
-		"kind":     CloudSQLMySQLSourceKind,
+		"type":     CloudSQLMySQLSourceType,
 		"project":  CloudSQLMySQLProject,
 		"instance": CloudSQLMySQLInstance,
 		"region":   CloudSQLMySQLRegion,
@@ -216,7 +216,7 @@ func TestCloudSQLMySQLIAMConnection(t *testing.T) {
 		"password": "random",
 	}
 	noUserNoPassSourceConfig := map[string]any{
-		"kind":     CloudSQLMySQLSourceKind,
+		"type":     CloudSQLMySQLSourceType,
 		"project":  CloudSQLMySQLProject,
 		"instance": CloudSQLMySQLInstance,
 		"region":   CloudSQLMySQLRegion,
@@ -260,7 +260,7 @@ func TestCloudSQLMySQLIAMConnection(t *testing.T) {
 				},
 				"tools": map[string]any{
 					"my-simple-tool": map[string]any{
-						"kind":        CloudSQLMySQLToolKind,
+						"type":        CloudSQLMySQLToolType,
 						"source":      uniqueSourceName,
 						"description": "Simple tool to test end to end functionality.",
 						"statement":   "SELECT 1;",
diff --git a/tests/cloudsqlpg/cloud_sql_pg_create_instances_test.go b/tests/cloudsqlpg/cloud_sql_pg_create_instances_test.go
index 85fb011085..df7350801f 100644
--- a/tests/cloudsqlpg/cloud_sql_pg_create_instances_test.go
+++ b/tests/cloudsqlpg/cloud_sql_pg_create_instances_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 var (
-	createInstanceToolKind = "cloud-sql-postgres-create-instance"
+	createInstanceToolType = "cloud-sql-postgres-create-instance"
 )
 
 type createInstanceTransport struct {
@@ -200,11 +200,10 @@ func TestCreateInstanceToolEndpoints(t *testing.T) {
 			want:     `{"name":"op2","status":"RUNNING"}`,
 		},
 		{
-			name:        "missing required parameter",
-			toolName:    "create-instance-prod",
-			body:        `{"name": "instance1"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
+			name:     "missing required parameter",
+			toolName: "create-instance-prod",
+			body:     `{"name": "instance1"}`,
+			want:     `{"error":"parameter \"project\" is required"}`,
 		},
 	}
 
@@ -262,16 +261,16 @@ func getCreateInstanceToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"create-instance-prod": map[string]any{
-				"kind":   createInstanceToolKind,
+				"type":   createInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 			"create-instance-dev": map[string]any{
-				"kind":   createInstanceToolKind,
+				"type":   createInstanceToolType,
 				"source": "my-cloud-sql-source",
 			},
 		},
diff --git a/tests/cloudsqlpg/cloud_sql_pg_integration_test.go b/tests/cloudsqlpg/cloud_sql_pg_integration_test.go
index dc8ecb27bf..e6340cb871 100644
--- a/tests/cloudsqlpg/cloud_sql_pg_integration_test.go
+++ b/tests/cloudsqlpg/cloud_sql_pg_integration_test.go
@@ -32,8 +32,8 @@ import (
 )
 
 var (
-	CloudSQLPostgresSourceKind = "cloud-sql-postgres"
-	CloudSQLPostgresToolKind   = "postgres-sql"
+	CloudSQLPostgresSourceType = "cloud-sql-postgres"
+	CloudSQLPostgresToolType   = "postgres-sql"
 	CloudSQLPostgresProject    = os.Getenv("CLOUD_SQL_POSTGRES_PROJECT")
 	CloudSQLPostgresRegion     = os.Getenv("CLOUD_SQL_POSTGRES_REGION")
 	CloudSQLPostgresInstance   = os.Getenv("CLOUD_SQL_POSTGRES_INSTANCE")
@@ -59,7 +59,7 @@ func getCloudSQLPgVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     CloudSQLPostgresSourceKind,
+		"type":     CloudSQLPostgresSourceType,
 		"project":  CloudSQLPostgresProject,
 		"instance": CloudSQLPostgresInstance,
 		"region":   CloudSQLPostgresRegion,
@@ -137,14 +137,14 @@ func TestCloudSQLPgSimpleToolEndpoints(t *testing.T) {
 	defer tearDownVectorTable(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLPostgresToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, CloudSQLPostgresToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddExecuteSqlConfig(t, toolsFile, "postgres-execute-sql")
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetPostgresSQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLPostgresToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CloudSQLPostgresToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	// Add semantic search tool config
 	insertStmt, searchStmt := tests.GetPostgresVectorSearchStmts(vectorTableName)
-	toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, CloudSQLPostgresToolKind, insertStmt, searchStmt)
+	toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, CloudSQLPostgresToolType, insertStmt, searchStmt)
 
 	toolsFile = tests.AddPostgresPrebuiltConfig(t, toolsFile)
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
@@ -217,7 +217,7 @@ func TestCloudSQLPgIpConnection(t *testing.T) {
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
 			sourceConfig["ipType"] = tc.ipType
-			err := tests.RunSourceConnectionTest(t, sourceConfig, CloudSQLPostgresToolKind)
+			err := tests.RunSourceConnectionTest(t, sourceConfig, CloudSQLPostgresToolType)
 			if err != nil {
 				t.Fatalf("Connection test failure: %s", err)
 			}
@@ -231,7 +231,7 @@ func TestCloudSQLPgIAMConnection(t *testing.T) {
 	serviceAccountEmail := strings.TrimSuffix(tests.ServiceAccountEmail, ".gserviceaccount.com")
 
 	noPassSourceConfig := map[string]any{
-		"kind":     CloudSQLPostgresSourceKind,
+		"type":     CloudSQLPostgresSourceType,
 		"project":  CloudSQLPostgresProject,
 		"instance": CloudSQLPostgresInstance,
 		"region":   CloudSQLPostgresRegion,
@@ -240,7 +240,7 @@ func TestCloudSQLPgIAMConnection(t *testing.T) {
 	}
 
 	noUserSourceConfig := map[string]any{
-		"kind":     CloudSQLPostgresSourceKind,
+		"type":     CloudSQLPostgresSourceType,
 		"project":  CloudSQLPostgresProject,
 		"instance": CloudSQLPostgresInstance,
 		"region":   CloudSQLPostgresRegion,
@@ -249,7 +249,7 @@ func TestCloudSQLPgIAMConnection(t *testing.T) {
 	}
 
 	noUserNoPassSourceConfig := map[string]any{
-		"kind":     CloudSQLPostgresSourceKind,
+		"type":     CloudSQLPostgresSourceType,
 		"project":  CloudSQLPostgresProject,
 		"instance": CloudSQLPostgresInstance,
 		"region":   CloudSQLPostgresRegion,
@@ -278,7 +278,7 @@ func TestCloudSQLPgIAMConnection(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.name, func(t *testing.T) {
-			err := tests.RunSourceConnectionTest(t, tc.sourceConfig, CloudSQLPostgresToolKind)
+			err := tests.RunSourceConnectionTest(t, tc.sourceConfig, CloudSQLPostgresToolType)
 			if err != nil {
 				if tc.isErr {
 					return
diff --git a/tests/cloudsqlpg/cloud_sql_pg_upgrade_precheck_test.go b/tests/cloudsqlpg/cloud_sql_pg_upgrade_precheck_test.go
index 7db191f5be..118680e3b1 100644
--- a/tests/cloudsqlpg/cloud_sql_pg_upgrade_precheck_test.go
+++ b/tests/cloudsqlpg/cloud_sql_pg_upgrade_precheck_test.go
@@ -35,7 +35,7 @@ import (
 )
 
 var (
-	preCheckToolKind = "postgres-upgrade-precheck"
+	preCheckToolType = "postgres-upgrade-precheck"
 )
 
 type preCheckTransport struct {
@@ -264,37 +264,34 @@ func TestPreCheckToolEndpoints(t *testing.T) {
 			name:     "successful precheck - with warnings",
 			toolName: "precheck-tool",
 			body:     `{"project": "p1", "instance": "instance-warnings", "targetDatabaseVersion": "POSTGRES_18"}`,
-			want:     `{"preCheckResponse":[{"actionsRequired":["Check documentation."],"kind":"","message":"This is a warning.","messageType":"WARNING"}]}`,
+			want:     `{"preCheckResponse":[{"actionsRequired":["Check documentation."],"type":"","message":"This is a warning.","messageType":"WARNING"}]}`,
 		},
 		{
 			name:     "successful precheck - with errors",
 			toolName: "precheck-tool",
 			body:     `{"project": "p1", "instance": "instance-errors", "targetDatabaseVersion": "POSTGRES_18"}`,
-			want:     `{"preCheckResponse":[{"actionsRequired":["Fix this now."],"kind":"","message":"This is a critical error.","messageType":"ERROR"}]}`,
+			want:     `{"preCheckResponse":[{"actionsRequired":["Fix this now."],"type":"","message":"This is a critical error.","messageType":"ERROR"}]}`,
 		},
 		{
 			name:        "instance not found",
 			toolName:    "precheck-tool",
 			body:        `{"project": "p1", "instance": "instance-notfound", "targetDatabaseVersion": "POSTGRES_18"}`,
+			want:        `{"error":"failed to access GCP resource: googleapi: got HTTP response code 403 with body: Not authorized to access instance\n"}`,
 			expectError: true,
-			errorStatus: http.StatusBadRequest,
-			errorMsg:    "Not authorized to access instance",
+			errorStatus: http.StatusInternalServerError,
+			errorMsg:    "failed to access GCP resource: googleapi: got HTTP response code 403",
 		},
 		{
-			name:        "missing required parameter - project",
-			toolName:    "precheck-tool",
-			body:        `{"instance": "instance-ok", "targetDatabaseVersion": "POSTGRES_18"}`,
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
-			errorMsg:    "parameter \\\"project\\\" is required",
+			name:     "missing required parameter - project",
+			toolName: "precheck-tool",
+			body:     `{"instance": "instance-ok", "targetDatabaseVersion": "POSTGRES_18"}`,
+			want:     `{"error":"parameter \"project\" is required"}`,
 		},
 		{
-			name:        "missing required parameter - instance",
-			toolName:    "precheck-tool",
-			body:        `{"project": "p1", "targetDatabaseVersion": "POSTGRES_18"}`, // Missing instance
-			expectError: true,
-			errorStatus: http.StatusBadRequest,
-			errorMsg:    "parameter \\\"instance\\\" is required",
+			name:     "missing required parameter - instance",
+			toolName: "precheck-tool",
+			body:     `{"project": "p1", "targetDatabaseVersion": "POSTGRES_18"}`, // Missing instance
+			want:     `{"error":"parameter \"instance\" is required"}`,
 		},
 		{
 			name:     "missing parameter - targetDatabaseVersion",
@@ -368,12 +365,12 @@ func getPreCheckToolsConfig() map[string]any {
 	return map[string]any{
 		"sources": map[string]any{
 			"my-cloud-sql-source": map[string]any{
-				"kind": "cloud-sql-admin",
+				"type": "cloud-sql-admin",
 			},
 		},
 		"tools": map[string]any{
 			"precheck-tool": map[string]any{
-				"kind":   preCheckToolKind,
+				"type":   preCheckToolType,
 				"source": "my-cloud-sql-source",
 				"authRequired": []string{
 					"https://www.googleapis.com/auth/cloud-platform",
diff --git a/tests/cockroachdb/cockroachdb_integration_test.go b/tests/cockroachdb/cockroachdb_integration_test.go
new file mode 100644
index 0000000000..3fff3f7716
--- /dev/null
+++ b/tests/cockroachdb/cockroachdb_integration_test.go
@@ -0,0 +1,220 @@
+// Copyright 2026 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cockroachdb
+
+import (
+	"context"
+	"fmt"
+	"net/url"
+	"os"
+	"regexp"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/google/uuid"
+	"github.com/googleapis/genai-toolbox/internal/testutils"
+	"github.com/googleapis/genai-toolbox/tests"
+	"github.com/jackc/pgx/v5/pgxpool"
+)
+
+var (
+	CockroachDBSourceType = "cockroachdb"
+	CockroachDBToolType   = "cockroachdb-sql"
+	CockroachDBDatabase   = getEnvOrDefault("COCKROACHDB_DATABASE", "defaultdb")
+	CockroachDBHost       = getEnvOrDefault("COCKROACHDB_HOST", "localhost")
+	CockroachDBPort       = getEnvOrDefault("COCKROACHDB_PORT", "26257")
+	CockroachDBUser       = getEnvOrDefault("COCKROACHDB_USER", "root")
+	CockroachDBPass       = getEnvOrDefault("COCKROACHDB_PASS", "")
+)
+
+func getEnvOrDefault(key, defaultValue string) string {
+	if value := os.Getenv(key); value != "" {
+		return value
+	}
+	return defaultValue
+}
+
+func getCockroachDBVars(t *testing.T) map[string]any {
+	if CockroachDBHost == "" {
+		t.Skip("COCKROACHDB_HOST not set, skipping CockroachDB integration test")
+	}
+
+	return map[string]any{
+		"type":           CockroachDBSourceType,
+		"host":           CockroachDBHost,
+		"port":           CockroachDBPort,
+		"database":       CockroachDBDatabase,
+		"user":           CockroachDBUser,
+		"password":       CockroachDBPass,
+		"maxRetries":     5,
+		"retryBaseDelay": "500ms",
+		"queryParams": map[string]string{
+			"sslmode": "disable",
+		},
+	}
+}
+
+func initCockroachDBConnectionPool(host, port, user, pass, dbname string) (*pgxpool.Pool, error) {
+	connURL := &url.URL{
+		Scheme:   "postgres",
+		User:     url.UserPassword(user, pass),
+		Host:     fmt.Sprintf("%s:%s", host, port),
+		Path:     dbname,
+		RawQuery: "sslmode=disable&application_name=cockroachdb-integration-test",
+	}
+	pool, err := pgxpool.New(context.Background(), connURL.String())
+	if err != nil {
+		return nil, fmt.Errorf("unable to create connection pool: %w", err)
+	}
+
+	return pool, nil
+}
+
+func TestCockroachDB(t *testing.T) {
+	sourceConfig := getCockroachDBVars(t)
+	ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
+	defer cancel()
+
+	var args []string
+
+	pool, err := initCockroachDBConnectionPool(CockroachDBHost, CockroachDBPort, CockroachDBUser, CockroachDBPass, CockroachDBDatabase)
+	if err != nil {
+		t.Fatalf("unable to create cockroachdb connection pool: %s", err)
+	}
+	// Note: Don't defer pool.Close() here - the pool is only used for test setup/teardown.
+	// Closing it explicitly can cause hangs if the server's pool is still active.
+	// The pool will be cleaned up when the test exits.
+
+	// Verify CockroachDB version
+	var version string
+	err = pool.QueryRow(ctx, "SELECT version()").Scan(&version)
+	if err != nil {
+		t.Fatalf("failed to query version: %s", err)
+	}
+	if !strings.Contains(version, "CockroachDB") {
+		t.Fatalf("not connected to CockroachDB, got: %s", version)
+	}
+	t.Logf("✅ Connected to: %s", version)
+
+	// cleanup test environment
+	tests.CleanupPostgresTables(t, ctx, pool)
+
+	// create table names with UUID suffix
+	tableNameParam := "param_table_" + strings.ReplaceAll(uuid.New().String(), "-", "")
+	tableNameAuth := "auth_table_" + strings.ReplaceAll(uuid.New().String(), "-", "")
+	tableNameTemplateParam := "template_param_table_" + strings.ReplaceAll(uuid.New().String(), "-", "")
+
+	// set up data for param tool (using CockroachDB explicit INT primary keys)
+	createParamTableStmt, insertParamTableStmt, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, paramTestParams := tests.GetCockroachDBParamToolInfo(tableNameParam)
+	teardownTable1 := tests.SetupPostgresSQLTable(t, ctx, pool, createParamTableStmt, insertParamTableStmt, tableNameParam, paramTestParams)
+	defer teardownTable1(t)
+
+	// set up data for auth tool
+	createAuthTableStmt, insertAuthTableStmt, authToolStmt, authTestParams := tests.GetCockroachDBAuthToolInfo(tableNameAuth)
+	teardownTable2 := tests.SetupPostgresSQLTable(t, ctx, pool, createAuthTableStmt, insertAuthTableStmt, tableNameAuth, authTestParams)
+	defer teardownTable2(t)
+
+	// Write config into a file and pass it to command
+	toolsFile := tests.GetToolsConfig(sourceConfig, CockroachDBToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+
+	// Add execute-sql tool with write-enabled source (CockroachDB MCP security requires explicit opt-in)
+	toolsFile = addCockroachDBExecuteSqlConfig(t, toolsFile, sourceConfig)
+
+	tmplSelectCombined, tmplSelectFilterCombined := tests.GetPostgresSQLTmplToolStatement()
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, CockroachDBToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
+
+	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
+	if err != nil {
+		t.Fatalf("command initialization returned an error: %s", err)
+	}
+	defer cleanup()
+
+	waitCtx, cancel := context.WithTimeout(ctx, 10*time.Second)
+	defer cancel()
+	out, err := testutils.WaitForString(waitCtx, regexp.MustCompile(`Server ready to serve`), cmd.Out)
+	if err != nil {
+		t.Logf("toolbox command logs: \n%s", out)
+		t.Fatalf("toolbox didn't start successfully: %s", err)
+	}
+
+	// Get configs for tests (use CockroachDB-specific expectations)
+	select1Want, mcpMyFailToolWant, createTableStatement, mcpSelect1Want := tests.GetCockroachDBWants()
+
+	// Run required integration test suites (per CONTRIBUTING.md)
+	t.Run("ToolGetTest", func(t *testing.T) {
+		tests.RunToolGetTest(t)
+	})
+
+	t.Run("ToolInvokeTest", func(t *testing.T) {
+		tests.RunToolInvokeTest(t, select1Want)
+	})
+
+	t.Run("MCPToolCallMethod", func(t *testing.T) {
+		tests.RunMCPToolCallMethod(t, mcpMyFailToolWant, mcpSelect1Want)
+	})
+
+	t.Run("ExecuteSqlToolInvokeTest", func(t *testing.T) {
+		tests.RunExecuteSqlToolInvokeTest(t, createTableStatement, select1Want)
+	})
+
+	t.Run("ToolInvokeWithTemplateParameters", func(t *testing.T) {
+		tests.RunToolInvokeWithTemplateParameters(t, tableNameTemplateParam)
+	})
+
+	t.Logf("✅✅✅ All CockroachDB integration tests passed!")
+}
+
+// addCockroachDBExecuteSqlConfig adds execute-sql tool with write-enabled source
+// CockroachDB has MCP security enabled by default, so execute-sql needs a separate source with enableWriteMode
+func addCockroachDBExecuteSqlConfig(t *testing.T, config map[string]any, baseSourceConfig map[string]any) map[string]any {
+	// Add write-enabled source for execute-sql tool
+	sources, ok := config["sources"].(map[string]any)
+	if !ok {
+		t.Fatalf("unable to get sources from config")
+	}
+
+	// Create a copy of the base source config with write mode enabled
+	writeEnabledSource := make(map[string]any)
+	for k, v := range baseSourceConfig {
+		writeEnabledSource[k] = v
+	}
+	writeEnabledSource["enableWriteMode"] = true
+	writeEnabledSource["readOnlyMode"] = false
+
+	sources["my-write-instance"] = writeEnabledSource
+
+	// Add tools using the write-enabled source
+	tools, ok := config["tools"].(map[string]any)
+	if !ok {
+		t.Fatalf("unable to get tools from config")
+	}
+
+	tools["my-exec-sql-tool"] = map[string]any{
+		"type":        "cockroachdb-execute-sql",
+		"source":      "my-write-instance",
+		"description": "Tool to execute sql",
+	}
+	tools["my-auth-exec-sql-tool"] = map[string]any{
+		"type":        "cockroachdb-execute-sql",
+		"source":      "my-write-instance",
+		"description": "Tool to execute sql",
+		"authRequired": []string{
+			"my-google-auth",
+		},
+	}
+
+	return config
+}
diff --git a/tests/common.go b/tests/common.go
index a567b5eae8..480143dbce 100644
--- a/tests/common.go
+++ b/tests/common.go
@@ -24,7 +24,6 @@ import (
 	"strings"
 	"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/cloudsqlmysql"
@@ -34,7 +33,7 @@ import (
 )
 
 // GetToolsConfig returns a mock tools config file
-func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
+func GetToolsConfig(sourceConfig map[string]any, toolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
 	// Write config into a file and pass it to command
 	toolsFile := map[string]any{
 		"sources": map[string]any{
@@ -42,19 +41,19 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"statement":   "SELECT 1",
 			},
 			"my-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"statement":   paramToolStatement,
@@ -72,7 +71,7 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 				},
 			},
 			"my-tool-by-id": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"statement":   idParamToolStmt,
@@ -85,7 +84,7 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 				},
 			},
 			"my-tool-by-name": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"statement":   nameParamToolStmt,
@@ -99,7 +98,7 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 				},
 			},
 			"my-array-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with array params.",
 				"statement":   arrayToolStatement,
@@ -127,7 +126,7 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 				},
 			},
 			"my-auth-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test authenticated parameters.",
 				// statement to auto-fill authenticated parameter
@@ -147,7 +146,7 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 				},
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test auth required invocation.",
 				"statement":   "SELECT 1",
@@ -156,7 +155,7 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 				},
 			},
 			"my-fail-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test statement with incorrect syntax.",
 				"statement":   "SELEC 1;",
@@ -168,18 +167,18 @@ func GetToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, i
 }
 
 // AddExecuteSqlConfig gets the tools config for `execute-sql` tools
-func AddExecuteSqlConfig(t *testing.T, config map[string]any, toolKind string) map[string]any {
+func AddExecuteSqlConfig(t *testing.T, config map[string]any, toolType string) map[string]any {
 	tools, ok := config["tools"].(map[string]any)
 	if !ok {
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -192,28 +191,28 @@ func AddExecuteSqlConfig(t *testing.T, config map[string]any, toolKind string) m
 
 func AddPostgresPrebuiltConfig(t *testing.T, config map[string]any) map[string]any {
 	var (
-		PostgresListSchemasToolKind             = "postgres-list-schemas"
-		PostgresListTablesToolKind              = "postgres-list-tables"
-		PostgresListActiveQueriesToolKind       = "postgres-list-active-queries"
-		PostgresListInstalledExtensionsToolKind = "postgres-list-installed-extensions"
-		PostgresListAvailableExtensionsToolKind = "postgres-list-available-extensions"
-		PostgresListViewsToolKind               = "postgres-list-views"
-		PostgresDatabaseOverviewToolKind        = "postgres-database-overview"
-		PostgresListTriggersToolKind            = "postgres-list-triggers"
-		PostgresListIndexesToolKind             = "postgres-list-indexes"
-		PostgresListSequencesToolKind           = "postgres-list-sequences"
-		PostgresLongRunningTransactionsToolKind = "postgres-long-running-transactions"
-		PostgresListLocksToolKind               = "postgres-list-locks"
-		PostgresReplicationStatsToolKind        = "postgres-replication-stats"
-		PostgresListQueryStatsToolKind          = "postgres-list-query-stats"
-		PostgresGetColumnCardinalityToolKind    = "postgres-get-column-cardinality"
+		PostgresListSchemasToolType             = "postgres-list-schemas"
+		PostgresListTablesToolType              = "postgres-list-tables"
+		PostgresListActiveQueriesToolType       = "postgres-list-active-queries"
+		PostgresListInstalledExtensionsToolType = "postgres-list-installed-extensions"
+		PostgresListAvailableExtensionsToolType = "postgres-list-available-extensions"
+		PostgresListViewsToolType               = "postgres-list-views"
+		PostgresDatabaseOverviewToolType        = "postgres-database-overview"
+		PostgresListTriggersToolType            = "postgres-list-triggers"
+		PostgresListIndexesToolType             = "postgres-list-indexes"
+		PostgresListSequencesToolType           = "postgres-list-sequences"
+		PostgresLongRunningTransactionsToolType = "postgres-long-running-transactions"
+		PostgresListLocksToolType               = "postgres-list-locks"
+		PostgresReplicationStatsToolType        = "postgres-replication-stats"
+		PostgresListQueryStatsToolType          = "postgres-list-query-stats"
+		PostgresGetColumnCardinalityToolType    = "postgres-get-column-cardinality"
 		PostgresListTableStats                  = "postgres-list-table-stats"
-		PostgresListPublicationTablesToolKind   = "postgres-list-publication-tables"
-		PostgresListTablespacesToolKind         = "postgres-list-tablespaces"
-		PostgresListPGSettingsToolKind          = "postgres-list-pg-settings"
-		PostgresListDatabaseStatsToolKind       = "postgres-list-database-stats"
-		PostgresListRolesToolKind               = "postgres-list-roles"
-		PostgresListStoredProcedureToolKind     = "postgres-list-stored-procedure"
+		PostgresListPublicationTablesToolType   = "postgres-list-publication-tables"
+		PostgresListTablespacesToolType         = "postgres-list-tablespaces"
+		PostgresListPGSettingsToolType          = "postgres-list-pg-settings"
+		PostgresListDatabaseStatsToolType       = "postgres-list-database-stats"
+		PostgresListRolesToolType               = "postgres-list-roles"
+		PostgresListStoredProcedureToolType     = "postgres-list-stored-procedure"
 	)
 
 	tools, ok := config["tools"].(map[string]any)
@@ -221,106 +220,106 @@ func AddPostgresPrebuiltConfig(t *testing.T, config map[string]any) map[string]a
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["list_tables"] = map[string]any{
-		"kind":        PostgresListTablesToolKind,
+		"type":        PostgresListTablesToolType,
 		"source":      "my-instance",
 		"description": "Lists tables in the database.",
 	}
 	tools["list_active_queries"] = map[string]any{
-		"kind":        PostgresListActiveQueriesToolKind,
+		"type":        PostgresListActiveQueriesToolType,
 		"source":      "my-instance",
 		"description": "Lists active queries in the database.",
 	}
 	tools["list_installed_extensions"] = map[string]any{
-		"kind":        PostgresListInstalledExtensionsToolKind,
+		"type":        PostgresListInstalledExtensionsToolType,
 		"source":      "my-instance",
 		"description": "Lists installed extensions in the database.",
 	}
 	tools["list_available_extensions"] = map[string]any{
-		"kind":        PostgresListAvailableExtensionsToolKind,
+		"type":        PostgresListAvailableExtensionsToolType,
 		"source":      "my-instance",
 		"description": "Lists available extensions in the database.",
 	}
 	tools["list_views"] = map[string]any{
-		"kind":   PostgresListViewsToolKind,
+		"type":   PostgresListViewsToolType,
 		"source": "my-instance",
 	}
 	tools["list_schemas"] = map[string]any{
-		"kind":   PostgresListSchemasToolKind,
+		"type":   PostgresListSchemasToolType,
 		"source": "my-instance",
 	}
 	tools["database_overview"] = map[string]any{
-		"kind":   PostgresDatabaseOverviewToolKind,
+		"type":   PostgresDatabaseOverviewToolType,
 		"source": "my-instance",
 	}
 	tools["list_triggers"] = map[string]any{
-		"kind":   PostgresListTriggersToolKind,
+		"type":   PostgresListTriggersToolType,
 		"source": "my-instance",
 	}
 	tools["list_indexes"] = map[string]any{
-		"kind":   PostgresListIndexesToolKind,
+		"type":   PostgresListIndexesToolType,
 		"source": "my-instance",
 	}
 	tools["list_sequences"] = map[string]any{
-		"kind":   PostgresListSequencesToolKind,
+		"type":   PostgresListSequencesToolType,
 		"source": "my-instance",
 	}
 	tools["list_publication_tables"] = map[string]any{
-		"kind":   PostgresListPublicationTablesToolKind,
+		"type":   PostgresListPublicationTablesToolType,
 		"source": "my-instance",
 	}
 	tools["long_running_transactions"] = map[string]any{
-		"kind":   PostgresLongRunningTransactionsToolKind,
+		"type":   PostgresLongRunningTransactionsToolType,
 		"source": "my-instance",
 	}
 	tools["list_locks"] = map[string]any{
-		"kind":   PostgresListLocksToolKind,
+		"type":   PostgresListLocksToolType,
 		"source": "my-instance",
 	}
 	tools["replication_stats"] = map[string]any{
-		"kind":   PostgresReplicationStatsToolKind,
+		"type":   PostgresReplicationStatsToolType,
 		"source": "my-instance",
 	}
 	tools["list_query_stats"] = map[string]any{
-		"kind":   PostgresListQueryStatsToolKind,
+		"type":   PostgresListQueryStatsToolType,
 		"source": "my-instance",
 	}
 	tools["get_column_cardinality"] = map[string]any{
-		"kind":   PostgresGetColumnCardinalityToolKind,
+		"type":   PostgresGetColumnCardinalityToolType,
 		"source": "my-instance",
 	}
 
 	tools["list_table_stats"] = map[string]any{
-		"kind":   PostgresListTableStats,
+		"type":   PostgresListTableStats,
 		"source": "my-instance",
 	}
 
 	tools["list_tablespaces"] = map[string]any{
-		"kind":   PostgresListTablespacesToolKind,
+		"type":   PostgresListTablespacesToolType,
 		"source": "my-instance",
 	}
 	tools["list_pg_settings"] = map[string]any{
-		"kind":   PostgresListPGSettingsToolKind,
+		"type":   PostgresListPGSettingsToolType,
 		"source": "my-instance",
 	}
 	tools["list_database_stats"] = map[string]any{
-		"kind":   PostgresListDatabaseStatsToolKind,
+		"type":   PostgresListDatabaseStatsToolType,
 		"source": "my-instance",
 	}
 
 	tools["list_roles"] = map[string]any{
-		"kind":   PostgresListRolesToolKind,
+		"type":   PostgresListRolesToolType,
 		"source": "my-instance",
 	}
 
 	tools["list_stored_procedure"] = map[string]any{
-		"kind":   PostgresListStoredProcedureToolKind,
+		"type":   PostgresListStoredProcedureToolType,
 		"source": "my-instance",
 	}
 	config["tools"] = tools
 	return config
 }
 
-func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplSelectCombined, tmplSelectFilterCombined string, tmplSelectAll string) map[string]any {
+func AddTemplateParamConfig(t *testing.T, config map[string]any, toolType, tmplSelectCombined, tmplSelectFilterCombined string, tmplSelectAll string) map[string]any {
 	toolsMap, ok := config["tools"].(map[string]any)
 	if !ok {
 		t.Fatalf("unable to get tools from config")
@@ -332,7 +331,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 	}
 
 	toolsMap["create-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "CREATE TABLE {{.tableName}} ({{array .columns}})",
@@ -342,7 +341,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 		},
 	}
 	toolsMap["insert-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Insert tool with template parameters",
 		"statement":   "INSERT INTO {{.tableName}} ({{array .columns}}) VALUES ({{.values}})",
@@ -353,7 +352,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 		},
 	}
 	toolsMap["select-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   selectAll,
@@ -362,7 +361,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 		},
 	}
 	toolsMap["select-templateParams-combined-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   tmplSelectCombined,
@@ -372,7 +371,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 		},
 	}
 	toolsMap["select-fields-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT {{array .fields}} FROM {{.tableName}} ORDER BY id",
@@ -382,7 +381,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 		},
 	}
 	toolsMap["select-filter-templateParams-combined-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   tmplSelectFilterCombined,
@@ -393,7 +392,7 @@ func AddTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplS
 		},
 	}
 	toolsMap["drop-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Drop table tool with template parameters",
 		"statement":   "DROP TABLE IF EXISTS {{.tableName}}",
@@ -412,12 +411,12 @@ func AddMySqlExecuteSqlConfig(t *testing.T, config map[string]any) map[string]an
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "mysql-execute-sql",
+		"type":        "mysql-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "mysql-execute-sql",
+		"type":        "mysql-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -435,27 +434,27 @@ func AddMySQLPrebuiltToolConfig(t *testing.T, config map[string]any) map[string]
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["list_tables"] = map[string]any{
-		"kind":        "mysql-list-tables",
+		"type":        "mysql-list-tables",
 		"source":      "my-instance",
 		"description": "Lists tables in the database.",
 	}
 	tools["list_active_queries"] = map[string]any{
-		"kind":        "mysql-list-active-queries",
+		"type":        "mysql-list-active-queries",
 		"source":      "my-instance",
 		"description": "Lists active queries in the database.",
 	}
 	tools["list_tables_missing_unique_indexes"] = map[string]any{
-		"kind":        "mysql-list-tables-missing-unique-indexes",
+		"type":        "mysql-list-tables-missing-unique-indexes",
 		"source":      "my-instance",
 		"description": "Lists tables that do not have primary or unique indexes in the database.",
 	}
 	tools["list_table_fragmentation"] = map[string]any{
-		"kind":        "mysql-list-table-fragmentation",
+		"type":        "mysql-list-table-fragmentation",
 		"source":      "my-instance",
 		"description": "Lists table fragmentation in the database.",
 	}
 	tools["get_query_plan"] = map[string]any{
-		"kind":        "mysql-get-query-plan",
+		"type":        "mysql-get-query-plan",
 		"source":      "my-instance",
 		"description": "Gets the query plan for a SQL statement.",
 	}
@@ -470,12 +469,12 @@ func AddMSSQLExecuteSqlConfig(t *testing.T, config map[string]any) map[string]an
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "mssql-execute-sql",
+		"type":        "mssql-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "mssql-execute-sql",
+		"type":        "mssql-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -493,7 +492,7 @@ func AddMSSQLPrebuiltToolConfig(t *testing.T, config map[string]any) map[string]
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["list_tables"] = map[string]any{
-		"kind":        "mssql-list-tables",
+		"type":        "mssql-list-tables",
 		"source":      "my-instance",
 		"description": "Lists tables in the database.",
 	}
@@ -501,7 +500,7 @@ func AddMSSQLPrebuiltToolConfig(t *testing.T, config map[string]any) map[string]
 	return config
 }
 
-// GetPostgresSQLParamToolInfo returns statements and param for my-tool postgres-sql kind
+// GetPostgresSQLParamToolInfo returns statements and param for my-tool postgres-sql type
 func GetPostgresSQLParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id SERIAL PRIMARY KEY, name TEXT);", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name) VALUES ($1), ($2), ($3), ($4);", tableName)
@@ -513,7 +512,7 @@ func GetPostgresSQLParamToolInfo(tableName string) (string, string, string, stri
 	return createStatement, insertStatement, toolStatement, idParamStatement, nameParamStatement, arrayToolStatement, params
 }
 
-// GetPostgresSQLAuthToolInfo returns statements and param of my-auth-tool for postgres-sql kind
+// GetPostgresSQLAuthToolInfo returns statements and param of my-auth-tool for postgres-sql type
 func GetPostgresSQLAuthToolInfo(tableName string) (string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id SERIAL PRIMARY KEY, name TEXT, email TEXT);", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name, email) VALUES ($1, $2), ($3, $4)", tableName)
@@ -522,14 +521,49 @@ func GetPostgresSQLAuthToolInfo(tableName string) (string, string, string, []any
 	return createStatement, insertStatement, toolStatement, params
 }
 
-// GetPostgresSQLTmplToolStatement returns statements and param for template parameter test cases for postgres-sql kind
+// GetPostgresSQLTmplToolStatement returns statements and param for template parameter test cases for postgres-sql type
 func GetPostgresSQLTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = $1"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = $1"
 	return tmplSelectCombined, tmplSelectFilterCombined
 }
 
-// GetMSSQLParamToolInfo returns statements and param for my-tool mssql-sql kind
+// GetCockroachDBParamToolInfo returns statements and param for my-tool cockroachdb-sql type
+// Uses explicit INT PRIMARY KEY instead of SERIAL to ensure deterministic IDs
+func GetCockroachDBParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
+	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT PRIMARY KEY, name TEXT);", tableName)
+	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name) VALUES (1, $1), (2, $2), (3, $3), (4, $4);", tableName)
+	toolStatement := fmt.Sprintf("SELECT * FROM %s WHERE id = $1 OR name = $2 ORDER BY id;", tableName)
+	idParamStatement := fmt.Sprintf("SELECT * FROM %s WHERE id = $1;", tableName)
+	nameParamStatement := fmt.Sprintf("SELECT * FROM %s WHERE name = $1;", tableName)
+	arrayToolStatement := fmt.Sprintf("SELECT * FROM %s WHERE id = ANY($1) AND name = ANY($2) ORDER BY id;", tableName)
+	params := []any{"Alice", "Jane", "Sid", nil}
+	return createStatement, insertStatement, toolStatement, idParamStatement, nameParamStatement, arrayToolStatement, params
+}
+
+// GetCockroachDBAuthToolInfo returns statements and param of my-auth-tool for cockroachdb-sql type
+// Uses explicit INT PRIMARY KEY instead of SERIAL to ensure deterministic IDs
+func GetCockroachDBAuthToolInfo(tableName string) (string, string, string, []any) {
+	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT PRIMARY KEY, name TEXT, email TEXT);", tableName)
+	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name, email) VALUES (1, $1, $2), (2, $3, $4)", tableName)
+	toolStatement := fmt.Sprintf("SELECT name FROM %s WHERE email = $1;", tableName)
+	params := []any{"Alice", ServiceAccountEmail, "Jane", "janedoe@gmail.com"}
+	return createStatement, insertStatement, toolStatement, params
+}
+
+// GetCockroachDBWants return the expected wants for cockroachdb
+func GetCockroachDBWants() (string, string, string, string) {
+	select1Want := "[{\"?column?\":1}]"
+	// CockroachDB formats syntax errors differently than PostgreSQL:
+	// - Uses lowercase for SQL keywords in error messages
+	// - Uses format: 'at or near "token": syntax error' instead of 'syntax error at or near "TOKEN"'
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: ERROR: at or near \"selec\": syntax error (SQLSTATE 42601)"}],"isError":true}}`
+	createTableStatement := `"CREATE TABLE t (id INT 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
+}
+
+// GetMSSQLParamToolInfo returns statements and param for my-tool mssql-sql type
 func GetMSSQLParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT IDENTITY(1,1) PRIMARY KEY, name VARCHAR(255));", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name) VALUES (@alice), (@jane), (@sid), (@nil);", tableName)
@@ -541,7 +575,7 @@ func GetMSSQLParamToolInfo(tableName string) (string, string, string, string, st
 	return createStatement, insertStatement, toolStatement, idParamStatement, nameParamStatement, arrayToolStatement, params
 }
 
-// GetMSSQLAuthToolInfo returns statements and param of my-auth-tool for mssql-sql kind
+// GetMSSQLAuthToolInfo returns statements and param of my-auth-tool for mssql-sql type
 func GetMSSQLAuthToolInfo(tableName string) (string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT IDENTITY(1,1) PRIMARY KEY, name VARCHAR(255), email VARCHAR(255));", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name, email) VALUES (@alice, @aliceemail), (@jane, @janeemail);", tableName)
@@ -550,14 +584,14 @@ func GetMSSQLAuthToolInfo(tableName string) (string, string, string, []any) {
 	return createStatement, insertStatement, toolStatement, params
 }
 
-// GetMSSQLTmplToolStatement returns statements and param for template parameter test cases for mysql-sql kind
+// GetMSSQLTmplToolStatement returns statements and param for template parameter test cases for mysql-sql type
 func GetMSSQLTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = @id"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = @name"
 	return tmplSelectCombined, tmplSelectFilterCombined
 }
 
-// GetMySQLParamToolInfo returns statements and param for my-tool mysql-sql kind
+// GetMySQLParamToolInfo returns statements and param for my-tool mysql-sql type
 func GetMySQLParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255));", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name) VALUES (?), (?), (?), (?);", tableName)
@@ -569,7 +603,7 @@ func GetMySQLParamToolInfo(tableName string) (string, string, string, string, st
 	return createStatement, insertStatement, toolStatement, idParamStatement, nameParamStatement, arrayToolStatement, params
 }
 
-// GetMySQLAuthToolInfo returns statements and param of my-auth-tool for mysql-sql kind
+// GetMySQLAuthToolInfo returns statements and param of my-auth-tool for mysql-sql type
 func GetMySQLAuthToolInfo(tableName string) (string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), email VARCHAR(255));", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name, email) VALUES (?, ?), (?, ?)", tableName)
@@ -578,7 +612,7 @@ func GetMySQLAuthToolInfo(tableName string) (string, string, string, []any) {
 	return createStatement, insertStatement, toolStatement, params
 }
 
-// GetMySQLTmplToolStatement returns statements and param for template parameter test cases for mysql-sql kind
+// GetMySQLTmplToolStatement returns statements and param for template parameter test cases for mysql-sql type
 func GetMySQLTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = ?"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = ?"
@@ -588,7 +622,7 @@ func GetMySQLTmplToolStatement() (string, string) {
 // GetPostgresWants return the expected wants for postgres
 func GetPostgresWants() (string, 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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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
@@ -597,7 +631,7 @@ func GetPostgresWants() (string, string, string, string) {
 // GetMSSQLWants return the expected wants for mssql
 func GetMSSQLWants() (string, 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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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
@@ -606,7 +640,7 @@ func GetMSSQLWants() (string, string, string, string) {
 // GetMySQLWants return the expected wants for mysql
 func GetMySQLWants() (string, 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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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
@@ -711,26 +745,26 @@ func GetRedisValkeyWants() (string, string, string, string, string, string, stri
 	return select1Want, mcpMyFailToolWant, invokeParamWant, invokeIdNullWant, nullWant, mcpSelect1Want, mcpInvokeParamWant
 }
 
-func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map[string]any {
+func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolType string) map[string]any {
 	toolsFile := map[string]any{
 		"sources": map[string]any{
 			"my-instance": sourceConfig,
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"commands":    [][]string{{"PING"}},
 			},
 			"my-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"commands":    [][]string{{"HGETALL", "row1"}, {"HGETALL", "row3"}},
@@ -748,7 +782,7 @@ func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map
 				},
 			},
 			"my-tool-by-id": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"commands":    [][]string{{"HGETALL", "row4"}},
@@ -761,7 +795,7 @@ func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map
 				},
 			},
 			"my-tool-by-name": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"commands":    [][]string{{"GET", "null"}},
@@ -775,7 +809,7 @@ func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map
 				},
 			},
 			"my-array-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with array params.",
 				"commands":    [][]string{{"HGETALL", "row1"}, {"$cmdArray"}},
@@ -793,7 +827,7 @@ func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map
 				},
 			},
 			"my-auth-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test authenticated parameters.",
 				// statement to auto-fill authenticated parameter
@@ -813,7 +847,7 @@ func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map
 				},
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test auth required invocation.",
 				"commands":    [][]string{{"PING"}},
@@ -822,7 +856,7 @@ func GetRedisValkeyToolsConfig(sourceConfig map[string]any, toolKind string) map
 				},
 			},
 			"my-fail-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test statement with incorrect syntax.",
 				"commands":    [][]string{{"SELEC 1;"}},
@@ -843,20 +877,20 @@ func TestCloudSQLMySQL_IPTypeParsingFromYAML(t *testing.T) {
 		{
 			desc: "IPType Defaulting to Public",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -870,21 +904,21 @@ func TestCloudSQLMySQL_IPTypeParsingFromYAML(t *testing.T) {
 		{
 			desc: "IPType Explicit Public",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: Public
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: Public
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -898,21 +932,21 @@ func TestCloudSQLMySQL_IPTypeParsingFromYAML(t *testing.T) {
 		{
 			desc: "IPType Explicit Private",
 			in: `
-			sources:
-				my-mysql-instance:
-					kind: cloud-sql-mysql
-					project: my-project
-					region: my-region
-					instance: my-instance
-					ipType: private
-					database: my_db
-					user: my_user
-					password: my_pass
+			kind: sources
+			name: my-mysql-instance
+			type: cloud-sql-mysql
+			project: my-project
+			region: my-region
+			instance: my-instance
+			ipType: private
+			database: my_db
+			user: my_user
+			password: my_pass
 			`,
 			want: server.SourceConfigs{
 				"my-mysql-instance": cloudsqlmysql.Config{
 					Name:     "my-mysql-instance",
-					Kind:     cloudsqlmysql.SourceKind,
+					Type:     cloudsqlmysql.SourceType,
 					Project:  "my-project",
 					Region:   "my-region",
 					Instance: "my-instance",
@@ -926,16 +960,12 @@ func TestCloudSQLMySQL_IPTypeParsingFromYAML(t *testing.T) {
 	}
 	for _, tc := range tcs {
 		t.Run(tc.desc, func(t *testing.T) {
-			got := struct {
-				Sources server.SourceConfigs `yaml:"sources"`
-			}{}
-			// Parse contents
-			err := yaml.Unmarshal(testutils.FormatYaml(tc.in), &got)
+			got, _, _, _, _, _, err := server.UnmarshalResourceConfig(context.Background(), testutils.FormatYaml(tc.in))
 			if err != nil {
 				t.Fatalf("unable to unmarshal: %s", err)
 			}
-			if !cmp.Equal(tc.want, got.Sources) {
-				t.Fatalf("incorrect parse: diff (-want +got):\n%s", cmp.Diff(tc.want, got.Sources))
+			if !cmp.Equal(tc.want, got) {
+				t.Fatalf("incorrect parse: diff (-want +got):\n%s", cmp.Diff(tc.want, got))
 			}
 		})
 	}
diff --git a/tests/couchbase/couchbase_integration_test.go b/tests/couchbase/couchbase_integration_test.go
index fcb0493c32..1d7bb6bfc4 100644
--- a/tests/couchbase/couchbase_integration_test.go
+++ b/tests/couchbase/couchbase_integration_test.go
@@ -30,8 +30,8 @@ import (
 )
 
 const (
-	couchbaseSourceKind = "couchbase"
-	couchbaseToolKind   = "couchbase-sql"
+	couchbaseSourceType = "couchbase"
+	couchbaseToolType   = "couchbase-sql"
 )
 
 var (
@@ -58,7 +58,7 @@ func getCouchbaseVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":                 couchbaseSourceKind,
+		"type":                 couchbaseSourceType,
 		"connectionString":     couchbaseConnection,
 		"bucket":               couchbaseBucket,
 		"scope":                couchbaseScope,
@@ -118,8 +118,8 @@ func TestCouchbaseToolEndpoints(t *testing.T) {
 	defer teardownCollection3(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, couchbaseToolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement)
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, couchbaseToolKind, tmplSelectCombined, tmplSelectFilterCombined, tmplSelectAll)
+	toolsFile := tests.GetToolsConfig(sourceConfig, couchbaseToolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement)
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, couchbaseToolType, tmplSelectCombined, tmplSelectFilterCombined, tmplSelectAll)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -137,7 +137,7 @@ 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;\"`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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\"}]"
@@ -231,7 +231,7 @@ func setupCouchbaseCollection(t *testing.T, ctx context.Context, cluster *gocb.C
 	}
 }
 
-// getCouchbaseParamToolInfo returns statements and params for my-tool couchbase-sql kind
+// getCouchbaseParamToolInfo returns statements and params for my-tool couchbase-sql type
 func getCouchbaseParamToolInfo(collectionName string) (string, string, string, string, []map[string]any) {
 	// N1QL uses positional or named parameters with $ prefix
 	toolStatement := fmt.Sprintf("SELECT TONUMBER(meta().id) as id, "+
@@ -254,7 +254,7 @@ func getCouchbaseParamToolInfo(collectionName string) (string, string, string, s
 	return toolStatement, idToolStatement, nameToolStatement, arrayToolStatemnt, params
 }
 
-// getCouchbaseAuthToolInfo returns statements and param of my-auth-tool for couchbase-sql kind
+// getCouchbaseAuthToolInfo returns statements and param of my-auth-tool for couchbase-sql type
 func getCouchbaseAuthToolInfo(collectionName string) (string, []map[string]any) {
 	toolStatement := fmt.Sprintf("SELECT name FROM %s WHERE email = $email", collectionName)
 
diff --git a/tests/dataform/dataform_integration_test.go b/tests/dataform/dataform_integration_test.go
index c7218f1d02..3be737fca0 100644
--- a/tests/dataform/dataform_integration_test.go
+++ b/tests/dataform/dataform_integration_test.go
@@ -69,7 +69,7 @@ func TestDataformCompileTool(t *testing.T) {
 	toolsFile := map[string]any{
 		"tools": map[string]any{
 			"my-dataform-compiler": map[string]any{
-				"kind":        "dataform-compile-local",
+				"type":        "dataform-compile-local",
 				"description": "Tool to compile dataform projects",
 			},
 		},
@@ -109,13 +109,13 @@ func TestDataformCompileTool(t *testing.T) {
 		{
 			name:       "missing parameter",
 			reqBody:    `{}`,
-			wantStatus: http.StatusBadRequest,
-			wantBody:   `parameter \"project_dir\" is required`,
+			wantStatus: http.StatusOK,
+			wantBody:   `error`,
 		},
 		{
 			name:       "non-existent directory",
 			reqBody:    fmt.Sprintf(`{"project_dir":"%s"}`, nonExistentDir),
-			wantStatus: http.StatusBadRequest,
+			wantStatus: http.StatusOK,
 			wantBody:   "error executing dataform compile",
 		},
 	}
diff --git a/tests/dataplex/dataplex_integration_test.go b/tests/dataplex/dataplex_integration_test.go
index 4466a50cf8..602c74ec2e 100644
--- a/tests/dataplex/dataplex_integration_test.go
+++ b/tests/dataplex/dataplex_integration_test.go
@@ -40,10 +40,10 @@ import (
 )
 
 var (
-	DataplexSourceKind                = "dataplex"
-	DataplexSearchEntriesToolKind     = "dataplex-search-entries"
-	DataplexLookupEntryToolKind       = "dataplex-lookup-entry"
-	DataplexSearchAspectTypesToolKind = "dataplex-search-aspect-types"
+	DataplexSourceType                = "dataplex"
+	DataplexSearchEntriesToolType     = "dataplex-search-entries"
+	DataplexLookupEntryToolType       = "dataplex-lookup-entry"
+	DataplexSearchAspectTypesToolType = "dataplex-search-aspect-types"
 	DataplexProject                   = os.Getenv("DATAPLEX_PROJECT")
 )
 
@@ -53,7 +53,7 @@ func getDataplexVars(t *testing.T) map[string]any {
 		t.Fatal("'DATAPLEX_PROJECT' not set")
 	}
 	return map[string]any{
-		"kind":    DataplexSourceKind,
+		"type":    DataplexSourceType,
 		"project": DataplexProject,
 	}
 }
@@ -283,40 +283,40 @@ func getDataplexToolsConfig(sourceConfig map[string]any) map[string]any {
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-dataplex-search-entries-tool": map[string]any{
-				"kind":        DataplexSearchEntriesToolKind,
+				"type":        DataplexSearchEntriesToolType,
 				"source":      "my-dataplex-instance",
 				"description": "Simple dataplex search entries tool to test end to end functionality.",
 			},
 			"my-auth-dataplex-search-entries-tool": map[string]any{
-				"kind":         DataplexSearchEntriesToolKind,
+				"type":         DataplexSearchEntriesToolType,
 				"source":       "my-dataplex-instance",
 				"description":  "Simple dataplex search entries tool to test end to end functionality.",
 				"authRequired": []string{"my-google-auth"},
 			},
 			"my-dataplex-lookup-entry-tool": map[string]any{
-				"kind":        DataplexLookupEntryToolKind,
+				"type":        DataplexLookupEntryToolType,
 				"source":      "my-dataplex-instance",
 				"description": "Simple dataplex lookup entry tool to test end to end functionality.",
 			},
 			"my-auth-dataplex-lookup-entry-tool": map[string]any{
-				"kind":         DataplexLookupEntryToolKind,
+				"type":         DataplexLookupEntryToolType,
 				"source":       "my-dataplex-instance",
 				"description":  "Simple dataplex lookup entry tool to test end to end functionality.",
 				"authRequired": []string{"my-google-auth"},
 			},
 			"my-dataplex-search-aspect-types-tool": map[string]any{
-				"kind":        DataplexSearchAspectTypesToolKind,
+				"type":        DataplexSearchAspectTypesToolType,
 				"source":      "my-dataplex-instance",
 				"description": "Simple dataplex search aspect types tool to test end to end functionality.",
 			},
 			"my-auth-dataplex-search-aspect-types-tool": map[string]any{
-				"kind":         DataplexSearchAspectTypesToolKind,
+				"type":         DataplexSearchAspectTypesToolType,
 				"source":       "my-dataplex-instance",
 				"description":  "Simple dataplex search aspect types tool to test end to end functionality.",
 				"authRequired": []string{"my-google-auth"},
@@ -517,8 +517,11 @@ func runDataplexSearchEntriesToolInvokeTest(t *testing.T, tableName string, data
 					t.Fatalf("expected entry to have key '%s', but it was not found in %v", tc.wantContentKey, entry)
 				}
 			} else {
-				if len(entries) != 0 {
-					t.Fatalf("expected 0 entries, but got %d", len(entries))
+				isResultEmpty := resultStr == "" || resultStr == "[]" || resultStr == "null"
+				hasError := strings.Contains(resultStr, `"error":`)
+
+				if !isResultEmpty && !hasError {
+					t.Fatalf("expected an empty result or error message, but got: %s", resultStr)
 				}
 			}
 		})
@@ -584,7 +587,7 @@ func runDataplexLookupEntryToolInvokeTest(t *testing.T, tableName string, datase
 			api:            "http://127.0.0.1:5000/api/tool/my-dataplex-lookup-entry-tool/invoke",
 			requestHeader:  map[string]string{},
 			requestBody:    bytes.NewBuffer([]byte(fmt.Sprintf("{\"name\":\"projects/%s/locations/us\", \"entry\":\"projects/%s/locations/us/entryGroups/@bigquery/entries/bigquery.googleapis.com/projects/%s/datasets/%s\"}", DataplexProject, DataplexProject, DataplexProject, "non-existent-dataset"))),
-			wantStatusCode: 400,
+			wantStatusCode: 200,
 			expectResult:   false,
 		},
 		{
@@ -602,7 +605,7 @@ func runDataplexLookupEntryToolInvokeTest(t *testing.T, tableName string, datase
 			api:            "http://127.0.0.1:5000/api/tool/my-dataplex-lookup-entry-tool/invoke",
 			requestHeader:  map[string]string{},
 			requestBody:    bytes.NewBuffer([]byte(fmt.Sprintf("{\"name\":\"projects/%s/locations/us\", \"entry\":\"projects/%s/locations/us/entryGroups/@bigquery/entries/bigquery.googleapis.com/projects/%s/datasets/%s/tables/%s\", \"view\": %d}", DataplexProject, DataplexProject, DataplexProject, datasetName, tableName, 3))),
-			wantStatusCode: 400,
+			wantStatusCode: 200,
 			expectResult:   false,
 		},
 		{
@@ -643,42 +646,44 @@ func runDataplexLookupEntryToolInvokeTest(t *testing.T, tableName string, datase
 				t.Fatalf("Error parsing response body: %v", err)
 			}
 
+			resultStr, hasResult := result["result"].(string)
+
 			if tc.expectResult {
-				resultStr, ok := result["result"].(string)
-				if !ok {
-					t.Fatalf("Expected 'result' field to be a string on success, got %T", result["result"])
-				}
-				if resultStr == "" || resultStr == "{}" || resultStr == "null" {
-					t.Fatal("Expected an entry, but got empty result")
+				if !hasResult || resultStr == "" || resultStr == "{}" || resultStr == "null" {
+					t.Fatalf("Expected a result, but got: %v", result)
 				}
 
 				var entry map[string]interface{}
 				if err := json.Unmarshal([]byte(resultStr), &entry); err != nil {
-					t.Fatalf("Error unmarshalling result string into entry map: %v", err)
+					t.Fatalf("Error unmarshalling result string: %v. Raw result: %s", err, resultStr)
 				}
 
 				if _, ok := entry[tc.wantContentKey]; !ok {
 					t.Fatalf("Expected entry to have key '%s', but it was not found in %v", tc.wantContentKey, entry)
 				}
 
-				if _, ok := entry[tc.dontWantContentKey]; ok {
-					t.Fatalf("Expected entry to not have key '%s', but it was found in %v", tc.dontWantContentKey, entry)
+				if tc.dontWantContentKey != "" {
+					if _, ok := entry[tc.dontWantContentKey]; ok {
+						t.Fatalf("Expected entry to NOT have key '%s', but it was found", tc.dontWantContentKey)
+					}
 				}
 
 				if tc.aspectCheck {
-					// Check length of aspects
 					aspects, ok := entry["aspects"].(map[string]interface{})
-					if !ok {
-						t.Fatalf("Expected 'aspects' to be a map, got %T", aspects)
-					}
-					if len(aspects) != 1 {
+					if !ok || len(aspects) != 1 {
 						t.Fatalf("Expected exactly one aspect, but got %d", len(aspects))
 					}
 				}
-			} else { // Handle expected error response
-				_, ok := result["error"]
-				if !ok {
-					t.Fatalf("Expected 'error' field in response, got %v", result)
+			} else {
+				foundError := false
+				if _, ok := result["error"]; ok {
+					foundError = true
+				} else if hasResult && strings.Contains(resultStr, `"error"`) {
+					foundError = true
+				}
+
+				if !foundError {
+					t.Fatalf("Expected an error in response, but none was found. Response: %v", result)
 				}
 			}
 		})
diff --git a/tests/dgraph/dgraph_integration_test.go b/tests/dgraph/dgraph_integration_test.go
index f27cd8dab1..17e17358ba 100644
--- a/tests/dgraph/dgraph_integration_test.go
+++ b/tests/dgraph/dgraph_integration_test.go
@@ -31,7 +31,7 @@ import (
 )
 
 var (
-	DgraphSourceKind = "dgraph"
+	DgraphSourceType = "dgraph"
 	DgraphApiKey     = "api-key"
 	DgraphUrl        = os.Getenv("DGRAPH_URL")
 )
@@ -41,7 +41,7 @@ func getDgraphVars(t *testing.T) map[string]any {
 		t.Fatal("'DGRAPH_URL' not set")
 	}
 	return map[string]any{
-		"kind":      DgraphSourceKind,
+		"type":      DgraphSourceType,
 		"dgraphUrl": DgraphUrl,
 		"apiKey":    DgraphApiKey,
 	}
@@ -61,7 +61,7 @@ func TestDgraphToolEndpoints(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"my-simple-dql-tool": map[string]any{
-				"kind":        "dgraph-dql",
+				"type":        "dgraph-dql",
 				"source":      "my-dgraph-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"statement":   "{result(func: uid(0x0)) {constant: math(1)}}",
diff --git a/tests/elasticsearch/elasticsearch_integration_test.go b/tests/elasticsearch/elasticsearch_integration_test.go
index 16a7b39b7b..bd451339c5 100644
--- a/tests/elasticsearch/elasticsearch_integration_test.go
+++ b/tests/elasticsearch/elasticsearch_integration_test.go
@@ -31,8 +31,8 @@ import (
 )
 
 var (
-	ElasticsearchSourceKind = "elasticsearch"
-	ElasticsearchToolKind   = "elasticsearch-esql"
+	ElasticsearchSourceType = "elasticsearch"
+	ElasticsearchToolType   = "elasticsearch-esql"
 	EsAddress               = os.Getenv("ELASTICSEARCH_HOST")
 	EsUser                  = os.Getenv("ELASTICSEARCH_USER")
 	EsPass                  = os.Getenv("ELASTICSEARCH_PASS")
@@ -43,7 +43,7 @@ func getElasticsearchVars(t *testing.T) map[string]any {
 		t.Fatal("'ELASTICSEARCH_HOST' not set")
 	}
 	return map[string]any{
-		"kind":      ElasticsearchSourceKind,
+		"type":      ElasticsearchSourceType,
 		"addresses": []string{EsAddress},
 		"username":  EsUser,
 		"password":  EsPass,
@@ -72,7 +72,7 @@ func TestElasticsearchToolEndpoints(t *testing.T) {
 
 	paramToolStatement, idParamToolStatement, nameParamToolStatement, arrayParamToolStatement, authToolStatement := getElasticsearchQueries(index)
 
-	toolsConfig := getElasticsearchToolsConfig(sourceConfig, ElasticsearchToolKind, paramToolStatement, idParamToolStatement, nameParamToolStatement, arrayParamToolStatement, authToolStatement)
+	toolsConfig := getElasticsearchToolsConfig(sourceConfig, ElasticsearchToolType, paramToolStatement, idParamToolStatement, nameParamToolStatement, arrayParamToolStatement, authToolStatement)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsConfig, args...)
 	if err != nil {
@@ -177,26 +177,26 @@ func getElasticsearchWants() ElasticsearchWants {
 	}
 }
 
-func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
+func getElasticsearchToolsConfig(sourceConfig map[string]any, toolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
 	toolsFile := map[string]any{
 		"sources": map[string]any{
 			"my-instance": sourceConfig,
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"query":       "FROM test-index | SORT id ASC",
 			},
 			"my-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"query":       paramToolStatement,
@@ -214,7 +214,7 @@ func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToo
 				},
 			},
 			"my-tool-by-id": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"query":       idParamToolStmt,
@@ -227,7 +227,7 @@ func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToo
 				},
 			},
 			"my-tool-by-name": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"query":       nameParamToolStmt,
@@ -241,7 +241,7 @@ func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToo
 				},
 			},
 			"my-array-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with array params.",
 				"query":       arrayToolStatement,
@@ -269,7 +269,7 @@ func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToo
 				},
 			},
 			"my-auth-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test authenticated parameters.",
 				// statement to auto-fill authenticated parameter
@@ -289,7 +289,7 @@ func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToo
 				},
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test auth required invocation.",
 				"query":       "FROM test-index | SORT id ASC",
@@ -298,7 +298,7 @@ func getElasticsearchToolsConfig(sourceConfig map[string]any, toolKind, paramToo
 				},
 			},
 			"my-fail-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test statement with incorrect syntax.",
 				"query":       "SELEC 1;",
diff --git a/tests/firebird/firebird_integration_test.go b/tests/firebird/firebird_integration_test.go
index af0246d11c..8644e0ffe5 100644
--- a/tests/firebird/firebird_integration_test.go
+++ b/tests/firebird/firebird_integration_test.go
@@ -32,8 +32,8 @@ import (
 )
 
 var (
-	FirebirdSourceKind = "firebird"
-	FirebirdToolKind   = "firebird-sql"
+	FirebirdSourceType = "firebird"
+	FirebirdToolType   = "firebird-sql"
 	FirebirdDatabase   = os.Getenv("FIREBIRD_DATABASE")
 	FirebirdHost       = os.Getenv("FIREBIRD_HOST")
 	FirebirdPort       = os.Getenv("FIREBIRD_PORT")
@@ -56,7 +56,7 @@ func getFirebirdVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     FirebirdSourceKind,
+		"type":     FirebirdSourceType,
 		"host":     FirebirdHost,
 		"port":     FirebirdPort,
 		"database": FirebirdDatabase,
@@ -107,10 +107,10 @@ func TestFirebirdToolEndpoints(t *testing.T) {
 	teardownTable2 := setupFirebirdTable(t, ctx, db, createAuthTableStmts, insertAuthTableStmt, tableNameAuth, authTestParams)
 	defer teardownTable2(t)
 
-	toolsFile := getFirebirdToolsConfig(sourceConfig, FirebirdToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := getFirebirdToolsConfig(sourceConfig, FirebirdToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addFirebirdExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getFirebirdTmplToolStatement()
-	toolsFile = addFirebirdTemplateParamConfig(t, toolsFile, FirebirdToolKind, tmplSelectCombined, tmplSelectFilterCombined)
+	toolsFile = addFirebirdTemplateParamConfig(t, toolsFile, FirebirdToolType, tmplSelectCombined, tmplSelectFilterCombined)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -305,14 +305,14 @@ func getFirebirdAuthToolInfo(tableName string) ([]string, string, string, []any)
 
 func getFirebirdWants() (string, 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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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
 }
 
-func getFirebirdToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
-	toolsFile := tests.GetToolsConfig(sourceConfig, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement)
+func getFirebirdToolsConfig(sourceConfig map[string]any, toolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
+	toolsFile := tests.GetToolsConfig(sourceConfig, toolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement)
 
 	toolsMap, ok := toolsFile["tools"].(map[string]any)
 	if !ok {
@@ -350,7 +350,7 @@ func getFirebirdToolsConfig(sourceConfig map[string]any, toolKind, paramToolStat
 	return toolsFile
 }
 
-func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKind, tmplSelectCombined, tmplSelectFilterCombined string) map[string]any {
+func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolType, tmplSelectCombined, tmplSelectFilterCombined string) map[string]any {
 	toolsMap, ok := config["tools"].(map[string]any)
 	if !ok {
 		t.Fatalf("unable to get tools from config")
@@ -358,7 +358,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 
 	// Firebird-specific template parameter tools with compatible syntax
 	toolsMap["create-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "CREATE TABLE {{.tableName}} ({{array .columns}})",
@@ -368,7 +368,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 		},
 	}
 	toolsMap["insert-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Insert table tool with template parameters",
 		"statement":   "INSERT INTO {{.tableName}} ({{array .columns}}) VALUES ({{.values}})",
@@ -379,7 +379,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 		},
 	}
 	toolsMap["select-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select table tool with template parameters",
 		"statement":   "SELECT id AS \"id\", name AS \"name\", age AS \"age\" FROM {{.tableName}}",
@@ -388,7 +388,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 		},
 	}
 	toolsMap["select-templateParams-combined-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select table tool with combined template parameters",
 		"statement":   tmplSelectCombined,
@@ -400,7 +400,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 		},
 	}
 	toolsMap["select-fields-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select specific fields tool with template parameters",
 		"statement":   "SELECT name AS \"name\" FROM {{.tableName}}",
@@ -409,7 +409,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 		},
 	}
 	toolsMap["select-filter-templateParams-combined-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Select table tool with filter template parameters",
 		"statement":   tmplSelectFilterCombined,
@@ -423,7 +423,7 @@ func addFirebirdTemplateParamConfig(t *testing.T, config map[string]any, toolKin
 	}
 	// Firebird uses simple DROP TABLE syntax without IF EXISTS
 	toolsMap["drop-table-templateParams-tool"] = map[string]any{
-		"kind":        toolKind,
+		"type":        toolType,
 		"source":      "my-instance",
 		"description": "Drop table tool with template parameters",
 		"statement":   "DROP TABLE {{.tableName}}",
@@ -441,12 +441,12 @@ func addFirebirdExecuteSqlConfig(t *testing.T, config map[string]any) map[string
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "firebird-execute-sql",
+		"type":        "firebird-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "firebird-execute-sql",
+		"type":        "firebird-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
diff --git a/tests/firestore/firestore_integration_test.go b/tests/firestore/firestore_integration_test.go
index 5b1610e01a..53bf90f657 100644
--- a/tests/firestore/firestore_integration_test.go
+++ b/tests/firestore/firestore_integration_test.go
@@ -37,7 +37,7 @@ import (
 )
 
 var (
-	FirestoreSourceKind = "firestore"
+	FirestoreSourceType = "firestore"
 	FirestoreProject    = os.Getenv("FIRESTORE_PROJECT")
 	FirestoreDatabase   = os.Getenv("FIRESTORE_DATABASE") // Optional, defaults to "(default)"
 )
@@ -48,7 +48,7 @@ func getFirestoreVars(t *testing.T) map[string]any {
 	}
 
 	vars := map[string]any{
-		"kind":    FirestoreSourceKind,
+		"type":    FirestoreSourceType,
 		"project": FirestoreProject,
 	}
 
@@ -527,45 +527,45 @@ func getFirestoreToolsConfig(sourceConfig map[string]any) map[string]any {
 	tools := map[string]any{
 		// Tool for RunToolGetTest
 		"my-simple-tool": map[string]any{
-			"kind":        "firestore-get-documents",
+			"type":        "firestore-get-documents",
 			"source":      "my-instance",
 			"description": "Simple tool to test end to end functionality.",
 		},
 		// Tool for MCP test - this will get documents
 		"my-param-tool": map[string]any{
-			"kind":        "firestore-get-documents",
+			"type":        "firestore-get-documents",
 			"source":      "my-instance",
 			"description": "Tool to get documents by paths",
 		},
 		// Tool for MCP test that fails
 		"my-fail-tool": map[string]any{
-			"kind":        "firestore-get-documents",
+			"type":        "firestore-get-documents",
 			"source":      "my-instance",
 			"description": "Tool that will fail",
 		},
 		// Firestore specific tools
 		"firestore-get-docs": map[string]any{
-			"kind":        "firestore-get-documents",
+			"type":        "firestore-get-documents",
 			"source":      "my-instance",
 			"description": "Get multiple documents from Firestore",
 		},
 		"firestore-list-colls": map[string]any{
-			"kind":        "firestore-list-collections",
+			"type":        "firestore-list-collections",
 			"source":      "my-instance",
 			"description": "List Firestore collections",
 		},
 		"firestore-delete-docs": map[string]any{
-			"kind":        "firestore-delete-documents",
+			"type":        "firestore-delete-documents",
 			"source":      "my-instance",
 			"description": "Delete documents from Firestore",
 		},
 		"firestore-query-coll": map[string]any{
-			"kind":        "firestore-query-collection",
+			"type":        "firestore-query-collection",
 			"source":      "my-instance",
 			"description": "Query a Firestore collection",
 		},
 		"firestore-query-param": map[string]any{
-			"kind":           "firestore-query",
+			"type":           "firestore-query",
 			"source":         "my-instance",
 			"description":    "Query a Firestore collection with parameterizable filters",
 			"collectionPath": "{{.collection}}",
@@ -595,7 +595,7 @@ func getFirestoreToolsConfig(sourceConfig map[string]any) map[string]any {
 			},
 		},
 		"firestore-query-select-array": map[string]any{
-			"kind":           "firestore-query",
+			"type":           "firestore-query",
 			"source":         "my-instance",
 			"description":    "Query with array-based select fields",
 			"collectionPath": "{{.collection}}",
@@ -622,22 +622,22 @@ func getFirestoreToolsConfig(sourceConfig map[string]any) map[string]any {
 			},
 		},
 		"firestore-get-rules": map[string]any{
-			"kind":        "firestore-get-rules",
+			"type":        "firestore-get-rules",
 			"source":      "my-instance",
 			"description": "Get Firestore security rules",
 		},
 		"firestore-validate-rules": map[string]any{
-			"kind":        "firestore-validate-rules",
+			"type":        "firestore-validate-rules",
 			"source":      "my-instance",
 			"description": "Validate Firestore security rules",
 		},
 		"firestore-add-docs": map[string]any{
-			"kind":        "firestore-add-documents",
+			"type":        "firestore-add-documents",
 			"source":      "my-instance",
 			"description": "Add documents to Firestore",
 		},
 		"firestore-update-doc": map[string]any{
-			"kind":        "firestore-update-document",
+			"type":        "firestore-update-document",
 			"source":      "my-instance",
 			"description": "Update a document in Firestore",
 		},
diff --git a/tests/http/http_integration_test.go b/tests/http/http_integration_test.go
index dcaab03011..6ec82f4ce7 100644
--- a/tests/http/http_integration_test.go
+++ b/tests/http/http_integration_test.go
@@ -34,8 +34,8 @@ import (
 )
 
 var (
-	HttpSourceKind = "http"
-	HttpToolKind   = "http"
+	HttpSourceType = "http"
+	HttpToolType   = "http"
 )
 
 func getHTTPSourceConfig(t *testing.T) map[string]any {
@@ -46,7 +46,7 @@ func getHTTPSourceConfig(t *testing.T) map[string]any {
 	idToken = "Bearer " + idToken
 
 	return map[string]any{
-		"kind":    HttpSourceKind,
+		"type":    HttpSourceType,
 		"headers": map[string]string{"Authorization": idToken},
 	}
 }
@@ -309,7 +309,7 @@ func TestHttpToolEndpoints(t *testing.T) {
 
 	var args []string
 
-	toolsFile := getHTTPToolsConfig(sourceConfig, HttpToolKind)
+	toolsFile := getHTTPToolsConfig(sourceConfig, HttpToolType)
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
 		t.Fatalf("command initialization returned an error: %s", err)
@@ -404,37 +404,41 @@ func runQueryParamInvokeTest(t *testing.T) {
 	}
 }
 
-// runToolInvoke runs the tool invoke endpoint
 func runAdvancedHTTPInvokeTest(t *testing.T) {
 	// Test HTTP tool invoke endpoint
 	invokeTcs := []struct {
 		name          string
 		api           string
 		requestHeader map[string]string
-		requestBody   io.Reader
+		requestBody   func() io.Reader
 		want          string
-		isErr         bool
+		isAgentErr    bool
 	}{
 		{
 			name:          "invoke my-advanced-tool",
 			api:           "http://127.0.0.1:5000/api/tool/my-advanced-tool/invoke",
 			requestHeader: map[string]string{},
-			requestBody:   bytes.NewBuffer([]byte(`{"animalArray": ["rabbit", "ostrich", "whale"], "id": 3, "path": "tool3", "country": "US", "X-Other-Header": "test"}`)),
-			want:          `"hello world"`,
-			isErr:         false,
+			requestBody: func() io.Reader {
+				return bytes.NewBuffer([]byte(`{"animalArray": ["rabbit", "ostrich", "whale"], "id": 3, "path": "tool3", "country": "US", "X-Other-Header": "test"}`))
+			},
+			want:       `"hello world"`,
+			isAgentErr: false,
 		},
 		{
 			name:          "invoke my-advanced-tool with wrong params",
 			api:           "http://127.0.0.1:5000/api/tool/my-advanced-tool/invoke",
 			requestHeader: map[string]string{},
-			requestBody:   bytes.NewBuffer([]byte(`{"animalArray": ["rabbit", "ostrich", "whale"], "id": 4, "path": "tool3", "country": "US", "X-Other-Header": "test"}`)),
-			isErr:         true,
+			requestBody: func() io.Reader {
+				return bytes.NewBuffer([]byte(`{"animalArray": ["rabbit", "ostrich", "whale"], "id": 4, "path": "tool3", "country": "US", "X-Other-Header": "test"}`))
+			},
+			want:       "error processing request: unexpected status code: 400, response body: Bad Request: Incorrect query parameter: id, actual: [2 1 4]",
+			isAgentErr: 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)
+			req, err := http.NewRequest(http.MethodPost, tc.api, tc.requestBody())
 			if err != nil {
 				t.Fatalf("unable to create request: %s", err)
 			}
@@ -442,40 +446,61 @@ func runAdvancedHTTPInvokeTest(t *testing.T) {
 			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()
 
+			// As you noted, the toolbox wraps errors in a 200 OK
 			if resp.StatusCode != http.StatusOK {
-				if tc.isErr == true {
-					return
-				}
 				bodyBytes, _ := io.ReadAll(resp.Body)
-				t.Fatalf("response status code is not 200, got %d: %s", resp.StatusCode, string(bodyBytes))
+				t.Fatalf("expected status 200 from toolbox, got %d: %s", resp.StatusCode, string(bodyBytes))
 			}
 
-			// Check response body
-			var body map[string]interface{}
-			err = json.NewDecoder(resp.Body).Decode(&body)
-			if err != nil {
-				t.Fatalf("error parsing response body")
-			}
-			got, ok := body["result"].(string)
-			if !ok {
-				t.Fatalf("unable to find result in response body")
+			// Decode the response body into a map
+			var body map[string]any
+			if err := json.NewDecoder(resp.Body).Decode(&body); err != nil {
+				t.Fatalf("failed to decode response: %v", err)
 			}
 
-			if got != tc.want {
-				t.Fatalf("unexpected value: got %q, want %q", got, tc.want)
+			if tc.isAgentErr {
+				resStr, ok := body["result"].(string)
+				if !ok {
+					t.Fatalf("expected 'result' field as string in response body, got: %v", body)
+				}
+
+				var resMap map[string]any
+				if err := json.Unmarshal([]byte(resStr), &resMap); err != nil {
+					t.Fatalf("failed to unmarshal result string: %v", err)
+				}
+
+				gotErr, ok := resMap["error"].(string)
+				if !ok {
+					t.Fatalf("expected 'error' field inside result, got: %v", resMap)
+				}
+
+				if !strings.Contains(gotErr, tc.want) {
+					t.Fatalf("unexpected error message: got %q, want it to contain %q", gotErr, tc.want)
+				}
+			} else {
+				got, ok := body["result"].(string)
+				if !ok {
+					resBytes, _ := json.Marshal(body["result"])
+					got = string(resBytes)
+				}
+
+				if got != tc.want {
+					t.Fatalf("unexpected result: got %q, want %q", got, tc.want)
+				}
 			}
 		})
 	}
 }
 
 // getHTTPToolsConfig returns a mock HTTP tool's config file
-func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string]any {
+func getHTTPToolsConfig(sourceConfig map[string]any, toolType string) map[string]any {
 	// Write config into a file and pass it to command
 	otherSourceConfig := make(map[string]any)
 	for k, v := range sourceConfig {
@@ -491,13 +516,13 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"path":        "/tool0",
 				"method":      "POST",
 				"source":      "my-instance",
@@ -505,23 +530,23 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"my-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"method":      "GET",
 				"path":        "/tool1",
 				"description": "some description",
 				"queryParams": []parameters.Parameter{
 					parameters.NewIntParameter("id", "user ID")},
+				"bodyParams": []parameters.Parameter{parameters.NewStringParameter("name", "user name")},
 				"requestBody": `{
 "age": 36,
 "name": "{{.name}}"
 }
 `,
-				"bodyParams": []parameters.Parameter{parameters.NewStringParameter("name", "user name")},
-				"headers":    map[string]string{"Content-Type": "application/json"},
+				"headers": map[string]string{"Content-Type": "application/json"},
 			},
 			"my-tool-by-id": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"method":      "GET",
 				"path":        "/tool1id",
@@ -531,7 +556,7 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 				"headers": map[string]string{"Content-Type": "application/json"},
 			},
 			"my-tool-by-name": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"method":      "GET",
 				"path":        "/tool1name",
@@ -541,7 +566,7 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 				"headers": map[string]string{"Content-Type": "application/json"},
 			},
 			"my-query-param-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"method":      "GET",
 				"path":        "/toolQueryTest",
@@ -553,7 +578,7 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 				},
 			},
 			"my-auth-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"method":      "GET",
 				"path":        "/tool2",
@@ -565,7 +590,7 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 				},
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":         toolKind,
+				"type":         toolType,
 				"source":       "my-instance",
 				"method":       "POST",
 				"path":         "/tool0",
@@ -574,7 +599,7 @@ func getHTTPToolsConfig(sourceConfig map[string]any, toolKind string) map[string
 				"authRequired": []string{"my-google-auth"},
 			},
 			"my-advanced-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "other-instance",
 				"method":      "get",
 				"path":        "/{{.path}}?id=2",
diff --git a/tests/looker/looker_integration_test.go b/tests/looker/looker_integration_test.go
index c360455907..3aa795683e 100644
--- a/tests/looker/looker_integration_test.go
+++ b/tests/looker/looker_integration_test.go
@@ -36,7 +36,7 @@ import (
 )
 
 var (
-	LookerSourceKind   = "looker"
+	LookerSourceType   = "looker"
 	LookerBaseUrl      = os.Getenv("LOOKER_BASE_URL")
 	LookerVerifySsl    = os.Getenv("LOOKER_VERIFY_SSL")
 	LookerClientId     = os.Getenv("LOOKER_CLIENT_ID")
@@ -62,7 +62,7 @@ func getLookerVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":          LookerSourceKind,
+		"type":          LookerSourceType,
 		"base_url":      LookerBaseUrl,
 		"verify_ssl":    (LookerVerifySsl == "true"),
 		"client_id":     LookerClientId,
@@ -93,162 +93,167 @@ func TestLooker(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"get_models": map[string]any{
-				"kind":        "looker-get-models",
+				"type":        "looker-get-models",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_explores": map[string]any{
-				"kind":        "looker-get-explores",
+				"type":        "looker-get-explores",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_dimensions": map[string]any{
-				"kind":        "looker-get-dimensions",
+				"type":        "looker-get-dimensions",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_measures": map[string]any{
-				"kind":        "looker-get-measures",
+				"type":        "looker-get-measures",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_filters": map[string]any{
-				"kind":        "looker-get-filters",
+				"type":        "looker-get-filters",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_parameters": map[string]any{
-				"kind":        "looker-get-parameters",
+				"type":        "looker-get-parameters",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"query": map[string]any{
-				"kind":        "looker-query",
+				"type":        "looker-query",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"query_sql": map[string]any{
-				"kind":        "looker-query-sql",
+				"type":        "looker-query-sql",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"query_url": map[string]any{
-				"kind":        "looker-query-url",
+				"type":        "looker-query-url",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_looks": map[string]any{
-				"kind":        "looker-get-looks",
+				"type":        "looker-get-looks",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"make_look": map[string]any{
-				"kind":        "looker-make-look",
+				"type":        "looker-make-look",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_dashboards": map[string]any{
-				"kind":        "looker-get-dashboards",
+				"type":        "looker-get-dashboards",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"make_dashboard": map[string]any{
-				"kind":        "looker-make-dashboard",
+				"type":        "looker-make-dashboard",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"add_dashboard_filter": map[string]any{
-				"kind":        "looker-add-dashboard-filter",
+				"type":        "looker-add-dashboard-filter",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"add_dashboard_element": map[string]any{
-				"kind":        "looker-add-dashboard-element",
+				"type":        "looker-add-dashboard-element",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"conversational_analytics": map[string]any{
-				"kind":        "looker-conversational-analytics",
+				"type":        "looker-conversational-analytics",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"health_pulse": map[string]any{
-				"kind":        "looker-health-pulse",
+				"type":        "looker-health-pulse",
 				"source":      "my-instance",
 				"description": "Checks the health of a Looker instance by running a series of checks on the system.",
 			},
 			"health_analyze": map[string]any{
-				"kind":        "looker-health-analyze",
+				"type":        "looker-health-analyze",
 				"source":      "my-instance",
 				"description": "Provides analysis of a Looker instance's projects, models, or explores.",
 			},
 			"health_vacuum": map[string]any{
-				"kind":        "looker-health-vacuum",
+				"type":        "looker-health-vacuum",
 				"source":      "my-instance",
 				"description": "Vacuums unused content from a Looker instance.",
 			},
 			"dev_mode": map[string]any{
-				"kind":        "looker-dev-mode",
+				"type":        "looker-dev-mode",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_projects": map[string]any{
-				"kind":        "looker-get-projects",
+				"type":        "looker-get-projects",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_project_files": map[string]any{
-				"kind":        "looker-get-project-files",
+				"type":        "looker-get-project-files",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_project_file": map[string]any{
-				"kind":        "looker-get-project-file",
+				"type":        "looker-get-project-file",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"create_project_file": map[string]any{
-				"kind":        "looker-create-project-file",
+				"type":        "looker-create-project-file",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"update_project_file": map[string]any{
-				"kind":        "looker-update-project-file",
+				"type":        "looker-update-project-file",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"delete_project_file": map[string]any{
-				"kind":        "looker-delete-project-file",
+				"type":        "looker-delete-project-file",
+				"source":      "my-instance",
+				"description": "Simple tool to test end to end functionality.",
+			},
+			"validate_project": map[string]any{
+				"type":        "looker-validate-project",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"generate_embed_url": map[string]any{
-				"kind":        "looker-generate-embed-url",
+				"type":        "looker-generate-embed-url",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_connections": map[string]any{
-				"kind":        "looker-get-connections",
+				"type":        "looker-get-connections",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_connection_schemas": map[string]any{
-				"kind":        "looker-get-connection-schemas",
+				"type":        "looker-get-connection-schemas",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_connection_databases": map[string]any{
-				"kind":        "looker-get-connection-databases",
+				"type":        "looker-get-connection-databases",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_connection_tables": map[string]any{
-				"kind":        "looker-get-connection-tables",
+				"type":        "looker-get-connection-tables",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"get_connection_table_columns": map[string]any{
-				"kind":        "looker-get-connection-table-columns",
+				"type":        "looker-get-connection-table-columns",
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
@@ -1446,6 +1451,23 @@ func TestLooker(t *testing.T) {
 			},
 		},
 	)
+	tests.RunToolGetTestByName(t, "validate_project",
+		map[string]any{
+			"validate_project": map[string]any{
+				"description":  "Simple tool to test end to end functionality.",
+				"authRequired": []any{},
+				"parameters": []any{
+					map[string]any{
+						"authSources": []any{},
+						"description": "The id of the project to validate",
+						"name":        "project_id",
+						"required":    true,
+						"type":        "string",
+					},
+				},
+			},
+		},
+	)
 	tests.RunToolGetTestByName(t, "generate_embed_url",
 		map[string]any{
 			"generate_embed_url": map[string]any{
@@ -1665,6 +1687,9 @@ func TestLooker(t *testing.T) {
 	wantResult = "deleted"
 	tests.RunToolInvokeParametersTest(t, "delete_project_file", []byte(`{"project_id": "the_look", "file_path": "foo.view.lkml"}`), wantResult)
 
+	wantResult = "\"errors\":[]"
+	tests.RunToolInvokeParametersTest(t, "validate_project", []byte(`{"project_id": "the_look"}`), wantResult)
+
 	wantResult = "production"
 	tests.RunToolInvokeParametersTest(t, "dev_mode", []byte(`{"devMode": false}`), wantResult)
 
diff --git a/tests/mariadb/mariadb_integration_test.go b/tests/mariadb/mariadb_integration_test.go
index 60d734ace7..29025b2554 100644
--- a/tests/mariadb/mariadb_integration_test.go
+++ b/tests/mariadb/mariadb_integration_test.go
@@ -36,8 +36,8 @@ import (
 )
 
 var (
-	MariaDBSourceKind = "mysql"
-	MariaDBToolKind   = "mysql-sql"
+	MariaDBSourceType = "mysql"
+	MariaDBToolType   = "mysql-sql"
 	MariaDBDatabase   = os.Getenv("MARIADB_DATABASE")
 	MariaDBHost       = os.Getenv("MARIADB_HOST")
 	MariaDBPort       = os.Getenv("MARIADB_PORT")
@@ -60,7 +60,7 @@ func getMariaDBVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     MariaDBSourceKind,
+		"type":     MariaDBSourceType,
 		"host":     MariaDBHost,
 		"port":     MariaDBPort,
 		"database": MariaDBDatabase,
@@ -112,10 +112,10 @@ func TestMySQLToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, MariaDBToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, MariaDBToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddMySqlExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMySQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, MariaDBToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, MariaDBToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	toolsFile = tests.AddMySQLPrebuiltToolConfig(t, toolsFile)
 
@@ -336,7 +336,7 @@ func RunMariDBListTablesTest(t *testing.T, databaseName, tableNameParam, tableNa
 // GetMariaDBWants return the expected wants for mariaDB
 func GetMariaDBWants() (string, 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 MariaDB server version for the right syntax to use near 'SELEC 1' at line 1"}],"isError":true}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: Error 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your MariaDB server version for the right syntax to use near 'SELEC 1' at line 1"}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id INT AUTO_INCREMENT 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
diff --git a/tests/mindsdb/mindsdb_integration_test.go b/tests/mindsdb/mindsdb_integration_test.go
index cbebce8238..18a8cb71f8 100644
--- a/tests/mindsdb/mindsdb_integration_test.go
+++ b/tests/mindsdb/mindsdb_integration_test.go
@@ -33,8 +33,8 @@ import (
 )
 
 var (
-	MindsDBSourceKind = "mindsdb"
-	MindsDBToolKind   = "mindsdb-sql"
+	MindsDBSourceType = "mindsdb"
+	MindsDBToolType   = "mindsdb-sql"
 	MindsDBDatabase   = os.Getenv("MINDSDB_DATABASE")
 	MindsDBHost       = os.Getenv("MINDSDB_HOST")
 	MindsDBPort       = os.Getenv("MINDSDB_PORT")
@@ -66,7 +66,7 @@ func getMindsDBVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     MindsDBSourceKind,
+		"type":     MindsDBSourceType,
 		"host":     MindsDBHost,
 		"port":     MindsDBPort,
 		"database": MindsDBDatabase,
@@ -107,19 +107,19 @@ func TestMindsDBToolEndpoints(t *testing.T) {
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"statement":   "SELECT 1",
 			},
 			"my-tool": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"statement":   paramToolStmt,
@@ -137,7 +137,7 @@ func TestMindsDBToolEndpoints(t *testing.T) {
 				},
 			},
 			"my-tool-by-id": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"statement":   idParamToolStmt,
@@ -150,7 +150,7 @@ func TestMindsDBToolEndpoints(t *testing.T) {
 				},
 			},
 			"my-tool-by-name": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with params.",
 				"statement":   nameParamToolStmt,
@@ -164,13 +164,13 @@ func TestMindsDBToolEndpoints(t *testing.T) {
 				},
 			},
 			"my-array-tool": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test invocation with array params.",
 				"statement":   "SELECT 1 as id, 'Alice' as name UNION SELECT 3 as id, 'Sid' as name",
 			},
 			"my-auth-tool": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test authenticated parameters.",
 				"statement":   authToolStmt,
@@ -189,7 +189,7 @@ func TestMindsDBToolEndpoints(t *testing.T) {
 				},
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test auth required invocation.",
 				"statement":   "SELECT 1",
@@ -198,18 +198,18 @@ func TestMindsDBToolEndpoints(t *testing.T) {
 				},
 			},
 			"my-fail-tool": map[string]any{
-				"kind":        MindsDBToolKind,
+				"type":        MindsDBToolType,
 				"source":      "my-instance",
 				"description": "Tool to test statement with incorrect syntax.",
 				"statement":   "INVALID SQL STATEMENT",
 			},
 			"my-exec-sql-tool": map[string]any{
-				"kind":        "mindsdb-execute-sql",
+				"type":        "mindsdb-execute-sql",
 				"source":      "my-instance",
 				"description": "Tool to execute sql",
 			},
 			"my-auth-exec-sql-tool": map[string]any{
-				"kind":        "mindsdb-execute-sql",
+				"type":        "mindsdb-execute-sql",
 				"source":      "my-instance",
 				"description": "Tool to execute sql with auth",
 				"authRequired": []string{
diff --git a/tests/mongodb/mongodb_integration_test.go b/tests/mongodb/mongodb_integration_test.go
index 3d84837de8..dc03a1c6c3 100644
--- a/tests/mongodb/mongodb_integration_test.go
+++ b/tests/mongodb/mongodb_integration_test.go
@@ -28,13 +28,13 @@ import (
 
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 	"github.com/googleapis/genai-toolbox/tests"
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
+	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/v2/mongo/options"
 )
 
 var (
-	MongoDbSourceKind   = "mongodb"
-	MongoDbToolKind     = "mongodb-find"
+	MongoDbSourceType   = "mongodb"
+	MongoDbToolType     = "mongodb-find"
 	MongoDbUri          = os.Getenv("MONGODB_URI")
 	MongoDbDatabase     = os.Getenv("MONGODB_DATABASE")
 	ServiceAccountEmail = os.Getenv("SERVICE_ACCOUNT_EMAIL")
@@ -48,14 +48,14 @@ func getMongoDBVars(t *testing.T) map[string]any {
 		t.Fatal("'MongoDbDatabase' not set")
 	}
 	return map[string]any{
-		"kind": MongoDbSourceKind,
+		"type": MongoDbSourceType,
 		"uri":  MongoDbUri,
 	}
 }
 
 func initMongoDbDatabase(ctx context.Context, uri, database string) (*mongo.Database, error) {
 	// Create a new mongodb Database
-	client, err := mongo.Connect(ctx, options.Client().ApplyURI(uri))
+	client, err := mongo.Connect(options.Client().ApplyURI(uri))
 	if err != nil {
 		return nil, fmt.Errorf("unable to connect to mongodb: %s", err)
 	}
@@ -83,7 +83,7 @@ func TestMongoDBToolEndpoints(t *testing.T) {
 	defer teardownDB(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := getMongoDBToolsConfig(sourceConfig, MongoDbToolKind)
+	toolsFile := getMongoDBToolsConfig(sourceConfig, MongoDbToolType)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -354,6 +354,7 @@ func runToolUpdateInvokeTest(t *testing.T, update1Want, updateManyWant string) {
 		})
 	}
 }
+
 func runToolAggregateInvokeTest(t *testing.T, aggregate1Want string, aggregateManyWant string) {
 	// Test tool invoke endpoint
 	invokeTcs := []struct {
@@ -385,8 +386,8 @@ func runToolAggregateInvokeTest(t *testing.T, aggregate1Want string, aggregateMa
 			api:           "http://127.0.0.1:5000/api/tool/my-read-only-aggregate-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{ "name" : "ToBeAggregated" }`)),
-			want:          "",
-			isErr:         true,
+			want:          `{"error":"error processing request: this is not a read-only pipeline: {\"$out\":\"target_collection\"}"}`,
+			isErr:         false,
 		},
 		{
 			name:          "invoke my-read-write-aggregate-tool",
@@ -482,20 +483,20 @@ func setupMongoDB(t *testing.T, ctx context.Context, database *mongo.Database) f
 
 }
 
-func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[string]any {
+func getMongoDBToolsConfig(sourceConfig map[string]any, toolType string) map[string]any {
 	toolsFile := map[string]any{
 		"sources": map[string]any{
 			"my-instance": sourceConfig,
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":           "mongodb-find-one",
+				"type":           "mongodb-find-one",
 				"source":         "my-instance",
 				"description":    "Simple tool to test end to end functionality.",
 				"collection":     "test_collection",
@@ -505,7 +506,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database":       MongoDbDatabase,
 			},
 			"my-tool": map[string]any{
-				"kind":          toolKind,
+				"type":          toolType,
 				"source":        "my-instance",
 				"description":   "Tool to test invocation with params.",
 				"authRequired":  []string{},
@@ -528,7 +529,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":          10,
 			},
 			"my-tool-by-id": map[string]any{
-				"kind":          toolKind,
+				"type":          toolType,
 				"source":        "my-instance",
 				"description":   "Tool to test invocation with params.",
 				"authRequired":  []string{},
@@ -546,7 +547,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":          10,
 			},
 			"my-tool-by-name": map[string]any{
-				"kind":          toolKind,
+				"type":          toolType,
 				"source":        "my-instance",
 				"description":   "Tool to test invocation with params.",
 				"authRequired":  []string{},
@@ -565,7 +566,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":          10,
 			},
 			"my-array-tool": map[string]any{
-				"kind":          toolKind,
+				"type":          toolType,
 				"source":        "my-instance",
 				"description":   "Tool to test invocation with array.",
 				"authRequired":  []string{},
@@ -587,7 +588,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":          10,
 			},
 			"my-auth-tool": map[string]any{
-				"kind":          toolKind,
+				"type":          toolType,
 				"source":        "my-instance",
 				"description":   "Tool to test authenticated parameters.",
 				"authRequired":  []string{},
@@ -611,7 +612,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":          10,
 			},
 			"my-auth-required-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Tool to test auth required invocation.",
 				"authRequired": []string{
@@ -624,7 +625,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":         10,
 			},
 			"my-fail-tool": map[string]any{
-				"kind":          toolKind,
+				"type":          toolType,
 				"source":        "my-instance",
 				"description":   "Tool to test statement with incorrect syntax.",
 				"authRequired":  []string{},
@@ -635,7 +636,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"limit":         10,
 			},
 			"my-delete-one-tool": map[string]any{
-				"kind":          "mongodb-delete-one",
+				"type":          "mongodb-delete-one",
 				"source":        "my-instance",
 				"description":   "Tool to test deleting an entry.",
 				"authRequired":  []string{},
@@ -645,7 +646,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database":      MongoDbDatabase,
 			},
 			"my-delete-many-tool": map[string]any{
-				"kind":          "mongodb-delete-many",
+				"type":          "mongodb-delete-many",
 				"source":        "my-instance",
 				"description":   "Tool to test deleting multiple entries.",
 				"authRequired":  []string{},
@@ -655,7 +656,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database":      MongoDbDatabase,
 			},
 			"my-insert-one-tool": map[string]any{
-				"kind":         "mongodb-insert-one",
+				"type":         "mongodb-insert-one",
 				"source":       "my-instance",
 				"description":  "Tool to test inserting an entry.",
 				"authRequired": []string{},
@@ -664,7 +665,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database":     MongoDbDatabase,
 			},
 			"my-insert-many-tool": map[string]any{
-				"kind":         "mongodb-insert-many",
+				"type":         "mongodb-insert-many",
 				"source":       "my-instance",
 				"description":  "Tool to test inserting multiple entries.",
 				"authRequired": []string{},
@@ -673,7 +674,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database":     MongoDbDatabase,
 			},
 			"my-update-one-tool": map[string]any{
-				"kind":          "mongodb-update-one",
+				"type":          "mongodb-update-one",
 				"source":        "my-instance",
 				"description":   "Tool to test updating an entry.",
 				"authRequired":  []string{},
@@ -698,7 +699,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database": MongoDbDatabase,
 			},
 			"my-update-many-tool": map[string]any{
-				"kind":          "mongodb-update-many",
+				"type":          "mongodb-update-many",
 				"source":        "my-instance",
 				"description":   "Tool to test updating multiple entries.",
 				"authRequired":  []string{},
@@ -723,7 +724,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database": MongoDbDatabase,
 			},
 			"my-aggregate-tool": map[string]any{
-				"kind":            "mongodb-aggregate",
+				"type":            "mongodb-aggregate",
 				"source":          "my-instance",
 				"description":     "Tool to test an aggregation.",
 				"authRequired":    []string{},
@@ -740,7 +741,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database": MongoDbDatabase,
 			},
 			"my-read-only-aggregate-tool": map[string]any{
-				"kind":            "mongodb-aggregate",
+				"type":            "mongodb-aggregate",
 				"source":          "my-instance",
 				"description":     "Tool to test an aggregation.",
 				"authRequired":    []string{},
@@ -758,7 +759,7 @@ func getMongoDBToolsConfig(sourceConfig map[string]any, toolKind string) map[str
 				"database": MongoDbDatabase,
 			},
 			"my-read-write-aggregate-tool": map[string]any{
-				"kind":            "mongodb-aggregate",
+				"type":            "mongodb-aggregate",
 				"source":          "my-instance",
 				"description":     "Tool to test an aggregation.",
 				"authRequired":    []string{},
diff --git a/tests/mssql/mssql_integration_test.go b/tests/mssql/mssql_integration_test.go
index b9dbe4712a..d3430f5a04 100644
--- a/tests/mssql/mssql_integration_test.go
+++ b/tests/mssql/mssql_integration_test.go
@@ -32,8 +32,8 @@ import (
 )
 
 var (
-	MSSQLSourceKind = "mssql"
-	MSSQLToolKind   = "mssql-sql"
+	MSSQLSourceType = "mssql"
+	MSSQLToolType   = "mssql-sql"
 	MSSQLDatabase   = os.Getenv("MSSQL_DATABASE")
 	MSSQLHost       = os.Getenv("MSSQL_HOST")
 	MSSQLPort       = os.Getenv("MSSQL_PORT")
@@ -56,7 +56,7 @@ func getMsSQLVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     MSSQLSourceKind,
+		"type":     MSSQLSourceType,
 		"host":     MSSQLHost,
 		"port":     MSSQLPort,
 		"database": MSSQLDatabase,
@@ -116,10 +116,10 @@ func TestMSSQLToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, MSSQLToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, MSSQLToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddMSSQLExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMSSQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, MSSQLToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, MSSQLToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 	toolsFile = tests.AddMSSQLPrebuiltToolConfig(t, toolsFile)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
diff --git a/tests/mysql/mysql_integration_test.go b/tests/mysql/mysql_integration_test.go
index 113767fd1d..3f9558181f 100644
--- a/tests/mysql/mysql_integration_test.go
+++ b/tests/mysql/mysql_integration_test.go
@@ -30,8 +30,8 @@ import (
 )
 
 var (
-	MySQLSourceKind = "mysql"
-	MySQLToolKind   = "mysql-sql"
+	MySQLSourceType = "mysql"
+	MySQLToolType   = "mysql-sql"
 	MySQLDatabase   = os.Getenv("MYSQL_DATABASE")
 	MySQLHost       = os.Getenv("MYSQL_HOST")
 	MySQLPort       = os.Getenv("MYSQL_PORT")
@@ -54,7 +54,7 @@ func getMySQLVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     MySQLSourceKind,
+		"type":     MySQLSourceType,
 		"host":     MySQLHost,
 		"port":     MySQLPort,
 		"database": MySQLDatabase,
@@ -106,10 +106,10 @@ func TestMySQLToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, MySQLToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, MySQLToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddMySqlExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMySQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, MySQLToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, MySQLToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	toolsFile = tests.AddMySQLPrebuiltToolConfig(t, toolsFile)
 
diff --git a/tests/neo4j/neo4j_integration_test.go b/tests/neo4j/neo4j_integration_test.go
index 5f2f357b4f..c1dfd27544 100644
--- a/tests/neo4j/neo4j_integration_test.go
+++ b/tests/neo4j/neo4j_integration_test.go
@@ -34,7 +34,7 @@ import (
 )
 
 var (
-	Neo4jSourceKind = "neo4j"
+	Neo4jSourceType = "neo4j"
 	Neo4jDatabase   = os.Getenv("NEO4J_DATABASE")
 	Neo4jUri        = os.Getenv("NEO4J_URI")
 	Neo4jUser       = os.Getenv("NEO4J_USER")
@@ -56,7 +56,7 @@ func getNeo4jVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     Neo4jSourceKind,
+		"type":     Neo4jSourceType,
 		"uri":      Neo4jUri,
 		"database": Neo4jDatabase,
 		"user":     Neo4jUser,
@@ -81,35 +81,35 @@ func TestNeo4jToolEndpoints(t *testing.T) {
 		},
 		"tools": map[string]any{
 			"my-simple-cypher-tool": map[string]any{
-				"kind":        "neo4j-cypher",
+				"type":        "neo4j-cypher",
 				"source":      "my-neo4j-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"statement":   "RETURN 1 as a;",
 			},
 			"my-simple-execute-cypher-tool": map[string]any{
-				"kind":        "neo4j-execute-cypher",
+				"type":        "neo4j-execute-cypher",
 				"source":      "my-neo4j-instance",
 				"description": "Simple tool to test end to end functionality.",
 			},
 			"my-readonly-execute-cypher-tool": map[string]any{
-				"kind":        "neo4j-execute-cypher",
+				"type":        "neo4j-execute-cypher",
 				"source":      "my-neo4j-instance",
 				"description": "A readonly cypher execution tool.",
 				"readOnly":    true,
 			},
 			"my-schema-tool": map[string]any{
-				"kind":        "neo4j-schema",
+				"type":        "neo4j-schema",
 				"source":      "my-neo4j-instance",
 				"description": "A tool to get the Neo4j schema.",
 			},
 			"my-schema-tool-with-cache": map[string]any{
-				"kind":               "neo4j-schema",
+				"type":               "neo4j-schema",
 				"source":             "my-neo4j-instance",
 				"description":        "A schema tool with a custom cache expiration.",
 				"cacheExpireMinutes": 10,
 			},
 			"my-populated-schema-tool": map[string]any{
-				"kind":        "neo4j-schema",
+				"type":        "neo4j-schema",
 				"source":      "my-neo4j-instance",
 				"description": "A tool to get the Neo4j schema from a populated DB.",
 			},
@@ -287,25 +287,37 @@ func TestNeo4jToolEndpoints(t *testing.T) {
 			},
 		},
 		{
-			name:               "invoke my-simple-execute-cypher-tool with dry_run and invalid syntax",
-			api:                "http://127.0.0.1:5000/api/tool/my-simple-execute-cypher-tool/invoke",
-			requestBody:        bytes.NewBuffer([]byte(`{"cypher": "RTN 1", "dry_run": true}`)),
-			wantStatus:         http.StatusBadRequest,
-			wantErrorSubstring: "unable to execute query",
+			name:        "invoke my-simple-execute-cypher-tool with dry_run and invalid syntax",
+			api:         "http://127.0.0.1:5000/api/tool/my-simple-execute-cypher-tool/invoke",
+			requestBody: bytes.NewBuffer([]byte(`{"cypher": "RTN 1", "dry_run": true}`)),
+			wantStatus:  http.StatusOK,
+			validateFunc: func(t *testing.T, body string) {
+				if !strings.Contains(body, "unable to execute query") {
+					t.Errorf("expected error message not found in body: %s", body)
+				}
+			},
 		},
 		{
-			name:               "invoke readonly tool with write query",
-			api:                "http://127.0.0.1:5000/api/tool/my-readonly-execute-cypher-tool/invoke",
-			requestBody:        bytes.NewBuffer([]byte(`{"cypher": "CREATE (n:TestNode)"}`)),
-			wantStatus:         http.StatusBadRequest,
-			wantErrorSubstring: "this tool is read-only and cannot execute write queries",
+			name:        "invoke readonly tool with write query",
+			api:         "http://127.0.0.1:5000/api/tool/my-readonly-execute-cypher-tool/invoke",
+			requestBody: bytes.NewBuffer([]byte(`{"cypher": "CREATE (n:TestNode)"}`)),
+			wantStatus:  http.StatusOK,
+			validateFunc: func(t *testing.T, body string) {
+				if !strings.Contains(body, "this tool is read-only and cannot execute write queries") {
+					t.Errorf("expected error message not found in body: %s", body)
+				}
+			},
 		},
 		{
-			name:               "invoke readonly tool with write query and dry_run",
-			api:                "http://127.0.0.1:5000/api/tool/my-readonly-execute-cypher-tool/invoke",
-			requestBody:        bytes.NewBuffer([]byte(`{"cypher": "CREATE (n:TestNode)", "dry_run": true}`)),
-			wantStatus:         http.StatusBadRequest,
-			wantErrorSubstring: "this tool is read-only and cannot execute write queries",
+			name:        "invoke readonly tool with write query and dry_run",
+			api:         "http://127.0.0.1:5000/api/tool/my-readonly-execute-cypher-tool/invoke",
+			requestBody: bytes.NewBuffer([]byte(`{"cypher": "CREATE (n:TestNode)", "dry_run": true}`)),
+			wantStatus:  http.StatusOK,
+			validateFunc: func(t *testing.T, body string) {
+				if !strings.Contains(body, "this tool is read-only and cannot execute write queries") {
+					t.Errorf("expected error message not found in body: %s", body)
+				}
+			},
 		},
 		{
 			name:        "invoke my-schema-tool",
diff --git a/tests/oceanbase/oceanbase_integration_test.go b/tests/oceanbase/oceanbase_integration_test.go
index e7691808fb..c6394cacb3 100644
--- a/tests/oceanbase/oceanbase_integration_test.go
+++ b/tests/oceanbase/oceanbase_integration_test.go
@@ -32,8 +32,8 @@ import (
 )
 
 var (
-	OceanBaseSourceKind = "oceanbase"
-	OceanBaseToolKind   = "oceanbase-sql"
+	OceanBaseSourceType = "oceanbase"
+	OceanBaseToolType   = "oceanbase-sql"
 	OceanBaseDatabase   = os.Getenv("OCEANBASE_DATABASE")
 	OceanBaseHost       = os.Getenv("OCEANBASE_HOST")
 	OceanBasePort       = os.Getenv("OCEANBASE_PORT")
@@ -56,7 +56,7 @@ func getOceanBaseVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     OceanBaseSourceKind,
+		"type":     OceanBaseSourceType,
 		"host":     OceanBaseHost,
 		"port":     OceanBasePort,
 		"database": OceanBaseDatabase,
@@ -105,10 +105,10 @@ func TestOceanBaseToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, OceanBaseToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, OceanBaseToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addOceanBaseExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getOceanBaseTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, OceanBaseToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, OceanBaseToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -166,7 +166,7 @@ func getOceanBaseTmplToolStatement() (string, string) {
 // OceanBase specific expected results
 func getOceanBaseWants() (string, 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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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
@@ -179,12 +179,12 @@ func addOceanBaseExecuteSqlConfig(t *testing.T, config map[string]any) map[strin
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "oceanbase-execute-sql",
+		"type":        "oceanbase-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "oceanbase-execute-sql",
+		"type":        "oceanbase-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
diff --git a/tests/oracle/oracle_integration_test.go b/tests/oracle/oracle_integration_test.go
index 0021679e9e..bbd8abbcdf 100644
--- a/tests/oracle/oracle_integration_test.go
+++ b/tests/oracle/oracle_integration_test.go
@@ -18,8 +18,8 @@ import (
 )
 
 var (
-	OracleSourceKind = "oracle"
-	OracleToolKind   = "oracle-sql"
+	OracleSourceType = "oracle"
+	OracleToolType   = "oracle-sql"
 	OracleHost       = os.Getenv("ORACLE_HOST")
 	OracleUser       = os.Getenv("ORACLE_USER")
 	OraclePass       = os.Getenv("ORACLE_PASS")
@@ -41,7 +41,7 @@ func getOracleVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":             OracleSourceKind,
+		"type":             OracleSourceType,
 		"connectionString": OracleConnStr,
 		"useOCI":           true,
 		"user":             OracleUser,
@@ -98,10 +98,10 @@ func TestOracleSimpleToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, OracleToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, OracleToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddExecuteSqlConfig(t, toolsFile, "oracle-execute-sql")
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMySQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, OracleToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, OracleToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -119,7 +119,7 @@ func TestOracleSimpleToolEndpoints(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: dpiStmt_execute: ORA-00900: invalid SQL statement"}],"isError":true}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: dpiStmt_execute: ORA-00900: invalid SQL statement"}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id NUMBER GENERATED AS IDENTITY PRIMARY KEY, name VARCHAR2(255))"`
 	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"1\":1}"}]}}`
 
diff --git a/tests/postgres/postgres_integration_test.go b/tests/postgres/postgres_integration_test.go
index ea34a4a8bc..06cb19310d 100644
--- a/tests/postgres/postgres_integration_test.go
+++ b/tests/postgres/postgres_integration_test.go
@@ -31,8 +31,8 @@ import (
 )
 
 var (
-	PostgresSourceKind = "postgres"
-	PostgresToolKind   = "postgres-sql"
+	PostgresSourceType = "postgres"
+	PostgresToolType   = "postgres-sql"
 	PostgresDatabase   = os.Getenv("POSTGRES_DATABASE")
 	PostgresHost       = os.Getenv("POSTGRES_HOST")
 	PostgresPort       = os.Getenv("POSTGRES_PORT")
@@ -55,7 +55,7 @@ func getPostgresVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     PostgresSourceKind,
+		"type":     PostgresSourceType,
 		"host":     PostgresHost,
 		"port":     PostgresPort,
 		"database": PostgresDatabase,
@@ -116,15 +116,15 @@ func TestPostgres(t *testing.T) {
 	defer tearDownVectorTable(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, PostgresToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, PostgresToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = tests.AddExecuteSqlConfig(t, toolsFile, "postgres-execute-sql")
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetPostgresSQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, PostgresToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, PostgresToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 	toolsFile = tests.AddPostgresPrebuiltConfig(t, toolsFile)
 
 	// Add semantic search tool config
 	insertStmt, searchStmt := tests.GetPostgresVectorSearchStmts(vectorTableName)
-	toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, PostgresToolKind, insertStmt, searchStmt)
+	toolsFile = tests.AddSemanticSearchConfig(t, toolsFile, PostgresToolType, insertStmt, searchStmt)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
diff --git a/tests/redis/redis_test.go b/tests/redis/redis_test.go
index 6ee611da51..1fdace25ae 100644
--- a/tests/redis/redis_test.go
+++ b/tests/redis/redis_test.go
@@ -28,8 +28,8 @@ import (
 )
 
 var (
-	RedisSourceKind = "redis"
-	RedisToolKind   = "redis"
+	RedisSourceType = "redis"
+	RedisToolType   = "redis"
 	RedisAddress    = os.Getenv("REDIS_ADDRESS")
 	RedisPass       = os.Getenv("REDIS_PASS")
 )
@@ -42,7 +42,7 @@ func getRedisVars(t *testing.T) map[string]any {
 		t.Fatal("'REDIS_PASS' not set")
 	}
 	return map[string]any{
-		"kind":     RedisSourceKind,
+		"type":     RedisSourceType,
 		"address":  []string{RedisAddress},
 		"password": RedisPass,
 	}
@@ -81,7 +81,7 @@ func TestRedisToolEndpoints(t *testing.T) {
 	defer teardownDB(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetRedisValkeyToolsConfig(sourceConfig, RedisToolKind)
+	toolsFile := tests.GetRedisValkeyToolsConfig(sourceConfig, RedisToolType)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
diff --git a/tests/server.go b/tests/server.go
index eac693f3a2..ac8ecb13d4 100644
--- a/tests/server.go
+++ b/tests/server.go
@@ -21,6 +21,7 @@ import (
 	"os"
 
 	yaml "github.com/goccy/go-yaml"
+	"github.com/spf13/cobra"
 
 	"github.com/googleapis/genai-toolbox/cmd"
 )
@@ -50,7 +51,7 @@ func tmpFileWithCleanup(content []byte) (string, func(), error) {
 type CmdExec struct {
 	Out io.ReadCloser
 
-	cmd     *cmd.Command
+	cmd     *cobra.Command
 	cancel  context.CancelFunc
 	closers []io.Closer
 	done    chan bool // closed once the cmd is completed
@@ -77,7 +78,7 @@ func StartCmd(ctx context.Context, toolsFile map[string]any, args ...string) (*C
 		return nil, nil, fmt.Errorf("unable to open stdout pipe: %w", err)
 	}
 
-	c := cmd.NewCommand(cmd.WithStreams(pw, pw))
+	c := cmd.GenerateCommand(pw, pw)
 	c.SetArgs(args)
 
 	t := &CmdExec{
diff --git a/tests/serverlessspark/serverless_spark_integration_test.go b/tests/serverlessspark/serverless_spark_integration_test.go
index 12545a87aa..dbb4670830 100644
--- a/tests/serverlessspark/serverless_spark_integration_test.go
+++ b/tests/serverlessspark/serverless_spark_integration_test.go
@@ -64,7 +64,7 @@ func getServerlessSparkVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     "serverless-spark",
+		"type":     "serverless-spark",
 		"project":  serverlessSparkProject,
 		"location": serverlessSparkLocation,
 	}
@@ -81,40 +81,40 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 		},
 		"authServices": map[string]any{
 			"my-google-auth": map[string]any{
-				"kind":     "google",
+				"type":     "google",
 				"clientId": tests.ClientId,
 			},
 		},
 		"tools": map[string]any{
 			"list-batches": map[string]any{
-				"kind":   "serverless-spark-list-batches",
+				"type":   "serverless-spark-list-batches",
 				"source": "my-spark",
 			},
 			"list-batches-with-auth": map[string]any{
-				"kind":         "serverless-spark-list-batches",
+				"type":         "serverless-spark-list-batches",
 				"source":       "my-spark",
 				"authRequired": []string{"my-google-auth"},
 			},
 			"get-batch": map[string]any{
-				"kind":   "serverless-spark-get-batch",
+				"type":   "serverless-spark-get-batch",
 				"source": "my-spark",
 			},
 			"get-batch-with-auth": map[string]any{
-				"kind":         "serverless-spark-get-batch",
+				"type":         "serverless-spark-get-batch",
 				"source":       "my-spark",
 				"authRequired": []string{"my-google-auth"},
 			},
 			"cancel-batch": map[string]any{
-				"kind":   "serverless-spark-cancel-batch",
+				"type":   "serverless-spark-cancel-batch",
 				"source": "my-spark",
 			},
 			"cancel-batch-with-auth": map[string]any{
-				"kind":         "serverless-spark-cancel-batch",
+				"type":         "serverless-spark-cancel-batch",
 				"source":       "my-spark",
 				"authRequired": []string{"my-google-auth"},
 			},
 			"create-pyspark-batch": map[string]any{
-				"kind":   "serverless-spark-create-pyspark-batch",
+				"type":   "serverless-spark-create-pyspark-batch",
 				"source": "my-spark",
 				"environmentConfig": map[string]any{
 					"executionConfig": map[string]any{
@@ -123,7 +123,7 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 				},
 			},
 			"create-pyspark-batch-2-3": map[string]any{
-				"kind":          "serverless-spark-create-pyspark-batch",
+				"type":          "serverless-spark-create-pyspark-batch",
 				"source":        "my-spark",
 				"runtimeConfig": map[string]any{"version": "2.3"},
 				"environmentConfig": map[string]any{
@@ -133,12 +133,12 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 				},
 			},
 			"create-pyspark-batch-with-auth": map[string]any{
-				"kind":         "serverless-spark-create-pyspark-batch",
+				"type":         "serverless-spark-create-pyspark-batch",
 				"source":       "my-spark",
 				"authRequired": []string{"my-google-auth"},
 			},
 			"create-spark-batch": map[string]any{
-				"kind":   "serverless-spark-create-spark-batch",
+				"type":   "serverless-spark-create-spark-batch",
 				"source": "my-spark",
 				"environmentConfig": map[string]any{
 					"executionConfig": map[string]any{
@@ -147,7 +147,7 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 				},
 			},
 			"create-spark-batch-2-3": map[string]any{
-				"kind":          "serverless-spark-create-spark-batch",
+				"type":          "serverless-spark-create-spark-batch",
 				"source":        "my-spark",
 				"runtimeConfig": map[string]any{"version": "2.3"},
 				"environmentConfig": map[string]any{
@@ -157,7 +157,7 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 				},
 			},
 			"create-spark-batch-with-auth": map[string]any{
-				"kind":         "serverless-spark-create-spark-batch",
+				"type":         "serverless-spark-create-spark-batch",
 				"source":       "my-spark",
 				"authRequired": []string{"my-google-auth"},
 			},
@@ -203,14 +203,14 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 					name:     "zero page size",
 					toolName: "list-batches",
 					request:  map[string]any{"pageSize": 0},
-					wantCode: http.StatusBadRequest,
+					wantCode: http.StatusOK,
 					wantMsg:  "pageSize must be positive: 0",
 				},
 				{
 					name:     "negative page size",
 					toolName: "list-batches",
 					request:  map[string]any{"pageSize": -1},
-					wantCode: http.StatusBadRequest,
+					wantCode: http.StatusOK,
 					wantMsg:  "pageSize must be positive: -1",
 				},
 			}
@@ -250,14 +250,14 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 						name:     "missing batch",
 						toolName: "get-batch",
 						request:  map[string]any{"name": "INVALID_BATCH"},
-						wantCode: http.StatusBadRequest,
-						wantMsg:  fmt.Sprintf("Not found: Batch projects/%s/locations/%s/batches/INVALID_BATCH", serverlessSparkProject, serverlessSparkLocation),
+						wantCode: http.StatusOK,
+						wantMsg:  fmt.Sprintf("error processing GCP request: failed to get batch: rpc error: code = NotFound desc = Not found: Batch projects/%s/locations/%s/batches/INVALID_BATCH", serverlessSparkProject, serverlessSparkLocation),
 					},
 					{
 						name:     "full batch name",
 						toolName: "get-batch",
 						request:  map[string]any{"name": missingBatchFullName},
-						wantCode: http.StatusBadRequest,
+						wantCode: http.StatusOK,
 						wantMsg:  fmt.Sprintf("name must be a short batch name without '/': %s", missingBatchFullName),
 					},
 				}
@@ -352,13 +352,13 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 					{
 						name:    "missing main file",
 						request: map[string]any{},
-						wantMsg: "parameter \\\"mainFile\\\" is required",
+						wantMsg: `{"error":"parameter \"mainFile\" is required"}`,
 					},
 				}
 				for _, tc := range tcs {
 					t.Run(tc.name, func(t *testing.T) {
 						t.Parallel()
-						testError(t, "create-pyspark-batch", tc.request, http.StatusBadRequest, tc.wantMsg)
+						testError(t, "create-pyspark-batch", tc.request, http.StatusOK, tc.wantMsg)
 					})
 				}
 			})
@@ -478,7 +478,7 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 				for _, tc := range tcs {
 					t.Run(tc.name, func(t *testing.T) {
 						t.Parallel()
-						testError(t, "create-spark-batch", tc.request, http.StatusBadRequest, tc.wantMsg)
+						testError(t, "create-spark-batch", tc.request, http.StatusOK, tc.wantMsg)
 					})
 				}
 			})
@@ -529,21 +529,21 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 						name:     "missing op parameter",
 						toolName: "cancel-batch",
 						request:  map[string]any{},
-						wantCode: http.StatusBadRequest,
-						wantMsg:  "parameter \\\"operation\\\" is required",
+						wantCode: http.StatusOK,
+						wantMsg:  `{"error":"parameter \"operation\" is required"}`,
 					},
 					{
 						name:     "nonexistent op",
 						toolName: "cancel-batch",
 						request:  map[string]any{"operation": "INVALID_OPERATION"},
-						wantCode: http.StatusBadRequest,
-						wantMsg:  "Operation not found",
+						wantCode: http.StatusOK,
+						wantMsg:  "error processing GCP request: failed to cancel operation: rpc error: code = NotFound desc = Operation not found",
 					},
 					{
 						name:     "full op name",
 						toolName: "cancel-batch",
 						request:  map[string]any{"operation": fullOpName},
-						wantCode: http.StatusBadRequest,
+						wantCode: http.StatusOK,
 						wantMsg:  fmt.Sprintf("operation must be a short operation name without '/': %s", fullOpName),
 					},
 				}
@@ -556,7 +556,7 @@ func TestServerlessSparkToolEndpoints(t *testing.T) {
 			})
 			t.Run("auth", func(t *testing.T) {
 				t.Parallel()
-				runAuthTest(t, "cancel-batch-with-auth", map[string]any{"operation": "INVALID_OPERATION"}, http.StatusBadRequest)
+				runAuthTest(t, "cancel-batch-with-auth", map[string]any{"operation": "INVALID_OPERATION"}, http.StatusOK)
 			})
 		})
 	})
@@ -1003,18 +1003,32 @@ func testError(t *testing.T, toolName string, request map[string]any, wantCode i
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode != wantCode {
-		bodyBytes, _ := io.ReadAll(resp.Body)
-		t.Fatalf("response status code is not %d, got %d: %s", wantCode, resp.StatusCode, string(bodyBytes))
-	}
-
 	bodyBytes, err := io.ReadAll(resp.Body)
 	if err != nil {
 		t.Fatalf("failed to read response body: %v", err)
 	}
 
-	if !bytes.Contains(bodyBytes, []byte(wantMsg)) {
-		t.Fatalf("response body does not contain %q: %s", wantMsg, string(bodyBytes))
+	if resp.StatusCode != wantCode {
+		t.Fatalf("response status code is not %d, got %d: %s", wantCode, resp.StatusCode, string(bodyBytes))
+	}
+
+	var body map[string]any
+	if err := json.Unmarshal(bodyBytes, &body); err != nil {
+		t.Fatalf("failed to unmarshal outer response: %v", err)
+	}
+
+	var resultStr string
+	if res, ok := body["result"].(string); ok {
+		resultStr = res
+	} else if errMsg, ok := body["error"].(string); ok {
+		resultStr = errMsg
+	} else {
+		// If neither exists, check the raw bytes as a last resort
+		resultStr = string(bodyBytes)
+	}
+
+	if !strings.Contains(resultStr, wantMsg) {
+		t.Fatalf("result string %q does not contain expected message %q", resultStr, wantMsg)
 	}
 }
 
diff --git a/tests/singlestore/singlestore_integration_test.go b/tests/singlestore/singlestore_integration_test.go
index 28419d49f3..3806f205db 100644
--- a/tests/singlestore/singlestore_integration_test.go
+++ b/tests/singlestore/singlestore_integration_test.go
@@ -30,8 +30,8 @@ import (
 )
 
 var (
-	SingleStoreSourceKind = "singlestore"
-	SingleStoreToolKind   = "singlestore-sql"
+	SingleStoreSourceType = "singlestore"
+	SingleStoreToolType   = "singlestore-sql"
 	SingleStoreDatabase   = os.Getenv("SINGLESTORE_DATABASE")
 	SingleStoreHost       = os.Getenv("SINGLESTORE_HOST")
 	SingleStorePort       = os.Getenv("SINGLESTORE_PORT")
@@ -54,7 +54,7 @@ func getSingleStoreVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     SingleStoreSourceKind,
+		"type":     SingleStoreSourceType,
 		"host":     SingleStoreHost,
 		"port":     SingleStorePort,
 		"database": SingleStoreDatabase,
@@ -85,7 +85,7 @@ func getSingleStoreAuthToolInfo(tableName string) (string, string, string, []any
 	return createStatement, insertStatement, toolStatement, params
 }
 
-// getSingleStoreTmplToolStatement returns statements and param for template parameter test cases for singlestore-sql kind
+// getSingleStoreTmplToolStatement returns statements and param for template parameter test cases for singlestore-sql type
 func getSingleStoreTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = ?"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = ?"
@@ -95,7 +95,7 @@ func getSingleStoreTmplToolStatement() (string, string) {
 // getSingleStoreWants return the expected wants for singlestore
 func getSingleStoreWants() (string, 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}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: 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 BIGINT 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
@@ -130,8 +130,8 @@ func setupSingleStoreTable(t *testing.T, ctx context.Context, pool *sql.DB, crea
 	}
 }
 
-func getSingleStoreToolsConfig(sourceConfig map[string]any, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
-	toolsFile := tests.GetToolsConfig(sourceConfig, toolKind, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement)
+func getSingleStoreToolsConfig(sourceConfig map[string]any, toolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement string) map[string]any {
+	toolsFile := tests.GetToolsConfig(sourceConfig, toolType, paramToolStatement, idParamToolStmt, nameParamToolStmt, arrayToolStatement, authToolStatement)
 
 	toolsMap, ok := toolsFile["tools"].(map[string]any)
 	if !ok {
@@ -151,12 +151,12 @@ func addSingleStoreExecuteSQLConfig(t *testing.T, config map[string]any) map[str
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "singlestore-execute-sql",
+		"type":        "singlestore-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "singlestore-execute-sql",
+		"type":        "singlestore-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -207,10 +207,10 @@ func TestSingleStoreToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := getSingleStoreToolsConfig(sourceConfig, SingleStoreToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := getSingleStoreToolsConfig(sourceConfig, SingleStoreToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addSingleStoreExecuteSQLConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getSingleStoreTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, SingleStoreToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, SingleStoreToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
diff --git a/tests/snowflake/snowflake_integration_test.go b/tests/snowflake/snowflake_integration_test.go
index cd81c8289f..f7f8b14b18 100644
--- a/tests/snowflake/snowflake_integration_test.go
+++ b/tests/snowflake/snowflake_integration_test.go
@@ -31,8 +31,8 @@ import (
 )
 
 var (
-	SnowflakeSourceKind = "snowflake"
-	SnowflakeToolKind   = "snowflake-sql"
+	SnowflakeSourceType = "snowflake"
+	SnowflakeToolType   = "snowflake-sql"
 	SnowflakeAccount    = os.Getenv("SNOWFLAKE_ACCOUNT")
 	SnowflakeUser       = os.Getenv("SNOWFLAKE_USER")
 	SnowflakePassword   = os.Getenv("SNOWFLAKE_PASS")
@@ -65,7 +65,7 @@ func getSnowflakeVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":      SnowflakeSourceKind,
+		"type":      SnowflakeSourceType,
 		"account":   SnowflakeAccount,
 		"user":      SnowflakeUser,
 		"password":  SnowflakePassword,
@@ -125,10 +125,10 @@ func TestSnowflake(t *testing.T) {
 	t.Logf("Test table setup complete.")
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, SnowflakeToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, SnowflakeToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addSnowflakeExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getSnowflakeTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, SnowflakeToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, SnowflakeToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -173,13 +173,13 @@ func addSnowflakeExecuteSqlConfig(t *testing.T, config map[string]any) map[strin
 	}
 
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "snowflake-execute-sql",
+		"type":        "snowflake-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "snowflake-execute-sql",
+		"type":        "snowflake-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -190,7 +190,7 @@ func addSnowflakeExecuteSqlConfig(t *testing.T, config map[string]any) map[strin
 	return config
 }
 
-// getSnowflakeParamToolInfo returns statements and param for my-param-tool snowflake-sql kind
+// getSnowflakeParamToolInfo returns statements and param for my-param-tool snowflake-sql type
 func getSnowflakeParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INTEGER AUTOINCREMENT PRIMARY KEY, name STRING);", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name) VALUES (?), (?), (?), (?);", tableName)
@@ -202,7 +202,7 @@ func getSnowflakeParamToolInfo(tableName string) (string, string, string, string
 	return createStatement, insertStatement, toolStatement, idParamStatement, nameParamStatement, arrayToolStatement, params
 }
 
-// getSnowflakeAuthToolInfo returns statements and param of my-auth-tool for snowflake-sql kind
+// getSnowflakeAuthToolInfo returns statements and param of my-auth-tool for snowflake-sql type
 func getSnowflakeAuthToolInfo(tableName string) (string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INTEGER AUTOINCREMENT PRIMARY KEY, name STRING, email STRING);", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (name, email) VALUES (?, ?), (?, ?)", tableName)
@@ -211,7 +211,7 @@ func getSnowflakeAuthToolInfo(tableName string) (string, string, string, []any)
 	return createStatement, insertStatement, toolStatement, params
 }
 
-// getSnowflakeTmplToolStatement returns statements and param for template parameter test cases for snowflake-sql kind
+// getSnowflakeTmplToolStatement returns statements and param for template parameter test cases for snowflake-sql type
 func getSnowflakeTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = ?"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = ?"
@@ -222,7 +222,7 @@ func getSnowflakeTmplToolStatement() (string, string) {
 func getSnowflakeWants() (string, string, string, string) {
 	select1Want := `[{"1":"1"}]`
 	failInvocationWant := `unexpected 'SELEC'`
-	createTableStatement := `"CREATE TABLE t (id INTEGER AUTOINCREMENT PRIMARY KEY, name STRING)"`
+	createTableStatement := `"CREATE TABLE IF NOT EXISTS t (id INTEGER AUTOINCREMENT PRIMARY KEY, name STRING)"`
 	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"1\":\"1\"}"}]}}`
 	return select1Want, failInvocationWant, createTableStatement, mcpSelect1Want
 }
diff --git a/tests/source.go b/tests/source.go
index 6ef647f823..6750dad490 100644
--- a/tests/source.go
+++ b/tests/source.go
@@ -30,7 +30,7 @@ import (
 )
 
 // RunSourceConnection test for source connection
-func RunSourceConnectionTest(t *testing.T, sourceConfig map[string]any, toolKind string) error {
+func RunSourceConnectionTest(t *testing.T, sourceConfig map[string]any, toolType string) error {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()
 
@@ -43,7 +43,7 @@ func RunSourceConnectionTest(t *testing.T, sourceConfig map[string]any, toolKind
 		},
 		"tools": map[string]any{
 			"my-simple-tool": map[string]any{
-				"kind":        toolKind,
+				"type":        toolType,
 				"source":      "my-instance",
 				"description": "Simple tool to test end to end functionality.",
 				"statement":   "SELECT 1;",
diff --git a/tests/spanner/spanner_integration_test.go b/tests/spanner/spanner_integration_test.go
index 4daf87a27e..265b84d89e 100644
--- a/tests/spanner/spanner_integration_test.go
+++ b/tests/spanner/spanner_integration_test.go
@@ -37,8 +37,8 @@ import (
 )
 
 var (
-	SpannerSourceKind = "spanner"
-	SpannerToolKind   = "spanner-sql"
+	SpannerSourceType = "spanner"
+	SpannerToolType   = "spanner-sql"
 	SpannerProject    = os.Getenv("SPANNER_PROJECT")
 	SpannerDatabase   = os.Getenv("SPANNER_DATABASE")
 	SpannerInstance   = os.Getenv("SPANNER_INSTANCE")
@@ -55,7 +55,7 @@ func getSpannerVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     SpannerSourceKind,
+		"type":     SpannerSourceType,
 		"project":  SpannerProject,
 		"instance": SpannerInstance,
 		"database": SpannerDatabase,
@@ -163,7 +163,7 @@ func TestSpannerToolEndpoints(t *testing.T) {
 	defer teardownGraph(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, SpannerToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, SpannerToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addSpannerExecuteSqlConfig(t, toolsFile)
 	toolsFile = addSpannerReadOnlyConfig(t, toolsFile)
 	toolsFile = addTemplateParamConfig(t, toolsFile)
@@ -215,7 +215,7 @@ func TestSpannerToolEndpoints(t *testing.T) {
 	runSpannerListGraphsTest(t, graphName)
 }
 
-// getSpannerToolInfo returns statements and param for my-tool for spanner-sql kind
+// getSpannerToolInfo returns statements and param for my-tool for spanner-sql type
 func getSpannerParamToolInfo(tableName string) (string, string, string, string, string, string, map[string]any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT64, name STRING(MAX)) PRIMARY KEY (id)", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name) VALUES (1, @name1), (2, @name2), (3, @name3), (4, @name4)", tableName)
@@ -227,7 +227,7 @@ func getSpannerParamToolInfo(tableName string) (string, string, string, string,
 	return createStatement, insertStatement, toolStatement, idToolStatement, nameToolStatement, arrayToolStatement, params
 }
 
-// getSpannerAuthToolInfo returns statements and param of my-auth-tool for spanner-sql kind
+// getSpannerAuthToolInfo returns statements and param of my-auth-tool for spanner-sql type
 func getSpannerAuthToolInfo(tableName string) (string, string, string, map[string]any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id INT64, name STRING(MAX), email STRING(MAX)) PRIMARY KEY (id)", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name, email) VALUES (1, @name1, @email1), (2, @name2, @email2)", tableName)
@@ -331,18 +331,18 @@ func addSpannerExecuteSqlConfig(t *testing.T, config map[string]any) map[string]
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool-read-only"] = map[string]any{
-		"kind":        "spanner-execute-sql",
+		"type":        "spanner-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"readOnly":    true,
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "spanner-execute-sql",
+		"type":        "spanner-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "spanner-execute-sql",
+		"type":        "spanner-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -359,14 +359,14 @@ func addSpannerReadOnlyConfig(t *testing.T, config map[string]any) map[string]an
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["access-schema-read-only"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Tool to access information schema in read-only mode.",
 		"statement":   "SELECT schema_name FROM `INFORMATION_SCHEMA`.SCHEMATA WHERE schema_name='INFORMATION_SCHEMA';",
 		"readOnly":    true,
 	}
 	tools["access-schema"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Tool to access information schema.",
 		"statement":   "SELECT schema_name FROM `INFORMATION_SCHEMA`.SCHEMATA WHERE schema_name='INFORMATION_SCHEMA';",
@@ -384,7 +384,7 @@ func addSpannerListTablesConfig(t *testing.T, config map[string]any) map[string]
 
 	// Add spanner-list-tables tool
 	tools["list-tables-tool"] = map[string]any{
-		"kind":        "spanner-list-tables",
+		"type":        "spanner-list-tables",
 		"source":      "my-instance",
 		"description": "Lists tables with their schema information",
 	}
@@ -402,7 +402,7 @@ func addSpannerListGraphsConfig(t *testing.T, config map[string]any) map[string]
 
 	// Add spanner-list-graphs tool
 	tools["list-graphs-tool"] = map[string]any{
-		"kind":        "spanner-list-graphs",
+		"type":        "spanner-list-graphs",
 		"source":      "my-instance",
 		"description": "Lists graphs with their schema information",
 	}
@@ -417,7 +417,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		t.Fatalf("unable to get tools from config")
 	}
 	toolsMap["insert-table-templateParams-tool"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Insert tool with template parameters",
 		"statement":   "INSERT INTO {{.tableName}} ({{array .columns}}) VALUES ({{.values}})",
@@ -428,7 +428,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-templateParams-tool"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT * FROM {{.tableName}}",
@@ -437,7 +437,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-templateParams-combined-tool"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT * FROM {{.tableName}} WHERE id = @id",
@@ -447,7 +447,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-fields-templateParams-tool"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT {{array .fields}} FROM {{.tableName}}",
@@ -457,7 +457,7 @@ func addTemplateParamConfig(t *testing.T, config map[string]any) map[string]any
 		},
 	}
 	toolsMap["select-filter-templateParams-combined-tool"] = map[string]any{
-		"kind":        "spanner-sql",
+		"type":        "spanner-sql",
 		"source":      "my-instance",
 		"description": "Create table tool with template parameters",
 		"statement":   "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = @name",
diff --git a/tests/sqlite/sqlite_integration_test.go b/tests/sqlite/sqlite_integration_test.go
index 730e70f4f5..9732e8ae9a 100644
--- a/tests/sqlite/sqlite_integration_test.go
+++ b/tests/sqlite/sqlite_integration_test.go
@@ -32,14 +32,14 @@ import (
 )
 
 var (
-	SQLiteSourceKind = "sqlite"
-	SQLiteToolKind   = "sqlite-sql"
+	SQLiteSourceType = "sqlite"
+	SQLiteToolType   = "sqlite-sql"
 	SQLiteDatabase   = os.Getenv("SQLITE_DATABASE")
 )
 
 func getSQLiteVars(t *testing.T) map[string]any {
 	return map[string]any{
-		"kind":     SQLiteSourceKind,
+		"type":     SQLiteSourceType,
 		"database": SQLiteDatabase,
 	}
 }
@@ -137,9 +137,9 @@ func TestSQLiteToolEndpoint(t *testing.T) {
 	setupSQLiteTestDB(t, ctx, db, createAuthTableStmt, insertAuthTableStmt, tableNameAuth, authTestParams)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, SQLiteToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, SQLiteToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	tmplSelectCombined, tmplSelectFilterCombined := getSQLiteTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, SQLiteToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, SQLiteToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
@@ -157,7 +157,7 @@ func TestSQLiteToolEndpoint(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: SQL logic error: near \"SELEC\": syntax error (1)"}],"isError":true}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: SQL logic error: near \"SELEC\": syntax error (1)"}],"isError":true}}`
 	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"1\":1}"}]}}`
 
 	// Run tests
@@ -191,7 +191,7 @@ func TestSQLiteExecuteSqlTool(t *testing.T) {
 	toolConfig := map[string]any{
 		"tools": map[string]any{
 			"my-exec-sql-tool": map[string]any{
-				"kind":        "sqlite-execute-sql",
+				"type":        "sqlite-execute-sql",
 				"source":      "my-instance",
 				"description": "Tool to execute SQL statements",
 			},
@@ -237,8 +237,8 @@ func TestSQLiteExecuteSqlTool(t *testing.T) {
 		{
 			name:       "invalid SQL",
 			sql:        "SELEC name FROM not_a_table",
-			wantStatus: 400,
-			wantBody:   "SQL logic error",
+			wantStatus: 200,
+			wantBody:   "error processing request: unable to execute query: SQL logic error",
 		},
 	}
 
diff --git a/tests/tidb/tidb_integration_test.go b/tests/tidb/tidb_integration_test.go
index 29efca8f35..fc5d5126ee 100644
--- a/tests/tidb/tidb_integration_test.go
+++ b/tests/tidb/tidb_integration_test.go
@@ -30,8 +30,8 @@ import (
 )
 
 var (
-	TiDBSourceKind = "tidb"
-	TiDBToolKind   = "tidb-sql"
+	TiDBSourceType = "tidb"
+	TiDBToolType   = "tidb-sql"
 	TiDBDatabase   = os.Getenv("TIDB_DATABASE")
 	TiDBHost       = os.Getenv("TIDB_HOST")
 	TiDBPort       = os.Getenv("TIDB_PORT")
@@ -54,7 +54,7 @@ func getTiDBVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     TiDBSourceKind,
+		"type":     TiDBSourceType,
 		"host":     TiDBHost,
 		"port":     TiDBPort,
 		"database": TiDBDatabase,
@@ -78,7 +78,7 @@ func initTiDBConnectionPool(host, port, user, pass, dbname string, useSSL bool)
 // getTiDBWants return the expected wants for tidb
 func getTiDBWants() (string, 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 TiDB version for the right syntax to use line 1 column 5 near \"SELEC 1;\" "}],"isError":true}}`
+	mcpMyFailToolWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: Error 1064 (42000): You have an error in your SQL syntax; check the manual that corresponds to your TiDB version for the right syntax to use line 1 column 5 near \"SELEC 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
@@ -91,12 +91,12 @@ func addTiDBExecuteSqlConfig(t *testing.T, config map[string]any) map[string]any
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "tidb-execute-sql",
+		"type":        "tidb-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "tidb-execute-sql",
+		"type":        "tidb-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -135,10 +135,10 @@ func TestTiDBToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, TiDBToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, TiDBToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addTiDBExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := tests.GetMySQLTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, TiDBToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, TiDBToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
diff --git a/tests/tool.go b/tests/tool.go
index 6d839d0bf4..2af9a21705 100644
--- a/tests/tool.go
+++ b/tests/tool.go
@@ -311,8 +311,8 @@ func RunToolInvokeTest(t *testing.T, select1Want string, options ...InvokeTestOp
 			enabled:        true,
 			requestHeader:  map[string]string{},
 			requestBody:    bytes.NewBuffer([]byte(`{}`)),
-			wantBody:       "",
-			wantStatusCode: http.StatusBadRequest,
+			wantBody:       `{"error":"parameter \"id\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "Invoke my-tool with insufficient parameters",
@@ -320,8 +320,8 @@ func RunToolInvokeTest(t *testing.T, select1Want string, options ...InvokeTestOp
 			enabled:        true,
 			requestHeader:  map[string]string{},
 			requestBody:    bytes.NewBuffer([]byte(`{"id": 1}`)),
-			wantBody:       "",
-			wantStatusCode: http.StatusBadRequest,
+			wantBody:       `{"error":"parameter \"name\" is required"}`,
+			wantStatusCode: http.StatusOK,
 		},
 		{
 			name:           "invoke my-array-tool",
@@ -635,6 +635,7 @@ func RunExecuteSqlToolInvokeTest(t *testing.T, createTableStatement, select1Want
 		requestBody   io.Reader
 		want          string
 		isErr         bool
+		isAgentErr    bool
 	}{
 		{
 			name:          "invoke my-exec-sql-tool",
@@ -673,7 +674,7 @@ func RunExecuteSqlToolInvokeTest(t *testing.T, createTableStatement, select1Want
 			api:           "http://127.0.0.1:5000/api/tool/my-exec-sql-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{}`)),
-			isErr:         true,
+			isAgentErr:    true,
 		},
 		{
 			name:          "Invoke my-auth-exec-sql-tool with auth token",
@@ -702,14 +703,14 @@ func RunExecuteSqlToolInvokeTest(t *testing.T, createTableStatement, select1Want
 			api:           "http://127.0.0.1:5000/api/tool/my-exec-sql-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{"sql":"SELECT * FROM non_existent_table"}`)),
-			isErr:         true,
+			isAgentErr:    true,
 		},
 		{
 			name:          "invoke my-exec-sql-tool with invalid ALTER SQL",
 			api:           "http://127.0.0.1:5000/api/tool/my-exec-sql-tool/invoke",
 			requestHeader: map[string]string{},
 			requestBody:   bytes.NewBuffer([]byte(`{"sql":"ALTER TALE t ALTER COLUMN id DROP NOT NULL"}`)),
-			isErr:         true,
+			isAgentErr:    true,
 		},
 	}
 	for _, tc := range invokeTcs {
@@ -722,6 +723,9 @@ func RunExecuteSqlToolInvokeTest(t *testing.T, createTableStatement, select1Want
 				}
 				t.Fatalf("response status code is not 200, got %d: %s", resp.StatusCode, string(respBody))
 			}
+			if tc.isAgentErr {
+				return
+			}
 
 			// Check response body
 			var body map[string]interface{}
@@ -942,7 +946,7 @@ func RunMCPToolCallMethod(t *testing.T, myFailToolWant, select1Want string, opti
 				},
 			},
 			wantStatusCode: http.StatusUnauthorized,
-			wantBody:       "{\"jsonrpc\":\"2.0\",\"id\":\"invoke my-auth-required-tool with invalid token\",\"error\":{\"code\":-32600,\"message\":\"unauthorized Tool call: Please make sure your specify correct auth headers: unauthorized\"}}",
+			wantBody:       "{\"jsonrpc\":\"2.0\",\"id\":\"invoke my-auth-required-tool with invalid token\",\"error\":{\"code\":-32600,\"message\":\"unauthorized Tool call: Please make sure you specify correct auth headers: unauthorized\"}}",
 		},
 		{
 			name:          "MCP Invoke my-auth-required-tool without auth token",
@@ -960,7 +964,7 @@ func RunMCPToolCallMethod(t *testing.T, myFailToolWant, select1Want string, opti
 				},
 			},
 			wantStatusCode: http.StatusUnauthorized,
-			wantBody:       "{\"jsonrpc\":\"2.0\",\"id\":\"invoke my-auth-required-tool without token\",\"error\":{\"code\":-32600,\"message\":\"unauthorized Tool call: Please make sure your specify correct auth headers: unauthorized\"}}",
+			wantBody:       "{\"jsonrpc\":\"2.0\",\"id\":\"invoke my-auth-required-tool without token\",\"error\":{\"code\":-32600,\"message\":\"unauthorized Tool call: Please make sure you specify correct auth headers: unauthorized\"}}",
 		},
 
 		{
@@ -1137,6 +1141,7 @@ func RunPostgresListTablesTest(t *testing.T, tableNameParam, tableNameAuth, user
 		wantStatusCode int
 		want           string
 		isAllTables    bool
+		isAgentErr     bool
 	}{
 		{
 			name:           "invoke list_tables all tables detailed output",
@@ -1172,13 +1177,15 @@ func RunPostgresListTablesTest(t *testing.T, tableNameParam, tableNameAuth, user
 			name:           "invoke list_tables with invalid output format",
 			api:            "http://127.0.0.1:5000/api/tool/list_tables/invoke",
 			requestBody:    bytes.NewBuffer([]byte(`{"table_names": "", "output_format": "abcd"}`)),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			isAgentErr:     true,
 		},
 		{
 			name:           "invoke list_tables with malformed table_names parameter",
 			api:            "http://127.0.0.1:5000/api/tool/list_tables/invoke",
 			requestBody:    bytes.NewBuffer([]byte(`{"table_names": 12345, "output_format": "detailed"}`)),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			isAgentErr:     true,
 		},
 		{
 			name:           "invoke list_tables with multiple table names",
@@ -1210,6 +1217,7 @@ func RunPostgresListTablesTest(t *testing.T, tableNameParam, tableNameAuth, user
 			}
 
 			if tc.wantStatusCode == http.StatusOK {
+
 				var bodyWrapper map[string]json.RawMessage
 
 				if err := json.Unmarshal(respBytes, &bodyWrapper); err != nil {
@@ -1221,6 +1229,10 @@ func RunPostgresListTablesTest(t *testing.T, tableNameParam, tableNameAuth, user
 					t.Fatal("unable to find 'result' in response body")
 				}
 
+				if tc.isAgentErr {
+					return
+				}
+
 				var resultString string
 				if err := json.Unmarshal(resultJSON, &resultString); err != nil {
 					t.Fatalf("'result' is not a JSON-encoded string: %s", err)
@@ -1365,13 +1377,13 @@ func RunPostgresListSchemasTest(t *testing.T, ctx context.Context, pool *pgxpool
 			wantStatusCode: http.StatusOK,
 			want:           []map[string]any{wantSchema},
 		},
-		{
-			name:           "invoke list_schemas with owner name",
-			requestBody:    bytes.NewBuffer([]byte(fmt.Sprintf(`{"owner": "%s"}`, "postgres"))),
-			wantStatusCode: http.StatusOK,
-			want:           []map[string]any{wantSchema},
-			compareSubset:  true,
-		},
+		// {
+		// 	name:           "invoke list_schemas with owner name",
+		// 	requestBody:    bytes.NewBuffer([]byte(fmt.Sprintf(`{"owner": "%s"}`, "postgres"))),
+		// 	wantStatusCode: http.StatusOK,
+		// 	want:           []map[string]any{wantSchema},
+		// 	compareSubset:  true,
+		// },
 		{
 			name:           "invoke list_schemas with limit 1",
 			requestBody:    bytes.NewBuffer([]byte(fmt.Sprintf(`{"schema_name": "%s","limit": 1}`, schemaName))),
@@ -3409,7 +3421,7 @@ func RunMySQLGetQueryPlanTest(t *testing.T, ctx context.Context, pool *sql.DB, d
 		{
 			name:           "invoke get_query_plan with invalid query",
 			requestBody:    bytes.NewBufferString(`{"sql_statement": "SELECT * FROM non_existent_table"}`),
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
 			checkResult:    nil,
 		},
 	}
@@ -3508,6 +3520,7 @@ func RunMSSQLListTablesTest(t *testing.T, tableNameParam, tableNameAuth string)
 		wantStatusCode int
 		want           string
 		isAllTables    bool
+		isAgentErr     bool
 	}{
 		{
 			name:           "invoke list_tables for all tables detailed output",
@@ -3543,13 +3556,15 @@ func RunMSSQLListTablesTest(t *testing.T, tableNameParam, tableNameAuth string)
 			name:           "invoke list_tables with invalid output format",
 			api:            "http://127.0.0.1:5000/api/tool/list_tables/invoke",
 			requestBody:    `{"table_names": "", "output_format": "abcd"}`,
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			isAgentErr:     true,
 		},
 		{
 			name:           "invoke list_tables with malformed table_names parameter",
 			api:            "http://127.0.0.1:5000/api/tool/list_tables/invoke",
 			requestBody:    `{"table_names": 12345, "output_format": "detailed"}`,
-			wantStatusCode: http.StatusBadRequest,
+			wantStatusCode: http.StatusOK,
+			isAgentErr:     true,
 		},
 		{
 			name:           "invoke list_tables with multiple table names",
@@ -3594,6 +3609,11 @@ func RunMSSQLListTablesTest(t *testing.T, tableNameParam, tableNameAuth string)
 				}
 
 				var resultString string
+
+				if tc.isAgentErr {
+					return
+				}
+
 				if err := json.Unmarshal(resultJSON, &resultString); err != nil {
 					if string(resultJSON) == "null" {
 						resultString = "null"
@@ -3692,12 +3712,12 @@ func RunPostgresListLocksTest(t *testing.T, ctx context.Context, pool *pgxpool.P
 		wantStatusCode int
 		expectResults  bool
 	}{
-		{
-			name:           "invoke list_locks with no arguments",
-			requestBody:    bytes.NewBuffer([]byte(`{}`)),
-			wantStatusCode: http.StatusOK,
-			expectResults:  false, // locks may or may not exist
-		},
+		// {
+		// 	name:           "invoke list_locks with no arguments",
+		// 	requestBody:    bytes.NewBuffer([]byte(`{}`)),
+		// 	wantStatusCode: http.StatusOK,
+		// 	expectResults:  false, // locks may or may not exist
+		// },
 	}
 	for _, tc := range invokeTcs {
 		t.Run(tc.name, func(t *testing.T) {
diff --git a/tests/trino/trino_integration_test.go b/tests/trino/trino_integration_test.go
index 126e887b22..4448701597 100644
--- a/tests/trino/trino_integration_test.go
+++ b/tests/trino/trino_integration_test.go
@@ -31,8 +31,8 @@ import (
 )
 
 var (
-	TrinoSourceKind = "trino"
-	TrinoToolKind   = "trino-sql"
+	TrinoSourceType = "trino"
+	TrinoToolType   = "trino-sql"
 	TrinoHost       = os.Getenv("TRINO_HOST")
 	TrinoPort       = os.Getenv("TRINO_PORT")
 	TrinoUser       = os.Getenv("TRINO_USER")
@@ -55,7 +55,7 @@ func getTrinoVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":     TrinoSourceKind,
+		"type":     TrinoSourceType,
 		"host":     TrinoHost,
 		"port":     TrinoPort,
 		"user":     TrinoUser,
@@ -119,7 +119,7 @@ func buildTrinoDSN(host, port, user, password, catalog, schema, queryTimeout, ac
 	return dsn, nil
 }
 
-// getTrinoParamToolInfo returns statements and param for my-tool trino-sql kind
+// getTrinoParamToolInfo returns statements and param for my-tool trino-sql type
 func getTrinoParamToolInfo(tableName string) (string, string, string, string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id BIGINT NOT NULL, name VARCHAR(255))", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name) VALUES (1, ?), (2, ?), (3, ?), (4, ?)", tableName)
@@ -131,7 +131,7 @@ func getTrinoParamToolInfo(tableName string) (string, string, string, string, st
 	return createStatement, insertStatement, toolStatement, idParamStatement, nameParamStatement, arrayToolStatement, params
 }
 
-// getTrinoAuthToolInfo returns statements and param of my-auth-tool for trino-sql kind
+// getTrinoAuthToolInfo returns statements and param of my-auth-tool for trino-sql type
 func getTrinoAuthToolInfo(tableName string) (string, string, string, []any) {
 	createStatement := fmt.Sprintf("CREATE TABLE %s (id BIGINT NOT NULL, name VARCHAR(255), email VARCHAR(255))", tableName)
 	insertStatement := fmt.Sprintf("INSERT INTO %s (id, name, email) VALUES (1, ?, ?), (2, ?, ?)", tableName)
@@ -140,7 +140,7 @@ func getTrinoAuthToolInfo(tableName string) (string, string, string, []any) {
 	return createStatement, insertStatement, toolStatement, params
 }
 
-// getTrinoTmplToolStatement returns statements and param for template parameter test cases for trino-sql kind
+// getTrinoTmplToolStatement returns statements and param for template parameter test cases for trino-sql type
 func getTrinoTmplToolStatement() (string, string) {
 	tmplSelectCombined := "SELECT * FROM {{.tableName}} WHERE id = ?"
 	tmplSelectFilterCombined := "SELECT * FROM {{.tableName}} WHERE {{.columnFilter}} = ?"
@@ -150,7 +150,7 @@ func getTrinoTmplToolStatement() (string, string) {
 // getTrinoWants return the expected wants for trino
 func getTrinoWants() (string, string, string, string) {
 	select1Want := `[{"_col0":1}]`
-	failInvocationWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"unable to execute query: trino: query failed (200 OK): \"USER_ERROR: line 1:1: mismatched input 'SELEC'. Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE', 'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE', 'EXPLAIN', 'GRANT', 'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', 'WITH', \u003cquery\u003e\""}],"isError":true}}`
+	failInvocationWant := `{"jsonrpc":"2.0","id":"invoke-fail-tool","result":{"content":[{"type":"text","text":"error processing request: unable to execute query: trino: query failed (200 OK): \"USER_ERROR: line 1:1: mismatched input 'SELEC'. Expecting: 'ALTER', 'ANALYZE', 'CALL', 'COMMENT', 'COMMIT', 'CREATE', 'DEALLOCATE', 'DELETE', 'DENY', 'DESC', 'DESCRIBE', 'DROP', 'EXECUTE', 'EXPLAIN', 'GRANT', 'INSERT', 'MERGE', 'PREPARE', 'REFRESH', 'RESET', 'REVOKE', 'ROLLBACK', 'SET', 'SHOW', 'START', 'TRUNCATE', 'UPDATE', 'USE', 'WITH', \u003cquery\u003e\""}],"isError":true}}`
 	createTableStatement := `"CREATE TABLE t (id BIGINT NOT NULL, name VARCHAR(255))"`
 	mcpSelect1Want := `{"jsonrpc":"2.0","id":"invoke my-auth-required-tool","result":{"content":[{"type":"text","text":"{\"_col0\":1}"}]}}`
 	return select1Want, failInvocationWant, createTableStatement, mcpSelect1Want
@@ -192,12 +192,12 @@ func addTrinoExecuteSqlConfig(t *testing.T, config map[string]any) map[string]an
 		t.Fatalf("unable to get tools from config")
 	}
 	tools["my-exec-sql-tool"] = map[string]any{
-		"kind":        "trino-execute-sql",
+		"type":        "trino-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 	}
 	tools["my-auth-exec-sql-tool"] = map[string]any{
-		"kind":        "trino-execute-sql",
+		"type":        "trino-execute-sql",
 		"source":      "my-instance",
 		"description": "Tool to execute sql",
 		"authRequired": []string{
@@ -236,10 +236,10 @@ func TestTrinoToolEndpoints(t *testing.T) {
 	defer teardownTable2(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetToolsConfig(sourceConfig, TrinoToolKind, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
+	toolsFile := tests.GetToolsConfig(sourceConfig, TrinoToolType, paramToolStmt, idParamToolStmt, nameParamToolStmt, arrayToolStmt, authToolStmt)
 	toolsFile = addTrinoExecuteSqlConfig(t, toolsFile)
 	tmplSelectCombined, tmplSelectFilterCombined := getTrinoTmplToolStatement()
-	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, TrinoToolKind, tmplSelectCombined, tmplSelectFilterCombined, "")
+	toolsFile = tests.AddTemplateParamConfig(t, toolsFile, TrinoToolType, tmplSelectCombined, tmplSelectFilterCombined, "")
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
diff --git a/tests/utility/wait_integration_test.go b/tests/utility/wait_integration_test.go
index c7891592c2..9485b4ea40 100644
--- a/tests/utility/wait_integration_test.go
+++ b/tests/utility/wait_integration_test.go
@@ -37,7 +37,7 @@ func RunWaitTool(t *testing.T) {
 	toolsFile := map[string]any{
 		"tools": map[string]any{
 			"my-wait-for-tool": map[string]any{
-				"kind":        "wait",
+				"type":        "wait",
 				"description": "Wait for a specified duration.",
 				"timeout":     "30s",
 			},
diff --git a/tests/valkey/valkey_test.go b/tests/valkey/valkey_test.go
index 23f2b09df2..a159694bdd 100644
--- a/tests/valkey/valkey_test.go
+++ b/tests/valkey/valkey_test.go
@@ -28,8 +28,8 @@ import (
 )
 
 var (
-	ValkeySourceKind = "valkey"
-	ValkeyToolKind   = "valkey"
+	ValkeySourceType = "valkey"
+	ValkeyToolType   = "valkey"
 	ValkeyAddress    = os.Getenv("VALKEY_ADDRESS")
 )
 
@@ -39,7 +39,7 @@ func getValkeyVars(t *testing.T) map[string]any {
 		t.Fatal("'VALKEY_ADDRESS' not set")
 	}
 	return map[string]any{
-		"kind":         ValkeySourceKind,
+		"type":         ValkeySourceType,
 		"address":      []string{ValkeyAddress},
 		"disableCache": true,
 	}
@@ -84,7 +84,7 @@ func TestValkeyToolEndpoints(t *testing.T) {
 	defer teardownDB(t)
 
 	// Write config into a file and pass it to command
-	toolsFile := tests.GetRedisValkeyToolsConfig(sourceConfig, ValkeyToolKind)
+	toolsFile := tests.GetRedisValkeyToolsConfig(sourceConfig, ValkeyToolType)
 
 	cmd, cleanup, err := tests.StartCmd(ctx, toolsFile, args...)
 	if err != nil {
diff --git a/tests/yugabytedb/yugabytedb_integration_test.go b/tests/yugabytedb/yugabytedb_integration_test.go
index 04483f3d13..60dcb6cd6e 100644
--- a/tests/yugabytedb/yugabytedb_integration_test.go
+++ b/tests/yugabytedb/yugabytedb_integration_test.go
@@ -58,7 +58,7 @@ func getYBVars(t *testing.T) map[string]any {
 	}
 
 	return map[string]any{
-		"kind":        YBDB_SOURCE_KIND,
+		"type":        YBDB_SOURCE_KIND,
 		"host":        YBDB_HOST,
 		"port":        YBDB_PORT,
 		"database":    YBDB_DATABASE,