From 97ea0f77f96480382f3031be2d0e8262381a58ce Mon Sep 17 00:00:00 2001
From: Andrew Pareles <andrewpareles@gmail.com>
Date: Sat, 25 Jan 2025 19:29:22 -0800
Subject: [PATCH] remove  duplicate model name and add storage fix

---
 .../void/common/voidSettingsService.ts        | 21 ++++++++++++++++---
 .../platform/void/common/voidSettingsTypes.ts |  1 -
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/vs/platform/void/common/voidSettingsService.ts b/src/vs/platform/void/common/voidSettingsService.ts
index 7200d8bf..fd37290f 100644
--- a/src/vs/platform/void/common/voidSettingsService.ts
+++ b/src/vs/platform/void/common/voidSettingsService.ts
@@ -117,9 +117,24 @@ class VoidSettingsService extends Disposable implements IVoidSettingsService {
 		// read and update the actual state immediately
 		this._readState().then(readS => {
 
-			// THIS IS A HACK BECAUSE WE ADDED DEEPSEEK
-			const deepseekAdd = { deepseek: defaultSettingsOfProvider['deepseek'] }
-			readS = { ...readS, settingsOfProvider: { ...deepseekAdd, ...readS.settingsOfProvider, } }
+			readS = {
+				...readS,
+				settingsOfProvider: {
+					// A HACK BECAUSE WE ADDED DEEPSEEK (did not exist before, comes before readS)
+					...{ deepseek: defaultSettingsOfProvider['deepseek'] },
+
+					...readS.settingsOfProvider,
+
+					// A HACK BECAUSE WE ADDED NEW GEMINI MODELS (existed before, comes after readS)
+					gemini: {
+						...readS.settingsOfProvider.gemini,
+						models: [
+							...readS.settingsOfProvider.gemini.models,
+							...defaultSettingsOfProvider.gemini.models.filter(m => /* if cant find the model in readS (yes this is O(n^2), very small) */ !readS.settingsOfProvider.gemini.models.find(m2 => m2.modelName === m.modelName))
+						]
+					}
+				}
+			}
 
 			this.state = readS
 			resolver()
diff --git a/src/vs/platform/void/common/voidSettingsTypes.ts b/src/vs/platform/void/common/voidSettingsTypes.ts
index dc6ce4a3..33090720 100644
--- a/src/vs/platform/void/common/voidSettingsTypes.ts
+++ b/src/vs/platform/void/common/voidSettingsTypes.ts
@@ -96,7 +96,6 @@ export const defaultGeminiModels = modelInfoOfDefaultNames([
 	'gemini-1.5-flash',
 	'gemini-1.5-pro',
 	'gemini-1.5-flash-8b',
-	'gemini-1.0-pro',
 	'gemini-2.0-flash-exp',
 	'gemini-2.0-flash-thinking-exp-1219',
 	'learnlm-1.5-pro-experimental'