chore: fix for configuration file changes

Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

.ci/integration.cloudbuild.yaml

@@ -171,23 +171,6 @@ steps:
           alloydbainl \
           alloydbainl
 
-  - id: "alloydb-omni"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "AlloyDB Omni" \
-          alloydbomni \
-          postgres
-
   - id: "bigtable"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -312,25 +295,6 @@ steps:
           cloudhealthcare \
           cloudhealthcare
 
-  - id: "cloud-logging-admin"
-    name: golang:1
-    waitFor: ["compile-test-binary"]
-    entrypoint: /bin/bash
-    env:
-      - "GOPATH=/gopath"
-      - "LOGADMIN_PROJECT=$PROJECT_ID"
-    secretEnv: ["CLIENT_ID"]
-    volumes:
-      - name: "go"
-        path: "/gopath"
-    args:
-      - -c
-      - |
-        .ci/test_with_coverage.sh \
-          "Cloud Logging Admin" \
-          cloudloggingadmin \
-          cloudloggingadmin
-
   - id: "postgres"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -376,6 +340,26 @@ steps:
           spanner \
           spanner || echo "Integration tests failed." # ignore test failures
 
+  - id: "spanner-admin"
+    name: golang:1
+    waitFor: ["compile-test-binary"]
+    entrypoint: /bin/bash
+    env:
+      - "GOPATH=/gopath"
+      - "SPANNER_PROJECT=$PROJECT_ID"
+      - "SERVICE_ACCOUNT_EMAIL=$SERVICE_ACCOUNT_EMAIL"
+    secretEnv: ["CLIENT_ID"]
+    volumes:
+      - name: "go"
+        path: "/gopath"
+    args:
+      - -c
+      - |
+        .ci/test_with_coverage.sh \
+          "Spanner Admin" \
+          spanneradmin \
+          spanneradmin || echo "Integration tests failed."
+
   - id: "neo4j"
     name: golang:1
     waitFor: ["compile-test-binary"]
@@ -923,7 +907,7 @@ steps:
         tar -C /usr/local -xzf go.tar.gz
         export PATH="/usr/local/go/bin:$$PATH"
 
-        go test -v ./tests/oracle/... \
+        go test -v ./internal/sources/oracle/... \
           -coverprofile=oracle_coverage.out \
           -coverpkg=./internal/sources/oracle/...,./internal/tools/oracle/...
         
@@ -931,8 +915,8 @@ steps:
         total_coverage=$(go tool cover -func=oracle_coverage.out | grep "total:" | awk '{print $3}')
         echo "Oracle total coverage: $total_coverage"
         coverage_numeric=$(echo "$total_coverage" | sed 's/%//')
-        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 60)}'; then
+        if awk -v cov="$coverage_numeric" 'BEGIN {exit !(cov < 20)}'; then
-            echo "Coverage failure: $total_coverage is below 60%."
+            echo "Coverage failure: $total_coverage is below 20%."
             exit 1
         fi
 

.lycheeignore

@@ -37,7 +37,6 @@ 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/server
 https://www.npmjs.com/package/@toolbox-sdk/core
 https://www.npmjs.com/package/@toolbox-sdk/adk
 https://www.oceanbase.com/

README.md

@@ -107,7 +107,7 @@ redeploying your application.
 
 ## Getting Started
 
-### Quickstart: Running Toolbox using NPX
+### (Non-production) Running Toolbox
 
 You can run Toolbox directly with a [configuration file](#configuration):
 

cmd/invoke_tool_test.go

@@ -1,131 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cmd
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestInvokeTool(t *testing.T) {
-	// Create a temporary tools file
-	tmpDir := t.TempDir()
-
-	toolsFileContent := `
-sources:
-  my-sqlite:
-    kind: sqlite
-    database: test.db
-tools:
-  hello-sqlite:
-    kind: sqlite-sql
-    source: my-sqlite
-    description: "hello tool"
-    statement: "SELECT 'hello' as greeting"
-  echo-tool:
-    kind: sqlite-sql
-    source: my-sqlite
-    description: "echo tool"
-    statement: "SELECT ? as msg"
-    parameters:
-      - name: message
-        type: string
-        description: message to echo
-`
-
-	toolsFilePath := filepath.Join(tmpDir, "tools.yaml")
-	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
-		t.Fatalf("failed to write tools file: %v", err)
-	}
-
-	tcs := []struct {
-		desc    string
-		args    []string
-		want    string
-		wantErr bool
-		errStr  string
-	}{
-		{
-			desc: "success - basic tool call",
-			args: []string{"invoke", "hello-sqlite", "--tools-file", toolsFilePath},
-			want: `"greeting": "hello"`,
-		},
-		{
-			desc: "success - tool call with parameters",
-			args: []string{"invoke", "echo-tool", `{"message": "world"}`, "--tools-file", toolsFilePath},
-			want: `"msg": "world"`,
-		},
-		{
-			desc:    "error - tool not found",
-			args:    []string{"invoke", "non-existent", "--tools-file", toolsFilePath},
-			wantErr: true,
-			errStr:  `tool "non-existent" not found`,
-		},
-		{
-			desc:    "error - invalid JSON params",
-			args:    []string{"invoke", "echo-tool", `invalid-json`, "--tools-file", toolsFilePath},
-			wantErr: true,
-			errStr:  `params must be a valid JSON string`,
-		},
-	}
-
-	for _, tc := range tcs {
-		t.Run(tc.desc, func(t *testing.T) {
-			_, got, err := invokeCommandWithContext(context.Background(), tc.args)
-			if (err != nil) != tc.wantErr {
-				t.Fatalf("got error %v, wantErr %v", err, tc.wantErr)
-			}
-			if tc.wantErr && !strings.Contains(err.Error(), tc.errStr) {
-				t.Fatalf("got error %v, want error containing %q", err, tc.errStr)
-			}
-			if !tc.wantErr && !strings.Contains(got, tc.want) {
-				t.Fatalf("got %q, want it to contain %q", got, tc.want)
-			}
-		})
-	}
-}
-
-func TestInvokeTool_AuthUnsupported(t *testing.T) {
-	tmpDir := t.TempDir()
-	toolsFileContent := `
-sources:
-  my-bq:
-    kind: bigquery
-    project: my-project
-    useClientOAuth: true
-tools:
-  bq-tool:
-    kind: bigquery-sql
-    source: my-bq
-    description: "bq tool"
-    statement: "SELECT 1"
-`
-	toolsFilePath := filepath.Join(tmpDir, "auth_tools.yaml")
-	if err := os.WriteFile(toolsFilePath, []byte(toolsFileContent), 0644); err != nil {
-		t.Fatalf("failed to write tools file: %v", err)
-	}
-
-	args := []string{"invoke", "bq-tool", "--tools-file", toolsFilePath}
-	_, _, err := invokeCommandWithContext(context.Background(), args)
-	if err == nil {
-		t.Fatal("expected error for tool requiring client auth, but got nil")
-	}
-	if !strings.Contains(err.Error(), "client authorization is not supported") {
-		t.Fatalf("unexpected error message: %v", err)
-	}
-}

cmd/root.go

