Merge remote-tracking branch 'origin/main' into bb/worktrees-ux

Author: brunobergher

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Roo Code Changelog
 
+## [3.43.0] - 2026-01-23
+
+![3.43.0 Release - Intelligent Context Condensation](/releases/3.43.0-release.png)
+
+- Intelligent Context Condensation v2: New context condensation system that intelligently summarizes conversation history when approaching context limits, preserving important information while reducing token usage (PR #10873 by @hannesrudolph)
+- Improved context condensation with environment details, accurate token counts, and lazy evaluation for better performance (PR #10920 by @hannesrudolph)
+- Move condense prompt editor to Context Management tab for better discoverability and organization (PR #10909 by @hannesrudolph)
+- Update Z.AI models with new variants and pricing (#10859 by @ErdemGKSL, PR #10860 by @ErdemGKSL)
+- Add pnpm install:vsix:nightly command for easier nightly build installation (PR #10912 by @hannesrudolph)
+- Fix: Convert orphaned tool_results to text blocks after condensing to prevent API errors (PR #10927 by @daniel-lxs)
+- Fix: Auto-migrate v1 condensing prompt and handle invalid providers on import (PR #10931 by @hannesrudolph)
+- Fix: Use json-stream-stringify for pretty-printing MCP config files to prevent memory issues with large configs (#9862 by @Michaelzag, PR #9864 by @Michaelzag)
+- Fix: Correct Gemini 3 pricing for Flash and Pro models (#10432 by @rossdonald, PR #10487 by @roomote)
+- Fix: Skip thoughtSignature blocks during markdown export for cleaner output (#10199 by @rossdonald, PR #10932 by @rossdonald)
+- Fix: Duplicate model display for OpenAI Codex provider (PR #10930 by @roomote)
+- Remove diffEnabled and fuzzyMatchThreshold settings as they are no longer needed (#10648 by @hannesrudolph, PR #10298 by @hannesrudolph)
+- Remove MULTI_FILE_APPLY_DIFF experiment (PR #10925 by @hannesrudolph)
+- Remove POWER_STEERING experimental feature (PR #10926 by @hannesrudolph)
+- Remove legacy XML tool calling code (getToolDescription) for cleaner codebase (PR #10929 by @hannesrudolph)
+
 ## [3.42.0] - 2026-01-22
 
 ![3.42.0 Release - ChatGPT Usage Tracking](/releases/3.42.0-release.png)

apps/cli/README.md

@@ -71,7 +71,7 @@ By default, the CLI prompts for approval before executing actions:
 ```bash
 export OPENROUTER_API_KEY=sk-or-v1-...
 
-roo ~/Documents/my-project -P "What is this project?"
+roo "What is this project?"  -w ~/Documents/my-project
 ```
 
 You can also run without a prompt and enter it interactively in TUI mode:
@@ -92,7 +92,7 @@ In interactive mode:
 For automation and scripts, use `-y` to auto-approve all actions:
 
 ```bash
-roo ~/Documents/my-project -y -P "Refactor the utils.ts file"
+roo "Refactor the utils.ts file" -y -w ~/Documents/my-project
 ```
 
 In non-interactive mode:
@@ -149,8 +149,8 @@ Tokens are valid for 90 days. The CLI will prompt you to re-authenticate when yo
 
 | Option                            | Description                                                                             | Default                       |
 | --------------------------------- | --------------------------------------------------------------------------------------- | ----------------------------- |
-| `[workspace]`                     | Workspace path to operate in (positional argument)                                      | Current directory             |
-| `-P, --prompt <prompt>`           | The prompt/task to execute (optional in TUI mode)                                       | None                          |
+| `[prompt]`                        | Your prompt (positional argument, optional)                                             | None                          |
+| `-w, --workspace <path>`          | Workspace path to operate in                                                            | Current directory             |
 | `-e, --extension <path>`          | Path to the extension bundle directory                                                  | Auto-detected                 |
 | `-d, --debug`                     | Enable debug output (includes detailed debug information, prompts, paths, etc)          | `false`                       |
 | `-x, --exit-on-complete`          | Exit the process when task completes (useful for testing)                               | `false`                       |
@@ -249,7 +249,7 @@ pnpm lint
 To create a new release, execute the /cli-release slash command:
 
 ```bash
-roo ~/Documents/Roo-Code -P "/cli-release" -y
+roo "/cli-release"  -w ~/Documents/Roo-Code -y
 ```
 
 The workflow will:

package.json

@@ -20,6 +20,7 @@
 		"vsix:nightly": "turbo vsix:nightly --log-order grouped --output-logs new-only",
 		"clean": "turbo clean --log-order grouped --output-logs new-only && rimraf dist out bin .vite-port .turbo",
 		"install:vsix": "pnpm install --frozen-lockfile && pnpm clean && pnpm vsix && node scripts/install-vsix.js",
+		"install:vsix:nightly": "pnpm install --frozen-lockfile && pnpm clean && pnpm vsix:nightly && node scripts/install-vsix.js --nightly",
 		"changeset:version": "cp CHANGELOG.md src/CHANGELOG.md && changeset version && cp -vf src/CHANGELOG.md .",
 		"knip": "knip --include files",
 		"evals": "dotenvx run -f packages/evals/.env.development packages/evals/.env.local -- docker compose -f packages/evals/docker-compose.yml --profile server --profile runner up --build --scale runner=0",

packages/core/src/worktree/types.ts

@@ -9,8 +9,6 @@ export type {
 	WorktreeResult,
 	BranchInfo,
 	CreateWorktreeOptions,
-	MergeWorktreeOptions,
-	MergeWorktreeResult,
 	WorktreeIncludeStatus,
 	WorktreeListResponse,
 	WorktreeDefaultsResponse,

packages/core/src/worktree/worktree-service.ts

@@ -9,14 +9,7 @@ import { exec, execFile } from "child_process"
 import * as path from "path"
 import { promisify } from "util"
 
-import type {
-	BranchInfo,
-	CreateWorktreeOptions,
-	MergeWorktreeOptions,
-	MergeWorktreeResult,
-	Worktree,
-	WorktreeResult,
-} from "./types.js"
+import type { BranchInfo, CreateWorktreeOptions, Worktree, WorktreeResult } from "./types.js"
 
 const execAsync = promisify(exec)
 const execFileAsync = promisify(execFile)
@@ -233,128 +226,6 @@ export class WorktreeService {
 		}
 	}
 
-	/**
-	 * Merge a worktree branch into target branch
-	 */
-	async mergeWorktree(cwd: string, options: MergeWorktreeOptions): Promise<MergeWorktreeResult> {
-		const { worktreePath, targetBranch, deleteAfterMerge } = options
-
-		try {
-			// Get the worktree info to find its branch
-			const worktrees = await this.listWorktrees(cwd)
-			const worktree = worktrees.find((wt) => this.normalizePath(wt.path) === this.normalizePath(worktreePath))
-
-			if (!worktree) {
-				return {
-					success: false,
-					message: "Worktree not found",
-					hasConflicts: false,
-					conflictingFiles: [],
-				}
-			}
-
-			const sourceBranch = worktree.branch
-			if (!sourceBranch) {
-				return {
-					success: false,
-					message: "Worktree has detached HEAD - cannot merge",
-					hasConflicts: false,
-					conflictingFiles: [],
-				}
-			}
-
-			// Find the worktree that has the target branch checked out
-			const targetWorktree = worktrees.find((wt) => wt.branch === targetBranch)
-			const mergeCwd = targetWorktree ? targetWorktree.path : cwd
-
-			// Check for uncommitted changes in source worktree
-			try {
-				const { stdout: statusOutput } = await execAsync("git status --porcelain", { cwd: worktreePath })
-				if (statusOutput.trim()) {
-					return {
-						success: false,
-						message: "Source worktree has uncommitted changes. Please commit or stash them first.",
-						hasConflicts: false,
-						conflictingFiles: [],
-						sourceBranch,
-						targetBranch,
-					}
-				}
-			} catch {
-				// Continue if status check fails
-			}
-
-			// Ensure we're on the target branch
-			await execFileAsync("git", ["checkout", targetBranch], { cwd: mergeCwd })
-
-			// Attempt the merge
-			try {
-				await execFileAsync("git", ["merge", sourceBranch, "--no-edit"], { cwd: mergeCwd })
-
-				// Merge succeeded
-				if (deleteAfterMerge) {
-					await this.deleteWorktree(cwd, worktreePath, false)
-				}
-
-				return {
-					success: true,
-					message: `Successfully merged ${sourceBranch} into ${targetBranch}`,
-					hasConflicts: false,
-					conflictingFiles: [],
-					sourceBranch,
-					targetBranch,
-				}
-			} catch (mergeError) {
-				// Check for merge conflicts
-				try {
-					const { stdout: conflictOutput } = await execAsync("git diff --name-only --diff-filter=U", {
-						cwd: mergeCwd,
-					})
-					const conflictingFiles = conflictOutput.trim().split("\n").filter(Boolean)
-
-					// Abort the merge to leave repo in clean state
-					await execAsync("git merge --abort", { cwd: mergeCwd })
-
-					return {
-						success: false,
-						message: `Merge conflicts detected in ${conflictingFiles.length} file(s)`,
-						hasConflicts: true,
-						conflictingFiles,
-						sourceBranch,
-						targetBranch,
-					}
-				} catch {
-					// If we can't get conflicts, just report the error
-					const errorMessage = mergeError instanceof Error ? mergeError.message : String(mergeError)
-
-					// Try to abort any in-progress merge
-					try {
-						await execAsync("git merge --abort", { cwd: mergeCwd })
-					} catch {
-						// Ignore abort errors
-					}
-
-					return {
-						success: false,
-						message: `Merge failed: ${errorMessage}`,
-						hasConflicts: false,
-						conflictingFiles: [],
-						sourceBranch,
-						targetBranch,
-					}
-				}
-			}
-		} catch (error) {
-			const errorMessage = error instanceof Error ? error.message : String(error)
-			return {
-				success: false,
-				message: `Merge failed: ${errorMessage}`,
-				hasConflicts: false,
-				conflictingFiles: [],
-			}
-		}
-	}
-
 	/**
 	 * Checkout a branch in the current worktree
 	 */

packages/types/src/cloud.ts

@@ -94,7 +94,6 @@ export type OrganizationAllowList = z.infer<typeof organizationAllowListSchema>
 export const organizationDefaultSettingsSchema = globalSettingsSchema
 	.pick({
 		enableCheckpoints: true,
-		fuzzyMatchThreshold: true,
 		maxOpenTabsContext: true,
 		maxReadFileLine: true,
 		maxWorkspaceFiles: true,

packages/types/src/experiment.ts

@@ -8,7 +8,6 @@ import type { Keys, Equals, AssertEqual } from "./type-fu.js"
 
 export const experimentIds = [
 	"powerSteering",
-	"multiFileApplyDiff",
 	"preventFocusDisruption",
 	"imageGeneration",
 	"runSlashCommand",
@@ -26,7 +25,6 @@ export type ExperimentId = z.infer<typeof experimentIdsSchema>
 
 export const experimentsSchema = z.object({
 	powerSteering: z.boolean().optional(),
-	multiFileApplyDiff: z.boolean().optional(),
 	preventFocusDisruption: z.boolean().optional(),
 	imageGeneration: z.boolean().optional(),
 	runSlashCommand: z.boolean().optional(),

packages/types/src/global-settings.ts

@@ -162,8 +162,6 @@ export const globalSettingsSchema = z.object({
 	diagnosticsEnabled: z.boolean().optional(),
 
 	rateLimitSeconds: z.number().optional(),
-	diffEnabled: z.boolean().optional(),
-	fuzzyMatchThreshold: z.number().optional(),
 	experiments: experimentsSchema.optional(),
 
 	codebaseIndexModels: codebaseIndexModelsSchema.optional(),
@@ -349,9 +347,6 @@ export const EVALS_SETTINGS: RooCodeSettings = {
 
 	diagnosticsEnabled: true,
 
-	diffEnabled: true,
-	fuzzyMatchThreshold: 1,
-
 	enableCheckpoints: false,
 
 	rateLimitSeconds: 0,

packages/types/src/provider-settings.ts

@@ -168,9 +168,7 @@ export type ProviderSettingsEntry = z.infer<typeof providerSettingsEntrySchema>
 
 const baseProviderSettingsSchema = z.object({
 	includeMaxTokens: z.boolean().optional(),
-	diffEnabled: z.boolean().optional(),
 	todoListEnabled: z.boolean().optional(),
-	fuzzyMatchThreshold: z.number().optional(),
 	modelTemperature: z.number().nullish(),
 	rateLimitSeconds: z.number().optional(),
 	consecutiveMistakeLimit: z.number().min(0).optional(),

packages/types/src/providers/gemini.ts

@@ -18,16 +18,19 @@ export const geminiModels = {
 		defaultTemperature: 1,
 		inputPrice: 4.0,
 		outputPrice: 18.0,
+		cacheReadsPrice: 0.4,
 		tiers: [
 			{
 				contextWindow: 200_000,
 				inputPrice: 2.0,
 				outputPrice: 12.0,
+				cacheReadsPrice: 0.2,
 			},
 			{
 				contextWindow: Infinity,
 				inputPrice: 4.0,
 				outputPrice: 18.0,
+				cacheReadsPrice: 0.4,
 			},
 		],
 	},
@@ -41,10 +44,9 @@ export const geminiModels = {
 
 		supportsTemperature: true,
 		defaultTemperature: 1,
-		inputPrice: 0.3,
-		outputPrice: 2.5,
-		cacheReadsPrice: 0.075,
-		cacheWritesPrice: 1.0,
+		inputPrice: 0.5,
+		outputPrice: 3.0,
+		cacheReadsPrice: 0.05,
 	},
 	// 2.5 Pro models
 	"gemini-2.5-pro": {