chore: resolve merge conflicts with main

- Resolved conflict in src/core/prompts/system.ts to keep MCP section removal
- Resolved conflict in src/core/prompts/__tests__/add-custom-instructions.spec.ts to remove MCP server creation test

Author: roomote

CHANGELOG.md

@@ -1,5 +1,49 @@
 # 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)
+
+- Added UI to track your ChatGPT usage limits in the OpenAI Codex provider (PR #10813 by @hannesrudolph)
+- Removed deprecated Claude Code provider (PR #10883 by @daniel-lxs)
+- Streamlined codebase by removing legacy XML tool calling functionality (#10848 by @hannesrudolph, PR #10841 by @hannesrudolph)
+- Standardize model selectors across all providers: Improved consistency of model selection UI (#10650 by @hannesrudolph, PR #10294 by @hannesrudolph)
+- Enable prompt caching for Cerebras zai-glm-4.7 model (#10601 by @jahanson, PR #10670 by @app/roomote)
+- Add Kimi K2 thinking model to VertexAI provider (#9268 by @diwakar-s-maurya, PR #9269 by @app/roomote)
+- Warn users when too many MCP tools are enabled (PR #10772 by @app/roomote)
+- Migrate context condensing prompt to customSupportPrompts (PR #10881 by @hannesrudolph)
+- Unify export path logic and default to Downloads folder (PR #10882 by @hannesrudolph)
+- Performance improvements for webview state synchronization (PR #10842 by @hannesrudolph)
+- Fix: Handle mode selector empty state on workspace switch (#10660 by @hannesrudolph, PR #9674 by @app/roomote)
+- Fix: Resolve race condition in context condensing prompt input (PR #10876 by @hannesrudolph)
+- Fix: Prevent double emission of text/reasoning in OpenAI native and codex handlers (PR #10888 by @hannesrudolph)
+- Fix: Prevent task abortion when resuming via IPC/bridge (PR #10892 by @cte)
+- Fix: Enforce file restrictions for all editing tools (PR #10896 by @app/roomote)
+- Fix: Remove custom condensing model option (PR #10901 by @hannesrudolph)
+- Unify user content tags to <user_message> for consistent prompt formatting (#10658 by @hannesrudolph, PR #10723 by @app/roomote)
+- Clarify linked SKILL.md file handling in prompts (PR #10907 by @hannesrudolph)
+- Fix: Padding on Roo Code Cloud teaser (PR #10889 by @app/roomote)
+
 ## [3.41.3] - 2026-01-18
 
 - Fix: Thinking block word-breaking to prevent horizontal scroll in the chat UI (PR #10806 by @roomote)

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:

apps/web-roo-code/src/components/slack/slack-thread-demo.tsx

@@ -181,15 +181,15 @@ export function SlackThreadDemo({ className }: SlackThreadDemoProps): JSX.Elemen
 				avatarClassName: "bg-[#2B2D31] text-[#F8F8F9] ring-1 ring-white/10",
 				kind: "human",
 				body: (
-					<div className="space-x-2">
-						<FakeLink className="no-underline hover:text-violet-200">@Roomote</FakeLink>
-						<span>let&apos;s create the plan to deliver this</span>
-					</div>
+					<span>
+						<FakeLink className="no-underline hover:text-violet-200">@Roomote</FakeLink> let&apos;s create
+						the plan to deliver this
+					</span>
 				),
 			},
 			{
 				id: "m5",
-				author: "Roomote (Roo Code)",
+				author: "Roomote",
 				timeLabel: "Monday at 3:09 PM",
 				avatarText: "R",
 				avatarClassName: "bg-violet-500/20 text-violet-200 ring-1 ring-violet-500/30",
@@ -215,7 +215,7 @@ export function SlackThreadDemo({ className }: SlackThreadDemoProps): JSX.Elemen
 			},
 			{
 				id: "m6",
-				author: "Roomote (Roo Code)",
+				author: "Roomote",
 				timeLabel: "Monday at 3:10 PM",
 				avatarText: "R",
 				avatarClassName: "bg-violet-500/20 text-violet-200 ring-1 ring-violet-500/30",
@@ -229,7 +229,7 @@ export function SlackThreadDemo({ className }: SlackThreadDemoProps): JSX.Elemen
 			},
 			{
 				id: "m7",
-				author: "Roomote (Roo Code)",
+				author: "Roomote",
 				timeLabel: "Monday at 3:12 PM",
 				avatarText: "R",
 				avatarClassName: "bg-violet-500/20 text-violet-200 ring-1 ring-violet-500/30",
@@ -260,7 +260,7 @@ export function SlackThreadDemo({ className }: SlackThreadDemoProps): JSX.Elemen
 			},
 			{
 				id: "m8",
-				author: "Roomote (Roo Code)",
+				author: "Roomote",
 				timeLabel: "Monday at 3:16 PM",
 				avatarText: "R",
 				avatarClassName: "bg-violet-500/20 text-violet-200 ring-1 ring-violet-500/30",
@@ -311,14 +311,14 @@ export function SlackThreadDemo({ className }: SlackThreadDemoProps): JSX.Elemen
 				kind: "human",
 				body: (
 					<div className="space-x-2">
-						<FakeLink className="no-underline hover:text-violet-200">@Roomote (Roo Code)</FakeLink>
+						<FakeLink className="no-underline hover:text-violet-200">@Roomote</FakeLink>
 						<span>this looks great, let&apos;s use Coderoo to build this</span>
 					</div>
 				),
 			},
 			{
 				id: "m10",
-				author: "Roomote (Roo Code)",
+				author: "Roomote",
 				timeLabel: "Monday at 3:23 PM",
 				avatarText: "R",
 				avatarClassName: "bg-violet-500/20 text-violet-200 ring-1 ring-violet-500/30",

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/__tests__/worktree-include.spec.ts

@@ -265,30 +265,28 @@ describe("WorktreeIncludeService", () => {
 			expect(result).toContain("node_modules")
 		})
 
-		it("should call progress callback with size-based progress", async () => {
+		it("should call progress callback with bytesCopied progress", async () => {
 			// Set up files to copy
 			await fs.writeFile(path.join(sourceDir, ".worktreeinclude"), "node_modules\n.env.local")
 			await fs.writeFile(path.join(sourceDir, ".gitignore"), "node_modules\n.env.local")
 			await fs.mkdir(path.join(sourceDir, "node_modules"), { recursive: true })
 			await fs.writeFile(path.join(sourceDir, "node_modules", "test.txt"), "test")
 			await fs.writeFile(path.join(sourceDir, ".env.local"), "LOCAL_VAR=value")
 
-			const progressCalls: Array<{ bytesCopied: number; totalBytes: number; itemName: string }> = []
-			const onProgress = vi.fn((progress: { bytesCopied: number; totalBytes: number; itemName: string }) => {
+			const progressCalls: Array<{ bytesCopied: number; itemName: string }> = []
+			const onProgress = vi.fn((progress: { bytesCopied: number; itemName: string }) => {
 				progressCalls.push({ ...progress })
 			})
 
 			await service.copyWorktreeIncludeFiles(sourceDir, targetDir, onProgress)
 
-			// Should be called multiple times (initial + after each copy + during polling)
+			// Should be called multiple times (initial + after each copy)
 			expect(onProgress).toHaveBeenCalled()
 
-			// All calls should have totalBytes > 0 (since we have files)
-			expect(progressCalls.every((p) => p.totalBytes > 0)).toBe(true)
-
-			// Final call should have bytesCopied === totalBytes (complete)
+			// bytesCopied should increase over time
+			expect(progressCalls.length).toBeGreaterThan(0)
 			const finalCall = progressCalls[progressCalls.length - 1]
-			expect(finalCall?.bytesCopied).toBe(finalCall?.totalBytes)
+			expect(finalCall?.bytesCopied).toBeGreaterThan(0)
 
 			// Each call should have an item name
 			expect(progressCalls.every((p) => typeof p.itemName === "string")).toBe(true)

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-include.ts

@@ -15,13 +15,12 @@ import ignore, { type Ignore } from "ignore"
 import type { WorktreeIncludeStatus } from "./types.js"
 
 /**
- * Progress info for size-based copy tracking.
+ * Progress info for copy tracking.
+ * Shows activity without trying to predict total size (which is inaccurate).
  */
 export interface CopyProgress {
 	/** Current bytes copied */
 	bytesCopied: number
-	/** Total bytes to copy */
-	totalBytes: number
 	/** Name of current item being copied */
 	itemName: string
 }
@@ -164,61 +163,50 @@ export class WorktreeIncludeService {
 			return []
 		}
 
-		// Calculate total size of all items to copy (for accurate progress)
-		const itemSizes = await Promise.all(
-			itemsToCopy.map(async (item) => {
-				const sourcePath = path.join(sourceDir, item)
-				const size = await this.getPathSize(sourcePath)
-				return { item, size }
-			}),
-		)
-
-		const totalBytes = itemSizes.reduce((sum, { size }) => sum + size, 0)
 		let bytesCopied = 0
 
 		// Report initial progress
-		if (onProgress && totalBytes > 0) {
-			onProgress({ bytesCopied: 0, totalBytes, itemName: itemsToCopy[0]! })
+		if (onProgress && itemsToCopy.length > 0) {
+			onProgress({ bytesCopied: 0, itemName: itemsToCopy[0]! })
 		}
 
-		// Copy the items with size-based progress tracking
+		// Copy the items with progress tracking (no total size calculation)
 		const copiedItems: string[] = []
-		for (const { item, size } of itemSizes) {
+		for (const item of itemsToCopy) {
 			const sourcePath = path.join(sourceDir, item)
 			const targetPath = path.join(targetDir, item)
 
 			try {
 				const stats = await fs.stat(sourcePath)
 
 				if (stats.isDirectory()) {
-					// Use native cp for directories with progress polling
-					await this.copyDirectoryWithProgress(
+					// Copy directory with progress tracking
+					bytesCopied = await this.copyDirectoryWithProgress(
 						sourcePath,
 						targetPath,
 						item,
 						bytesCopied,
-						totalBytes,
 						onProgress,
 					)
 				} else {
 					// Report progress before copying
-					onProgress?.({ bytesCopied, totalBytes, itemName: item })
+					onProgress?.({ bytesCopied, itemName: item })
 
 					// Ensure parent directory exists
 					await fs.mkdir(path.dirname(targetPath), { recursive: true })
 					await fs.copyFile(sourcePath, targetPath)
+
+					// Update bytes copied
+					bytesCopied += this.getSizeOnDisk(stats)
 				}
 
-				bytesCopied += size
 				copiedItems.push(item)
 
 				// Report progress after copying
-				onProgress?.({ bytesCopied, totalBytes, itemName: item })
+				onProgress?.({ bytesCopied, itemName: item })
 			} catch (error) {
 				// Log but don't fail on individual copy errors
 				console.error(`Failed to copy ${item}:`, error)
-				// Still count the size as "processed" to avoid progress getting stuck
-				bytesCopied += size
 			}
 		}
 
@@ -302,22 +290,21 @@ export class WorktreeIncludeService {
 	}
 
 	/**
-	 * Copy directory with progress polling.
+	 * Copy directory with progress polling using native cp command.
 	 * Starts native copy and polls target directory size to report progress.
+	 * Returns the updated bytesCopied count.
 	 */
 	private async copyDirectoryWithProgress(
 		source: string,
 		target: string,
 		itemName: string,
 		bytesCopiedBefore: number,
-		totalBytes: number,
 		onProgress?: CopyProgressCallback,
-	): Promise<void> {
+	): Promise<number> {
 		// Ensure parent directory exists
 		await fs.mkdir(path.dirname(target), { recursive: true })
 
 		const isWindows = process.platform === "win32"
-		const expectedSize = await this.getPathSize(source)
 
 		// Start the copy process
 		const copyPromise = new Promise<void>((resolve, reject) => {
@@ -361,8 +348,7 @@ export class WorktreeIncludeService {
 				const totalCopied = bytesCopiedBefore + currentSize
 
 				onProgress?.({
-					bytesCopied: Math.min(totalCopied, bytesCopiedBefore + expectedSize),
-					totalBytes,
+					bytesCopied: totalCopied,
 					itemName,
 				})
 
@@ -380,6 +366,10 @@ export class WorktreeIncludeService {
 			// Wait for final poll iteration to complete
 			await pollPromise.catch(() => {})
 		}
+
+		// Get the final size of the copied directory
+		const finalSize = await this.getPathSize(target)
+		return bytesCopiedBefore + finalSize
 	}
 
 	/**