fix(acp): Wait for mcp initialization in acp (#18893) - #18894
Conversation
Summary of ChangesHello @Mervap, I'm Gemini Code Assist1! 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 resolves a timing issue where the Micro-Controller Platform (MCP) might not be fully ready when an agent attempts to interact with it, particularly in ACP mode. By adjusting the initialization logic, it guarantees that MCP is properly set up, preventing potential inconsistencies in agent responses and improving system stability. Highlights
Changelog
Using Gemini Code AssistThe 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
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 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
|
There was a problem hiding this comment.
Code Review
This pull request addresses a race condition where MCP initialization could run in the background in ACP mode, potentially causing inconsistent behavior. The fix correctly modifies the logic to await the MCP initialization promise when experimentalZedIntegration is true, ensuring that MCP servers are fully connected before proceeding. This change is a direct and effective solution to the described problem.
…oogle-gemini#18894) Co-authored-by: Mervap <megavaprold@gmail.com> Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
…oogle-gemini#18894) Co-authored-by: Mervap <megavaprold@gmail.com> Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
…oogle-gemini#18894) Co-authored-by: Mervap <megavaprold@gmail.com> Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
…oogle-gemini#18894) Co-authored-by: Mervap <megavaprold@gmail.com> Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
…oogle-gemini#18894) Co-authored-by: Mervap <megavaprold@gmail.com> Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
Summary
Fixes mcp initialization in ACP mode
Details
ACP mode assumed to be
Config.interactive, which caused MCP initialization to run in the background. As a result, when the firstGeminiAgent.promptrequest is received, MCP may not be connected yet (or it may be!), and the agent can produce inconsistent responsesRelated Issues
Fixes ##18893
How to Validate
Add a slow MCP server, send
promptrequest immediately afternewSessionrequestPre-Merge Checklist