Merge branch 'watsonx-ai-integration' of https://github.com/PrasangAPrajapati/Roo-Code into watsonx-ai-integration

PrasangAPrajapati · PrasangAPrajapati · commit 252989255563 · 2025-09-17T18:58:32.000-04:00
diff --git a/apps/web-roo-code/src/app/privacy/page.tsx b/apps/web-roo-code/src/app/privacy/page.tsx
@@ -86,8 +86,8 @@ export default function Privacy() {
 								Your source code does not transit Roo Code servers unless you explicitly choose Roo Code
 								as a model provider (proxy mode).
 							</strong>{" "}
-							When Roo Code Cloud is your model provider, your code briefly transits Roo Code servers only to
-							forward it to the upstream model, is not stored, and is deleted immediately after
+							When Roo Code Cloud is your model provider, your code briefly transits Roo Code servers only
+							to forward it to the upstream model, is not stored, and is deleted immediately after
 							forwarding. Otherwise, your code is sent <strong>directly</strong>—via client‑to‑provider
 							TLS—to the model you select. Roo Code never stores, inspects, or trains on your code.
 						</li>
diff --git a/packages/types/src/global-settings.ts b/packages/types/src/global-settings.ts
@@ -199,6 +199,9 @@ export const SECRET_STATE_KEYS = [
 	"codebaseIndexMistralApiKey",
 	"codebaseIndexVercelAiGatewayApiKey",
 	"huggingFaceApiKey",
+	"watsonxApiKey",
+	"codebaseIndexWatsonxApiKey",
+	"codebaseIndexWatsonxProjectId",
 	"sambaNovaApiKey",
 	"zaiApiKey",
 	"fireworksApiKey",
diff --git a/packages/types/src/provider-settings.ts b/packages/types/src/provider-settings.ts
@@ -60,6 +60,7 @@ export const providerNames = [
 	"chutes",
 	"litellm",
 	"huggingface",
+	"watsonx",
 	"cerebras",
 	"sambanova",
 	"zai",
@@ -388,6 +389,7 @@ export const providerSettingsSchemaDiscriminated = z.discriminatedUnion("apiProv
 	huggingFaceSchema.merge(z.object({ apiProvider: z.literal("huggingface") })),
 	chutesSchema.merge(z.object({ apiProvider: z.literal("chutes") })),
 	litellmSchema.merge(z.object({ apiProvider: z.literal("litellm") })),
+	watsonxSchema.merge(z.object({ apiProvider: z.literal("watsonx") })),
 	cerebrasSchema.merge(z.object({ apiProvider: z.literal("cerebras") })),
 	sambaNovaSchema.merge(z.object({ apiProvider: z.literal("sambanova") })),
 	zaiSchema.merge(z.object({ apiProvider: z.literal("zai") })),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/api/providers/featherless.ts b/src/api/providers/featherless.ts
@@ -1,4 +1,9 @@
-import { DEEP_SEEK_DEFAULT_TEMPERATURE, type FeatherlessModelId, featherlessDefaultModelId, featherlessModels } from "@roo-code/types"
+import {
+	DEEP_SEEK_DEFAULT_TEMPERATURE,
+	type FeatherlessModelId,
+	featherlessDefaultModelId,
+	featherlessModels,
+} from "@roo-code/types"
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 
diff --git a/src/api/providers/fetchers/modelCache.ts b/src/api/providers/fetchers/modelCache.ts
@@ -21,7 +21,6 @@ import { getLMStudioModels } from "./lmstudio"
 import { getIOIntelligenceModels } from "./io-intelligence"
 import { getDeepInfraModels } from "./deepinfra"
 import { getWatsonxModels } from "./watsonx"
-
 const memoryCache = new NodeCache({ stdTTL: 5 * 60, checkperiod: 5 * 60 })
 
 async function writeModels(router: RouterName, data: ModelRecord) {
diff --git a/src/api/providers/index.ts b/src/api/providers/index.ts
@@ -28,6 +28,7 @@ export { UnboundHandler } from "./unbound"
 export { VertexHandler } from "./vertex"
 export { VsCodeLmHandler } from "./vscode-lm"
 export { XAIHandler } from "./xai"
+export { WatsonxAIHandler } from "./watsonx"
 export { ZAiHandler } from "./zai"
 export { FireworksHandler } from "./fireworks"
 export { RooHandler } from "./roo"
diff --git a/src/core/tools/codebaseSearchTool.ts b/src/core/tools/codebaseSearchTool.ts
@@ -17,7 +17,7 @@ export async function codebaseSearchTool(
 	removeClosingTag: RemoveClosingTag,
 ) {
 	const toolName = "codebase_search"
-	const workspacePath = (cline.cwd && cline.cwd.trim() !== '') ? cline.cwd : getWorkspacePath()
+	const workspacePath = cline.cwd && cline.cwd.trim() !== "" ? cline.cwd : getWorkspacePath()
 
 	if (!workspacePath) {
 		// This case should ideally not happen if Cline is initialized correctly
diff --git a/src/core/webview/webviewMessageHandler.ts b/src/core/webview/webviewMessageHandler.ts
@@ -11,7 +11,7 @@ import {
 	type ClineMessage,
 	type TelemetrySetting,
 	TelemetryEventName,
-	UserSettingsConfig
+	UserSettingsConfig,
 } from "@roo-code/types"
 import { CloudService } from "@roo-code/cloud"
 import { TelemetryService } from "@roo-code/telemetry"
@@ -2545,7 +2545,6 @@ export const webviewMessageHandler = async (
 						settings.codebaseIndexVercelAiGatewayApiKey,
 					)
 				}
-
 				if (settings.codebaseIndexWatsonxApiKey !== undefined) {
 					await provider.contextProxy.storeSecret(
 						"codebaseIndexWatsonxApiKey",
@@ -2558,7 +2557,6 @@ export const webviewMessageHandler = async (
 						settings.codebaseIndexWatsonxProjectId,
 					)
 				}
-
 				// Send success response first - settings are saved regardless of validation
 				await provider.postMessageToWebview({
 					type: "codeIndexSettingsSaved",
diff --git a/src/i18n/locales/en/embeddings.json b/src/i18n/locales/en/embeddings.json
@@ -47,6 +47,7 @@
 		"openAiCompatibleConfigMissing": "OpenAI Compatible configuration missing for embedder creation",
 		"geminiConfigMissing": "Gemini configuration missing for embedder creation",
 		"mistralConfigMissing": "Mistral configuration missing for embedder creation",
+		"watsonxConfigMissing": "IBM watsonx configuration missing for embedder creation",
 		"vercelAiGatewayConfigMissing": "Vercel AI Gateway configuration missing for embedder creation",
 		"watsonxConfigMissing": "IBM watsonx configuration missing for embedder creation",
 		"invalidEmbedderType": "Invalid embedder type configured: {{embedderProvider}}",
diff --git a/src/services/code-index/config-manager.ts b/src/services/code-index/config-manager.ts
@@ -252,12 +252,15 @@ export class CodeIndexConfigManager {
 			const qdrantUrl = this.qdrantUrl
 			const isConfigured = !!(apiKey && qdrantUrl)
 			return isConfigured
-		} else if (this.embedderProvider === "vercel-ai-gateway") {
-			const apiKey = this.vercelAiGatewayOptions?.apiKey
 		} else if (this.embedderProvider === "watsonx") {
 			const apiKey = this.watsonxOptions?.codebaseIndexWatsonxApiKey
+			const projectId = this.watsonxOptions?.codebaseIndexWatsonxProjectId
 			const qdrantUrl = this.qdrantUrl
-			const isConfigured = !!(apiKey && qdrantUrl)
+			const isConfigured = !!(apiKey && projectId && qdrantUrl)
+			return isConfigured
+		} else if (this.embedderProvider === "vercel-ai-gateway") {
+			const apiKey = this.vercelAiGatewayOptions?.apiKey
+			const isConfigured = !!apiKey
 			return isConfigured
 		}
 		return false // Should not happen if embedderProvider is always set correctly
@@ -362,14 +365,13 @@ export class CodeIndexConfigManager {
 			return true
 		}
 
-		if (prevVercelAiGatewayApiKey !== currentVercelAiGatewayApiKey) {
+		if (prevWatsonxApiKey !== currentWatsonxApiKey || prevWatsonxProjectId !== currentWatsonxProjectId) {
 			return true
 		}
 
-		if (prevWatsonxApiKey !== currentWatsonxApiKey || prevWatsonxProjectId !== currentWatsonxProjectId) {
+		if (prevVercelAiGatewayApiKey !== currentVercelAiGatewayApiKey) {
 			return true
 		}
-
 		// Check for model dimension changes (generic for all providers)
 		if (prevModelDimension !== currentModelDimension) {
 			return true
diff --git a/src/services/tree-sitter/queries/c-sharp.ts b/src/services/tree-sitter/queries/c-sharp.ts
@@ -63,5 +63,3 @@ export default `
 ; LINQ expressions
 (query_expression) @definition.linq_expression
 `
- 
- 
diff --git a/src/shared/ExtensionMessage.ts b/src/shared/ExtensionMessage.ts
@@ -14,6 +14,7 @@ import type {
 	CloudUserInfo,
 	ShareVisibility,
 	QueuedMessage,
+	ModelInfo,
 } from "@roo-code/types"
 
 import { GitCommit } from "../utils/git"
diff --git a/src/shared/api.ts b/src/shared/api.ts
@@ -156,5 +156,4 @@ export type GetModelsOptions =
 	| { provider: "deepinfra"; apiKey?: string; baseUrl?: string }
 	| { provider: "io-intelligence"; apiKey: string }
 	| { provider: "vercel-ai-gateway" }
-	| { provider: "watsonx"; apiKey: string }
 	| { provider: "watsonx"; apiKey: string; baseUrl: string }
diff --git a/webview-ui/src/components/chat/CodeIndexPopover.tsx b/webview-ui/src/components/chat/CodeIndexPopover.tsx
@@ -408,6 +408,10 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 					if (!prev.codebaseIndexMistralApiKey || prev.codebaseIndexMistralApiKey === SECRET_PLACEHOLDER) {
 						updated.codebaseIndexMistralApiKey = secretStatus.hasMistralApiKey ? SECRET_PLACEHOLDER : ""
 					}
+					if (!prev.codebaseIndexWatsonxApiKey || prev.codebaseIndexWatsonxApiKey === SECRET_PLACEHOLDER) {
+						updated.codebaseIndexWatsonxApiKey = secretStatus.hasWatsonxApiKey ? SECRET_PLACEHOLDER : ""
+					}
+
 					if (
 						!prev.codebaseIndexVercelAiGatewayApiKey ||
 						prev.codebaseIndexVercelAiGatewayApiKey === SECRET_PLACEHOLDER
@@ -427,6 +431,15 @@ export const CodeIndexPopover: React.FC<CodeIndexPopoverProps> = ({
 							: ""
 					}
 
+					if (
+						!prev.codebaseIndexWatsonxProjectId ||
+						prev.codebaseIndexWatsonxProjectId === SECRET_PLACEHOLDER
+					) {
+						updated.codebaseIndexWatsonxProjectId = secretStatus.hasWatsonxProjectId
+							? SECRET_PLACEHOLDER
+							: ""
+					}
+
 					return updated
 				}
 
diff --git a/webview-ui/src/components/settings/ApiOptions.tsx b/webview-ui/src/components/settings/ApiOptions.tsx
@@ -28,6 +28,7 @@ import {
 	chutesDefaultModelId,
 	bedrockDefaultModelId,
 	vertexDefaultModelId,
+	watsonxAiDefaultModelId,
 	sambaNovaDefaultModelId,
 	internationalZAiDefaultModelId,
 	mainlandZAiDefaultModelId,
@@ -623,6 +624,15 @@ const ApiOptions = ({
 				/>
 			)}
 
+			{selectedProvider === "watsonx" && (
+				<WatsonxAI
+					apiConfiguration={apiConfiguration}
+					setApiConfigurationField={setApiConfigurationField}
+					organizationAllowList={organizationAllowList}
+					modelValidationError={modelValidationError}
+				/>
+			)}
+
 			{selectedProvider === "sambanova" && (
 				<SambaNova apiConfiguration={apiConfiguration} setApiConfigurationField={setApiConfigurationField} />
 			)}
diff --git a/webview-ui/src/components/settings/constants.ts b/webview-ui/src/components/settings/constants.ts
@@ -15,6 +15,7 @@ import {
 	xaiModels,
 	groqModels,
 	chutesModels,
+	watsonxAiModels,
 	sambaNovaModels,
 	doubaoModels,
 	internationalZAiModels,
@@ -40,6 +41,7 @@ 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,
@@ -76,6 +78,7 @@ 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
diff --git a/webview-ui/src/i18n/locales/en/settings.json b/webview-ui/src/i18n/locales/en/settings.json

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import {`
`11`	`11`	`type ClineMessage,`
`12`	`12`	`type TelemetrySetting,`
`13`	`13`	`TelemetryEventName,`
`14`		`- UserSettingsConfig`
	`14`	`+ UserSettingsConfig,`
`15`	`15`	`} from "@roo-code/types"`
`16`	`16`	`import { CloudService } from "@roo-code/cloud"`
`17`	`17`	`import { TelemetryService } from "@roo-code/telemetry"`
`@@ -2545,7 +2545,6 @@ export const webviewMessageHandler = async (`
`2545`	`2545`	`settings.codebaseIndexVercelAiGatewayApiKey,`
`2546`	`2546`	`)`
`2547`	`2547`	`}`
`2548`		`-`
`2549`	`2548`	`if (settings.codebaseIndexWatsonxApiKey !== undefined) {`
`2550`	`2549`	`await provider.contextProxy.storeSecret(`
`2551`	`2550`	`"codebaseIndexWatsonxApiKey",`
`@@ -2558,7 +2557,6 @@ export const webviewMessageHandler = async (`
`2558`	`2557`	`settings.codebaseIndexWatsonxProjectId,`
`2559`	`2558`	`)`
`2560`	`2559`	`}`
`2561`		`-`
`2562`	`2560`	`// Send success response first - settings are saved regardless of validation`
`2563`	`2561`	`await provider.postMessageToWebview({`
`2564`	`2562`	`type: "codeIndexSettingsSaved",`