Roo to main

.roo/commands/release.md

@@ -29,7 +29,7 @@ argument-hint: patch | minor | major
 6. If the generate_image tool is available, create a release image at `releases/[version]-release.png`
     - The image should feature a realistic-looking kangaroo doing something human-like that relates to the main highlight of the release
     - Pass `releases/template.png` as the reference image for aspect ratio and kangaroo style
-    - Add the generated image to .changeset/v[version].md before the list of changes with format: `![X.Y.Z Release - Description](releases/X.Y.Z-release.png)`
+    - Add the generated image to .changeset/v[version].md before the list of changes with format: `![X.Y.Z Release - Description](/releases/X.Y.Z-release.png)`
 7. If a major or minor release:
     - Ask the user what the three most important areas to highlight are in the release
     - Update the English version relevant announcement files and documentation (webview-ui/src/components/chat/Announcement.tsx, README.md, and the `latestAnnouncementId` in src/core/webview/ClineProvider.ts)

packages/cloud/src/bridge/BridgeOrchestrator.ts

@@ -61,13 +61,19 @@ export class BridgeOrchestrator {
 	public static async connectOrDisconnect(
 		userInfo: CloudUserInfo | null,
 		remoteControlEnabled: boolean | undefined,
-		options: BridgeOrchestratorOptions,
+		options?: BridgeOrchestratorOptions,
 	): Promise<void> {
 		const isEnabled = BridgeOrchestrator.isEnabled(userInfo, remoteControlEnabled)
 		const instance = BridgeOrchestrator.instance
 
 		if (isEnabled) {
 			if (!instance) {
+				if (!options) {
+					console.error(
+						`[BridgeOrchestrator#connectOrDisconnect] Cannot connect: options are required for connection`,
+					)
+					return
+				}
 				try {
 					console.log(`[BridgeOrchestrator#connectOrDisconnect] Connecting...`)
 					BridgeOrchestrator.instance = new BridgeOrchestrator(options)

src/extension.ts

@@ -13,7 +13,7 @@ try {
 	console.warn("Failed to load environment variables:", e)
 }
 
-// import type { CloudUserInfo } from "@roo-code/types"
+// import type { CloudUserInfo, AuthState } from "@roo-code/types"
 // import { CloudService, BridgeOrchestrator } from "@roo-code/cloud"
 import { TelemetryService, PostHogTelemetryClient } from "@roo-code/telemetry"
 
@@ -56,7 +56,7 @@ let outputChannel: vscode.OutputChannel
 let extensionContext: vscode.ExtensionContext
 // let cloudService: CloudService | undefined
 
-// let authStateChangedHandler: (() => void) | undefined
+// let authStateChangedHandler: ((data: { state: AuthState; previousState: AuthState }) => Promise<void>) | undefined
 // let settingsUpdatedHandler: (() => void) | undefined
 // let userInfoHandler: ((data: { userInfo: CloudUserInfo }) => Promise<void>) | undefined
 
@@ -129,7 +129,28 @@ export async function activate(context: vscode.ExtensionContext) {
 
 	// // Initialize Roo Code Cloud service.
 	// const postStateListener = () => ClineProvider.getVisibleInstance()?.postStateToWebview()
-	// authStateChangedHandler = postStateListener
+
+	// authStateChangedHandler = async (data: { state: AuthState; previousState: AuthState }) => {
+	// 	postStateListener()
+
+	// 	// Check if user has logged out
+	// 	if (data.state === "logged-out") {
+	// 		try {
+	// 			// Disconnect the bridge when user logs out
+	// 			// When userInfo is null and remoteControlEnabled is false, BridgeOrchestrator
+	// 			// will disconnect. The options parameter is not needed for disconnection.
+	// 			await BridgeOrchestrator.connectOrDisconnect(null, false)
+
+	// 			cloudLogger("[CloudService] BridgeOrchestrator disconnected on logout")
+	// 		} catch (error) {
+	// 			cloudLogger(
+	// 				`[CloudService] Failed to disconnect BridgeOrchestrator on logout: ${
+	// 					error instanceof Error ? error.message : String(error)
+	// 				}`,
+	// 			)
+	// 		}
+	// 	}
+	// }
 
 	// settingsUpdatedHandler = async () => {
 	// 	const userInfo = CloudService.instance.getUserInfo()

src/integrations/claude-code/run.ts

@@ -260,7 +260,7 @@ function attemptParseChunk(data: string): ClaudeCodeMessage | null {
  * Creates a user-friendly error message for Claude Code ENOENT errors
  */
 function createClaudeCodeNotFoundError(claudePath: string, originalError: Error): Error {
-	const errorMessage = t("errors.claudeCode.notFound", {
+	const errorMessage = t("common:errors.claudeCode.notFound", {
 		claudePath,
 		installationUrl: CLAUDE_CODE_INSTALLATION_URL,
 		originalError: originalError.message,

src/package.json

@@ -648,6 +648,13 @@
 					"type": "boolean",
 					"default": false,
 					"description": "%settings.newTaskRequireTodos.description%"
+				},
+				"roo-cline.codeIndex.embeddingBatchSize": {
+					"type": "number",
+					"default": 60,
+					"minimum": 1,
+					"maximum": 200,
+					"description": "%settings.codeIndex.embeddingBatchSize.description%"
 				}
 			}
 		},

src/package.nls.json

@@ -67,5 +67,6 @@
 	"settings.apiRequestTimeout.description": "Maximum time in seconds to wait for API responses (0 = no timeout, 1-3600s, default: 600s). Higher values are recommended for local providers like LM Studio and Ollama that may need more processing time.",
 	"settings.apiResponseRenderMode.description": "API response rendering speed mode (fast = minimal delay, medium = balanced, slow = maximum compatibility). Higher values provide better compatibility but may feel less responsive.",
 	"settings.autoCommit.description": "Automatically commit current changed files after accepting AI model changes",
-	"settings.newTaskRequireTodos.description": "Require todos parameter when creating new tasks with the new_task tool"
+	"settings.newTaskRequireTodos.description": "Require todos parameter when creating new tasks with the new_task tool",
+	"settings.codeIndex.embeddingBatchSize.description": "The batch size for embedding operations during code indexing. Adjust this based on your API provider's limits. Default is 60."
 }

src/services/code-index/processors/file-watcher.ts

@@ -26,6 +26,7 @@ import { isPathInIgnoredDirectory } from "../../glob/ignore-utils"
 import { TelemetryService } from "@roo-code/telemetry"
 import { TelemetryEventName } from "@roo-code/types"
 import { sanitizeErrorMessage } from "../shared/validation-helpers"
+import { Package } from "../../../shared/package"
 
 /**
  * Implementation of the file watcher interface
@@ -38,6 +39,7 @@ export class FileWatcher implements IFileWatcher {
 	private batchProcessDebounceTimer?: NodeJS.Timeout
 	private readonly BATCH_DEBOUNCE_DELAY_MS = 500
 	private readonly FILE_PROCESSING_CONCURRENCY_LIMIT = 10
+	private readonly batchSegmentThreshold: number
 
 	private readonly _onDidStartBatchProcessing = new vscode.EventEmitter<string[]>()
 	private readonly _onBatchProgressUpdate = new vscode.EventEmitter<{
@@ -78,11 +80,26 @@ export class FileWatcher implements IFileWatcher {
 		private vectorStore?: IVectorStore,
 		ignoreInstance?: Ignore,
 		ignoreController?: RooIgnoreController,
+		batchSegmentThreshold?: number,
 	) {
 		this.ignoreController = ignoreController || new RooIgnoreController(workspacePath)
 		if (ignoreInstance) {
 			this.ignoreInstance = ignoreInstance
 		}
+		// Get the configurable batch size from VSCode settings, fallback to default
+		// If not provided in constructor, try to get from VSCode settings
+		if (batchSegmentThreshold !== undefined) {
+			this.batchSegmentThreshold = batchSegmentThreshold
+		} else {
+			try {
+				this.batchSegmentThreshold = vscode.workspace
+					.getConfiguration(Package.name)
+					.get<number>("codeIndex.embeddingBatchSize", BATCH_SEGMENT_THRESHOLD)
+			} catch {
+				// In test environment, vscode.workspace might not be available
+				this.batchSegmentThreshold = BATCH_SEGMENT_THRESHOLD
+			}
+		}
 	}
 
 	/**
@@ -341,8 +358,8 @@ export class FileWatcher implements IFileWatcher {
 	): Promise<Error | undefined> {
 		if (pointsForBatchUpsert.length > 0 && this.vectorStore && !overallBatchError) {
 			try {
-				for (let i = 0; i < pointsForBatchUpsert.length; i += BATCH_SEGMENT_THRESHOLD) {
-					const batch = pointsForBatchUpsert.slice(i, i + BATCH_SEGMENT_THRESHOLD)
+				for (let i = 0; i < pointsForBatchUpsert.length; i += this.batchSegmentThreshold) {
+					const batch = pointsForBatchUpsert.slice(i, i + this.batchSegmentThreshold)
 					let retryCount = 0
 					let upsertError: Error | undefined
 

src/services/code-index/processors/scanner.ts

@@ -29,15 +29,34 @@ import { isPathInIgnoredDirectory } from "../../glob/ignore-utils"
 import { TelemetryService } from "@roo-code/telemetry"
 import { TelemetryEventName } from "@roo-code/types"
 import { sanitizeErrorMessage } from "../shared/validation-helpers"
+import { Package } from "../../../shared/package"
 
 export class DirectoryScanner implements IDirectoryScanner {
+	private readonly batchSegmentThreshold: number
+
 	constructor(
 		private readonly embedder: IEmbedder,
 		private readonly qdrantClient: IVectorStore,
 		private readonly codeParser: ICodeParser,
 		private readonly cacheManager: CacheManager,
 		private readonly ignoreInstance: Ignore,
-	) {}
+		batchSegmentThreshold?: number,
+	) {
+		// Get the configurable batch size from VSCode settings, fallback to default
+		// If not provided in constructor, try to get from VSCode settings
+		if (batchSegmentThreshold !== undefined) {
+			this.batchSegmentThreshold = batchSegmentThreshold
+		} else {
+			try {
+				this.batchSegmentThreshold = vscode.workspace
+					.getConfiguration(Package.name)
+					.get<number>("codeIndex.embeddingBatchSize", BATCH_SEGMENT_THRESHOLD)
+			} catch {
+				// In test environment, vscode.workspace might not be available
+				this.batchSegmentThreshold = BATCH_SEGMENT_THRESHOLD
+			}
+		}
+	}
 
 	/**
 	 * Recursively scans a directory for code blocks in supported files.
@@ -153,7 +172,7 @@ export class DirectoryScanner implements IDirectoryScanner {
 									addedBlocksFromFile = true
 
 									// Check if batch threshold is met
-									if (currentBatchBlocks.length >= BATCH_SEGMENT_THRESHOLD) {
+									if (currentBatchBlocks.length >= this.batchSegmentThreshold) {
 										// Wait if we've reached the maximum pending batches
 										while (pendingBatchCount >= MAX_PENDING_BATCHES) {
 											// Wait for at least one batch to complete

src/services/code-index/service-factory.ts

@@ -16,6 +16,8 @@ import { Ignore } from "ignore"
 import { t } from "../../i18n"
 import { TelemetryService } from "@roo-code/telemetry"
 import { TelemetryEventName } from "@roo-code/types"
+import { Package } from "../../shared/package"
+import { BATCH_SEGMENT_THRESHOLD } from "./constants"
 
 /**
  * Factory class responsible for creating and configuring code indexing service dependencies.
@@ -156,7 +158,17 @@ export class CodeIndexServiceFactory {
 		parser: ICodeParser,
 		ignoreInstance: Ignore,
 	): DirectoryScanner {
-		return new DirectoryScanner(embedder, vectorStore, parser, this.cacheManager, ignoreInstance)
+		// Get the configurable batch size from VSCode settings
+		let batchSize: number
+		try {
+			batchSize = vscode.workspace
+				.getConfiguration(Package.name)
+				.get<number>("codeIndex.embeddingBatchSize", BATCH_SEGMENT_THRESHOLD)
+		} catch {
+			// In test environment, vscode.workspace might not be available
+			batchSize = BATCH_SEGMENT_THRESHOLD
+		}
+		return new DirectoryScanner(embedder, vectorStore, parser, this.cacheManager, ignoreInstance, batchSize)
 	}
 
 	/**
@@ -170,6 +182,16 @@ export class CodeIndexServiceFactory {
 		ignoreInstance: Ignore,
 		rooIgnoreController?: RooIgnoreController,
 	): IFileWatcher {
+		// Get the configurable batch size from VSCode settings
+		let batchSize: number
+		try {
+			batchSize = vscode.workspace
+				.getConfiguration(Package.name)
+				.get<number>("codeIndex.embeddingBatchSize", BATCH_SEGMENT_THRESHOLD)
+		} catch {
+			// In test environment, vscode.workspace might not be available
+			batchSize = BATCH_SEGMENT_THRESHOLD
+		}
 		return new FileWatcher(
 			this.workspacePath,
 			context,
@@ -178,6 +200,7 @@ export class CodeIndexServiceFactory {
 			vectorStore,
 			ignoreInstance,
 			rooIgnoreController,
+			batchSize,
 		)
 	}
 

webview-ui/src/components/chat/ChatTextArea.tsx

@@ -774,7 +774,6 @@ export const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 				)
 
 				highlightLayerRef.current.innerHTML = processedText
-				console.log("processedText")
 
 				// Custom replacement for commands - only highlight valid ones
 				processedText = processedText.replace(commandRegexGlobal, (match, commandName) => {

webview-ui/src/components/cloud/CloudView.tsx

@@ -11,6 +11,9 @@ import { ToggleSwitch } from "@/components/ui/toggle-switch"
 
 import { History, PiggyBank, SquareArrowOutUpRightIcon } from "lucide-react"
 
+// Define the production URL constant locally to avoid importing from cloud package in tests
+const PRODUCTION_ROO_CODE_API_URL = "https://app.roocode.com"
+
 type CloudViewProps = {
 	userInfo: CloudUserInfo | null
 	isAuthenticated: boolean
@@ -56,10 +59,16 @@ export const CloudView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: Cl
 		// Send telemetry for cloud website visit
 		// NOTE: Using ACCOUNT_* telemetry events for backward compatibility with analytics
 		telemetryClient.capture(TelemetryEventName.ACCOUNT_CONNECT_CLICKED)
-		const cloudUrl = cloudApiUrl || "https://app.roocode.com"
+		const cloudUrl = cloudApiUrl || PRODUCTION_ROO_CODE_API_URL
 		vscode.postMessage({ type: "openExternal", url: cloudUrl })
 	}
 
+	const handleOpenCloudUrl = () => {
+		if (cloudApiUrl) {
+			vscode.postMessage({ type: "openExternal", url: cloudApiUrl })
+		}
+	}
+
 	const handleRemoteControlToggle = () => {
 		const newValue = !remoteControlEnabled
 		setRemoteControlEnabled(newValue)
@@ -186,6 +195,18 @@ export const CloudView = ({ userInfo, isAuthenticated, cloudApiUrl, onDone }: Cl
 					</div>
 				</>
 			)}
+			{cloudApiUrl && cloudApiUrl !== PRODUCTION_ROO_CODE_API_URL && (
+				<div className="mt-6 flex justify-center">
+					<div className="inline-flex items-center px-3 py-1 gap-1 rounded-full bg-vscode-badge-background/50 text-vscode-badge-foreground text-xs">
+						<span className="text-vscode-foreground/75">{t("cloud:cloudUrlPillLabel")}: </span>
+						<button
+							onClick={handleOpenCloudUrl}
+							className="text-vscode-textLink-foreground hover:text-vscode-textLink-activeForeground underline cursor-pointer bg-transparent border-none p-0">
+							{cloudApiUrl}
+						</button>
+					</div>
+				</div>
+			)}
 		</div>
 	)
 }