@@ -34,7 +34,6 @@ import (
 	"github.com/fsnotify/fsnotify"
 	yaml "github.com/goccy/go-yaml"
 	"github.com/googleapis/genai-toolbox/internal/auth"
-	"github.com/googleapis/genai-toolbox/internal/cli/invoke"
 	"github.com/googleapis/genai-toolbox/internal/embeddingmodels"
 	"github.com/googleapis/genai-toolbox/internal/log"
 	"github.com/googleapis/genai-toolbox/internal/prebuiltconfigs"
@@ -92,9 +91,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistlognames"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminlistresourcetypes"
-	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudloggingadmin/cloudloggingadminquerylogs"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudmonitoring"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcloneinstance"
 	_ "github.com/googleapis/genai-toolbox/internal/tools/cloudsql/cloudsqlcreatebackup"
@@ -228,6 +224,7 @@ import (
 	_ "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/spanneradmin/spannercreateinstance"
 	_ "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"
@@ -248,7 +245,6 @@ import (
 	_ "github.com/googleapis/genai-toolbox/internal/sources/clickhouse"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudgda"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudhealthcare"
-	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudloggingadmin"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudmonitoring"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqladmin"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/cloudsqlmssql"
@@ -275,6 +271,7 @@ import (
 	_ "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/spanneradmin"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/sqlite"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/tidb"
 	_ "github.com/googleapis/genai-toolbox/internal/sources/trino"
@@ -366,42 +363,37 @@ func NewCommand(opts ...Option) *Command {
 	baseCmd.SetErr(cmd.errStream)
 
 	flags := cmd.Flags()
-	persistentFlags := cmd.PersistentFlags()
-
 	flags.StringVarP(&cmd.cfg.Address, "address", "a", "127.0.0.1", "Address of the interface the server will listen on.")
 	flags.IntVarP(&cmd.cfg.Port, "port", "p", 5000, "Port the server will listen on.")
 
 	flags.StringVar(&cmd.tools_file, "tools_file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
 	// deprecate tools_file
 	_ = flags.MarkDeprecated("tools_file", "please use --tools-file instead")
-	persistentFlags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
+	flags.StringVar(&cmd.tools_file, "tools-file", "", "File path specifying the tool configuration. Cannot be used with --tools-files, or --tools-folder.")
-	persistentFlags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, or --tools-folder.")
+	flags.StringSliceVar(&cmd.tools_files, "tools-files", []string{}, "Multiple file paths specifying tool configurations. Files will be merged. Cannot be used with --tools-file, or --tools-folder.")
-	persistentFlags.StringVar(&cmd.tools_folder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --tools-file, or --tools-files.")
+	flags.StringVar(&cmd.tools_folder, "tools-folder", "", "Directory path containing YAML tool configuration files. All .yaml and .yml files in the directory will be loaded and merged. Cannot be used with --tools-file, or --tools-files.")
-	persistentFlags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
+	flags.Var(&cmd.cfg.LogLevel, "log-level", "Specify the minimum level logged. Allowed: 'DEBUG', 'INFO', 'WARN', 'ERROR'.")
-	persistentFlags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
+	flags.Var(&cmd.cfg.LoggingFormat, "logging-format", "Specify logging format to use. Allowed: 'standard' or 'JSON'.")
-	persistentFlags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
+	flags.BoolVar(&cmd.cfg.TelemetryGCP, "telemetry-gcp", false, "Enable exporting directly to Google Cloud Monitoring.")
-	persistentFlags.StringVar(&cmd.cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
+	flags.StringVar(&cmd.cfg.TelemetryOTLP, "telemetry-otlp", "", "Enable exporting using OpenTelemetry Protocol (OTLP) to the specified endpoint (e.g. 'http://127.0.0.1:4318')")
-	persistentFlags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
+	flags.StringVar(&cmd.cfg.TelemetryServiceName, "telemetry-service-name", "toolbox", "Sets the value of the service.name resource attribute for telemetry data.")
 	// Fetch prebuilt tools sources to customize the help description
 	prebuiltHelp := fmt.Sprintf(
 		"Use a prebuilt tool configuration by source type. Allowed: '%s'. Can be specified multiple times.",
 		strings.Join(prebuiltconfigs.GetPrebuiltSources(), "', '"),
 	)
-	persistentFlags.StringSliceVar(&cmd.prebuiltConfigs, "prebuilt", []string{}, prebuiltHelp)
+	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.")
 	// TODO: Insecure by default. Might consider updating this for v1.0.0
 	flags.StringSliceVar(&cmd.cfg.AllowedOrigins, "allowed-origins", []string{"*"}, "Specifies a list of origins permitted to access this server. Defaults to '*'.")
 	flags.StringSliceVar(&cmd.cfg.AllowedHosts, "allowed-hosts", []string{"*"}, "Specifies a list of hosts permitted to access this server. Defaults to '*'.")
-	persistentFlags.StringSliceVar(&cmd.cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
+	flags.StringSliceVar(&cmd.cfg.UserAgentMetadata, "user-agent-metadata", []string{}, "Appends additional metadata to the User-Agent.")
 
 	// wrap RunE command so that we have access to original Command object
 	cmd.RunE = func(*cobra.Command, []string) error { return run(cmd) }
 
-	// Register subcommands for tool invocation
-	baseCmd.AddCommand(invoke.NewCommand(cmd))
-
 	return cmd
 }
 
@@ -925,23 +917,70 @@ func resolveWatcherInputs(toolsFile string, toolsFiles []string, toolsFolder str
 	return watchDirs, watchedFiles
 }
 
-func (cmd *Command) Config() server.ServerConfig {
+func run(cmd *Command) error {
-	return cmd.cfg
+	ctx, cancel := context.WithCancel(cmd.Context())
-}
+	defer cancel()
 
-func (cmd *Command) Out() io.Writer {
+	// watch for sigterm / sigint signals
-	return cmd.outStream
+	signals := make(chan os.Signal, 1)
-}
+	signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT)
-
+	go func(sCtx context.Context) {
-func (cmd *Command) Logger() log.Logger {
+		var s os.Signal
-	return cmd.logger
+		select {
-}
+		case <-sCtx.Done():
-
+			// this should only happen when the context supplied when testing is canceled
-func (cmd *Command) LoadConfig(ctx context.Context) error {
+			return
-	logger, err := util.LoggerFromContext(ctx)
+		case s = <-signals:
-	if err != nil {
-		return err
 		}
+		switch s {
+		case syscall.SIGINT:
+			cmd.logger.DebugContext(sCtx, "Received SIGINT signal to shutdown.")
+		case syscall.SIGTERM:
+			cmd.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)
+	if err != nil {
+		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
+		cmd.logger.ErrorContext(ctx, errMsg.Error())
+		return errMsg
+	}
+	defer func() {
+		err := otelShutdown(ctx)
+		if err != nil {
+			errMsg := fmt.Errorf("error shutting down OpenTelemetry: %w", err)
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
+		}
+	}()
 
 	var allToolsFiles []ToolsFile
 
@@ -951,20 +990,23 @@ func (cmd *Command) LoadConfig(ctx context.Context) error {
 		slices.Sort(cmd.prebuiltConfigs)
 		sourcesList := strings.Join(cmd.prebuiltConfigs, ", ")
 		logMsg := fmt.Sprintf("Using prebuilt tool configurations for: %s", sourcesList)
-		logger.InfoContext(ctx, logMsg)
+		cmd.logger.InfoContext(ctx, logMsg)
 
 		for _, configName := range cmd.prebuiltConfigs {
 			buf, err := prebuiltconfigs.Get(configName)
 			if err != nil {
-				logger.ErrorContext(ctx, err.Error())
+				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)
-				logger.ErrorContext(ctx, errMsg.Error())
+				cmd.logger.ErrorContext(ctx, errMsg.Error())
 				return errMsg
 			}
 			allToolsFiles = append(allToolsFiles, parsed)
@@ -990,7 +1032,7 @@ func (cmd *Command) LoadConfig(ctx context.Context) error {
 			(cmd.tools_file != "" && cmd.tools_folder != "") ||
 			(len(cmd.tools_files) > 0 && cmd.tools_folder != "") {
 			errMsg := fmt.Errorf("--tools-file, --tools-files, and --tools-folder flags cannot be used simultaneously")
-			logger.ErrorContext(ctx, errMsg.Error())
+			cmd.logger.ErrorContext(ctx, errMsg.Error())
 			return errMsg
 		}
 
@@ -999,18 +1041,18 @@ func (cmd *Command) LoadConfig(ctx context.Context) error {
 
 		if len(cmd.tools_files) > 0 {
 			// Use tools-files
-			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging %d tool configuration files", len(cmd.tools_files)))
+			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
-			logger.InfoContext(ctx, fmt.Sprintf("Loading and merging all YAML files from directory: %s", cmd.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)
-				logger.ErrorContext(ctx, errMsg.Error())
+				cmd.logger.ErrorContext(ctx, errMsg.Error())
 				return errMsg
 			}
 			customTools, err = parseToolsFile(ctx, buf)
@@ -1020,29 +1062,17 @@ func (cmd *Command) LoadConfig(ctx context.Context) error {
 		}
 
 		if err != nil {
-			logger.ErrorContext(ctx, err.Error())
+			cmd.logger.ErrorContext(ctx, err.Error())
 			return err
 		}
 		allToolsFiles = append(allToolsFiles, customTools)
 	}
 
-	// Modify version string based on loaded configurations
-	if len(cmd.prebuiltConfigs) > 0 {
-		tag := "prebuilt"
-		if isCustomConfigured {
-			tag = "custom"
-		}
-		// cmd.prebuiltConfigs is already sorted above
-		for _, configName := range cmd.prebuiltConfigs {
-			cmd.cfg.Version += fmt.Sprintf("+%s.%s", tag, configName)
-		}
-	}
-
 	// Merge Everything
 	// This will error if custom tools collide with prebuilt tools
 	finalToolsFile, err := mergeToolsFiles(allToolsFiles...)
 	if err != nil {
-		logger.ErrorContext(ctx, err.Error())
+		cmd.logger.ErrorContext(ctx, err.Error())
 		return err
 	}
 
@@ -1053,91 +1083,15 @@ func (cmd *Command) LoadConfig(ctx context.Context) error {
 	cmd.cfg.ToolsetConfigs = finalToolsFile.Toolsets
 	cmd.cfg.PromptConfigs = finalToolsFile.Prompts
 
-	return nil
+	instrumentation, err := telemetry.CreateTelemetryInstrumentation(versionString)
-}
-
-func (cmd *Command) Setup(ctx context.Context) (context.Context, func(context.Context) error, error) {
-	// If stdio, set logger's out stream (usually DEBUG and INFO logs) to errStream
-	loggerOut := cmd.outStream
-	if cmd.cfg.Stdio {
-		loggerOut = cmd.errStream
-	}
-
-	// Handle logger separately from config
-	logger, err := log.NewLogger(cmd.cfg.LoggingFormat.String(), cmd.cfg.LogLevel.String(), loggerOut, cmd.errStream)
-	if err != nil {
-		return ctx, nil, fmt.Errorf("unable to initialize logger: %w", err)
-	}
-	cmd.logger = logger
-
-	ctx = util.WithLogger(ctx, cmd.logger)
-
-	// Set up OpenTelemetry
-	otelShutdown, err := telemetry.SetupOTel(ctx, cmd.cfg.Version, cmd.cfg.TelemetryOTLP, cmd.cfg.TelemetryGCP, cmd.cfg.TelemetryServiceName)
-	if err != nil {
-		errMsg := fmt.Errorf("error setting up OpenTelemetry: %w", err)
-		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return ctx, nil, errMsg
-	}
-
-	shutdownFunc := func(ctx context.Context) error {
-		err := otelShutdown(ctx)
-		if err != nil {
-			errMsg := fmt.Errorf("error shutting down OpenTelemetry: %w", err)
-			cmd.logger.ErrorContext(ctx, errMsg.Error())
-			return err
-		}
-		return nil
-	}
-
-	instrumentation, err := telemetry.CreateTelemetryInstrumentation(cmd.cfg.Version)
 	if err != nil {
 		errMsg := fmt.Errorf("unable to create telemetry instrumentation: %w", err)
 		cmd.logger.ErrorContext(ctx, errMsg.Error())
-		return ctx, shutdownFunc, errMsg
+		return errMsg
 	}
 
 	ctx = util.WithInstrumentation(ctx, instrumentation)
 
-	return ctx, shutdownFunc, nil
-}
-
-func run(cmd *Command) error {
-	ctx, cancel := context.WithCancel(cmd.Context())
-	defer cancel()
-
-	// watch for sigterm / sigint signals
-	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, syscall.SIGTERM, syscall.SIGINT)
-	go func(sCtx context.Context) {
-		var s os.Signal
-		select {
-		case <-sCtx.Done():
-			// this should only happen when the context supplied when testing is canceled
-			return
-		case s = <-signals:
-		}
-		switch s {
-		case syscall.SIGINT:
-			cmd.logger.DebugContext(sCtx, "Received SIGINT signal to shutdown.")
-		case syscall.SIGTERM:
-			cmd.logger.DebugContext(sCtx, "Sending SIGTERM signal to shutdown.")
-		}
-		cancel()
-	}(ctx)
-
-	ctx, shutdown, err := cmd.Setup(ctx)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = shutdown(ctx)
-	}()
-
-	if err := cmd.LoadConfig(ctx); err != nil {
-		return err
-	}
-
 	// start server
 	s, err := server.NewServer(ctx, cmd.cfg)
 	if err != nil {
@@ -1177,9 +1131,6 @@ func run(cmd *Command) error {
 		}()
 	}
 
-	// Determine if Custom Files are configured (re-check as loadAndMergeConfig might have updated defaults)
-	isCustomConfigured := cmd.tools_file != "" || len(cmd.tools_files) > 0 || cmd.tools_folder != ""
-
 	if isCustomConfigured && !cmd.cfg.DisableReload {
 		watchDirs, watchedFiles := resolveWatcherInputs(cmd.tools_file, cmd.tools_files, cmd.tools_folder)
 		// start watching the file(s) or folder for changes to trigger dynamic reloading

cmd/root_test.go

@@ -2054,7 +2054,6 @@ func TestSingleEdit(t *testing.T) {
 
 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")
@@ -2105,12 +2104,6 @@ func TestPrebuiltTools(t *testing.T) {
 	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")
@@ -2204,16 +2197,6 @@ func TestPrebuiltTools(t *testing.T) {
 		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,

docs/ALLOYDBADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt alloydb-postgres-admin```.
-
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]

docs/ALLOYDBPG_README.md

@@ -27,13 +27,6 @@ For AlloyDB infrastructure management, search the MCP store for the AlloyDB for
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt alloydb-postgres```.
 
 2. Add the required inputs for your [cluster](https://docs.cloud.google.com/alloydb/docs/cluster-list) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/BIGQUERY_README.md

@@ -21,13 +21,6 @@ An editor configured to use the BigQuery MCP server can use its AI capabilities
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt bigquery```.
 
 2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/CLOUDSQLMSSQLADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mssql-admin```.
-
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]

docs/CLOUDSQLMSSQL_README.md

@@ -24,13 +24,6 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mssql```.
 
 2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/sqlserver/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/CLOUDSQLMYSQLADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mysql-admin```.
-
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]

docs/CLOUDSQLMYSQL_README.md

@@ -26,13 +26,6 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-mysql```.
 
 2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/mysql/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/CLOUDSQLPGADMIN_README.md

@@ -23,14 +23,6 @@ To connect to the database to explore and query data, search the MCP store for t
 
 In the Antigravity MCP Store, click the "Install" button.
 
-> [!NOTE]
-> On first use, the installation process automatically downloads and uses
-> [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-> `>=0.26.0`. To update MCP Toolbox, use:
-> ```npm i -g @toolbox-sdk/server@latest```
-> To always run the latest version, update the MCP server configuration to use:
-> ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-postgres-admin```.
-
 You'll now be able to see all enabled tools in the "Tools" tab.
 
 > [!NOTE]

docs/CLOUDSQLPG_README.md

@@ -26,13 +26,6 @@ For Cloud SQL infrastructure management, search the MCP store for the Cloud SQL
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt cloud-sql-postgres```.
 
 2. Add the required inputs for your [instance](https://cloud.google.com/sql/docs/postgres/instance-info) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/DATAPLEX_README.md

@@ -20,13 +20,6 @@ An editor configured to use the Dataplex MCP server can use its AI capabilities
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt dataplex```.
 
 2. Add the required inputs in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/LOOKER_README.md

@@ -21,13 +21,6 @@ An editor configured to use the Looker MCP server can use its AI capabilities to
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt looker```.
 
 2. Add the required inputs for your [instance](https://docs.cloud.google.com/looker/docs/set-up-and-administer-looker) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/SPANNERADMIN_README.md

@@ -0,0 +1,59 @@
+# Cloud Spanner Admin MCP Server
+
+The Cloud Spanner Admin Model Context Protocol (MCP) Server gives AI-powered development tools the ability to manage your Google Cloud Spanner infrastructure. It supports creating instances.
+
+## Features
+
+An editor configured to use the Cloud Spanner Admin MCP server can use its AI capabilities to help you:
+
+- **Provision & Manage Infrastructure** - Create Cloud Spanner instances
+
+## Prerequisites
+
+*   [Node.js](https://nodejs.org/) installed.
+*   A Google Cloud project with the **Cloud Spanner Admin API** enabled.
+*   Ensure [Application Default Credentials](https://cloud.google.com/docs/authentication/gcloud) are available in your environment.
+*   IAM Permissions:
+    *   Cloud Spanner Admin (`roles/spanner.admin`)
+
+## Install & Configuration
+
+In the Antigravity MCP Store, click the "Install" button.
+
+You'll now be able to see all enabled tools in the "Tools" tab.
+
+> [!NOTE]
+> If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.
+
+## Usage
+
+Once configured, the MCP server will automatically provide Cloud Spanner Admin capabilities to your AI assistant. You can:
+
+   * "Create a new Spanner instance named 'my-spanner-instance' in the 'my-gcp-project' project with config 'regional-us-central1', edition 'ENTERPRISE', and 1 node."
+
+## Server Capabilities
+
+The Cloud Spanner Admin MCP server provides the following tools:
+
+| Tool Name         | Description                      |
+|:------------------|:---------------------------------|
+| `create_instance` | Create a Cloud Spanner instance. |
+
+## Custom MCP Server Configuration
+
+Add the following configuration to your MCP client (e.g., `settings.json` for Gemini CLI, `mcp_config.json` for Antigravity):
+
+```json
+{
+  "mcpServers": {
+    "spanner-admin": {
+      "command": "npx",
+      "args": ["-y", "@toolbox-sdk/server", "--prebuilt", "spanner-admin", "--stdio"]
+    }
+  }
+}
+```
+
+## Documentation
+
+For more information, visit the [Cloud Spanner Admin API documentation](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1).

docs/SPANNER_README.md

@@ -21,13 +21,6 @@ An editor configured to use the Cloud Spanner MCP server can use its AI capabili
 ## Install & Configuration
 
 1. In the Antigravity MCP Store, click the "Install" button.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest --prebuilt spanner```.
 
 2. Add the required inputs for your [instance](https://docs.cloud.google.com/spanner/docs/instances) in the configuration pop-up, then click "Save". You can update this configuration at any time in the "Configure" tab.
 

docs/TOOLBOX_README.md

@@ -12,17 +12,10 @@ The MCP Toolbox for Databases Server gives AI-powered development tools the abil
 ## Install & Configuration
 
 1.  In the Antigravity MCP Store, click the **Install** button. A configuration window will appear.
-    > [!NOTE]
-    > On first use, the installation process automatically downloads and uses
-    > [MCP Toolbox](https://www.npmjs.com/package/@toolbox-sdk/server)
-    > `>=0.26.0`. To update MCP Toolbox, use:
-    > ```npm i -g @toolbox-sdk/server@latest```
-    > To always run the latest version, update the MCP server configuration to use:
-    > ```npx -y @toolbox-sdk/server@latest```. 
 
-3.  Create your [`tools.yaml` configuration file](https://googleapis.github.io/genai-toolbox/getting-started/configure/).
+2.  Create your [`tools.yaml` configuration file](https://googleapis.github.io/genai-toolbox/getting-started/configure/).
 
-4.  In the configuration window, enter the full absolute path to your `tools.yaml` file and click **Save**.
+3.  In the configuration window, enter the full absolute path to your `tools.yaml` file and click **Save**.
 
 > [!NOTE]
 > If you encounter issues with Windows Defender blocking the execution, you may need to configure an allowlist. See [Configure exclusions for Microsoft Defender Antivirus](https://learn.microsoft.com/en-us/microsoft-365/security/defender-endpoint/configure-exclusions-microsoft-defender-antivirus?view=o365-worldwide) for more details.

docs/en/getting-started/introduction/_index.md

@@ -77,7 +77,7 @@ redeploying your application.
 
 ## Getting Started
 
-### Quickstart: Running Toolbox using NPX 
+### (Non-production) Running Toolbox
 
 You can run Toolbox directly with a [configuration file](../configure.md):
 

docs/en/how-to/invoke_tool.md

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

docs/en/reference/cli.md

@@ -30,21 +30,6 @@ description: >
 |              | `--user-agent-metadata`    | Appends additional metadata to the User-Agent.                                                                                                                                   |             |
 | `-v`         | `--version`                | version for toolbox                                                                                                                                                              |             |
 
-## Sub Commands
-
-### `invoke`
-
-Executes a tool directly with the provided parameters. This is useful for testing tool configurations and parameters without needing a full client setup.
-
-**Syntax:**
-
-```bash
-toolbox invoke <tool-name> [params]
-```
-
-- `<tool-name>`: The name of the tool to execute (as defined in your configuration).
-- `[params]`: (Optional) A JSON string containing the parameters for the tool.
-
 ## Examples
 
 ### Transport Configuration

docs/en/reference/prebuilt-tools.md

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

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

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

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

@@ -0,0 +1,43 @@
+---
+title: Spanner Admin
+type: docs
+weight: 1
+description: "A \"spanner-admin\" source provides a client for the Cloud Spanner Admin API.\n"
+alias: [/resources/sources/spanner-admin]
+---
+
+## About
+
+The `spanner-admin` source provides a client to interact with the [Google
+Cloud Spanner Admin API](https://cloud.google.com/spanner/docs/reference/rpc/google.spanner.admin.instance.v1). This
+allows tools to perform administrative tasks on Spanner instances, such as
+creating instances.
+
+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.
+
+## Example
+
+```yaml
+kind: sources
+name: my-spanner-admin
+type: spanner-admin
+---
+kind: sources
+name: my-oauth-spanner-admin
+type: spanner-admin
+useClientOAuth: true
+```
+
+## Reference
+
+| **field**      | **type** | **required** | **description**                                                                                                                                |
+| -------------- | :------: | :----------: | ---------------------------------------------------------------------------------------------------------------------------------------------- |
+| type           |  string  |     true     | Must be "spanner-admin".                                                                                                                       |
+| defaultProject |  string  |     false    | The Google Cloud project ID to use for Spanner infrastructure tools.                                                                           |
+| useClientOAuth |  boolean |     false    | If true, the source will use client-side OAuth for authorization. Otherwise, it will use Application Default Credentials. Defaults to `false`. |

docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-log-names.md

@@ -1,39 +0,0 @@
----
-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). |

docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-list-resource-types.md

@@ -1,34 +0,0 @@
----
-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. |
-

docs/en/resources/tools/cloudloggingadmin/cloud-logging-admin-query-logs.md

@@ -1,44 +0,0 @@
----
-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`. |

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 type `cloud-sql-admin`.
+This tool uses a `source` of kind `cloud-sql-admin`.
 {{< /notice >}}
 
 ## Examples
@@ -16,11 +16,11 @@ This tool uses a `source` of type `cloud-sql-admin`.
 Basic backup restore
 
 ```yaml
-kind: tools
+tools:
-name: backup-restore-basic
+  backup-restore-basic:
-type: cloud-sql-restore-backup
+    kind: cloud-sql-restore-backup
-source: cloud-sql-admin-source
+    source: cloud-sql-admin-source
-description: "Restores a backup onto the given Cloud SQL instance."
+    description: "Restores a backup onto the given Cloud SQL instance."
 ```
 
 ## Reference
@@ -28,7 +28,7 @@ description: "Restores a backup onto the given Cloud SQL instance."
 ### Tool Configuration
 | **field**      | **type** | **required** | **description**                                  |
 | -------------- | :------: | :----------: | ------------------------------------------------ |
-| type           | string   | true         | Must be "cloud-sql-restore-backup".              |
+| kind           | 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.                       |
 

docs/en/resources/tools/spanneradmin/spanner-create-instance.md

@@ -0,0 +1,52 @@
+---
+title: spanner-create-instance
+type: docs
+weight: 2
+description: "Create a Cloud Spanner instance."
+---
+
+The `spanner-create-instance` tool creates a new Cloud Spanner instance in a
+specified Google Cloud project.
+
+{{< notice info >}}
+This tool uses the `spanner-admin` source.
+{{< /notice >}}
+
+## Configuration
+
+Here is an example of how to configure the `spanner-create-instance` tool in
+your `tools.yaml` file:
+
+```yaml
+kind: sources
+name: my-spanner-admin-source
+type: spanner-admin
+---
+kind: tools
+name: create_my_spanner_instance
+type: spanner-create-instance
+source: my-spanner-admin-source
+description: "Creates a Spanner instance."
+```
+
+## Parameters
+
+The `spanner-create-instance` tool has the following parameters:
+
+| **field**       | **type** | **required** | **description**                                                                      |
+| --------------- | :------: | :----------: | ------------------------------------------------------------------------------------ |
+| project         |  string  |     true     | The Google Cloud project ID.                                                         |
+| instanceId      |  string  |     true     | The ID of the instance to create.                                                    |
+| displayName     |  string  |     true     | The display name of the instance.                                                    |
+| config          |  string  |     true     | The instance configuration (e.g., `regional-us-central1`).                           |
+| nodeCount       | integer  |     true     | The number of nodes. Mutually exclusive with `processingUnits` (one must be 0).      |
+| processingUnits | integer  |     true     | The number of processing units. Mutually exclusive with `nodeCount` (one must be 0). |
+| edition         |  string  |    false     | The edition of the instance (`STANDARD`, `ENTERPRISE`, `ENTERPRISE_PLUS`).           |
+
+## Reference
+
+| **field**   | **type** | **required** | **description**                                              |
+| ----------- | :------: | :----------: | ------------------------------------------------------------ |
+| type        |  string  |     true     | Must be `spanner-create-instance`.                           |
+| source      |  string  |     true     | The name of the `spanner-admin` source to use for this tool. |
+| description |  string  |    false     | A description of the tool that is passed to the agent.       |

go.mod

@@ -13,7 +13,6 @@ 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
@@ -47,12 +46,11 @@ 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/v2 v2.4.2
+	go.mongodb.org/mongo-driver v1.17.4
 	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
@@ -92,19 +90,16 @@ 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
@@ -130,29 +125,17 @@ 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
@@ -161,7 +144,6 @@ 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
@@ -197,46 +179,27 @@ 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/morikuni/aec v1.0.0 // indirect
+	github.com/montanaflynn/stats v0.7.1 // 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
@@ -269,7 +232,6 @@ 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

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.1 h1:O7LvmO0kGLaHY/gq8cV7T0dyp6zJhYAOtZPX4TF3QtY=
+cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
-cloud.google.com/go/logging v1.13.1/go.mod h1:XAQkfkMBxQRjQek96WLPNze7vsOmay9H5PqfsNYDqvw=
+cloud.google.com/go/logging v1.13.0/go.mod h1:36CoKh6KA/M0PbhPKMq6/qety2DCAErbhXT62TuXALA=
 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,8 +647,6 @@ 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=
@@ -802,14 +800,6 @@ github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443 h1:aQ3y1lwWyqYPiWZThqv
 github.com/cncf/xds/go v0.0.0-20250501225837-2ac532fd4443/go.mod h1:W+zGtBO5Y1IgJhy4+A9GOqVhqLpfZi+vwmdNXUehLA8=
 github.com/containerd/continuity v0.4.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=
@@ -826,12 +816,8 @@ 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=
@@ -840,12 +826,10 @@ 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.5.1+incompatible h1:Bm8DchhSD2J6PsFzxC35TZo4TLGR2PdW/E69rU45NhM=
+github.com/docker/docker v28.4.0+incompatible h1:KVC7bz5zJY/4AZe/78BIvCnPsLaC9T/zh72xnlrTTOk=
-github.com/docker/docker v28.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.4.0+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=
@@ -856,8 +840,6 @@ 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=
@@ -931,8 +913,6 @@ 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=
@@ -1194,13 +1174,9 @@ 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=
@@ -1218,18 +1194,8 @@ 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=
@@ -1238,8 +1204,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/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow=
 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=
@@ -1288,8 +1254,6 @@ 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=
@@ -1311,8 +1275,6 @@ 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=
@@ -1350,15 +1312,9 @@ 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=
@@ -1391,8 +1347,6 @@ 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=
@@ -1402,8 +1356,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/v2 v2.4.2 h1:HrJ+Auygxceby9MLp3YITobef5a8Bv4HcPFIkml1U7U=
+go.mongodb.org/mongo-driver v1.17.4 h1:jUorfmVzljjr0FLzYQsGP8cgN/qzzxlY9Vh0C9KFXVw=
-go.mongodb.org/mongo-driver/v2 v2.4.2/go.mod h1:jHeEDJHJq7tm6ZF45Issun9dbogjfnPySb1vXA7EeAI=
+go.mongodb.org/mongo-driver v1.17.4/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
@@ -1673,7 +1627,6 @@ 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=
@@ -1695,7 +1648,6 @@ 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=
@@ -1748,7 +1700,6 @@ 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=
@@ -2178,8 +2129,6 @@ 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=

internal/cli/invoke/command.go

@@ -1,161 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package invoke
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"github.com/googleapis/genai-toolbox/internal/log"
-	"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"
-)
-
-// RootCommand defines the interface for required by invoke subcommand.
-// This allows subcommands to access shared resources and functionality without
-// direct coupling to the root command's implementation.
-type RootCommand interface {
-	// Config returns a copy of the current server configuration.
-	Config() server.ServerConfig
-
-	// Out returns the writer used for standard output.
-	Out() io.Writer
-
-	// LoadConfig loads and merges the configuration from files, folders, and prebuilts.
-	LoadConfig(ctx context.Context) error
-
-	// Setup initializes the runtime environment, including logging and telemetry.
-	// It returns the updated context and a shutdown function to be called when finished.
-	Setup(ctx context.Context) (context.Context, func(context.Context) error, error)
-
-	// Logger returns the logger instance.
-	Logger() log.Logger
-}
-
-func NewCommand(rootCmd RootCommand) *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, rootCmd)
-		},
-	}
-	return cmd
-}
-
-func runInvoke(cmd *cobra.Command, args []string, rootCmd RootCommand) error {
-	ctx, cancel := context.WithCancel(cmd.Context())
-	defer cancel()
-
-	ctx, shutdown, err := rootCmd.Setup(ctx)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		_ = shutdown(ctx)
-	}()
-
-	// Load and merge tool configurations
-	if err := rootCmd.LoadConfig(ctx); err != nil {
-		return err
-	}
-
-	// Initialize Resources
-	sourcesMap, authServicesMap, embeddingModelsMap, toolsMap, toolsetsMap, promptsMap, promptsetsMap, err := server.InitializeConfigs(ctx, rootCmd.Config())
-	if err != nil {
-		errMsg := fmt.Errorf("failed to initialize resources: %w", err)
-		rootCmd.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)
-		rootCmd.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)
-			rootCmd.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)
-		rootCmd.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)
-		rootCmd.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)
-		rootCmd.Logger().ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	if requiresAuth {
-		errMsg := fmt.Errorf("client authorization is not supported")
-		rootCmd.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)
-		rootCmd.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)
-		rootCmd.Logger().ErrorContext(ctx, errMsg.Error())
-		return errMsg
-	}
-	fmt.Fprintln(rootCmd.Out(), string(output))
-
-	return nil
-}

internal/log/log.go

@@ -22,18 +22,6 @@ 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

internal/prebuiltconfigs/prebuiltconfigs_test.go

@@ -21,7 +21,6 @@ import (
 )
 
 var expectedToolSources = []string{
-	"alloydb-omni",
 	"alloydb-postgres-admin",
 	"alloydb-postgres-observability",
 	"alloydb-postgres",
@@ -51,6 +50,7 @@ var expectedToolSources = []string{
 	"serverless-spark",
 	"singlestore",
 	"snowflake",
+	"spanner-admin",
 	"spanner-postgres",
 	"spanner",
 	"sqlite",
@@ -100,40 +100,36 @@ func TestLoadPrebuiltToolYAMLs(t *testing.T) {
 }
 
 func TestGetPrebuiltTool(t *testing.T) {
-	alloydb_omni_config := getOrFatal(t, "alloydb-omni")
+	alloydb_admin_config, _ := Get("alloydb-postgres-admin")
-	alloydb_admin_config := getOrFatal(t, "alloydb-postgres-admin")
+	alloydb_observability_config, _ := Get("alloydb-postgres-observability")
-	alloydb_observability_config := getOrFatal(t, "alloydb-postgres-observability")
+	alloydb_config, _ := Get("alloydb-postgres")
-	alloydb_config := getOrFatal(t, "alloydb-postgres")
+	bigquery_config, _ := Get("bigquery")
-	bigquery_config := getOrFatal(t, "bigquery")
+	clickhouse_config, _ := Get("clickhouse")
-	clickhouse_config := getOrFatal(t, "clickhouse")
+	cloudsqlpg_observability_config, _ := Get("cloud-sql-postgres-observability")
-	cloudsqlpg_observability_config := getOrFatal(t, "cloud-sql-postgres-observability")
+	cloudsqlpg_config, _ := Get("cloud-sql-postgres")
-	cloudsqlpg_config := getOrFatal(t, "cloud-sql-postgres")
+	cloudsqlpg_admin_config, _ := Get("cloud-sql-postgres-admin")
-	cloudsqlpg_admin_config := getOrFatal(t, "cloud-sql-postgres-admin")
+	cloudsqlmysql_admin_config, _ := Get("cloud-sql-mysql-admin")
-	cloudsqlmysql_admin_config := getOrFatal(t, "cloud-sql-mysql-admin")
+	cloudsqlmssql_admin_config, _ := Get("cloud-sql-mssql-admin")
-	cloudsqlmssql_admin_config := getOrFatal(t, "cloud-sql-mssql-admin")
+	cloudsqlmysql_observability_config, _ := Get("cloud-sql-mysql-observability")
-	cloudsqlmysql_observability_config := getOrFatal(t, "cloud-sql-mysql-observability")
+	cloudsqlmysql_config, _ := Get("cloud-sql-mysql")
-	cloudsqlmysql_config := getOrFatal(t, "cloud-sql-mysql")
+	cloudsqlmssql_observability_config, _ := Get("cloud-sql-mssql-observability")
-	cloudsqlmssql_observability_config := getOrFatal(t, "cloud-sql-mssql-observability")
+	cloudsqlmssql_config, _ := Get("cloud-sql-mssql")
-	cloudsqlmssql_config := getOrFatal(t, "cloud-sql-mssql")
+	dataplex_config, _ := Get("dataplex")
-	dataplex_config := getOrFatal(t, "dataplex")
+	firestoreconfig, _ := Get("firestore")
-	firestoreconfig := getOrFatal(t, "firestore")
+	looker_config, _ := Get("looker")
-	looker_config := getOrFatal(t, "looker")
+	lookerca_config, _ := Get("looker-conversational-analytics")
-	lookerca_config := getOrFatal(t, "looker-conversational-analytics")
+	mysql_config, _ := Get("mysql")
-	mysql_config := getOrFatal(t, "mysql")
+	mssql_config, _ := Get("mssql")
-	mssql_config := getOrFatal(t, "mssql")
+	oceanbase_config, _ := Get("oceanbase")
-	oceanbase_config := getOrFatal(t, "oceanbase")
+	postgresconfig, _ := Get("postgres")
-	postgresconfig := getOrFatal(t, "postgres")
+	singlestore_config, _ := Get("singlestore")
-	singlestore_config := getOrFatal(t, "singlestore")
+	spanner_config, _ := Get("spanner")
-	spanner_config := getOrFatal(t, "spanner")
+	spannerpg_config, _ := Get("spanner-postgres")
-	spannerpg_config := getOrFatal(t, "spanner-postgres")
+	mindsdb_config, _ := Get("mindsdb")
-	mindsdb_config := getOrFatal(t, "mindsdb")
+	sqlite_config, _ := Get("sqlite")
-	sqlite_config := getOrFatal(t, "sqlite")
+	neo4jconfig, _ := Get("neo4j")
-	neo4jconfig := getOrFatal(t, "neo4j")
+	healthcare_config, _ := Get("cloud-healthcare")
-	healthcare_config := getOrFatal(t, "cloud-healthcare")
+	snowflake_config, _ := Get("snowflake")
-	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")
 	}
@@ -238,11 +234,3 @@ 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
-}

internal/prebuiltconfigs/tools/alloydb-omni.yaml

@@ -1,277 +0,0 @@
-# Copyright 2026 Google LLC
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-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

internal/prebuiltconfigs/tools/spanner-admin.yaml

@@ -0,0 +1,27 @@
+# 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:
+  spanner-admin-source:
+    kind: spanner-admin
+    defaultProject: ${SPANNER_PROJECT:}
+
+tools:
+  create_instance:
+    kind: spanner-create-instance
+    source: spanner-admin-source
+
+toolsets:
+  spanner_admin_tools:
+    - create_instance

internal/server/api.go

@@ -26,7 +26,6 @@ import (
 	"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"
@@ -232,7 +231,7 @@ func toolInvokeHandler(s *Server, w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
+	params, err := tool.ParseParams(data, claimsFromAuth)
 	if err != nil {
 		// If auth error, return 401
 		if errors.Is(err, util.ErrUnauthorized) {

internal/server/mcp/v20241105/method.go

@@ -28,7 +28,6 @@ import (
 	"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"
 )
 
 // ProcessMethod returns a response for the request.
@@ -177,7 +176,7 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
+	params, err := tool.ParseParams(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

internal/server/mcp/v20250326/method.go

@@ -28,7 +28,6 @@ import (
 	"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"
 )
 
 // ProcessMethod returns a response for the request.
@@ -177,7 +176,7 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
+	params, err := tool.ParseParams(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

internal/server/mcp/v20250618/method.go

@@ -28,7 +28,6 @@ import (
 	"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"
 )
 
 // ProcessMethod returns a response for the request.
@@ -170,7 +169,7 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
+	params, err := tool.ParseParams(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

internal/server/mcp/v20251125/method.go

@@ -28,7 +28,6 @@ import (
 	"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"
 )
 
 // ProcessMethod returns a response for the request.
@@ -170,7 +169,7 @@ func toolsCallHandler(ctx context.Context, id jsonrpc.RequestId, resourceMgr *re
 	}
 	logger.DebugContext(ctx, "tool invocation authorized")
 
-	params, err := parameters.ParseParams(tool.GetParameters(), data, claimsFromAuth)
+	params, err := tool.ParseParams(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

internal/server/static/js/auth.js

@@ -12,8 +12,6 @@
 // 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.
@@ -114,14 +112,13 @@ 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 (${safeProfileName})</span>
+            <span class="auth-method-label">Google ID Token (${authProfileName})</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;">

internal/server/static/js/loadTools.js

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { renderToolInterface } from "./toolDisplay.js";
-import { escapeHtml } from "./sanitize.js";
 
 let toolDetailsAbortController = null;
 
@@ -35,7 +34,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>${escapeHtml(String(error))}</code></pre></p>`;
+        secondNavContent.innerHTML = `<p class="error">Failed to load tools: <pre><code>${error}</code></pre></p>`;
     }
 }
 
@@ -169,7 +168,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 ${escapeHtml(toolName)}. ${escapeHtml(error.message)}</p>`;
+            toolDisplayArea.innerHTML = `<p class="error">Failed to load details for ${toolName}. ${error.message}</p>`;
         }
     }
 }

internal/server/static/js/sanitize.js

@@ -1,43 +0,0 @@
-// Copyright 2025 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * 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 = {
-    '&': '&',
-    '<': '&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]);
-}

internal/server/static/js/toolDisplay.js

@@ -14,7 +14,6 @@
 
 import { handleRunTool, displayResults } from './runTool.js';
 import { createGoogleAuthMethodItem } from './auth.js'
-import { escapeHtml } from './sanitize.js'
 
 /**
  * Helper function to create form inputs for parameters.
@@ -358,9 +357,9 @@ export function renderToolInterface(tool, containerElement) {
     const descBox = document.createElement('div');
 
     nameBox.className = 'tool-box tool-name';
-    nameBox.innerHTML = `<h5>Name:</h5><p>${escapeHtml(tool.name)}</p>`;
+    nameBox.innerHTML = `<h5>Name:</h5><p>${tool.name}</p>`;
     descBox.className = 'tool-box tool-description';
-    descBox.innerHTML = `<h5>Description:</h5><p>${escapeHtml(tool.description)}</p>`;
+    descBox.innerHTML = `<h5>Description:</h5><p>${tool.description}</p>`;
 
     toolInfoContainer.className = 'tool-info';
     toolInfoContainer.appendChild(nameBox);

internal/sources/bigquery/bigquery.go

@@ -236,9 +236,9 @@ func setupClientCaching(s *Source, baseCreator BigqueryClientCreator) {
 	}
 
 	// Initialize caches
-	s.bqClientCache = sources.NewCache(onBqEvict)
+	s.bqClientCache = NewCache(onBqEvict)
-	s.bqRestCache = sources.NewCache(nil)
+	s.bqRestCache = NewCache(nil)
-	s.dataplexCache = sources.NewCache(onDataplexEvict)
+	s.dataplexCache = 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 *sources.Cache
+	bqClientCache *Cache
-	bqRestCache   *sources.Cache
+	bqRestCache   *Cache
-	dataplexCache *sources.Cache
+	dataplexCache *Cache
 }
 
 type Session struct {

internal/sources/bigquery/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 sources
+package bigquery
 
 import (
 	"sync"

internal/sources/cloudloggingadmin/cloud_logging_admin.go

@@ -1,439 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package 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
-}

internal/sources/mongodb/mongodb.go

@@ -23,9 +23,9 @@ 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/v2/bson"
+	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/v2/mongo"
+	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/v2/mongo/options"
+	"go.mongodb.org/mongo-driver/mongo/options"
 	"go.opentelemetry.io/otel/trace"
 )
 
@@ -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.FindOptionsBuilder) ([]any, error) {
+func (s *Source) Find(ctx context.Context, filterString, database, collection string, opts *options.FindOptions) ([]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.FindOneOptionsBuilder) ([]any, error) {
+func (s *Source) FindOne(ctx context.Context, filterString, database, collection string, opts *options.FindOneOptions) ([]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.UpdateMany().SetUpsert(upsert))
+	res, err := s.MongoClient().Database(database).Collection(collection).UpdateMany(ctx, filter, update, options.Update().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.UpdateOne().SetUpsert(upsert))
+	res, err := s.MongoClient().Database(database).Collection(collection).UpdateOne(ctx, filter, update, options.Update().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.DeleteMany())
+	res, err := s.MongoClient().Database(database).Collection(collection).DeleteMany(ctx, filter, options.Delete())
 	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.DeleteOne())
+	res, err := s.MongoClient().Database(database).Collection(collection).DeleteOne(ctx, filter, options.Delete())
 	if err != nil {
 		return nil, err
 	}
@@ -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(clientOpts)
+	client, err := mongo.Connect(ctx, clientOpts)
 	if err != nil {
 		return nil, fmt.Errorf("unable to create MongoDB client: %w", err)
 	}

internal/sources/spanneradmin/spanneradmin.go

@@ -0,0 +1,120 @@
+// 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 spanneradmin
+
+import (
+	"context"
+	"fmt"
+
+	instance "cloud.google.com/go/spanner/admin/instance/apiv1"
+	"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"
+	"google.golang.org/api/option"
+)
+
+const SourceType string = "spanner-admin"
+
+// validate interface
+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"`
+	DefaultProject string `yaml:"defaultProject"`
+	UseClientOAuth bool   `yaml:"useClientOAuth"`
+}
+
+func (r Config) SourceConfigType() string {
+	return SourceType
+}
+
+// Initialize initializes a Spanner Admin Source instance.
+func (r Config) Initialize(ctx context.Context, tracer trace.Tracer) (sources.Source, error) {
+	var client *instance.InstanceAdminClient
+
+	if !r.UseClientOAuth {
+		ua, err := util.UserAgentFromContext(ctx)
+		if err != nil {
+			return nil, fmt.Errorf("error in User Agent retrieval: %s", err)
+		}
+		// Use Application Default Credentials
+		client, err = instance.NewInstanceAdminClient(ctx, option.WithUserAgent(ua))
+		if err != nil {
+			return nil, fmt.Errorf("error creating new spanner instance admin client: %w", err)
+		}
+	}
+
+	s := &Source{
+		Config: r,
+		Client: client,
+	}
+	return s, nil
+}
+
+var _ sources.Source = &Source{}
+
+type Source struct {
+	Config
+	Client *instance.InstanceAdminClient
+}
+
+func (s *Source) SourceType() string {
+	return SourceType
+}
+
+func (s *Source) ToConfig() sources.SourceConfig {
+	return s.Config
+}
+
+func (s *Source) GetDefaultProject() string {
+	return s.DefaultProject
+}
+
+func (s *Source) GetClient(ctx context.Context, accessToken string) (*instance.InstanceAdminClient, error) {
+	if s.UseClientOAuth {
+		token := &oauth2.Token{AccessToken: accessToken}
+		ua, err := util.UserAgentFromContext(ctx)
+		if err != nil {
+			return nil, err
+		}
+		client, err := instance.NewInstanceAdminClient(ctx, option.WithTokenSource(oauth2.StaticTokenSource(token)), option.WithUserAgent(ua))
+		if err != nil {
+			return nil, fmt.Errorf("error creating new spanner instance admin client: %w", err)
+		}
+		return client, nil
+	}
+	return s.Client, nil
+}
+
+func (s *Source) UseClientAuthorization() bool {
+	return s.UseClientOAuth
+}

internal/sources/spanneradmin/spanneradmin_test.go

@@ -11,7 +11,8 @@
 // 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
+
+package spanneradmin_test
 
 import (
 	"context"
@@ -19,11 +20,12 @@ import (
 
 	"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/sources"
+	"github.com/googleapis/genai-toolbox/internal/sources/spanneradmin"
 	"github.com/googleapis/genai-toolbox/internal/testutils"
 )
 
-func TestParseFromYamlCloudLoggingAdmin(t *testing.T) {
+func TestParseFromYamlSpannerAdmin(t *testing.T) {
 	tcs := []struct {
 		desc string
 		in   string
@@ -33,54 +35,33 @@ func TestParseFromYamlCloudLoggingAdmin(t *testing.T) {
 			desc: "basic example",
 			in: `
 			kind: sources
-			name: my-instance
+			name: my-spanner-admin-instance
-			type: cloud-logging-admin
+			type: spanner-admin
-			project: my-project
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
-				"my-instance": cloudloggingadmin.Config{
+				"my-spanner-admin-instance": spanneradmin.Config{
-					Name:    "my-instance",
+					Name:           "my-spanner-admin-instance",
-					Type:    cloudloggingadmin.SourceType,
+					Type:           spanneradmin.SourceType,
-					Project: "my-project",
+					UseClientOAuth: false,
 				},
 			},
 		},
 		{
-			desc: "with client oauth",
+			desc: "use client auth example",
 			in: `
 			kind: sources
-			name: my-instance
+			name: my-spanner-admin-instance
-			type: cloud-logging-admin
+			type: spanner-admin
-			project: my-project
 			useClientOAuth: true
 			`,
-			want: server.SourceConfigs{
+			want: map[string]sources.SourceConfig{
-				"my-instance": cloudloggingadmin.Config{
+				"my-spanner-admin-instance": spanneradmin.Config{
-					Name:           "my-instance",
+					Name:           "my-spanner-admin-instance",
-					Type:           cloudloggingadmin.SourceType,
+					Type:           spanneradmin.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) {
@@ -96,6 +77,7 @@ func TestParseFromYamlCloudLoggingAdmin(t *testing.T) {
 }
 
 func TestFailParseFromYaml(t *testing.T) {
+	t.Parallel()
 	tcs := []struct {
 		desc string
 		in   string
@@ -105,21 +87,24 @@ func TestFailParseFromYaml(t *testing.T) {
 			desc: "extra field",
 			in: `
 			kind: sources
-			name: my-instance
+			name: my-spanner-admin-instance
-			type: cloud-logging-admin
+			type: spanner-admin
-			project: my-project
+			project: test-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",
+			err: `error unmarshaling sources: unable to parse source "my-spanner-admin-instance" as "spanner-admin": [2:1] unknown field "project"
+   1 | name: my-spanner-admin-instance
+>  2 | project: test-project
+       ^
+   3 | type: spanner-admin`,
 		},
 		{
 			desc: "missing required field",
 			in: `
 			kind: sources
-			name: my-instance
+			name: my-spanner-admin-instance
-			type: cloud-logging-admin
+			useClientOAuth: true
 			`,
-			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",
+			err: "error unmarshaling sources: missing 'type' field or it is not a string",
 		},
 	}
 	for _, tc := range tcs {

internal/tools/alloydb/alloydbcreatecluster/alloydbcreatecluster.go

@@ -162,6 +162,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydbcreateinstance/alloydbcreateinstance.go

@@ -168,6 +168,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydbcreateuser/alloydbcreateuser.go

@@ -173,6 +173,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)
+}
+
 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)
 }

internal/tools/alloydb/alloydbgetcluster/alloydbgetcluster.go

@@ -144,6 +144,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydbgetinstance/alloydbgetinstance.go

@@ -148,6 +148,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydbgetuser/alloydbgetuser.go

@@ -148,6 +148,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydblistclusters/alloydblistclusters.go

@@ -138,6 +138,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydblistinstances/alloydblistinstances.go

@@ -143,6 +143,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydblistusers/alloydblistusers.go

@@ -143,6 +143,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydb/alloydbwaitforoperation/alloydbwaitforoperation.go

@@ -267,6 +267,11 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/alloydbainl/alloydbainl.go

@@ -148,6 +148,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
 }

internal/tools/bigquery/bigqueryanalyzecontribution/bigqueryanalyzecontribution.go

@@ -308,6 +308,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/bigquery/bigqueryconversationalanalytics/bigqueryconversationalanalytics.go

@@ -264,6 +264,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
 }

internal/tools/bigquery/bigqueryexecutesql/bigqueryexecutesql.go

@@ -281,6 +281,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/bigquery/bigqueryforecast/bigqueryforecast.go

@@ -271,6 +271,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/bigquery/bigquerygetdatasetinfo/bigquerygetdatasetinfo.go

@@ -157,6 +157,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
 }

internal/tools/bigquery/bigquerygettableinfo/bigquerygettableinfo.go

@@ -167,6 +167,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
 }

internal/tools/bigquery/bigquerylistdatasetids/bigquerylistdatasetids.go

@@ -163,6 +163,10 @@ 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)
 }

internal/tools/bigquery/bigquerylisttableids/bigquerylisttableids.go

@@ -174,6 +174,10 @@ 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)
 }

internal/tools/bigquery/bigquerysearchcatalog/bigquerysearchcatalog.go

@@ -258,6 +258,11 @@ 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)
 }

internal/tools/bigquery/bigquerysql/bigquerysql.go

@@ -213,6 +213,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/bigtable/bigtable.go

@@ -116,6 +116,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cassandra/cassandracql/cassandracql.go

@@ -136,6 +136,11 @@ 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)
 }

internal/tools/clickhouse/clickhouseexecutesql/clickhouseexecutesql.go

@@ -101,6 +101,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases.go

@@ -103,6 +103,10 @@ 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)
 }

internal/tools/clickhouse/clickhouselistdatabases/clickhouselistdatabases_test.go

@@ -81,7 +81,7 @@ func TestListDatabasesToolParseParams(t *testing.T) {
 		},
 	}
 
-	params, err := parameters.ParseParams(tool.GetParameters(), map[string]any{}, map[string]map[string]any{})
+	params, err := tool.ParseParams(map[string]any{}, map[string]map[string]any{})
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}

internal/tools/clickhouse/clickhouselisttables/clickhouselisttables.go

@@ -125,6 +125,10 @@ 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)
 }
@@ -150,5 +154,5 @@ func (t Tool) GetAuthTokenHeaderName(resourceMgr tools.SourceProvider) (string,
 }
 
 func (t Tool) GetParameters() parameters.Parameters {
-	return t.AllParams
+	return t.Parameters
 }

internal/tools/clickhouse/clickhouselisttables/clickhouselisttables_test.go

@@ -83,7 +83,7 @@ func TestListTablesToolParseParams(t *testing.T) {
 		AllParams: parameters.Parameters{databaseParam},
 	}
 
-	params, err := parameters.ParseParams(tool.GetParameters(), map[string]any{"database": "test_db"}, map[string]map[string]any{})
+	params, err := tool.ParseParams(map[string]any{"database": "test_db"}, map[string]map[string]any{})
 	if err != nil {
 		t.Errorf("unexpected error: %v", err)
 	}

internal/tools/clickhouse/clickhousesql/clickhousesql.go

@@ -108,6 +108,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudgda/cloudgda.go

@@ -159,6 +159,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcarefhirfetchpage/cloudhealthcarefhirfetchpage.go

@@ -113,6 +113,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcarefhirpatienteverything/cloudhealthcarefhirpatienteverything.go

@@ -165,6 +165,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcarefhirpatientsearch/cloudhealthcarefhirpatientsearch.go

