Skip to content

fix(patch): cherry-pick 1d72a12 to release/v0.41.0-preview.1-pr-26479 to patch version v0.41.0-preview.1 and create version 0.41.0-preview.2#26508

Merged
scidomino merged 1 commit intorelease/v0.41.0-preview.1-pr-26479from
hotfix/v0.41.0-preview.1/0.41.0-preview.2/preview/cherry-pick-1d72a12/pr-26479
May 5, 2026
Merged

fix(patch): cherry-pick 1d72a12 to release/v0.41.0-preview.1-pr-26479 to patch version v0.41.0-preview.1 and create version 0.41.0-preview.2#26508
scidomino merged 1 commit intorelease/v0.41.0-preview.1-pr-26479from
hotfix/v0.41.0-preview.1/0.41.0-preview.2/preview/cherry-pick-1d72a12/pr-26479

Conversation

@gemini-cli-robot
Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 1d72a12 to patch version v0.41.0-preview.1 in the preview release to create version 0.41.0-preview.2.

…tus reporting (#26479)

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 5, 2026

Size Change: -4 B (0%)

Total Size: 33.9 MB

Filename Size Change
./bundle/chunk-53XHTLAL.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-F5YLACOZ.js 0 B -49.2 kB (removed) 🏆
./bundle/chunk-FSSZPWER.js 0 B -2.73 MB (removed) 🏆
./bundle/chunk-LMHGESVW.js 0 B -674 kB (removed) 🏆
./bundle/chunk-MTW7ELM4.js 0 B -3.8 kB (removed) 🏆
./bundle/chunk-NEJ6CJJ2.js 0 B -14.7 MB (removed) 🏆
./bundle/core-L3QK5DBO.js 0 B -48.1 kB (removed) 🏆
./bundle/devtoolsService-H263LV5H.js 0 B -28 kB (removed) 🏆
./bundle/gemini-GGHJTDZY.js 0 B -575 kB (removed) 🏆
./bundle/interactiveCli-BFMK5Z66.js 0 B -1.31 MB (removed) 🏆
./bundle/liteRtServerManager-NR35A3RM.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-FD3XCGAN.js 0 B -9.16 kB (removed) 🏆
./bundle/chunk-2735PDCL.js 3.8 kB +3.8 kB (new file) 🆕
./bundle/chunk-7KQUU252.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/chunk-I6EIVT62.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-IIOMSXCX.js 14.7 MB +14.7 MB (new file) 🆕
./bundle/chunk-KDBEWO7R.js 2.73 MB +2.73 MB (new file) 🆕
./bundle/chunk-UV4ZDWIM.js 674 kB +674 kB (new file) 🆕
./bundle/core-AOW4HO27.js 48.1 kB +48.1 kB (new file) 🆕
./bundle/devtoolsService-NMY7C6OK.js 28 kB +28 kB (new file) 🆕
./bundle/gemini-D4EG5FKZ.js 575 kB +575 kB (new file) 🆕
./bundle/interactiveCli-DW27YGZI.js 1.31 MB +1.31 MB (new file) 🆕
./bundle/liteRtServerManager-O2ZORHSB.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-FWS4DNUA.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-XRLFHCHC.js 1.97 MB 0 B
./bundle/cleanup-SSF4ETYV.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-FN3IAPBT.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-JGUZDOWS.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-XESHX6BQ.js 932 B +932 B (new file) 🆕
./bundle/start-ZIBARPT6.js 622 B +622 B (new file) 🆕

compressed-size-action

@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, 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 addresses race conditions and improves status reporting for tool calls in the A2A server. It introduces schedulerId filtering for event-driven updates, maps internal validating statuses to scheduled for the client, and enhances the task state management logic to ensure accurate transitions to input-required.

Highlights

  • Race Condition Fix: Added schedulerId validation to event-driven tool call updates to ensure the task only processes events relevant to its own execution context.
  • Status Mapping: Updated the client-facing status mapping to display 'scheduled' instead of 'validating' for tool calls, providing a more consistent experience.
  • State Management: Enhanced task state tracking by introducing pendingOutcomes and refining the checkInputRequiredState logic to prevent premature transitions.
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.

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.

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request addresses a race condition by preventing premature transitions to the input-required state while tools are still validating. It introduces pendingOutcomes tracking, enforces schedulerId validation for tool call updates, and maps the internal validating status to scheduled for client consistency. Feedback highlights the need to clear the new pendingOutcomes map and existing state collections in the cancelPendingTools method to avoid memory leaks and state leakage.

Comment on lines +99 to +100
private pendingOutcomes: Map<string, ToolConfirmationOutcome | undefined> =
new Map(); // toolCallId --> outcome
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

The new pendingOutcomes map should be cleared in the cancelPendingTools method (around line 234). Additionally, the existing toolsAlreadyConfirmed and pendingToolConfirmationDetails collections also appear to be missing from the cleanup logic in that method. Failing to clear these state-tracking collections can lead to state leakage between task executions or memory leaks when tasks are cancelled or retried within the same session.

References
  1. Ensure instance-scoped state is properly managed and cleared to prevent memory leaks and state leakage in concurrent or session-based environments.

@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label May 5, 2026
@kschaab kschaab enabled auto-merge (squash) May 5, 2026 17:54
@scidomino scidomino disabled auto-merge May 5, 2026 17:58
@scidomino scidomino merged commit c6a695d into release/v0.41.0-preview.1-pr-26479 May 5, 2026
25 of 27 checks passed
@scidomino scidomino deleted the hotfix/v0.41.0-preview.1/0.41.0-preview.2/preview/cherry-pick-1d72a12/pr-26479 branch May 5, 2026 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status/need-issue Pull requests that need to have an associated issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants