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

Co-authored-by: Abhi <43648792+abhipatel12@users.noreply.github.com>
Co-authored-by: Abhi <abhipatel@google.com>
This commit is contained in:
gemini-cli-robot
2025-10-01 07:56:17 -07:00
committed by GitHub
parent b9e046de34
commit babc691c8a
4 changed files with 5 additions and 5 deletions
+2 -2
View File
@@ -1485,7 +1485,7 @@ describe('loadCliConfig model selection', () => {
argv, argv,
); );
expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL_AUTO); expect(config.getModel()).toBe(DEFAULT_GEMINI_MODEL);
}); });
it('always prefers model from argvs', async () => { it('always prefers model from argvs', async () => {
@@ -1803,7 +1803,7 @@ describe('loadCliConfig useRipgrep', () => {
const argv = await parseArguments({} as Settings); const argv = await parseArguments({} as Settings);
const settings: Settings = {}; const settings: Settings = {};
const config = await loadCliConfig(settings, [], 'test-session', argv); const config = await loadCliConfig(settings, [], 'test-session', argv);
expect(config.getUseModelRouter()).toBe(true); expect(config.getUseModelRouter()).toBe(false);
}); });
it('should be true when useModelRouter is set to true in settings', async () => { it('should be true when useModelRouter is set to true in settings', async () => {
+1 -1
View File
@@ -587,7 +587,7 @@ export async function loadCliConfig(
); );
} }
const useModelRouter = settings.experimental?.useModelRouter ?? true; const useModelRouter = settings.experimental?.useModelRouter ?? false;
const defaultModel = useModelRouter const defaultModel = useModelRouter
? DEFAULT_GEMINI_MODEL_AUTO ? DEFAULT_GEMINI_MODEL_AUTO
: DEFAULT_GEMINI_MODEL; : DEFAULT_GEMINI_MODEL;
@@ -328,7 +328,7 @@ describe('SettingsSchema', () => {
).toBe('Experimental'); ).toBe('Experimental');
expect( expect(
getSettingsSchema().experimental.properties.useModelRouter.default, getSettingsSchema().experimental.properties.useModelRouter.default,
).toBe(true); ).toBe(false);
}); });
}); });
}); });
+1 -1
View File
@@ -986,7 +986,7 @@ const SETTINGS_SCHEMA = {
label: 'Use Model Router', label: 'Use Model Router',
category: 'Experimental', category: 'Experimental',
requiresRestart: true, requiresRestart: true,
default: true, default: false,
description: description:
'Enable model routing to route requests to the best model based on complexity.', 'Enable model routing to route requests to the best model based on complexity.',
showInDialog: true, showInDialog: true,