Skip to content

fix(patch): cherry-pick 265f24e to release/v0.12.0-preview.9-pr-12412 [CONFLICTS]#12498

Merged
abhipatel12 merged 2 commits into
release/v0.12.0-preview.9-pr-12412from
hotfix/v0.12.0-preview.9/0.12.0-preview.10/preview/cherry-pick-265f24e/pr-12412
Nov 3, 2025
Merged

fix(patch): cherry-pick 265f24e to release/v0.12.0-preview.9-pr-12412 [CONFLICTS]#12498
abhipatel12 merged 2 commits into
release/v0.12.0-preview.9-pr-12412from
hotfix/v0.12.0-preview.9/0.12.0-preview.10/preview/cherry-pick-265f24e/pr-12412

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 265f24e to patch version v0.12.0-preview.9 in the preview release to create version 0.12.0-preview.10.

⚠️ 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/core/src/config/config.test.ts
@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 aims to enhance the responsiveness of the user interface by ensuring that model changes are immediately reflected. It achieves this by implementing a new event-driven mechanism where the core configuration system emits a ModelChanged event whenever the active model is updated. The main UI container then subscribes to this event, allowing for real-time synchronization of the displayed model. This is an automated cherry-pick that requires manual conflict resolution.

Highlights

  • New ModelChanged Event: A new ModelChanged event has been introduced in the core event system to signal when the active model is updated.
  • Config Class Emits Event: The Config class now emits the ModelChanged event whenever its setModel method successfully changes the current model.
  • UI Reacts to Model Changes: The AppContainer UI component has been updated to subscribe to the ModelChanged event, ensuring that the UI immediately reflects any changes to the active model.
  • New Unit Tests: New unit tests have been added to verify the correct emission of the ModelChanged event and the AppContainer's subscription and state update.
  • Merge Conflicts Detected: This pull request is an automated cherry-pick and currently has merge conflicts that require manual resolution before it 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 cherry-picks a fix to ensure UI updates when the model changes. The changes involve adding a ModelChanged event and updating the AppContainer to listen for it. However, a critical issue was found: an unresolved merge conflict in packages/core/src/config/config.test.ts which will prevent the code from compiling. This must be resolved before merging.

Comment thread packages/core/src/config/config.test.ts Outdated
@github-actions

github-actions Bot commented Nov 3, 2025

Copy link
Copy Markdown

Size Change: +630 B (0%)

Total Size: 20.2 MB

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

@abhipatel12 abhipatel12 merged commit 5bd73a3 into release/v0.12.0-preview.9-pr-12412 Nov 3, 2025
21 checks passed
@abhipatel12 abhipatel12 deleted the hotfix/v0.12.0-preview.9/0.12.0-preview.10/preview/cherry-pick-265f24e/pr-12412 branch November 3, 2025 22:16
@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