Skip to content

fix(patch): cherry-pick f47d6c6 to release/v0.54.0-preview.0-pr-28566 to patch version v0.54.0-preview.0 and create version 0.54.0-preview.1 - #28609

Merged
DavidAPierce merged 2 commits into
release/v0.54.0-preview.0-pr-28566from
hotfix/v0.54.0-preview.0/0.54.0-preview.1/preview/cherry-pick-f47d6c6/pr-28566
Jul 31, 2026
Merged

fix(patch): cherry-pick f47d6c6 to release/v0.54.0-preview.0-pr-28566 to patch version v0.54.0-preview.0 and create version 0.54.0-preview.1#28609
DavidAPierce merged 2 commits into
release/v0.54.0-preview.0-pr-28566from
hotfix/v0.54.0-preview.0/0.54.0-preview.1/preview/cherry-pick-f47d6c6/pr-28566

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit f47d6c6 to patch version v0.54.0-preview.0 in the preview release to create version 0.54.0-preview.1.

…c empty response guidance (#28566)

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

github-actions Bot commented Jul 31, 2026

Copy link
Copy Markdown

📊 PR Size: size/XL

  • Lines changed: 2441
  • Additions: +2359
  • Deletions: -82
  • Files changed: 30

@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 introduces comprehensive improvements to how the CLI handles stream errors and model-side failures. By categorizing and explicitly handling various InvalidStream scenarios—such as safety blocks, token limit exhaustion, and empty responses—the system now provides clearer feedback and maintains better state consistency. Additionally, the PR includes telemetry updates for tracking these errors and refined prompt instructions to guide the model toward more reliable tool usage and response generation.

Highlights

  • Improved Error Handling: Enhanced handling of InvalidStream events across the CLI and core packages, ensuring that model-side errors like safety blocks and token limits are managed gracefully.
  • Telemetry Enhancements: Added semantic validation error tracking to telemetry, allowing for better monitoring of model response failures.
  • History Management: Implemented robust history rollback logic to ensure the chat state remains consistent when stream errors occur.
  • Prompt Guidelines: Updated system prompts to include strict rules for tool execution and post-edit responses to improve model reliability.
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.

@github-actions

github-actions Bot commented Jul 31, 2026

Copy link
Copy Markdown

Size Change: +14.3 kB (+0.04%)

Total Size: 35.2 MB

Filename Size Change
./bundle/chunk-3HOMWE24.js 0 B -3.65 MB (removed) 🏆
./bundle/chunk-7KSM4S2U.js 0 B -3.43 kB (removed) 🏆
./bundle/chunk-FQUV5EJJ.js 0 B -661 kB (removed) 🏆
./bundle/chunk-IW43HSKM.js 0 B -16.6 MB (removed) 🏆
./bundle/chunk-OFL6ZVTP.js 0 B -3.77 kB (removed) 🏆
./bundle/chunk-OK2RNZU7.js 0 B -19.5 kB (removed) 🏆
./bundle/chunk-VQFIXBUC.js 0 B -13 kB (removed) 🏆
./bundle/chunk-Y4AVW5BG.js 0 B -49.2 kB (removed) 🏆
./bundle/core-SR6UXEPE.js 0 B -50.1 kB (removed) 🏆
./bundle/devtoolsService-44GABOT5.js 0 B -147 kB (removed) 🏆
./bundle/gemini-SBMUGNEF.js 0 B -590 kB (removed) 🏆
./bundle/interactiveCli-HURHI662.js 0 B -1.3 MB (removed) 🏆
./bundle/liteRtServerManager-2JUCZ3VA.js 0 B -2.08 kB (removed) 🏆
./bundle/oauth2-provider-BTMIUZDX.js 0 B -9.12 kB (removed) 🏆
./bundle/chunk-3HDHVDLL.js 3.65 MB +3.65 MB (new file) 🆕
./bundle/chunk-F6ZAE7IA.js 13 kB +13 kB (new file) 🆕
./bundle/chunk-F7LGANDF.js 661 kB +661 kB (new file) 🆕
./bundle/chunk-HTHWER22.js 3.43 kB +3.43 kB (new file) 🆕
./bundle/chunk-LEAMKIWO.js 3.77 kB +3.77 kB (new file) 🆕
./bundle/chunk-OJJQKDWE.js 19.5 kB +19.5 kB (new file) 🆕
./bundle/chunk-WA2RY5NW.js 16.6 MB +16.6 MB (new file) 🆕
./bundle/chunk-YEGDA7CE.js 49.2 kB +49.2 kB (new file) 🆕
./bundle/core-PDNCVR4O.js 50.5 kB +50.5 kB (new file) 🆕
./bundle/devtoolsService-43FTW5BX.js 147 kB +147 kB (new file) 🆕
./bundle/gemini-DCZH4UX5.js 593 kB +593 kB (new file) 🆕
./bundle/interactiveCli-KYGKGAPF.js 1.31 MB +1.31 MB (new file) 🆕
./bundle/liteRtServerManager-Z4PW4BIV.js 2.08 kB +2.08 kB (new file) 🆕
./bundle/oauth2-provider-MPS34XTW.js 9.12 kB +9.12 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-L5V3KIDT.js 1.62 kB 0 B
./bundle/chunk-TUDYL3X4.js 40.3 kB 0 B
./bundle/cleanup-AFDO3FJW.js 0 B -902 B (removed) 🏆
./bundle/devtools-TYCPOPV3.js 683 kB 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.38 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/https-proxy-agent-AVGR4LHR.js 490 B 0 B
./bundle/multipart-parser-E7RMVJWU.js 11.7 kB 0 B
./bundle/multipart-parser-KPBZEGQU.js 11.7 kB 0 B
./bundle/sandbox-macos-permissive-open.sb 5.29 kB 0 B
./bundle/sandbox-macos-permissive-proxied.sb 5.58 kB 0 B
./bundle/sandbox-macos-restrictive-open.sb 3.3 kB 0 B
./bundle/sandbox-macos-restrictive-proxied.sb 3.5 kB 0 B
./bundle/sandbox-macos-strict-open.sb 4.75 kB 0 B
./bundle/sandbox-macos-strict-proxied.sb 4.96 kB 0 B
./bundle/src-65GKNWUJ.js 45.4 kB 0 B
./bundle/src-U45KTUYT.js 45.7 kB 0 B
./bundle/src-XZYPU6PJ.js 352 kB 0 B
./bundle/start-VTXQFRZN.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/worker/worker-entry.js 363 kB 0 B
./bundle/cleanup-A6MG3KTQ.js 902 B +902 B (new file) 🆕
./bundle/start-M4SAMEBY.js 622 B +622 B (new file) 🆕

compressed-size-action

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

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.

Code Review

This pull request enhances the CLI and core packages with robust handling of invalid stream events, context-aware retries with on-retry nudging, and rollback mechanisms to revert un-responded user turns upon stream failures or aborts. It also updates prompt guidelines, scheduler cancellation behavior, and telemetry tracking. Feedback highlights three critical issues: a potential TypeError when accessing toolCall.response.responseParts on cancelled tool calls, the need to support Content objects in the systemInstruction retry nudge logic, and the necessity of cancelling and finalizing all active non-terminal calls in the scheduler when aborted.

Comment thread packages/cli/src/ui/hooks/useGeminiStream.ts
Comment thread packages/core/src/core/geminiChat.ts
Comment thread packages/core/src/scheduler/scheduler.ts
@gemini-cli gemini-cli Bot added the status/need-issue Pull requests that need to have an associated issue. label Jul 31, 2026
@github-actions

Copy link
Copy Markdown

70 tests passed successfully on gemini-3-flash-preview.

🧠 Model Steering Guidance

This PR modifies files that affect the model's behavior (prompts, tools, or instructions).

  • ⚠️ Consider adding Evals: No behavioral evaluations (evals/*.eval.ts) were added or updated in this PR. Consider adding a test case to verify the new behavior and prevent regressions.
  • 🚀 Maintainer Reminder: Please ensure that these changes do not regress results on benchmark evals before merging.

This is an automated guidance message triggered by steering logic signatures.

@DavidAPierce
DavidAPierce enabled auto-merge (squash) July 31, 2026 20:24
@DavidAPierce
DavidAPierce merged commit d3c51f1 into release/v0.54.0-preview.0-pr-28566 Jul 31, 2026
47 of 49 checks passed
@DavidAPierce
DavidAPierce deleted the hotfix/v0.54.0-preview.0/0.54.0-preview.1/preview/cherry-pick-f47d6c6/pr-28566 branch July 31, 2026 20:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/xl An extra large PR 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