refactor(tool): make tool:tool groups = n:m, not n:1

[fang-tech]

AgentScope-Java Version

[The version of AgentScope-Java you are working on, e.g. 1.0.8, check your pom.xml dependency version or run mvn dependency:tree | grep agentscope-parent:pom(only mac/linux)]

Description

close&fix #612 #671 #682

Checklist

Please check the following items before code is ready to be reviewed.

• Code has been formatted with mvn spotless:apply
• All tests are passing (mvn test)
• Javadoc comments are complete and follow project conventions
• Related documentation has been updated (e.g. links, examples, etc.)
• Code is ready for review

[gemini-code-assist]

Summary of Changes

Hello @fang-tech, 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 refactors the tool management system to support a more flexible many-to-many relationship between tools and groups. Previously, a tool could only belong to one group; now, a tool can be part of multiple groups, and its availability is determined by the activation status of any of its associated groups. This change improves the modularity and reusability of tools within the system.

Highlights

• Refactored Tool-Group Relationship: The core change refactors the tool grouping mechanism from a many-to-one (N:1) relationship, where a tool belongs to a single group, to a many-to-many (N:M) relationship, allowing a tool to be associated with multiple groups.
• Updated Tool Group Management: The ToolGroupManager now maintains an explicit mapping of tools to their associated groups, enabling flexible activation logic where a tool is considered active if any of its assigned groups are active, or if it is ungrouped.
• Simplified RegisteredToolFunction: The groupName field and related constructor parameters have been removed from RegisteredToolFunction, as group membership is now managed externally by the ToolGroupManager.
• Enhanced Tool Activation Logic: The ToolExecutor and ToolSchemaProvider have been updated to leverage the new ToolGroupManager methods for checking tool activation, ensuring compatibility with the N:M group structure.
• Comprehensive Test Coverage: New and updated tests have been added across various modules to validate the correct behavior of shared tools across multiple groups and the new tool activation logic.

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.

Footnotes

1. 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 refactors the tool-to-group relationship from a 1-to-n mapping to a more flexible n-to-m mapping. The changes are well-implemented across the core logic in RegisteredToolFunction, ToolGroupManager, ToolExecutor, and ToolSchemaProvider. The removal of groupName from RegisteredToolFunction and the introduction of a new mapping in ToolGroupManager are clean and effective. I particularly appreciate the thorough updates to the test suite, including new tests that specifically validate the many-to-many behavior. I have a couple of minor suggestions in a new test file to improve consistency and robustness. Overall, this is a solid and well-executed refactoring.

[Copilot]

Pull request overview

This PR refactors the tool-to-tool-group relationship from n:1 (many tools to one group) to n:m (many-to-many), enabling tools to belong to multiple groups simultaneously. A tool is now considered active if it's ungrouped or belongs to at least one active group.

Changes:

• Removed the groupName field from RegisteredToolFunction, shifting group membership management to ToolGroupManager
• Added bidirectional mapping in ToolGroupManager (tool -> groups) with new methods isActiveTool(), isGroupedTool(), and getActiveToolNames()
• Updated tool activation logic in ToolExecutor and ToolSchemaProvider to check if tools belong to any active group
• Added comprehensive tests demonstrating n:m relationships for both direct tool registration and skill-based tool sharing

Reviewed changes

Copilot reviewed 12 out of 12 changed files in this pull request and generated 1 comment.

Show a summary per file

File	Description
agentscope-core/src/main/java/io/agentscope/core/tool/RegisteredToolFunction.java	Removed groupName field and related methods; simplified constructor to focus on schema extension and MCP metadata
agentscope-core/src/main/java/io/agentscope/core/tool/ToolGroupManager.java	Added bidirectional tool-group mapping and new methods for checking tool activation across multiple groups
agentscope-core/src/main/java/io/agentscope/core/tool/ToolExecutor.java	Updated authorization check to use isActiveTool() instead of checking single group membership
agentscope-core/src/main/java/io/agentscope/core/tool/ToolSchemaProvider.java	Updated filtering logic to check if tools are in any active group using new group manager methods
agentscope-core/src/main/java/io/agentscope/core/tool/Toolkit.java	Updated tool registration to remove groupName parameter from RegisteredToolFunction constructor
agentscope-core/src/test/java/io/agentscope/core/tool/ToolkitTest.java	Added test verifying tools can belong to multiple groups and are accessible when any assigned group is active
agentscope-core/src/test/java/io/agentscope/core/tool/ToolSchemaProviderTest.java	Updated tests to use addToolToGroup() instead of passing groupName in constructor
agentscope-core/src/test/java/io/agentscope/core/tool/ToolRegistryTest.java	Updated test fixture constructors to remove groupName parameter
agentscope-core/src/test/java/io/agentscope/core/tool/ToolGroupManagerTest.java	Renamed test methods and added test for isActiveTool() behavior
agentscope-core/src/test/java/io/agentscope/core/tool/RegisteredToolFunctionTest.java	Updated tests to reflect constructor changes and removed test for deprecated getGroupName()
agentscope-core/src/test/java/io/agentscope/core/tool/MetaToolFactoryTest.java	Updated tests to use addToolToGroup() and removed empty lines
agentscope-core/src/test/java/io/agentscope/core/skill/SkillBoxTest.java	Added comprehensive test demonstrating shared tool across multiple skills with proper activation semantics

[codecov]

Codecov Report

❌ Patch coverage is 72.41379% with 16 lines in your changes missing coverage. Please review.

Files with missing lines	Patch %	Lines
...java/io/agentscope/core/tool/ToolGroupManager.java	65.11%	7 Missing and 8 partials ⚠️
...ain/java/io/agentscope/core/tool/ToolExecutor.java	83.33%	0 Missing and 1 partial ⚠️

📢 Thoughts on this report? Let us know!