Upstream 2026.06.16#150
Merged
Merged
Conversation
0a3f240 to
3fae8fc
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Syncs the latest internal changes into the public repo through 2026.06.16. This is a cleanup + maintenance sync with no user-facing behavior changes:
regression/…example trail paths, asourceUrlmetadata key). Strings and comments only — no runtime behavior changes.ToolLoadingStrategyenum,DynamicToolSetManager, andToolSetManagementToolSet(and their tests), plus thetoolLoadingStrategyconfig key. These were never wired into a live code path; tool exposure is governed by the existingMcpToolProfile(FULL / MINIMAL).Dependency-guard fix (also in this PR)
The micrometer bump above is a transitive force to patch CVE-2026-40984. That force previously lived only in the internal repo's root
build.gradle.kts(not mirrored here), so the synced baselines said1.15.12while this repo actually resolved1.13.4→dependencyGuardfailed. This PR adds a sharedgradle/dependency-security.gradle.kts(applied from the root build) so this repo resolves the same1.15.12, the baselines match, and the open-source build gets the CVE patch too. The internal counterpart is squareup/trailblaze-internal#3805.