Merge User and Agent Card Descriptions #20849

[adamfweidman]

Summary

This PR ensures that user-provided descriptions for remote A2A agents are preserved and merged with the description found on the agent's remote card, rather than being overwritten.

Details

In AgentRegistry.registerRemoteAgent, we now concatenate the local definition.description and the remote agentCard.description using specific labels:

• User Description: <content>
• Agent Description: <content>

Labels and content are only included if the respective description is non-empty. This provides better context in the system prompt while respecting the user's local configuration.

Related Issues

Fixes #20849

How to Validate

1. Run unit tests for AgentRegistry:

   npm test -w @google/gemini-cli-core -- src/agents/registry.test.ts

2. Verify the new test cases:
   • should merge user and agent description when registering a remote agent
   • should handle empty user or agent descriptions during merging

Pre-Merge Checklist

• Updated relevant documentation and README (if needed)
• Added/updated tests (if needed)
• Noted breaking changes (if any)
• Validated on required platforms/methods:
  • MacOS
    • npm run

[gemini-cli]

Hi @adamfweidman, thank you so much for your contribution to Gemini CLI! We really appreciate the time and effort you've put into this.

We're making some updates to our contribution process to improve how we track and review changes. Please take a moment to review our recent discussion post: Improving Our Contribution Process & Introducing New Guidelines.

Key Update: Starting January 26, 2026, the Gemini CLI project will require all pull requests to be associated with an existing issue. Any pull requests not linked to an issue by that date will be automatically closed.

Thank you for your understanding and for being a part of our community!

[gemini-code-assist]

Summary of Changes

Hello, 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 enhances the AgentRegistry to intelligently combine user-defined descriptions for remote agents with those provided by their respective agent cards. This change ensures that valuable context from both sources is preserved and presented clearly, improving the overall understanding of agent capabilities within the system.

Highlights

• Description Merging: Implemented logic to merge user-provided agent descriptions with descriptions from remote agent cards, preventing overwrites.
• Formatted Output: Merged descriptions are now formatted with "User Description: " and "Agent Description: " labels for clarity.
• Empty Description Handling: Ensured that empty user or agent descriptions are gracefully handled and not included in the final merged description.
• New Unit Tests: Added comprehensive unit tests to validate the new description merging behavior, including cases for both merged and empty descriptions.

Changelog

• packages/core/src/agents/registry.test.ts
  • Added unit tests to verify the merging of user and agent card descriptions.
  • Added unit tests to ensure proper handling of empty descriptions during the merging process.
• packages/core/src/agents/registry.ts
  • Modified the registerRemoteAgent method to merge definition.description and agentCard.description.
  • Implemented conditional formatting to label and include descriptions only if they are non-empty.
  • Removed previous logic that overwrote definition.description with agentCard.skills.

Activity

• Added new unit tests to cover the description merging logic.
• Validated the changes on MacOS using npm run.
• Updated relevant documentation and README (if needed).

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. ↩

[github-actions]

Size Change: +716 B (0%)

Total Size: 25.8 MB

ℹ️ View Unchanged

Filename	Size	Change
./bundle/gemini.js	25.3 MB	+716 B (0%)
./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js	221 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js	227 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js	11.5 kB	0 B
./bundle/node_modules/@google/gemini-cli-devtools/dist/src/types.js	132 B	0 B
./bundle/sandbox-macos-permissive-open.sb	890 B	0 B
./bundle/sandbox-macos-permissive-proxied.sb	1.31 kB	0 B
./bundle/sandbox-macos-restrictive-open.sb	3.36 kB	0 B
./bundle/sandbox-macos-restrictive-proxied.sb	3.56 kB	0 B
./bundle/sandbox-macos-strict-open.sb	4.82 kB	0 B
./bundle/sandbox-macos-strict-proxied.sb	5.02 kB	0 B

_{compressed-size-action}

[abhipatel12]

LGTM

[gemini-code-assist]

Code Review

This pull request correctly merges user-provided agent descriptions with those from the remote agent card. However, it removes the fallback logic of generating a description from the agent's skills, which could be a regression. The suggested reintroduction of this fallback also incorporates trimming optional strings for robustness. The new tests are good but would benefit from a case covering this fallback scenario.