@@ -238,6 +238,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaregetdataset/cloudhealthcaregetdataset.go

@@ -105,6 +105,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaregetdicomstore/cloudhealthcaregetdicomstore.go

@@ -126,6 +126,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaregetdicomstoremetrics/cloudhealthcaregetdicomstoremetrics.go

@@ -126,6 +126,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaregetfhirresource/cloudhealthcaregetfhirresource.go

@@ -140,6 +140,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaregetfhirstore/cloudhealthcaregetfhirstore.go

@@ -126,6 +126,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaregetfhirstoremetrics/cloudhealthcaregetfhirstoremetrics.go

@@ -126,6 +126,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcarelistdicomstores/cloudhealthcarelistdicomstores.go

@@ -105,6 +105,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcarelistfhirstores/cloudhealthcarelistfhirstores.go

@@ -105,6 +105,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcareretrieverendereddicominstance/cloudhealthcareretrieverendereddicominstance.go

@@ -153,6 +153,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaresearchdicominstances/cloudhealthcaresearchdicominstances.go

@@ -179,6 +179,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return source.SearchDICOM(t.Type, 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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaresearchdicomseries/cloudhealthcaresearchdicomseries.go

@@ -164,6 +164,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return source.SearchDICOM(t.Type, 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)
+}
+
 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)
 }

internal/tools/cloudhealthcare/cloudhealthcaresearchdicomstudies/cloudhealthcaresearchdicomstudies.go

@@ -148,6 +148,10 @@ func (t Tool) Invoke(ctx context.Context, resourceMgr tools.SourceProvider, para
 	return source.SearchDICOM(t.Type, 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)
+}
+
 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)
 }

internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames.go

@@ -1,155 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package cloudloggingadminlistlognames
-
-import (
-	"context"
-	"fmt"
-
-	"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/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, error) {
-	source, err := tools.GetCompatibleSource[compatibleSource](resourceMgr, t.Source, t.Name, t.Type)
-	if err != nil {
-		return nil, err
-	}
-
-	limit := defaultLimit
-	paramsMap := params.AsMap()
-	if val, ok := paramsMap["limit"].(int); ok && val > 0 {
-		limit = val
-	} else if ok && val < 0 {
-		return nil, fmt.Errorf("limit must be greater than or equal to 1")
-	}
-
-	tokenString := ""
-	if source.UseClientAuthorization() {
-		tokenString, err = accessToken.ParseBearerToken()
-		if err != nil {
-			return nil, fmt.Errorf("failed to parse access token: %w", err)
-		}
-	}
-
-	return source.ListLogNames(ctx, limit, tokenString)
-}
-
-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
-}

internal/tools/cloudloggingadmin/cloudloggingadminlistlognames/cloudloggingadminlistlognames_test.go

@@ -1,122 +0,0 @@
-// Copyright 2026 Google LLC
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package 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)
-			}
-		})
-	}
-}