Skip to content

fix(patch): cherry-pick 4c5ab80 to release/v0.7.0-preview.1-pr-10283 [CONFLICTS]#10342

Merged
skeshive merged 2 commits into
release/v0.7.0-preview.1-pr-10283from
hotfix/v0.7.0-preview.1/preview/cherry-pick-4c5ab80
Oct 1, 2025
Merged

fix(patch): cherry-pick 4c5ab80 to release/v0.7.0-preview.1-pr-10283 [CONFLICTS]#10342
skeshive merged 2 commits into
release/v0.7.0-preview.1-pr-10283from
hotfix/v0.7.0-preview.1/preview/cherry-pick-4c5ab80

Conversation

@gemini-cli-robot

Copy link
Copy Markdown
Collaborator

This PR automatically cherry-picks commit 4c5ab80 to patch the preview release.

⚠️ 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/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 was automatically generated to cherry-pick a specific fix into a preview release branch. The primary purpose of the original commit was to change the default behavior of the experimental "useModelRouter" setting to false. Due to differences in the target branch, the automated cherry-pick encountered merge conflicts, which must be manually resolved by a developer before this PR can be merged and the patch release can proceed.

Highlights

  • Automated Cherry-Pick: This PR is an automated cherry-pick of commit "4c5ab80" to patch the "release/v0.7.0-preview.1-pr-10283" branch.
  • Merge Conflicts: The cherry-pick operation resulted in merge conflicts that require manual resolution before the PR can be merged.
  • Model Router Default Disabled: The underlying change from the cherry-picked commit disables the experimental model router by default.
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 change to disable the model router by default. The changes in config.ts and settingsSchema.ts correctly reflect this. However, there is a critical unresolved merge conflict in packages/cli/src/config/config.test.ts that needs to be fixed before this can be merged.

Comment thread packages/cli/src/config/config.test.ts Outdated
Comment on lines +1805 to +1820
<<<<<<< HEAD
const config = await loadCliConfig(settings, [], 'test-session', argv);
expect(config.getUseModelRouter()).toBe(true);
=======
const config = await loadCliConfig(
settings,
[],
new ExtensionEnablementManager(
ExtensionStorage.getUserExtensionsDir(),
argv.extensions,
),
'test-session',
argv,
);
expect(config.getUseModelRouter()).toBe(false);
>>>>>>> 4c5ab80b (fix(routing): Disable model router by default (#10283))

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.

critical

This file contains an unresolved merge conflict. The conflict markers (<<<<<<<, =======, >>>>>>>) need to be removed and the conflict resolved. The test should verify that useModelRouter is false by default, using the correct signature for loadCliConfig.

      const config = await loadCliConfig(settings, [], 'test-session', argv);
      expect(config.getUseModelRouter()).toBe(false);

@github-actions

github-actions Bot commented Oct 1, 2025

Copy link
Copy Markdown

Size Change: 0 B

Total Size: 17.4 MB

ℹ️ View Unchanged
Filename Size
./bundle/gemini.js 17.4 MB
./bundle/sandbox-macos-permissive-closed.sb 1.03 kB
./bundle/sandbox-macos-permissive-open.sb 830 B
./bundle/sandbox-macos-permissive-proxied.sb 1.31 kB
./bundle/sandbox-macos-restrictive-closed.sb 3.29 kB
./bundle/sandbox-macos-restrictive-open.sb 3.36 kB
./bundle/sandbox-macos-restrictive-proxied.sb 3.56 kB

compressed-size-action

@skeshive skeshive merged commit babc691 into release/v0.7.0-preview.1-pr-10283 Oct 1, 2025
21 of 25 checks passed
@skeshive skeshive deleted the hotfix/v0.7.0-preview.1/preview/cherry-pick-4c5ab80 branch October 1, 2025 14:56
@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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants