Skip to content

fix(patch): cherry-pick 3e50be1 to release/v0.17.1-pr-13428 [CONFLICTS]#13760

Merged
cornmander merged 2 commits intorelease/v0.17.1-pr-13428from
hotfix/v0.17.1/0.17.2/stable/cherry-pick-3e50be1/pr-13428
Nov 24, 2025
Merged

fix(patch): cherry-pick 3e50be1 to release/v0.17.1-pr-13428 [CONFLICTS]#13760
cornmander merged 2 commits intorelease/v0.17.1-pr-13428from
hotfix/v0.17.1/0.17.2/stable/cherry-pick-3e50be1/pr-13428

Conversation

@gemini-cli-robot
Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 3e50be1 to patch version v0.17.1 in the stable release to create version 0.17.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

… banner has been displayed (#13428)

# Conflicts:
#	packages/cli/src/ui/components/AppHeader.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, an automated cherry-pick, updates the CLI's banner display mechanism. It introduces a new useBanner React hook to centralize banner logic, including handling warning messages, preview features, and managing how often default banners are shown. The persistence layer has been enhanced to track individual banner display counts using hashed identifiers, moving from a single global counter to a more granular, per-banner tracking system. This change ensures that different banners can be managed independently. Due to the automated nature, merge conflicts have arisen and require manual intervention before this PR can be merged.

Highlights

  • Banner Display Logic Refactor: The PR refactors the banner display logic by introducing a new useBanner React hook to centralize banner management.
  • Persistent State Update: The defaultBannerShownCount in persistentState now stores a map of banner hashes to their display counts, allowing for tracking multiple distinct banners rather than a single global counter.
  • Automated Cherry-Pick with Conflicts: This is an automated cherry-pick of commit 3e50be1 to the release/v0.17.1-pr-13428 branch, which has resulted in merge conflicts requiring manual resolution.
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
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 is a cherry-pick that updates how banner display counts are persisted, moving from a single count to a per-message count using a hash of the message text. This logic is encapsulated in a new useBanner hook. The review has identified several critical issues. The AppHeader.tsx component contains unresolved merge conflicts which will prevent the code from compiling. Additionally, the new useBanner hook does not handle the legacy format of the persisted banner count, which will lead to a runtime crash. These issues must be addressed.

Comment thread packages/cli/src/ui/components/AppHeader.tsx Outdated
Comment thread packages/cli/src/ui/hooks/useBanner.ts
Comment thread packages/cli/src/ui/hooks/useBanner.ts
@github-actions
Copy link
Copy Markdown

Size Change: +846 B (0%)

Total Size: 20.6 MB

ℹ️ View Unchanged
Filename Size Change
./bundle/gemini.js 20.6 MB +846 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

@cornmander cornmander merged commit 4a31e5c into release/v0.17.1-pr-13428 Nov 24, 2025
21 checks passed
@cornmander cornmander deleted the hotfix/v0.17.1/0.17.2/stable/cherry-pick-3e50be1/pr-13428 branch November 24, 2025 20:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants