Skip to content

Conversation

@gemini-cli-robot
Copy link
Collaborator

This PR automatically cherry-picks commit 87a0db2 to patch version v0.25.0 in the stable release to create version 0.25.1.

⚠️ Merge Conflicts Detected

This cherry-pick resulted in merge conflicts that need manual resolution.

🔧 Next Steps:

  1. Review the conflicts: Check out this branch and review the conflict markers
  2. Resolve conflicts: Edit the affected files to resolve the conflicts
  3. Test the changes: Ensure the patch works correctly after resolution
  4. Update this PR: Push your conflict resolution

📋 Files with conflicts:

The commit has been created with conflict markers for easier manual resolution.

🚨 Important:

  • Do not merge this PR until conflicts are resolved
  • The automated patch release will trigger once this PR is merged

# Conflicts:
#	packages/cli/src/gemini.tsx
@gemini-code-assist
Copy link
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 is an automated cherry-pick aimed at integrating a critical fix into the release/v0.25.0-pr-17308 branch. The primary goal of the original commit was to enhance the robustness of the CLI by preventing an immediate crash when the initial authentication process encounters an error. Instead, the system now records the authentication failure and proceeds to load other configurations, only exiting if the failure persists and impacts subsequent critical operations. This change requires manual conflict resolution before merging.

Highlights

  • Deferred Authentication Exit: The CLI now defers exiting on initial authentication failure. Instead of crashing immediately, it records the failure and proceeds to load other configurations, only exiting if the authentication issue persists and impacts subsequent critical operations.
  • Modified Authentication Condition: The condition for triggering the initial authentication refresh has been updated, specifically by removing the selectedType check, which changes when the authentication flow is initiated.
  • Test Suite Updates: Mocks for getRemoteAdminSettings and isInteractive have been added to the loadCliConfig mock in the gemini.tsx main function exit codes test suite to accommodate the new authentication flow.
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.

Copy link
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 attempts to cherry-pick a commit that modifies the authentication failure handling, deferring the application exit until after sandbox configuration. While the intent to prevent immediate crashes on initial authentication failure is a good improvement, the presence of merge conflict markers in packages/cli/src/gemini.tsx indicates that the cherry-pick was not clean. This requires manual resolution before the changes can be properly integrated and tested.

Comment on lines 366 to 374
<<<<<<< HEAD
if (
settings.merged.security?.auth?.selectedType &&
!settings.merged.security?.auth?.useExternal
) {
=======
let initialAuthFailed = false;
if (!settings.merged.security.auth.useExternal) {
>>>>>>> 87a0db20d (fix(auth): don't crash when initial auth fails (#17308))
Copy link
Contributor

Choose a reason for hiding this comment

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

critical

The presence of merge conflict markers (<<<<<<< HEAD, =======, >>>>>>>) indicates that this file has unresolved conflicts from the cherry-pick. This code is currently uncompilable and unrunnable. Please resolve these conflicts manually to ensure the intended logic is correctly applied.

@gemini-cli gemini-cli bot added the status/need-issue Pull requests that need to have an associated issue. label Jan 22, 2026
@skeshive skeshive enabled auto-merge (squash) January 22, 2026 18:23
@github-actions
Copy link

Size Change: +106 B (0%)

Total Size: 23 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 23 MB +106 B (0%)
./bundle/sandbox-macos-permissive-closed.sb 1.03 kB 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-closed.sb 3.29 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

compressed-size-action

@skeshive skeshive merged commit 2a8e1a8 into release/v0.25.0-pr-17308 Jan 22, 2026
24 checks passed
@skeshive skeshive deleted the hotfix/v0.25.0/0.25.1/stable/cherry-pick-87a0db2/pr-17308 branch January 22, 2026 18:31
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.

2 participants