Merge pull request #2455 from Sakuranda/fix/2454-model-settings-preservation

fix(cli): preserve runtime-added models when saving settings
This commit is contained in:
tanzhenxin 2026-04-05 14:47:12 +08:00 committed by GitHub
commit 4c594e222a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 98 additions and 6 deletions

View file

@ -375,7 +375,7 @@ export class LoadedSettings {
setNestedPropertySafe(settingsFile.settings, key, value);
setNestedPropertySafe(settingsFile.originalSettings, key, value);
this._merged = this.computeMergedSettings();
saveSettings(settingsFile);
saveSettings(settingsFile, createSettingsUpdate(key, value));
}
}
@ -771,7 +771,22 @@ export function loadSettings(
);
}
export function saveSettings(settingsFile: SettingsFile): void {
function createSettingsUpdate(
key: string,
value: unknown,
): Record<string, unknown> {
const root: Record<string, unknown> = {};
setNestedPropertySafe(root, key, value);
return root;
}
export function saveSettings(
settingsFile: SettingsFile,
updates: Record<string, unknown> = settingsFile.originalSettings as Record<
string,
unknown
>,
): void {
try {
// Ensure the directory exists
const dirPath = path.dirname(settingsFile.path);
@ -780,10 +795,7 @@ export function saveSettings(settingsFile: SettingsFile): void {
}
// Use the format-preserving update function
updateSettingsFilePreservingFormat(
settingsFile.path,
settingsFile.originalSettings as Record<string, unknown>,
);
updateSettingsFilePreservingFormat(settingsFile.path, updates);
} catch (error) {
debugLogger.error('Error saving user settings file.');
debugLogger.error(error instanceof Error ? error.message : String(error));