From 67e406d87645a89daed02711ea5b3b088ae04b33 Mon Sep 17 00:00:00 2001
From: Prasang Prajapati <Prasang.A.Prajapati@ibm.com>
Date: Wed, 17 Sep 2025 19:00:15 -0400
Subject: [PATCH] Merge branch 'watsonx-ai-integration' of
 https://github.com/PrasangAPrajapati/Roo-Code into watsonx-ai-integration

---
 webview-ui/src/components/settings/ApiOptions.tsx     | 1 -
 webview-ui/src/components/settings/constants.ts       | 3 ---
 webview-ui/src/components/settings/providers/index.ts | 1 -
 3 files changed, 5 deletions(-)

diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx
index 18d296de1b..fded4402ad 100644
--- a/webview-ui/src/components/settings/ApiOptions.tsx
+++ b/webview-ui/src/components/settings/ApiOptions.tsx
@@ -28,7 +28,6 @@ import {
 	chutesDefaultModelId,
 	bedrockDefaultModelId,
 	vertexDefaultModelId,
-	watsonxAiDefaultModelId,
 	sambaNovaDefaultModelId,
 	internationalZAiDefaultModelId,
 	mainlandZAiDefaultModelId,
diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts
index 81c1f97639..f8e7716a0c 100644
--- a/webview-ui/src/components/settings/constants.ts
+++ b/webview-ui/src/components/settings/constants.ts
@@ -15,7 +15,6 @@ import {
 	xaiModels,
 	groqModels,
 	chutesModels,
-	watsonxAiModels,
 	sambaNovaModels,
 	doubaoModels,
 	internationalZAiModels,
@@ -41,7 +40,6 @@ export const MODELS_BY_PROVIDER: Partial<Record<ProviderName, Record<string, Mod
 	xai: xaiModels,
 	groq: groqModels,
 	chutes: chutesModels,
-	watsonx: watsonxAiModels,
 	sambanova: sambaNovaModels,
 	zai: internationalZAiModels,
 	fireworks: fireworksModels,
@@ -78,7 +76,6 @@ export const PROVIDERS = [
 	{ value: "huggingface", label: "Hugging Face" },
 	{ value: "chutes", label: "Chutes AI" },
 	{ value: "litellm", label: "LiteLLM" },
-	{ value: "watsonx", label: "IBM watsonx" },
 	{ value: "sambanova", label: "SambaNova" },
 	{ value: "zai", label: "Z AI" },
 	{ value: "fireworks", label: "Fireworks AI" },
diff --git a/webview-ui/src/components/settings/providers/index.ts b/webview-ui/src/components/settings/providers/index.ts
index f537847911..238c5636c9 100644
--- a/webview-ui/src/components/settings/providers/index.ts
+++ b/webview-ui/src/components/settings/providers/index.ts
@@ -26,7 +26,6 @@ export { VSCodeLM } from "./VSCodeLM"
 export { XAI } from "./XAI"
 export { ZAi } from "./ZAi"
 export { LiteLLM } from "./LiteLLM"
-export { WatsonxAI } from "./WatsonxAI"
 export { Fireworks } from "./Fireworks"
 export { Featherless } from "./Featherless"
 export { VercelAiGateway } from "./VercelAiGateway"