Skip to content

fix(patch): cherry-pick 87a0db2 to release/v0.26.0-preview.1-pr-17308 [CONFLICTS]#17317

Merged
skeshive merged 2 commits into
release/v0.26.0-preview.1-pr-17308from
hotfix/v0.26.0-preview.1/0.26.0-preview.2/preview/cherry-pick-87a0db2/pr-17308
Jan 22, 2026
Merged

fix(patch): cherry-pick 87a0db2 to release/v0.26.0-preview.1-pr-17308 [CONFLICTS]#17317
skeshive merged 2 commits into
release/v0.26.0-preview.1-pr-17308from
hotfix/v0.26.0-preview.1/0.26.0-preview.2/preview/cherry-pick-87a0db2/pr-17308

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 87a0db2 to patch version v0.26.0-preview.1 in the preview release to create version 0.26.0-preview.2.

⚠️ 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
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 is an automated cherry-pick of a fix aimed at improving the robustness of the CLI's authentication process. The original commit addressed an issue where the application would crash immediately if initial authentication failed. The changes introduce a more graceful error handling mechanism, deferring the exit to allow for potential further processing or context. However, the cherry-pick encountered merge conflicts that need to be resolved manually.

Highlights

  • Authentication Error Handling: The pull request modifies the CLI's initial authentication flow to prevent immediate termination upon authentication failure. Instead, it now records the failure and defers the application exit until after the sandbox configuration has been processed.
  • Merge Conflicts Detected: This automated cherry-pick resulted in merge conflicts within the gemini.tsx file, specifically around the initial authentication condition. These conflicts require manual resolution before the pull request can be merged.
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 aims to fix an issue where the CLI would crash if initial authentication failed, by deferring the exit until a later stage. It introduces an initialAuthFailed flag to track authentication status and moves the exit logic to occur before sandbox setup. The test file has been updated to reflect these changes in loadCliConfig mocks. No high or critical security vulnerabilities were found to be introduced by these changes. Please ensure that the merge conflicts are fully resolved before merging this PR.

@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:25
@github-actions

Copy link
Copy Markdown

Size Change: +106 B (0%)

Total Size: 23.2 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 23.2 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 0fa9a54 into release/v0.26.0-preview.1-pr-17308 Jan 22, 2026
24 checks passed
@skeshive skeshive deleted the hotfix/v0.26.0-preview.1/0.26.0-preview.2/preview/cherry-pick-87a0db2/pr-17308 branch January 22, 2026 18:34
@sripasg sripasg added the size/s A small 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/s A small 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