Feature/bedrock embeddings support (#9475)

* feat: add AWS Bedrock support for codebase indexing

- Add bedrock as a new EmbedderProvider type
- Add AWS Bedrock embedding model profiles (titan-embed-text models)
- Create BedrockEmbedder class with support for Titan and Cohere models
- Add Bedrock configuration support to config manager and interfaces
- Update service factory to create BedrockEmbedder instances
- Add comprehensive tests for BedrockEmbedder
- Add localization strings for Bedrock support

Closes #8658

* fix: add missing bedrockOptions to loadConfiguration return type

* Fix various issues that the original PR missed.

* Remove debug logs

* Rename AWS Bedrock -> Amazon Bedrock

* Remove some 'as any's

* Revert README changes

* Add translations

* More translations

* Remove leftover code from a debugging session.

* fix: add bedrock to codebaseIndexModelsSchema and update brace-expansion override

- Add bedrock provider to codebaseIndexModelsSchema type definition to fix empty model dropdown in UI
- Update pnpm override for brace-expansion from '>=2.0.2' to '^2.0.2' to resolve ESM/CommonJS compatibility issues

* Improvements to AWS Bedrock embeddings support

- Enhanced bedrock.ts embedder implementation
- Added comprehensive test coverage in bedrock.spec.ts
- Updated config-manager.ts for better Bedrock configuration handling
- Improved service-factory.ts integration
- Updated embeddingModels.ts with Bedrock models
- Enhanced CodeIndexPopover.tsx UI for Bedrock options
- Added auto-populate test for CodeIndexPopover
- Updated pnpm-lock.yaml dependencies

* Restore openrouter config

* Remove debug log

* Fix config-manager.spec.ts unit test.

* Add translations for "optional"

* Revert unnecessary change related to open ia embedder

---------

Co-authored-by: Roo Code <[email protected]>
Co-authored-by: Matt Rubens <[email protected]>
Co-authored-by: Smartsheet-JB-Brown <[email protected]>

Author: 4 people

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -76,7 +76,7 @@ body:
       label: API Provider (optional)
       options:
         - Anthropic
-        - AWS Bedrock
+        - Amazon Bedrock
         - Chutes AI
         - DeepSeek
         - Featherless AI

.roo/rules-translate/instructions-zh-cn.md

@@ -115,7 +115,7 @@
 
     - 保留英文品牌名
     - 技术术语保持一致性
-    - 保留英文专有名词：如"AWS Bedrock ARN"
+    - 保留英文专有名词：如"Amazon Bedrock ARN"
 
 4. **用户操作**
     - 操作动词统一：

CHANGELOG.md

@@ -374,7 +374,7 @@
 
 ## [3.28.11] - 2025-09-29
 
-- Fix: Correct AWS Bedrock Claude Sonnet 4.5 model identifier (#8371 by @sunhyung, PR by @app/roomote)
+- Fix: Correct Amazon Bedrock Claude Sonnet 4.5 model identifier (#8371 by @sunhyung, PR by @app/roomote)
 - Fix: Correct Claude Sonnet 4.5 model ID format (thanks @daniel-lxs!)
 
 ## [3.28.10] - 2025-09-29
@@ -706,7 +706,7 @@
 ## [3.25.14] - 2025-08-13
 
 - Fix: Only include verbosity parameter for models that support it (#7054 by @eastonmeth, PR by @app/roomote)
-- Fix: AWS Bedrock 1M context - Move anthropic_beta to additionalModelRequestFields (thanks @daniel-lxs!)
+- Fix: Amazon Bedrock 1M context - Move anthropic_beta to additionalModelRequestFields (thanks @daniel-lxs!)
 - Fix: Make cancelling requests more responsive by reverting recent changes
 
 ## [3.25.13] - 2025-08-12
@@ -1071,7 +1071,7 @@
 - Add user-configurable search score threshold slider for semantic search (thanks @hannesrudolph!)
 - Add default headers and testing for litellm fetcher (thanks @andrewshu2000!)
 - Fix consistent cancellation error messages for thinking vs streaming phases
-- Fix AWS Bedrock cross-region inference profile mapping (thanks @KevinZhao!)
+- Fix Amazon Bedrock cross-region inference profile mapping (thanks @KevinZhao!)
 - Fix URL loading timeout issues in @ mentions (thanks @MuriloFP!)
 - Fix API retry exponential backoff capped at 10 minutes (thanks @MuriloFP!)
 - Fix Qdrant URL field auto-filling with default value (thanks @SannidhyaSah!)
@@ -1085,7 +1085,7 @@
 - Suppress Mermaid error rendering
 - Improve Mermaid buttons with light background in light mode (thanks @chrarnoldus!)
 - Add .vscode/ to write-protected files/directories
-- Update AWS Bedrock cross-region inference profile mapping (thanks @KevinZhao!)
+- Update Amazon Bedrock cross-region inference profile mapping (thanks @KevinZhao!)
 
 ## [3.22.5] - 2025-06-28
 
@@ -1709,7 +1709,7 @@
 - Improved display of diff errors + easy copying for investigation
 - Fixes to .vscodeignore (thanks @franekp!)
 - Fix a zh-CN translation for model capabilities (thanks @zhangtony239!)
-- Rename AWS Bedrock to Amazon Bedrock (thanks @ronyblum!)
+- Rename Amazon Bedrock to Amazon Bedrock (thanks @ronyblum!)
 - Update extension title and description (thanks @StevenTCramer!)
 
 ## [3.11.12] - 2025-04-09
@@ -1958,12 +1958,12 @@
 - PowerShell-specific command handling (thanks @KJ7LNW!)
 - OpenAI-compatible DeepSeek/QwQ reasoning support (thanks @lightrabbit!)
 - Anthropic-style prompt caching in the OpenAI-compatible provider (thanks @dleen!)
-- Add Deepseek R1 for AWS Bedrock (thanks @ATempsch!)
+- Add Deepseek R1 for Amazon Bedrock (thanks @ATempsch!)
 - Fix MarkdownBlock text color for Dark High Contrast theme (thanks @cannuri!)
 - Add gemini-2.0-pro-exp-02-05 model to vertex (thanks @shohei-ihaya!)
 - Bring back progress status for multi-diff edits (thanks @qdaxb!)
 - Refactor alert dialog styles to use the correct vscode theme (thanks @cannuri!)
-- Custom ARNs in AWS Bedrock (thanks @Smartsheet-JB-Brown!)
+- Custom ARNs in Amazon Bedrock (thanks @Smartsheet-JB-Brown!)
 - Update MCP servers directory path for platform compatibility (thanks @hannesrudolph!)
 - Fix browser system prompt inclusion rules (thanks @cannuri!)
 - Publish git tags to github from CI (thanks @pdecat!)
@@ -2101,7 +2101,7 @@
 
 ## [3.7.1] - 2025-02-24
 
-- Add AWS Bedrock support for Sonnet 3.7 and update some defaults to Sonnet 3.7 instead of 3.5
+- Add Amazon Bedrock support for Sonnet 3.7 and update some defaults to Sonnet 3.7 instead of 3.5
 
 ## [3.7.0] - 2025-02-24
 
@@ -2118,7 +2118,7 @@
 
 ## [3.3.24] - 2025-02-20
 
-- Fixed a bug with region selection preventing AWS Bedrock profiles from being saved (thanks @oprstchn!)
+- Fixed a bug with region selection preventing Amazon Bedrock profiles from being saved (thanks @oprstchn!)
 - Updated the price of gpt-4o (thanks @marvijo-code!)
 
 ## [3.3.23] - 2025-02-20
@@ -2302,7 +2302,7 @@
 - Reverts provider key entry back to checking onInput instead of onChange to hopefully address issues entering API keys (thanks @samhvw8!)
 - Added explicit checkbox to use Azure for OpenAI compatible providers (thanks @samhvw8!)
 - Fixed Glama usage reporting (thanks @punkpeye!)
-- Added Llama 3.3 70B Instruct model to the AWS Bedrock provider options (thanks @Premshay!)
+- Added Llama 3.3 70B Instruct model to the Amazon Bedrock provider options (thanks @Premshay!)
 
 ## [3.2.7]
 

package.json

@@ -57,7 +57,7 @@
 			"tar-fs": ">=3.1.1",
 			"esbuild": ">=0.25.0",
 			"undici": ">=5.29.0",
-			"brace-expansion": ">=2.0.2",
+			"brace-expansion": "^2.0.2",
 			"form-data": ">=4.0.4",
 			"bluebird": ">=3.7.2",
 			"glob": ">=11.1.0"

packages/types/src/codebase-index.ts

@@ -22,7 +22,16 @@ export const codebaseIndexConfigSchema = z.object({
 	codebaseIndexEnabled: z.boolean().optional(),
 	codebaseIndexQdrantUrl: z.string().optional(),
 	codebaseIndexEmbedderProvider: z
-		.enum(["openai", "ollama", "openai-compatible", "gemini", "mistral", "vercel-ai-gateway", "openrouter"])
+		.enum([
+			"openai",
+			"ollama",
+			"openai-compatible",
+			"gemini",
+			"mistral",
+			"vercel-ai-gateway",
+			"bedrock",
+			"openrouter",
+		])
 		.optional(),
 	codebaseIndexEmbedderBaseUrl: z.string().optional(),
 	codebaseIndexEmbedderModelId: z.string().optional(),
@@ -36,6 +45,9 @@ export const codebaseIndexConfigSchema = z.object({
 	// OpenAI Compatible specific fields
 	codebaseIndexOpenAiCompatibleBaseUrl: z.string().optional(),
 	codebaseIndexOpenAiCompatibleModelDimension: z.number().optional(),
+	// Bedrock specific fields
+	codebaseIndexBedrockRegion: z.string().optional(),
+	codebaseIndexBedrockProfile: z.string().optional(),
 })
 
 export type CodebaseIndexConfig = z.infer<typeof codebaseIndexConfigSchema>
@@ -52,6 +64,7 @@ export const codebaseIndexModelsSchema = z.object({
 	mistral: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
 	"vercel-ai-gateway": z.record(z.string(), z.object({ dimension: z.number() })).optional(),
 	openrouter: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
+	bedrock: z.record(z.string(), z.object({ dimension: z.number() })).optional(),
 })
 
 export type CodebaseIndexModels = z.infer<typeof codebaseIndexModelsSchema>

pnpm-lock.yaml

@@ -109,12 +109,12 @@ export async function browserActionTool(
 						// Do not close the browser on parameter validation errors
 						return // can't be within an inner switch
 					}
-	
+
 					// Get viewport dimensions from the browser session
 					const viewportSize = cline.browserSession.getViewportSize()
 					const viewportWidth = viewportSize.width || 900 // default to 900 if not available
 					const viewportHeight = viewportSize.height || 600 // default to 600 if not available
-	
+
 					// Scale coordinate from image dimensions to viewport dimensions
 					try {
 						processedCoordinate = scaleCoordinate(coordinate, viewportWidth, viewportHeight)
@@ -143,7 +143,7 @@ export async function browserActionTool(
 						return
 					}
 				}
-	
+
 				if (action === "resize") {
 					if (!size) {
 						cline.consecutiveMistakeCount++

src/core/tools/BrowserActionTool.ts

@@ -2084,6 +2084,8 @@ export class ClineProvider
 				codebaseIndexOpenAiCompatibleBaseUrl: codebaseIndexConfig?.codebaseIndexOpenAiCompatibleBaseUrl,
 				codebaseIndexSearchMaxResults: codebaseIndexConfig?.codebaseIndexSearchMaxResults,
 				codebaseIndexSearchMinScore: codebaseIndexConfig?.codebaseIndexSearchMinScore,
+				codebaseIndexBedrockRegion: codebaseIndexConfig?.codebaseIndexBedrockRegion,
+				codebaseIndexBedrockProfile: codebaseIndexConfig?.codebaseIndexBedrockProfile,
 			},
 			// Only set mdmCompliant if there's an actual MDM policy
 			// undefined means no MDM policy, true means compliant, false means non-compliant
@@ -2312,6 +2314,8 @@ export class ClineProvider
 					stateValues.codebaseIndexConfig?.codebaseIndexOpenAiCompatibleBaseUrl,
 				codebaseIndexSearchMaxResults: stateValues.codebaseIndexConfig?.codebaseIndexSearchMaxResults,
 				codebaseIndexSearchMinScore: stateValues.codebaseIndexConfig?.codebaseIndexSearchMinScore,
+				codebaseIndexBedrockRegion: stateValues.codebaseIndexConfig?.codebaseIndexBedrockRegion,
+				codebaseIndexBedrockProfile: stateValues.codebaseIndexConfig?.codebaseIndexBedrockProfile,
 			},
 			profileThresholds: stateValues.profileThresholds ?? {},
 			includeDiagnosticMessages: stateValues.includeDiagnosticMessages ?? true,

src/core/webview/ClineProvider.ts

@@ -2378,6 +2378,8 @@ export const webviewMessageHandler = async (
 					codebaseIndexEmbedderModelId: settings.codebaseIndexEmbedderModelId,
 					codebaseIndexEmbedderModelDimension: settings.codebaseIndexEmbedderModelDimension, // Generic dimension
 					codebaseIndexOpenAiCompatibleBaseUrl: settings.codebaseIndexOpenAiCompatibleBaseUrl,
+					codebaseIndexBedrockRegion: settings.codebaseIndexBedrockRegion,
+					codebaseIndexBedrockProfile: settings.codebaseIndexBedrockProfile,
 					codebaseIndexSearchMaxResults: settings.codebaseIndexSearchMaxResults,
 					codebaseIndexSearchMinScore: settings.codebaseIndexSearchMinScore,
 				}