Skip to content

fix(patch): cherry-pick 261788c to release/v0.30.0-preview.0-pr-19453 to patch version v0.30.0-preview.0 and create version 0.30.0-preview.1#19490

Merged
skeshive merged 1 commit into
release/v0.30.0-preview.0-pr-19453from
hotfix/v0.30.0-preview.0/0.30.0-preview.1/preview/cherry-pick-261788c/pr-19453
Feb 19, 2026
Merged

fix(patch): cherry-pick 261788c to release/v0.30.0-preview.0-pr-19453 to patch version v0.30.0-preview.0 and create version 0.30.0-preview.1#19490
skeshive merged 1 commit into
release/v0.30.0-preview.0-pr-19453from
hotfix/v0.30.0-preview.0/0.30.0-preview.1/preview/cherry-pick-261788c/pr-19453

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 261788c to patch version v0.30.0-preview.0 in the preview release to create version 0.30.0-preview.1.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @gemini-cli-robot, 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 cherry-picks a critical commit to patch a preview release, focusing on refining the client-side handling of administrative controls. The changes introduce a new adminControlsApplicable flag in the server response to govern the fetching and polling of these settings, replacing previous logic that relied on specific HTTP error codes. This update also standardizes error handling by propagating fetch errors and ensures that remote admin settings are reset during authentication refreshes, contributing to a more stable and predictable application state.

Highlights

  • Admin Controls Logic Refinement: The logic for fetching and polling admin controls has been updated to use a new adminControlsApplicable field from the server response, providing a more explicit way to manage polling behavior.
  • Improved Error Handling: The system now throws errors when fetching admin controls fails, rather than silently returning empty objects and attempting to retry polling, leading to more robust error propagation.
  • Authentication Flow Enhancement: Remote admin settings are now explicitly cleared when a user refreshes their authentication in the CLI application.
  • Schema Update: The FetchAdminControlsResponseSchema has been extended to include the new adminControlsApplicable boolean field.
Changelog
  • packages/cli/src/ui/AppContainer.tsx
    • Cleared remote admin settings before refreshing authentication.
  • packages/core/src/code_assist/admin/admin_controls.test.ts
    • Updated mock server responses to include adminControlsApplicable: true.
    • Modified test cases to assert that fetchAdminControls throws an error on fetch failure and does not start polling.
    • Changed test cases to stop polling when adminControlsApplicable is false, replacing the previous 403 error handling.
    • Adjusted fetchAdminControlsOnce tests to throw errors on fetch failure or return an empty object if adminControlsApplicable is false.
  • packages/core/src/code_assist/admin/admin_controls.ts
    • Removed isGaxiosError utility function.
    • Implemented logic to stop admin controls polling and clear settings if adminControlsApplicable is false in the server response.
    • Changed fetchAdminControls and fetchAdminControlsOnce to throw errors on fetch failures instead of returning empty objects.
    • Ensured cachedSettings are not empty before being used to avoid blocking startup.
  • packages/core/src/code_assist/types.ts
    • Added adminControlsApplicable as an optional boolean field to FetchAdminControlsResponseSchema.
  • packages/core/src/config/config.ts
    • Updated setRemoteAdminSettings method to accept undefined for clearing remote admin settings.
Activity
  • This pull request was automatically generated to cherry-pick a specific commit for a preview release patch.
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 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 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

  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.

@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 refactors the logic for handling admin controls by introducing an adminControlsApplicable flag from the server, replacing the previous reliance on HTTP 403 status codes. The client-side logic is updated to use this flag for applying settings and managing polling. Error handling for the initial fetch is also improved to be more explicit by throwing exceptions on failure. The changes are well-tested and represent a solid improvement in robustness and clarity. I have no comments on the changes.

@skeshive skeshive enabled auto-merge (squash) February 19, 2026 00:15
@github-actions

Copy link
Copy Markdown

Size Change: -79 B (0%)

Total Size: 24.5 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 24.5 MB -79 B (0%)
./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

compressed-size-action

@skeshive skeshive merged commit 0114b3e into release/v0.30.0-preview.0-pr-19453 Feb 19, 2026
27 checks passed
@skeshive skeshive deleted the hotfix/v0.30.0-preview.0/0.30.0-preview.1/preview/cherry-pick-261788c/pr-19453 branch February 19, 2026 00:26
kuishou68 pushed a commit to iOfficeAI/gemini-cli-pro that referenced this pull request Feb 27, 2026
… to patch version v0.30.0-preview.0 and create version 0.30.0-preview.1 (google-gemini#19490)

Co-authored-by: Shreya Keshive <shreyakeshive@google.com>
@sripasg sripasg added the size/m A medium sized PR label Jun 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size/m A medium sized PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants