MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-06-11 11:57:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Make ensure default definitions are merged with user defined definitions

Browse Source
This commit is contained in:
Kevin Wang
2026-03-13 08:53:20 +00:00
parent fc4fdc3cbe
commit e4d6a5cc7c
1 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/core/src/config/config.ts
+13 -17
View File
@@ -1113,27 +1113,23 @@ export class Config implements McpContext, AgentLoopContext {
// TODO(12593): Fix the settings loading logic to properly merge defaults and
// remove this hack.
let modelConfigServiceConfig = params.modelConfigServiceConfig;
const defaultsToApply: Partial<ModelConfigServiceConfig> = {};
if (modelConfigServiceConfig) {
if (!modelConfigServiceConfig.aliases) {
defaultsToApply.aliases = DEFAULT_MODEL_CONFIGS.aliases;
}
if (!modelConfigServiceConfig.overrides) {
defaultsToApply.overrides = DEFAULT_MODEL_CONFIGS.overrides;
}
if (
!modelConfigServiceConfig.modelDefinitions ||
Object.keys(modelConfigServiceConfig.modelDefinitions).length === 0
) {
defaultsToApply.modelDefinitions =
DEFAULT_MODEL_CONFIGS.modelDefinitions;
}
}
// Ensure user-defined model definitions augment, not replace, the defaults.
const mergedModelDefinitions = {
...DEFAULT_MODEL_CONFIGS.modelDefinitions,
...modelConfigServiceConfig.modelDefinitions,
};
if (Object.keys(defaultsToApply).length > 0) {
modelConfigServiceConfig = {
// Preserve other user settings like customAliases
...modelConfigServiceConfig,
...defaultsToApply,
// Apply defaults for aliases and overrides if they are not provided
aliases:
modelConfigServiceConfig.aliases ?? DEFAULT_MODEL_CONFIGS.aliases,
overrides:
modelConfigServiceConfig.overrides ?? DEFAULT_MODEL_CONFIGS.overrides,
// Use the merged model definitions
modelDefinitions: mergedModelDefinitions,
};
}