refactor: introduce canonical tool naming convention and update evalsets & model generators to reflect this change.#400
Merged
Merged
Conversation
…ets and model generators to reflect this change.
…r expected trajectories
Collaborator
|
/gcbrun |
IsmailMehdi
approved these changes
May 21, 2026
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
The changes centralize tool name normalization into a new utility module, allowing the trajectory matcher to remain generator-agnostic while ensuring that tool identities are preserved across different agent platforms
Key Changes
server__toolformat (using double underscores) to distinguish between tools with the same name across different servers.evalbench/generators/models/tool_naming.pyto handle specific formatting differences from Claude Code (mcp__), Gemini CLI (mcp_), and Codex CLI.TrajectoryMatcherto remove per-generator normalization logic, enabling simpler string-based comparisons of pre-normalized trajectories.expected_trajectoryentries in evaluation sets (e.g., Cloud SQL and Bigtable datasets) to reflect the new canonical format.