fix(patch): cherry-pick 4c5ab80 to release/v0.7.0-preview.1-pr-10283 [CONFLICTS]#10342
Conversation
# Conflicts: # packages/cli/src/config/config.test.ts
Summary of ChangesHello @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 Highlights
Using Gemini Code AssistThe 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
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 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
|
There was a problem hiding this comment.
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.
| <<<<<<< 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)) |
There was a problem hiding this comment.
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);|
Size Change: 0 B Total Size: 17.4 MB ℹ️ View Unchanged
|
babc691
into
release/v0.7.0-preview.1-pr-10283
This PR automatically cherry-picks commit 4c5ab80 to patch the preview release.
This cherry-pick resulted in merge conflicts that need manual resolution.
🔧 Next Steps:
📋 Files with conflicts:
The commit has been created with conflict markers for easier manual resolution.
🚨 Important: