Merge remote-tracking branch 'refs/remotes/origin/main' into feature/2122-editor-focus

# Conflicts:
#	src/package.json
#	src/package.nls.json

Author: felixAnhalt

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Roo Code Changelog
 
+## [3.22.5] - 2025-06-28
+
+- Remove Gemini CLI provider while we work with Google on a better integration
+
 ## [3.22.4] - 2025-06-27
 
 - Fix: resolve E2BIG error by passing large prompts via stdin to Claude CLI (thanks @Fovty!)

packages/types/src/providers/bedrock.ts

@@ -360,78 +360,49 @@ export const BEDROCK_MAX_TOKENS = 4096
 
 export const BEDROCK_DEFAULT_CONTEXT = 128_000
 
-export const BEDROCK_REGION_INFO: Record<
-	string,
-	{
-		regionId: string
-		description: string
-		pattern?: string
-		multiRegion?: boolean
-	}
-> = {
-	/*
-	 * This JSON generated by AWS's AI assistant - Amazon Q on March 29, 2025
-	 *
-	 *  - Africa (Cape Town) region does not appear to support Amazon Bedrock at this time.
-	 *  - Some Asia Pacific regions, such as Asia Pacific (Hong Kong) and Asia Pacific (Jakarta), are not listed among the supported regions for Bedrock services.
-	 *  - Middle East regions, including Middle East (Bahrain) and Middle East (UAE), are not mentioned in the list of supported regions for Bedrock. [3]
-	 *  - China regions (Beijing and Ningxia) are not listed as supported for Amazon Bedrock.
-	 *  - Some newer or specialized AWS regions may not have Bedrock support yet.
-	 */
-	"us.": { regionId: "us-east-1", description: "US East (N. Virginia)", pattern: "us-", multiRegion: true },
-	"use.": { regionId: "us-east-1", description: "US East (N. Virginia)" },
-	"use1.": { regionId: "us-east-1", description: "US East (N. Virginia)" },
-	"use2.": { regionId: "us-east-2", description: "US East (Ohio)" },
-	"usw.": { regionId: "us-west-2", description: "US West (Oregon)" },
-	"usw2.": { regionId: "us-west-2", description: "US West (Oregon)" },
-	"ug.": {
-		regionId: "us-gov-west-1",
-		description: "AWS GovCloud (US-West)",
-		pattern: "us-gov-",
-		multiRegion: true,
-	},
-	"uge1.": { regionId: "us-gov-east-1", description: "AWS GovCloud (US-East)" },
-	"ugw1.": { regionId: "us-gov-west-1", description: "AWS GovCloud (US-West)" },
-	"eu.": { regionId: "eu-west-1", description: "Europe (Ireland)", pattern: "eu-", multiRegion: true },
-	"euw1.": { regionId: "eu-west-1", description: "Europe (Ireland)" },
-	"euw2.": { regionId: "eu-west-2", description: "Europe (London)" },
-	"euw3.": { regionId: "eu-west-3", description: "Europe (Paris)" },
-	"euc1.": { regionId: "eu-central-1", description: "Europe (Frankfurt)" },
-	"euc2.": { regionId: "eu-central-2", description: "Europe (Zurich)" },
-	"eun1.": { regionId: "eu-north-1", description: "Europe (Stockholm)" },
-	"eus1.": { regionId: "eu-south-1", description: "Europe (Milan)" },
-	"eus2.": { regionId: "eu-south-2", description: "Europe (Spain)" },
-	"ap.": {
-		regionId: "ap-southeast-1",
-		description: "Asia Pacific (Singapore)",
-		pattern: "ap-",
-		multiRegion: true,
-	},
-	"ape1.": { regionId: "ap-east-1", description: "Asia Pacific (Hong Kong)" },
-	"apne1.": { regionId: "ap-northeast-1", description: "Asia Pacific (Tokyo)" },
-	"apne2.": { regionId: "ap-northeast-2", description: "Asia Pacific (Seoul)" },
-	"apne3.": { regionId: "ap-northeast-3", description: "Asia Pacific (Osaka)" },
-	"aps1.": { regionId: "ap-south-1", description: "Asia Pacific (Mumbai)" },
-	"aps2.": { regionId: "ap-south-2", description: "Asia Pacific (Hyderabad)" },
-	"apse1.": { regionId: "ap-southeast-1", description: "Asia Pacific (Singapore)" },
-	"apse2.": { regionId: "ap-southeast-2", description: "Asia Pacific (Sydney)" },
-	"ca.": { regionId: "ca-central-1", description: "Canada (Central)", pattern: "ca-", multiRegion: true },
-	"cac1.": { regionId: "ca-central-1", description: "Canada (Central)" },
-	"sa.": { regionId: "sa-east-1", description: "South America (São Paulo)", pattern: "sa-", multiRegion: true },
-	"sae1.": { regionId: "sa-east-1", description: "South America (São Paulo)" },
+// AWS Bedrock Inference Profile mapping based on official documentation
+// https://docs.aws.amazon.com/bedrock/latest/userguide/inference-profiles-support.html
+// This mapping is pre-ordered by pattern length (descending) to ensure more specific patterns match first
+export const AWS_INFERENCE_PROFILE_MAPPING: Array<[string, string]> = [
+	// US Government Cloud → ug. inference profile (most specific prefix first)
+	["us-gov-", "ug."],
+	// Americas regions → us. inference profile
+	["us-", "us."],
+	// Europe regions → eu. inference profile
+	["eu-", "eu."],
+	// Asia Pacific regions → apac. inference profile
+	["ap-", "apac."],
+	// Canada regions → ca. inference profile
+	["ca-", "ca."],
+	// South America regions → sa. inference profile
+	["sa-", "sa."],
+]
 
-	// These are not official - they weren't generated by Amazon Q nor were
-	// found in the AWS documentation but another Roo contributor found apac.
-	// Was needed so I've added the pattern of the other geo zones.
-	"apac.": { regionId: "ap-southeast-1", description: "Default APAC region", pattern: "ap-", multiRegion: true },
-	"emea.": { regionId: "eu-west-1", description: "Default EMEA region", pattern: "eu-", multiRegion: true },
-	"amer.": { regionId: "us-east-1", description: "Default Americas region", pattern: "us-", multiRegion: true },
-}
-
-export const BEDROCK_REGIONS = Object.values(BEDROCK_REGION_INFO)
-	// Extract all region IDs
-	.map((info) => ({ value: info.regionId, label: info.regionId }))
-	// Filter to unique region IDs (remove duplicates)
-	.filter((region, index, self) => index === self.findIndex((r) => r.value === region.value))
-	// Sort alphabetically by region ID
-	.sort((a, b) => a.value.localeCompare(b.value))
+// AWS Bedrock supported regions for the regions dropdown
+// Based on official AWS documentation
+export const BEDROCK_REGIONS = [
+	{ value: "us-east-1", label: "us-east-1" },
+	{ value: "us-east-2", label: "us-east-2" },
+	{ value: "us-west-1", label: "us-west-1" },
+	{ value: "us-west-2", label: "us-west-2" },
+	{ value: "ap-northeast-1", label: "ap-northeast-1" },
+	{ value: "ap-northeast-2", label: "ap-northeast-2" },
+	{ value: "ap-northeast-3", label: "ap-northeast-3" },
+	{ value: "ap-south-1", label: "ap-south-1" },
+	{ value: "ap-south-2", label: "ap-south-2" },
+	{ value: "ap-southeast-1", label: "ap-southeast-1" },
+	{ value: "ap-southeast-2", label: "ap-southeast-2" },
+	{ value: "ap-east-1", label: "ap-east-1" },
+	{ value: "eu-central-1", label: "eu-central-1" },
+	{ value: "eu-central-2", label: "eu-central-2" },
+	{ value: "eu-west-1", label: "eu-west-1" },
+	{ value: "eu-west-2", label: "eu-west-2" },
+	{ value: "eu-west-3", label: "eu-west-3" },
+	{ value: "eu-north-1", label: "eu-north-1" },
+	{ value: "eu-south-1", label: "eu-south-1" },
+	{ value: "eu-south-2", label: "eu-south-2" },
+	{ value: "ca-central-1", label: "ca-central-1" },
+	{ value: "sa-east-1", label: "sa-east-1" },
+	{ value: "us-gov-east-1", label: "us-gov-east-1" },
+	{ value: "us-gov-west-1", label: "us-gov-west-1" },
+].sort((a, b) => a.value.localeCompare(b.value))

packages/types/src/providers/gemini-cli.ts

@@ -4,7 +4,6 @@ export * from "./chutes.js"
 export * from "./claude-code.js"
 export * from "./deepseek.js"
 export * from "./gemini.js"
-export * from "./gemini-cli.js"
 export * from "./glama.js"
 export * from "./groq.js"
 export * from "./lite-llm.js"

packages/types/src/providers/index.ts

@@ -15,7 +15,6 @@ import {
 	OllamaHandler,
 	LmStudioHandler,
 	GeminiHandler,
-	GeminiCliHandler,
 	OpenAiNativeHandler,
 	DeepSeekHandler,
 	MistralHandler,
@@ -86,8 +85,6 @@ export function buildApiHandler(configuration: ProviderSettings): ApiHandler {
 			return new LmStudioHandler(options)
 		case "gemini":
 			return new GeminiHandler(options)
-		case "gemini-cli":
-			return new GeminiCliHandler(options)
 		case "openai-native":
 			return new OpenAiNativeHandler(options)
 		case "deepseek":