fix(patch): cherry-pick 02995ba to release/v0.42.0-preview.1-pr-26568 to patch version v0.42.0-preview.1 and create version 0.42.0-preview.2 by gemini-cli-robot · Pull Request #26590 · google-gemini/gemini-cli

gemini-cli-robot · 2026-05-06T16:37:08Z

This PR automatically cherry-picks commit 02995ba to patch version v0.42.0-preview.1 in the preview release to create version 0.42.0-preview.2.

…26568)

gemini-code-assist · 2026-05-06T16:37:19Z

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 refactors the tool completion tracking mechanism within the task execution flow. By replacing a fragile Promise-based notifier with an EventEmitter, the system gains better control over synchronization during tool updates. These changes address potential race conditions where multiple tool confirmations or concurrent scheduling could lead to incorrect task states or hung processes, ensuring more robust handling of asynchronous tool lifecycles.

Highlights

Tool Completion Logic Refactoring: Replaced the Promise-based tool completion mechanism with an EventEmitter to improve reliability and handle race conditions during multi-turn tool execution.
Improved Wait Logic: Updated waitForPendingTools to use a polling loop with the new emitter, allowing the task to correctly wait for tool execution while distinguishing between pending states and awaiting-approval states.
Race Condition Fixes: Added new test cases to verify that concurrent tool scheduling and multi-turn tool resolutions do not cause the task to hang.

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 refactors the tool completion logic in the Task class by replacing the single-use promise mechanism with a more robust EventEmitter-based approach. This change addresses potential race conditions when multiple tools are processed or confirmed concurrently. Key additions include the isAwaitingApprovalOnly check and a revised waitForPendingTools loop. Comprehensive tests for race conditions, multi-turn resolution, and subagent progress have also been added. I have no feedback to provide.

github-actions · 2026-05-06T16:41:18Z

Size Change: -4 B (0%)

Total Size: 34 MB

Filename	Size	Change
`./bundle/chunk-63FI5SWC.js`	0 B	-19.5 kB (removed)	🏆
`./bundle/chunk-6XJ7X5RT.js`	0 B	-3.43 kB (removed)	🏆
`./bundle/chunk-HBFCAFPJ.js`	0 B	-12.5 kB (removed)	🏆
`./bundle/chunk-KPIASQ2Z.js`	0 B	-14.7 MB (removed)	🏆
`./bundle/chunk-SYANZWOW.js`	0 B	-2.78 MB (removed)	🏆
`./bundle/chunk-TH3JXLVJ.js`	0 B	-49.2 kB (removed)	🏆
`./bundle/chunk-XKIAV42H.js`	0 B	-3.8 kB (removed)	🏆
`./bundle/chunk-YTXATODZ.js`	0 B	-658 kB (removed)	🏆
`./bundle/core-EMI6AWZQ.js`	0 B	-48.7 kB (removed)	🏆
`./bundle/devtoolsService-5SHJDCDW.js`	0 B	-28 kB (removed)	🏆
`./bundle/gemini-5POFBWZ4.js`	0 B	-583 kB (removed)	🏆
`./bundle/interactiveCli-B2GTFML6.js`	0 B	-1.29 MB (removed)	🏆
`./bundle/liteRtServerManager-3WGSSNNF.js`	0 B	-2.11 kB (removed)	🏆
`./bundle/oauth2-provider-RN7DO2CC.js`	0 B	-9.16 kB (removed)	🏆
`./bundle/chunk-ATHRBZC4.js`	3.8 kB	+3.8 kB (new file)	🆕
`./bundle/chunk-G5243OI4.js`	3.43 kB	+3.43 kB (new file)	🆕
`./bundle/chunk-KNPG5B33.js`	14.7 MB	+14.7 MB (new file)	🆕
`./bundle/chunk-MBKU6N2V.js`	658 kB	+658 kB (new file)	🆕
`./bundle/chunk-PLNEK4N5.js`	12.5 kB	+12.5 kB (new file)	🆕
`./bundle/chunk-UP3ETS3W.js`	2.78 MB	+2.78 MB (new file)	🆕
`./bundle/chunk-Z5JVXUH6.js`	49.2 kB	+49.2 kB (new file)	🆕
`./bundle/chunk-ZODVX2EH.js`	19.5 kB	+19.5 kB (new file)	🆕
`./bundle/core-4MBJSBYR.js`	48.7 kB	+48.7 kB (new file)	🆕
`./bundle/devtoolsService-DMBE25KA.js`	28 kB	+28 kB (new file)	🆕
`./bundle/gemini-ERQO57LN.js`	583 kB	+583 kB (new file)	🆕
`./bundle/interactiveCli-4XWIBHEG.js`	1.29 MB	+1.29 MB (new file)	🆕
`./bundle/liteRtServerManager-TSNVWBDT.js`	2.11 kB	+2.11 kB (new file)	🆕
`./bundle/oauth2-provider-HWW2Y4IP.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-ECNYAST2.js`	1.97 MB	0 B
`./bundle/chunk-IUUIT4SU.js`	56.5 kB	0 B
`./bundle/chunk-RJTRUG2J.js`	39.8 kB	0 B
`./bundle/cleanup-EVUX5PJK.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`	5.1 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-FB7MMKTA.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-S3HTGC36.js`	0 B	-652 B (removed)	🏆
`./bundle/tree-sitter-7U6MW5PS.js`	274 kB	0 B
`./bundle/tree-sitter-bash-34ZGLXVX.js`	1.84 MB	0 B
`./bundle/cleanup-HRH4I4LT.js`	932 B	+932 B (new file)	🆕
`./bundle/start-MNHBIKUW.js`	652 B	+652 B (new file)	🆕

_{compressed-size-action}

fix(a2a-server): Resolve race condition in tool completion waiting (#…

d3ce32d

…26568)

gemini-cli-robot requested a review from a team as a code owner May 6, 2026 16:37

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

fix(a2a-server): Resolve race condition in tool completion waiting #26568

Merged

18 tasks

gemini-code-assist Bot reviewed May 6, 2026

View reviewed changes

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

kschaab enabled auto-merge (squash) May 6, 2026 17:05

kschaab approved these changes May 6, 2026

View reviewed changes

kschaab merged commit 6837b08 into release/v0.42.0-preview.1-pr-26568 May 6, 2026
26 checks passed

kschaab deleted the hotfix/v0.42.0-preview.1/0.42.0-preview.2/preview/cherry-pick-02995ba/pr-26568 branch May 6, 2026 17:09

kschaab temporarily deployed to prod May 6, 2026 17:09 — with GitHub Actions Inactive

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(patch): cherry-pick 02995ba to release/v0.42.0-preview.1-pr-26568 to patch version v0.42.0-preview.1 and create version 0.42.0-preview.2#26590

fix(patch): cherry-pick 02995ba to release/v0.42.0-preview.1-pr-26568 to patch version v0.42.0-preview.1 and create version 0.42.0-preview.2#26590
kschaab merged 1 commit intorelease/v0.42.0-preview.1-pr-26568from
hotfix/v0.42.0-preview.1/0.42.0-preview.2/preview/cherry-pick-02995ba/pr-26568

gemini-cli-robot commented May 6, 2026

Uh oh!

gemini-code-assist Bot commented May 6, 2026

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

github-actions Bot commented May 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

gemini-cli-robot commented May 6, 2026

Uh oh!

gemini-code-assist Bot commented May 6, 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 6, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants