feat: Support combining prebuilt and custom tool configurations by dishaprakash · Pull Request #2188 · googleapis/mcp-toolbox

dishaprakash · 2025-12-16T21:36:21Z

Description

This PR updates the CLI to allow the --prebuilt flag to be used simultaneously with custom tool flags (--tools-file, --tools-files, or --tools-folder). This enables users to extend a standard prebuilt environment with their own custom tools and configurations.

Key changes

Sequential Loading: Load prebuilt configurations first, then accumulate any specified custom configurations before merging.
Smart Defaults: Updated logic to only default to tools.yaml if no configuration flags are provided.
Legacy Auth Compatibility: Implemented an additive merge strategy for authentication. Legacy authSources from custom files are merged into the modern authServices map used by prebuilt tools.
Strict Validation: To prevent ambiguity, the server will throw an explicit error if a legacy authSource name conflicts with an existing authService name (e.g., from a prebuilt config).

PR Checklist

Thank you for opening a Pull Request! Before submitting your PR, there are a
few things you can do to make sure it goes smoothly:

Make sure you reviewed
CONTRIBUTING.md
Make sure to open an issue as a
bug/issue
before writing your code! That way we can discuss the change, evaluate
designs, and agree on the general idea
Ensure the tests and linter pass
Code coverage does not decrease (if any source code was changed)
Appropriate docs were updated (if necessary)
Make sure to add ! if this involve a breaking change

🛠️ Fixes #1220

gemini-code-assist · 2025-12-16T21:36:38Z

Summary of Changes

Hello @dishaprakash, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly enhances the flexibility of the CLI by enabling users to seamlessly integrate custom tool definitions with existing prebuilt configurations. This change allows for more tailored and powerful tool environments, moving beyond the previous limitation of mutually exclusive configuration options.

Highlights

Combined Tool Configurations: The CLI now supports using the --prebuilt flag simultaneously with custom tool flags (--tools-file, --tools-files, or --tools-folder), allowing users to extend prebuilt environments with custom tools.
Sequential Loading and Merging: Prebuilt configurations are loaded first, followed by any specified custom configurations, which are then merged together.
Smart Default for tools.yaml: The system will now only default to loading tools.yaml if no other configuration flags (prebuilt or custom) are explicitly provided.
Legacy Authentication Compatibility: An additive merge strategy has been implemented for authentication, allowing legacy authSources from custom files to be merged into the modern authServices map used by prebuilt tools.
Strict Validation for Conflicts: To prevent ambiguity, the server will now explicitly error if a legacy authSource name conflicts with an existing authService name during the merge process.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request successfully implements the ability to combine prebuilt and custom tool configurations, which is a great enhancement. The logic for loading, merging, and handling conflicts is well-structured, and the updates to flag definitions and help messages are correct. The new tests for this functionality are comprehensive. I have a few suggestions to improve code consistency in error handling and to fix hanging tests by using contexts with timeouts.

github-actions · 2025-12-16T22:42:59Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-17T21:15:15Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-18T21:06:25Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-18T21:54:35Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-18T22:11:31Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-18T22:37:30Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-18T23:01:50Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-19T01:05:21Z

🔎 Preview at https://googleapis.github.io/genai-toolbox/previews/PR-2188/

github-actions · 2025-12-19T01:22:08Z

🧨 Preview deployments removed.

…ns (#2188) ## Description This PR updates the CLI to allow the --prebuilt flag to be used simultaneously with custom tool flags (--tools-file, --tools-files, or --tools-folder). This enables users to extend a standard prebuilt environment with their own custom tools and configurations. ### Key changes - Sequential Loading: Load prebuilt configurations first, then accumulate any specified custom configurations before merging. - Smart Defaults: Updated logic to only default to tools.yaml if no configuration flags are provided. - Legacy Auth Compatibility: Implemented an additive merge strategy for authentication. Legacy authSources from custom files are merged into the modern authServices map used by prebuilt tools. - Strict Validation: To prevent ambiguity, the server will throw an explicit error if a legacy authSource name conflicts with an existing authService name (e.g., from a prebuilt config). ## PR Checklist > Thank you for opening a Pull Request! Before submitting your PR, there are a > few things you can do to make sure it goes smoothly: - [x] Make sure you reviewed [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md) - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) - [x] Make sure to add `!` if this involve a breaking change 🛠️ Fixes #1220 --------- Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> 5788605

…ns (googleapis#2188) ## Description This PR updates the CLI to allow the --prebuilt flag to be used simultaneously with custom tool flags (--tools-file, --tools-files, or --tools-folder). This enables users to extend a standard prebuilt environment with their own custom tools and configurations. ### Key changes - Sequential Loading: Load prebuilt configurations first, then accumulate any specified custom configurations before merging. - Smart Defaults: Updated logic to only default to tools.yaml if no configuration flags are provided. - Legacy Auth Compatibility: Implemented an additive merge strategy for authentication. Legacy authSources from custom files are merged into the modern authServices map used by prebuilt tools. - Strict Validation: To prevent ambiguity, the server will throw an explicit error if a legacy authSource name conflicts with an existing authService name (e.g., from a prebuilt config). ## PR Checklist > Thank you for opening a Pull Request! Before submitting your PR, there are a > few things you can do to make sure it goes smoothly: - [x] Make sure you reviewed [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md) - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) - [x] Make sure to add `!` if this involve a breaking change 🛠️ Fixes googleapis#1220 --------- Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> 5788605

🤖 I have created a release *beep* *boop* --- ## [0.24.0](v0.23.0...v0.24.0) (2025-12-19) ### Features * **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([#2181](#2181)) ([aa270b2](aa270b2)) * **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([#2050](#2050)) ([af3d3c5](af3d3c5)) * **sources/oracle:** Add Oracle OCI and Wallet support ([#1945](#1945)) ([8ea39ec](8ea39ec)) * Support combining prebuilt and custom tool configurations ([#2188](#2188)) ([5788605](5788605)) * **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([#2123](#2123)) ([0641da0](0641da0)) ### Bug Fixes * **spanner:** Move list graphs validation to runtime ([#2154](#2154)) ([914b3ee](914b3ee)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ## [0.24.0](v0.23.0...v0.24.0) (2025-12-19) ### Features * **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([#2181](#2181)) ([aa270b2](aa270b2)) * **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([#2050](#2050)) ([af3d3c5](af3d3c5)) * **sources/oracle:** Add Oracle OCI and Wallet support ([#1945](#1945)) ([8ea39ec](8ea39ec)) * Support combining prebuilt and custom tool configurations ([#2188](#2188)) ([5788605](5788605)) * **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([#2123](#2123)) ([0641da0](0641da0)) ### Bug Fixes * **spanner:** Move list graphs validation to runtime ([#2154](#2154)) ([914b3ee](914b3ee)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> f520b4e

🤖 I have created a release *beep* *boop* --- ## [0.24.0](googleapis/mcp-toolbox@v0.23.0...v0.24.0) (2025-12-19) ### Features * **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([googleapis#2181](googleapis#2181)) ([aa270b2](googleapis@aa270b2)) * **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([googleapis#2050](googleapis#2050)) ([af3d3c5](googleapis@af3d3c5)) * **sources/oracle:** Add Oracle OCI and Wallet support ([googleapis#1945](googleapis#1945)) ([8ea39ec](googleapis@8ea39ec)) * Support combining prebuilt and custom tool configurations ([googleapis#2188](googleapis#2188)) ([5788605](googleapis@5788605)) * **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([googleapis#2123](googleapis#2123)) ([0641da0](googleapis@0641da0)) ### Bug Fixes * **spanner:** Move list graphs validation to runtime ([googleapis#2154](googleapis#2154)) ([914b3ee](googleapis@914b3ee)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com> f520b4e

…leapis#2188) ## Description This PR updates the CLI to allow the --prebuilt flag to be used simultaneously with custom tool flags (--tools-file, --tools-files, or --tools-folder). This enables users to extend a standard prebuilt environment with their own custom tools and configurations. ### Key changes - Sequential Loading: Load prebuilt configurations first, then accumulate any specified custom configurations before merging. - Smart Defaults: Updated logic to only default to tools.yaml if no configuration flags are provided. - Legacy Auth Compatibility: Implemented an additive merge strategy for authentication. Legacy authSources from custom files are merged into the modern authServices map used by prebuilt tools. - Strict Validation: To prevent ambiguity, the server will throw an explicit error if a legacy authSource name conflicts with an existing authService name (e.g., from a prebuilt config). ## PR Checklist > Thank you for opening a Pull Request! Before submitting your PR, there are a > few things you can do to make sure it goes smoothly: - [x] Make sure you reviewed [CONTRIBUTING.md](https://github.com/googleapis/genai-toolbox/blob/main/CONTRIBUTING.md) - [x] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/genai-toolbox/issues/new/choose) before writing your code! That way we can discuss the change, evaluate designs, and agree on the general idea - [x] Ensure the tests and linter pass - [x] Code coverage does not decrease (if any source code was changed) - [x] Appropriate docs were updated (if necessary) - [x] Make sure to add `!` if this involve a breaking change 🛠️ Fixes googleapis#1220 --------- Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ## [0.24.0](googleapis/mcp-toolbox@v0.23.0...v0.24.0) (2025-12-19) ### Features * **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([googleapis#2181](googleapis#2181)) ([aa270b2](googleapis@aa270b2)) * **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([googleapis#2050](googleapis#2050)) ([af3d3c5](googleapis@af3d3c5)) * **sources/oracle:** Add Oracle OCI and Wallet support ([googleapis#1945](googleapis#1945)) ([8ea39ec](googleapis@8ea39ec)) * Support combining prebuilt and custom tool configurations ([googleapis#2188](googleapis#2188)) ([5788605](googleapis@5788605)) * **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([googleapis#2123](googleapis#2123)) ([0641da0](googleapis@0641da0)) ### Bug Fixes * **spanner:** Move list graphs validation to runtime ([googleapis#2154](googleapis#2154)) ([914b3ee](googleapis@914b3ee)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

🤖 I have created a release *beep* *boop* --- ## [0.24.0](googleapis/mcp-toolbox@v0.23.0...v0.24.0) (2025-12-19) ### Features * **sources/cloud-gemini-data-analytics:** Add the Gemini Data Analytics (GDA) integration for DB NL2SQL conversion to Toolbox ([#2181](googleapis/mcp-toolbox#2181)) ([aa270b2](googleapis/mcp-toolbox@aa270b2)) * **source/cloudsqlmysql:** Add support for IAM authentication in Cloud SQL MySQL source ([#2050](googleapis/mcp-toolbox#2050)) ([af3d3c5](googleapis/mcp-toolbox@af3d3c5)) * **sources/oracle:** Add Oracle OCI and Wallet support ([#1945](googleapis/mcp-toolbox#1945)) ([8ea39ec](googleapis/mcp-toolbox@8ea39ec)) * Support combining prebuilt and custom tool configurations ([#2188](googleapis/mcp-toolbox#2188)) ([5788605](googleapis/mcp-toolbox@5788605)) * **tools/mysql-get-query-plan:** Add new `mysql-get-query-plan` tool for MySQL source ([#2123](googleapis/mcp-toolbox#2123)) ([0641da0](googleapis/mcp-toolbox@0641da0)) ### Bug Fixes * **spanner:** Move list graphs validation to runtime ([#2154](googleapis/mcp-toolbox#2154)) ([914b3ee](googleapis/mcp-toolbox@914b3ee)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> Co-authored-by: Yuan Teoh <45984206+Yuan325@users.noreply.github.com>

feat: Support combining prebuilt and custom tool configurations

62a5def

gemini-code-assist Bot reviewed Dec 16, 2025

View reviewed changes

Comment thread cmd/root_test.go

Comment thread cmd/root_test.go Outdated

Comment thread cmd/root.go

dishaprakash added 2 commits December 16, 2025 22:28

fix tests

f755172

Add documentation

c89544a

dishaprakash marked this pull request as ready for review December 16, 2025 22:41

dishaprakash requested a review from a team December 16, 2025 22:41

blunderbuss-gcf Bot assigned duwenxin99 Dec 16, 2025

dishaprakash assigned averikitsch and unassigned duwenxin99 Dec 16, 2025

Merge branch 'main' into prebuilt-and-custom

fb1b803

Merge branch 'main' into prebuilt-and-custom

3b6e079

averikitsch reviewed Dec 18, 2025

View reviewed changes

Comment thread cmd/root.go

Comment thread docs/en/reference/cli.md

Comment thread docs/en/reference/prebuilt-tools.md Outdated

Comment thread cmd/root.go Outdated

Comment thread cmd/root_test.go

review changes

b831ed2

dishaprakash requested a review from averikitsch December 18, 2025 22:00

alter link

8defa4d

averikitsch approved these changes Dec 18, 2025

View reviewed changes

averikitsch added the release candidate Use label to signal PR should be included in the next release. label Dec 18, 2025

correct link

7dce790

averikitsch removed the release candidate Use label to signal PR should be included in the next release. label Dec 18, 2025

correct example

b775350

Merge branch 'main' into prebuilt-and-custom

16ef0aa

Yuan325 merged commit 5788605 into main Dec 19, 2025
12 checks passed

Yuan325 deleted the prebuilt-and-custom branch December 19, 2025 01:21

release-please Bot mentioned this pull request Dec 19, 2025

chore(main): release 0.24.0 #2162

Merged

BrewTestBot mentioned this pull request Dec 19, 2025

mcp-toolbox 0.24.0 Homebrew/homebrew-core#259301

Merged

Conversation

dishaprakash commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Key changes

PR Checklist

Uh oh!

gemini-code-assist Bot commented Dec 16, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Dec 16, 2025

Uh oh!

github-actions Bot commented Dec 17, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions Bot commented Dec 18, 2025

Uh oh!

github-actions Bot commented Dec 18, 2025

Uh oh!

github-actions Bot commented Dec 18, 2025

Uh oh!

github-actions Bot commented Dec 18, 2025

Uh oh!

github-actions Bot commented Dec 18, 2025

Uh oh!

github-actions Bot commented Dec 19, 2025

Uh oh!

Uh oh!

github-actions Bot commented Dec 19, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dishaprakash commented Dec 16, 2025 •

edited

Loading