fix(patch): cherry-pick 1d72a12 to release/v0.40.1-pr-26479 to patch version v0.40.1 and create version 0.40.2 by gemini-cli-robot · Pull Request #26510 · google-gemini/gemini-cli

gemini-cli-robot · 2026-05-05T15:53:54Z

This PR automatically cherry-picks commit 1d72a12 to patch version v0.40.1 in the stable release to create version 0.40.2.

…tus reporting (#26479) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

gemini-code-assist · 2026-05-05T15:55:31Z

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 introduces critical refinements to the agent's task management system, primarily focusing on the robust handling of tool call lifecycles. It prevents potential race conditions by ensuring that user input is not requested until all necessary tool validations are complete. The changes also standardize how internal tool states are presented to external clients and improve the precision of event routing within the system.

Highlights

Race Condition Fix: Resolved a race condition where the system could transition to an 'input-required' state prematurely while tools were still in a 'validating' state, ensuring proper sequencing of user interaction.
Tool Call Status Mapping: Implemented a mapping for internal 'validating' tool call statuses to 'scheduled' when communicating with the client, providing a more consistent external representation.
Event Routing Improvement: Enhanced the event handling mechanism to ensure that tool call update messages are processed only by their intended scheduler, preventing cross-task interference.

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 the 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 counterproductive. 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.

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 addresses a race condition in the task scheduler by ensuring the task does not transition to an 'input-required' state while tools are still in a 'validating' phase. It introduces a 'pendingOutcomes' map to track tool confirmation results and implements stricter event filtering using 'schedulerId' to prevent cross-task interference. Additionally, internal 'validating' statuses are now mapped to 'scheduled' when communicating with clients. I have no feedback to provide as no review comments were submitted.

github-actions · 2026-05-05T15:58:26Z

Size Change: -4 B (0%)

Total Size: 33.7 MB

Filename	Size	Change
`./bundle/chunk-ERAISTW3.js`	0 B	-3.43 kB (removed)	🏆
`./bundle/chunk-LLH2MAJN.js`	0 B	-669 kB (removed)	🏆
`./bundle/chunk-NYIMKEJK.js`	0 B	-3.8 kB (removed)	🏆
`./bundle/chunk-OPE6PNM2.js`	0 B	-49.2 kB (removed)	🏆
`./bundle/chunk-PMK5ML36.js`	0 B	-2.73 MB (removed)	🏆
`./bundle/chunk-X2Q2I6QX.js`	0 B	-14.6 MB (removed)	🏆
`./bundle/core-XT3KBLKD.js`	0 B	-47.5 kB (removed)	🏆
`./bundle/devtoolsService-BCMZIVNO.js`	0 B	-27.8 kB (removed)	🏆
`./bundle/gemini-6B2KFD6G.js`	0 B	-578 kB (removed)	🏆
`./bundle/interactiveCli-XVWA6LBK.js`	0 B	-1.29 MB (removed)	🏆
`./bundle/liteRtServerManager-LFWCHUBQ.js`	0 B	-2.08 kB (removed)	🏆
`./bundle/oauth2-provider-NTSPN44N.js`	0 B	-9.16 kB (removed)	🏆
`./bundle/chunk-5FFML27M.js`	3.8 kB	+3.8 kB (new file)	🆕
`./bundle/chunk-5I2YIIXY.js`	669 kB	+669 kB (new file)	🆕
`./bundle/chunk-BGPPTHKL.js`	49.2 kB	+49.2 kB (new file)	🆕
`./bundle/chunk-O5265C2W.js`	3.43 kB	+3.43 kB (new file)	🆕
`./bundle/chunk-RC4HH42A.js`	2.73 MB	+2.73 MB (new file)	🆕
`./bundle/chunk-ZDLFS7C5.js`	14.6 MB	+14.6 MB (new file)	🆕
`./bundle/core-QDT336DO.js`	47.5 kB	+47.5 kB (new file)	🆕
`./bundle/devtoolsService-OANBXQMQ.js`	27.8 kB	+27.8 kB (new file)	🆕
`./bundle/gemini-YRKJADHL.js`	578 kB	+578 kB (new file)	🆕
`./bundle/interactiveCli-VDG4GM74.js`	1.29 MB	+1.29 MB (new file)	🆕
`./bundle/liteRtServerManager-F2VLANMC.js`	2.08 kB	+2.08 kB (new file)	🆕
`./bundle/oauth2-provider-QPJ3R3NY.js`	9.16 kB	+9.16 kB (new file)	🆕

ℹ️ View Unchanged

Filename	Size	Change
`./bundle/bundled/third_party/index.js`	8 MB	0 B
`./bundle/chunk-34MYV7JD.js`	2.45 kB	0 B
`./bundle/chunk-5AUYMPVF.js`	858 B	0 B
`./bundle/chunk-5PS3AYFU.js`	1.18 kB	0 B
`./bundle/chunk-664ZODQF.js`	124 kB	0 B
`./bundle/chunk-DAHVX5MI.js`	206 kB	0 B
`./bundle/chunk-IUUIT4SU.js`	56.5 kB	0 B
`./bundle/chunk-RJTRUG2J.js`	39.8 kB	0 B
`./bundle/chunk-UHHRGNIO.js`	1.97 MB	0 B
`./bundle/cleanup-XFO7T5WB.js`	0 B	-932 B (removed)	🏆
`./bundle/devtools-36NN55EP.js`	696 kB	0 B
`./bundle/dist-T73EYRDX.js`	356 B	0 B
`./bundle/events-XB7DADIJ.js`	418 B	0 B
`./bundle/examples/hooks/scripts/on-start.js`	188 B	0 B
`./bundle/examples/mcp-server/example.js`	1.43 kB	0 B
`./bundle/gemini.js`	4.97 kB	0 B
`./bundle/getMachineId-bsd-TXG52NKR.js`	1.55 kB	0 B
`./bundle/getMachineId-darwin-7OE4DDZ6.js`	1.55 kB	0 B
`./bundle/getMachineId-linux-SHIFKOOX.js`	1.34 kB	0 B
`./bundle/getMachineId-unsupported-5U5DOEYY.js`	1.06 kB	0 B
`./bundle/getMachineId-win-6KLLGOI4.js`	1.72 kB	0 B
`./bundle/memoryDiscovery-CZURD35O.js`	980 B	0 B
`./bundle/multipart-parser-KPBZEGQU.js`	11.7 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/client/main.js`	222 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/_client-assets.js`	229 kB	0 B
`./bundle/node_modules/@google/gemini-cli-devtools/dist/src/index.js`	13.4 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
`./bundle/src-QVCVGIUX.js`	47 kB	0 B
`./bundle/start-22STA634.js`	0 B	-622 B (removed)	🏆
`./bundle/tree-sitter-7U6MW5PS.js`	274 kB	0 B
`./bundle/tree-sitter-bash-34ZGLXVX.js`	1.84 MB	0 B
`./bundle/cleanup-P5UBDKYK.js`	932 B	+932 B (new file)	🆕
`./bundle/start-AFCCFEZW.js`	622 B	+622 B (new file)	🆕

_{compressed-size-action}

fix(a2a-server): resolve tool approval race condition and improve sta…

e30132f

…tus reporting (#26479) Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

gemini-cli-robot requested a review from a team as a code owner May 5, 2026 15:53

github-actions Bot mentioned this pull request May 5, 2026

fix(a2a-server): resolve tool approval race condition and improve status reporting #26479

Merged

18 tasks

gemini-code-assist Bot reviewed May 5, 2026

View reviewed changes

gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label May 5, 2026

kschaab enabled auto-merge (squash) May 5, 2026 17:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(patch): cherry-pick 1d72a12 to release/v0.40.1-pr-26479 to patch version v0.40.1 and create version 0.40.2#26510

fix(patch): cherry-pick 1d72a12 to release/v0.40.1-pr-26479 to patch version v0.40.1 and create version 0.40.2#26510
gemini-cli-robot wants to merge 1 commit intorelease/v0.40.1-pr-26479from
hotfix/v0.40.1/0.40.2/stable/cherry-pick-1d72a12/pr-26479

gemini-cli-robot commented May 5, 2026

Uh oh!

gemini-code-assist Bot commented May 5, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

github-actions Bot commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

gemini-cli-robot commented May 5, 2026

Uh oh!

gemini-code-assist Bot commented May 5, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

github-actions Bot commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants