Merge remote-tracking branch 'origin/main' into browser-devtools

Author: g-danna

src/core/sidecar/types.ts

@@ -648,14 +648,14 @@ function getProviderConfiguration(type: Provider, value: ModelProviderConfigurat
 	//		'Ollama': {}
 	//	};
 	//}
-	//if (type === 'openai-compatible') {
-	//	return {
-	//		'OpenAICompatible': {
-	//			'api_key': value.apiKey,
-	//			'api_base': value.apiBase,
-	//		}
-	//	};
-	//}
+	if (type === 'openai-compatible') {
+		return {
+			'OpenAICompatible': {
+				'api_key': value.apiKey,
+				'api_base': value.apiBase,
+			}
+		};
+	}
 	//if (type === 'codestory') {
 	//	// if its codestory then we also want to provider the access token over here
 	//	return {

src/model.ts

@@ -369,7 +369,7 @@ export enum Provider {
   OpenRouter = 'open-router',
   //GoogleGemini = 'google-gemini',
   //AWSBedrock = 'aws-bedrock',
-  //OpenAICompatible = 'open-ai-compatible',
+  OpenAICompatible = 'openai-compatible',
   //Ollama = 'ollama',
 }
 

src/webviews/@settings/form.tsx

@@ -83,14 +83,14 @@ export function PresetForm(props: PresetFormProps) {
             defaultValue={initialData?.apiKey}
           />
         </label>
-        {/*<label className="-mt-1 flex items-start">
+        <label className="-mt-1 flex items-start">
           <Checkbox
             name="custom-base-URL"
             checked={hasCustomBaseUrl}
             onCheckedChange={setHasCustomBaseUrl}
           />
           <span className="ml-2">Use custom base URL</span>
-        </label>*/}
+        </label>
         <label className={cn('mt-2', !hasCustomBaseUrl && 'sr-only')}>
           <p className="font-medium text-foreground">Custom base URL</p>
           <Input