Refactor reasoning effort option and checkpoint handling

• Replace "o3MiniReasoningEffort" with "reasoningEffort" in API providers
• Remove deprecated configuration properties from package.json
• Guard checkpoint tracker initialization and saving using the enableCheckpoints flag

.changeset/bright-grapes-suffer.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix minor visual issues with auto-approve menu

.changeset/brown-dots-sip.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-convert condense command to use grpc

.changeset/cyan-donuts-sparkle.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-downloadMcp protobus migration

.changeset/eight-bats-decide.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+refreshRequestyModels protobus migration

.changeset/fuzzy-ducks-flow.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add Fireworks API Provider

.changeset/hip-buttons-smile.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Remove vite files and make enable all the first item

.changeset/nice-baboons-suffer.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Adds switch to enabler/disable telemtry categories

.changeset/nice-pears-hope.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-toggleFavoriteModel protobus migration

.changeset/nine-spiders-kneel.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Finishing the migration of Vscode Advanced settings to Settings Webview

.changeset/odd-dots-change.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add detailed configuration options for LiteLLM provider

.changeset/rich-comics-work.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-adding activation events so cline is activated when vs code opens

.changeset/silly-zebras-applaud.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Releasing memory after every diff edit to help fix grey screen webview crashes

.changeset/tasty-parrots-applaud.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-prevent IME composition Enter from auto‑sending edited message

.clinerules/cline-overview.md

@@ -209,7 +209,7 @@ class Task {
         switch (chunk.type) {
           case "text":
             // Parse into content blocks
-            this.assistantMessageContent = parseAssistantMessageV2(chunk.text)
+            this.assistantMessageContent = parseAssistantMessage(chunk.text)
             // Present blocks to user
             await this.presentAssistantMessage()
             break

.vscode/launch.json

@@ -16,28 +16,6 @@
 				"IS_DEV": "true",
 				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}"
 			}
-		},
-		{
-			"name": "Run Extension (Fresh Install Mode)",
-			"type": "extensionHost",
-			"request": "launch",
-			"runtimeExecutable": "${execPath}",
-			"args": [
-				"--profile-temp",
-				"--sync",
-				"off",
-				"--disable-extensions",
-				"--extensionDevelopmentPath=${workspaceFolder}",
-				"${workspaceFolder}"
-			],
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"preLaunchTask": "clean-sandbox",
-			"internalConsoleOptions": "openOnSessionStart",
-			"postDebugTask": "stop",
-			"env": {
-				"IS_DEV": "true",
-				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}"
-			}
 		}
 	]
 }

.vscode/tasks.json

@@ -185,12 +185,6 @@
 			"label": "stop",
 			"command": "echo ${input:terminate}",
 			"type": "shell"
-		},
-		{
-			"label": "clean-sandbox",
-			"type": "shell",
-			"dependsOn": ["watch"],
-			"command": "rm -rf .vscode-dev"
 		}
 	],
 	"inputs": [

CHANGELOG.md

@@ -1,16 +1,5 @@
 # Changelog
 
-## [3.15.2]
-
-- Added details to auto approve menu and more sensible default controls
-- Add detailed configuration options for LiteLLM provider
-- Add webview telemetry for users who have opted in to telemetry
-- Update Gemini in OpenRouter/Cline providers to use implicit caching
-- Fix freezing issues during rendering of large streaming text
-- Fix grey screen webview crashes by releasing memory after every diff edit
-- Fix breaking out of diff auto-scroll
-- Fix IME composition Enter auto‑sending edited message
-
 ## [3.15.1]
 
 -   Fix bug where PowerShell commands weren't given enough time before giving up and showing an error

docs/more-info/telemetry.mdx

@@ -26,9 +26,9 @@ For complete transparency, you can inspect our [telemetry implementation](https:
 
 ### How to Opt Out
 
-Telemetry in Cline is entirely optional:
+Telemetry in Cline is entirely optional and requires your explicit consent:
 
--   When you update or install our VS Code extension, you'll see a message about our anonymous telemetry
+-   When you update or install our VS Code extension, you'll see a simple prompt: "Help Improve Cline" with Allow or Deny options
 -   You can change your preference anytime in settings
 
 Cline also respects VS Code's global telemetry settings. If you've disabled telemetry at the VS Code level, Cline's telemetry will automatically be disabled as well.

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.15.2",
+	"version": "3.15.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.15.2",
+			"version": "3.15.1",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.12.4",

package.json

@@ -2,7 +2,7 @@
 	"name": "claude-dev",
 	"displayName": "Cline",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "3.15.2",
+	"version": "3.15.1",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -40,8 +40,6 @@
 		"llama"
 	],
 	"activationEvents": [
-		"onLanguage",
-		"onStartupFinished",
 		"workspaceContains:evals.env"
 	],
 	"main": "./dist/extension.js",
@@ -236,43 +234,7 @@
 		},
 		"configuration": {
 			"title": "Cline",
-			"properties": {
-				"cline.enableCheckpoints": {
-					"type": "boolean",
-					"default": true,
-					"description": "Enables extension to save checkpoints of workspace throughout the task. Uses git under the hood which may not work well with large workspaces."
-				},
-				"cline.preferredLanguage": {
-					"type": "string",
-					"enum": [
-						"English",
-						"Arabic - العربية",
-						"Portuguese - Português (Brasil)",
-						"Czech - Čeština",
-						"French - Français",
-						"German - Deutsch",
-						"Hindi - हिन्दी",
-						"Hungarian - Magyar",
-						"Italian - Italiano",
-						"Japanese - 日本語",
-						"Korean - 한국어",
-						"Polish - Polski",
-						"Portuguese - Português (Portugal)",
-						"Russian - Русский",
-						"Simplified Chinese - 简体中文",
-						"Spanish - Español",
-						"Traditional Chinese - 繁體中文",
-						"Turkish - Türkçe"
-					],
-					"default": "English",
-					"description": "The language that Cline should use for communication."
-				},
-				"cline.mcpMarketplace.enabled": {
-					"type": "boolean",
-					"default": true,
-					"description": "Controls whether the MCP Marketplace is enabled."
-				}
-			}
+			"properties": {}
 		}
 	},
 	"scripts": {

proto/build-proto.js

@@ -29,7 +29,6 @@ const serviceNameMap = {
 	task: "cline.TaskService",
 	web: "cline.WebService",
 	models: "cline.ModelsService",
-	slash: "cline.SlashService",
 	// Add new services here - no other code changes needed!
 }
 const serviceDirs = Object.keys(serviceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src", "core", "controller", serviceKey))

proto/mcp.proto

@@ -10,7 +10,6 @@ service McpService {
   rpc toggleMcpServer(ToggleMcpServerRequest) returns (McpServers);
   rpc updateMcpTimeout(UpdateMcpTimeoutRequest) returns (McpServers);
   rpc addRemoteMcpServer(AddRemoteMcpServerRequest) returns (McpServers);
-  rpc downloadMcp(StringRequest) returns (Empty);
 }
 
 message ToggleMcpServerRequest {

proto/slash.proto

@@ -1,14 +0,0 @@
-syntax = "proto3";
-
-package cline;
-option java_package = "bot.cline.proto";
-option java_multiple_files = true;
-
-import "common.proto";
-
-// SlashService provides methods for managing slash
-service SlashService {
-  // Sends button click message
-  rpc reportBug(StringRequest) returns (Empty);
-  rpc condense(StringRequest) returns (Empty);
-}

proto/state.proto

@@ -6,7 +6,6 @@ import "common.proto";
 service StateService {
   rpc getLatestState(EmptyRequest) returns (State);
   rpc subscribeToState(EmptyRequest) returns (stream State);
-  rpc toggleFavoriteModel(StringRequest) returns (Empty);
 }
 
 message State {

src/api/index.ts

@@ -19,7 +19,6 @@ import { DoubaoHandler } from "./providers/doubao"
 import { VsCodeLmHandler } from "./providers/vscode-lm"
 import { ClineHandler } from "./providers/cline"
 import { LiteLlmHandler } from "./providers/litellm"
-import { FireworksHandler } from "./providers/fireworks"
 import { AskSageHandler } from "./providers/asksage"
 import { XAIHandler } from "./providers/xai"
 import { SambanovaHandler } from "./providers/sambanova"
@@ -59,8 +58,6 @@ export function buildApiHandler(configuration: ApiConfiguration): ApiHandler {
 			return new DeepSeekHandler(options)
 		case "requesty":
 			return new RequestyHandler(options)
-		case "fireworks":
-			return new FireworksHandler(options)
 		case "together":
 			return new TogetherHandler(options)
 		case "qwen":

src/api/providers/cline.ts

@@ -33,7 +33,7 @@ export class ClineHandler implements ApiHandler {
 			systemPrompt,
 			messages,
 			this.getModel(),
-			this.options.o3MiniReasoningEffort,
+			this.options.reasoningEffort,
 			this.options.thinkingBudgetTokens,
 			this.options.openRouterProviderSorting,
 		)

src/api/providers/fireworks.ts

@@ -1,94 +0,0 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import OpenAI from "openai"
-import { withRetry } from "../retry"
-import { ApiHandler } from ".."
-import {
-	ApiHandlerOptions,
-	DeepSeekModelId,
-	ModelInfo,
-	deepSeekDefaultModelId,
-	deepSeekModels,
-	openAiModelInfoSaneDefaults,
-} from "../../shared/api"
-import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
-
-export class FireworksHandler implements ApiHandler {
-	private options: ApiHandlerOptions
-	private client: OpenAI
-
-	constructor(options: ApiHandlerOptions) {
-		this.options = options
-		this.client = new OpenAI({
-			baseURL: "https://api.fireworks.ai/inference/v1",
-			apiKey: this.options.fireworksApiKey,
-		})
-	}
-
-	@withRetry()
-	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const modelId = this.options.fireworksModelId ?? ""
-
-		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
-			{ role: "system", content: systemPrompt },
-			...convertToOpenAiMessages(messages),
-		]
-
-		const stream = await this.client.chat.completions.create({
-			model: modelId,
-			...(this.options.fireworksModelMaxCompletionTokens
-				? { max_completion_tokens: this.options.fireworksModelMaxCompletionTokens }
-				: {}),
-			...(this.options.fireworksModelMaxTokens ? { max_tokens: this.options.fireworksModelMaxTokens } : {}),
-			messages: openAiMessages,
-			stream: true,
-			stream_options: { include_usage: true },
-			temperature: 0,
-		})
-
-		let reasoning: string | null = null
-		for await (const chunk of stream) {
-			const delta = chunk.choices[0]?.delta
-			if (reasoning || delta?.content?.includes("<think>")) {
-				reasoning = (reasoning || "") + (delta.content ?? "")
-			}
-
-			if (delta?.content && !reasoning) {
-				yield {
-					type: "text",
-					text: delta.content,
-				}
-			}
-
-			if (reasoning || ("reasoning_content" in delta && delta.reasoning_content)) {
-				yield {
-					type: "reasoning",
-					reasoning: delta.content || ((delta as any).reasoning_content as string | undefined) || "",
-				}
-				if (reasoning?.includes("</think>")) {
-					// Reset so the next chunk is regular content
-					reasoning = null
-				}
-			}
-
-			if (chunk.usage) {
-				yield {
-					type: "usage",
-					inputTokens: chunk.usage.prompt_tokens || 0, // (deepseek reports total input AND cache reads/writes, see context caching: https://api-docs.deepseek.com/guides/kv_cache) where the input tokens is the sum of the cache hits/misses, while anthropic reports them as separate tokens. This is important to know for 1) context management truncation algorithm, and 2) cost calculation (NOTE: we report both input and cache stats but for now set input price to 0 since all the cost calculation will be done using cache hits/misses)
-					outputTokens: chunk.usage.completion_tokens || 0,
-					// @ts-ignore-next-line
-					cacheReadTokens: chunk.usage.prompt_cache_hit_tokens || 0,
-					// @ts-ignore-next-line
-					cacheWriteTokens: chunk.usage.prompt_cache_miss_tokens || 0,
-				}
-			}
-		}
-	}
-
-	getModel(): { id: string; info: ModelInfo } {
-		return {
-			id: this.options.fireworksModelId ?? "",
-			info: openAiModelInfoSaneDefaults,
-		}
-	}
-}

src/api/providers/openai-native.ts

@@ -66,8 +66,9 @@ export class OpenAiNativeHandler implements ApiHandler {
 					messages: [{ role: "developer", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
 					stream: true,
 					stream_options: { include_usage: true },
-					reasoning_effort: (this.options.o3MiniReasoningEffort as ChatCompletionReasoningEffort) || "medium",
+					reasoning_effort: (this.options.reasoningEffort as ChatCompletionReasoningEffort) || "medium",
 				})
+
 				for await (const chunk of stream) {
 					const delta = chunk.choices[0]?.delta
 					if (delta?.content) {

src/api/providers/openai.ts

@@ -65,7 +65,7 @@ export class OpenAiHandler implements ApiHandler {
 		if (isReasoningModelFamily) {
 			openAiMessages = [{ role: "developer", content: systemPrompt }, ...convertToOpenAiMessages(messages)]
 			temperature = undefined // does not support temperature
-			reasoningEffort = (this.options.o3MiniReasoningEffort as ChatCompletionReasoningEffort) || "medium"
+			reasoningEffort = (this.options.reasoningEffort as ChatCompletionReasoningEffort) || "medium"
 		}
 
 		const stream = await this.client.chat.completions.create({

src/api/providers/openrouter.ts

@@ -35,7 +35,7 @@ export class OpenRouterHandler implements ApiHandler {
 			systemPrompt,
 			messages,
 			this.getModel(),
-			this.options.o3MiniReasoningEffort,
+			this.options.reasoningEffort,
 			this.options.thinkingBudgetTokens,
 			this.options.openRouterProviderSorting,
 		)

src/api/providers/requesty.ts

@@ -32,7 +32,7 @@ export class RequestyHandler implements ApiHandler {
 			...convertToOpenAiMessages(messages),
 		]
 
-		const reasoningEffort = this.options.o3MiniReasoningEffort || "medium"
+		const reasoningEffort = this.options.reasoningEffort || "medium"
 		const reasoning = { reasoning_effort: reasoningEffort }
 		const reasoningArgs = model.id.startsWith("openai/o") ? reasoning : {}
 

src/api/transform/openrouter-stream.ts

@@ -9,7 +9,7 @@ export async function createOpenRouterStream(
 	systemPrompt: string,
 	messages: Anthropic.Messages.MessageParam[],
 	model: { id: string; info: ModelInfo },
-	o3MiniReasoningEffort?: string,
+	reasoningEffort?: string,
 	thinkingBudgetTokens?: number,
 	openRouterProviderSorting?: string,
 ) {
@@ -75,6 +75,74 @@ export async function createOpenRouterStream(
 			break
 	}
 
+	// handles gemini caching logic
+	if (model.id.startsWith("google/") && model.info.supportsPromptCache) {
+		// gemini only uses the last breakpoint for caching, so the others will be ignored
+		openAiMessages[0] = {
+			role: "system",
+			content: [
+				{
+					type: "text",
+					text: systemPrompt,
+					// @ts-ignore-next-line
+					cache_control: { type: "ephemeral" },
+				},
+			],
+		}
+
+		// for safety, but this should always be the case
+		if (openAiMessages.length >= 2) {
+			const msg = openAiMessages[1]
+
+			if (msg) {
+				if (typeof msg.content === "string") {
+					msg.content = [{ type: "text", text: msg.content }]
+				}
+				if (Array.isArray(msg.content)) {
+					// NOTE: this is fine since env details will always be added at the end. but if it weren't there, and the user added a image_url type message, it would pop a text part before it and then move it after to the end.
+					let lastTextPart = msg.content.filter((part) => part.type === "text").pop()
+
+					if (!lastTextPart) {
+						lastTextPart = { type: "text", text: "..." }
+						msg.content.push(lastTextPart)
+					}
+					// @ts-ignore-next-line
+					lastTextPart["cache_control"] = { type: "ephemeral" }
+				}
+			}
+		}
+
+		// it doesn't make sense to alter breakpoints at all with the gemini cache implementation at this time
+		/*const GEMINI_CACHE_USER_MESSAGE_INTERVAL = 4 // add new breakpoint every 4 turns
+		const userMessages = openAiMessages.filter((msg) => msg.role === "user")
+
+		const userMessageCount = userMessages.length
+		const targetUserMessageNumber =
+			Math.floor(userMessageCount / GEMINI_CACHE_USER_MESSAGE_INTERVAL) * GEMINI_CACHE_USER_MESSAGE_INTERVAL
+
+		if (targetUserMessageNumber > 0) {
+			// otherwise dont need to add a breakpoint
+			const msg = userMessages[targetUserMessageNumber - 1]
+
+			if (msg) {
+				if (typeof msg.content === "string") {
+					msg.content = [{ type: "text", text: msg.content }]
+				}
+				if (Array.isArray(msg.content)) {
+					// NOTE: this is fine since env details will always be added at the end. but if it weren't there, and the user added a image_url type message, it would pop a text part before it and then move it after to the end.
+					let lastTextPart = msg.content.filter((part) => part.type === "text").pop()
+
+					if (!lastTextPart) {
+						lastTextPart = { type: "text", text: "..." }
+						msg.content.push(lastTextPart)
+					}
+					// @ts-ignore-next-line
+					lastTextPart["cache_control"] = { type: "ephemeral" }
+				}
+			}
+		}*/
+	}
+
 	// Not sure how openrouter defaults max tokens when no value is provided, but the anthropic api requires this value and since they offer both 4096 and 8192 variants, we should ensure 8192.
 	// (models usually default to max tokens allowed)
 	let maxTokens: number | undefined
@@ -144,7 +212,7 @@ export async function createOpenRouterStream(
 		stream_options: { include_usage: true },
 		transforms: shouldApplyMiddleOutTransform ? ["middle-out"] : undefined,
 		include_reasoning: true,
-		...(model.id.startsWith("openai/o") ? { reasoning_effort: o3MiniReasoningEffort || "medium" } : {}),
+		...(model.id.startsWith("openai/o") ? { reasoning_effort: reasoningEffort || "medium" } : {}),
 		...(reasoning ? { reasoning } : {}),
 		...(openRouterProviderSorting ? { provider: { sort: openRouterProviderSorting } } : {}),
 	})

src/core/assistant-message/index.ts

@@ -1,6 +1,6 @@
 export type AssistantMessageContent = TextContent | ToolUse
 
-export { parseAssistantMessageV1, parseAssistantMessageV2 } from "./parse-assistant-message"
+export { parseAssistantMessage } from "./parse-assistant-message"
 
 export interface TextContent {
 	type: "text"

src/core/assistant-message/parse-assistant-message.ts

@@ -1,24 +1,6 @@
-import { AssistantMessageContent, TextContent, ToolUse, ToolParamName, toolParamNames, toolUseNames, ToolUseName } from "." // Assuming types are defined in index.ts or a similar file
+import { AssistantMessageContent, TextContent, ToolUse, ToolParamName, toolParamNames, toolUseNames, ToolUseName } from "."
 
-/**
- * @description **Version 1**
- * Parses an assistant message string potentially containing mixed text and tool usage blocks
- * marked with XML-like tags into an array of structured content objects.
- *
- * This version iterates through the message character by character, building an accumulator string.
- * It maintains state to track whether it's currently parsing text, a tool use block, or a specific tool parameter.
- * It detects the start and end of tool uses and parameters by checking if the accumulator ends with
- * the corresponding opening or closing tags.
- * Special handling is included for `write_to_file` and `new_rule` tool uses to correctly parse
- * the `content` parameter, which might contain the closing tag itself, by looking for the *last*
- * occurrence of the closing tag.
- * If the input string ends mid-tag or mid-content, the last block (text or tool use) is marked as partial.
- *
- * @param assistantMessage The raw string output from the assistant.
- * @returns An array of `AssistantMessageContent` objects, which can be `TextContent` or `ToolUse`.
- *          Blocks that were not fully closed by the end of the input string will have their `partial` flag set to `true`.
- */
-export function parseAssistantMessageV1(assistantMessage: string): AssistantMessageContent[] {
+export function parseAssistantMessage(assistantMessage: string) {
 	const contentBlocks: AssistantMessageContent[] = []
 	let currentTextContent: TextContent | undefined = undefined
 	let currentTextContentStartIndex = 0
@@ -32,56 +14,46 @@ export function parseAssistantMessageV1(assistantMessage: string): AssistantMess
 		const char = assistantMessage[i]
 		accumulator += char
 
-		// --- State: Parsing a Tool Parameter ---
 		// there should not be a param without a tool use
 		if (currentToolUse && currentParamName) {
 			const currentParamValue = accumulator.slice(currentParamValueStartIndex)
 			const paramClosingTag = `</${currentParamName}>`
 			if (currentParamValue.endsWith(paramClosingTag)) {
-				// End of param value found
+				// end of param value
 				currentToolUse.params[currentParamName] = currentParamValue.slice(0, -paramClosingTag.length).trim()
-				currentParamName = undefined // Go back to parsing tool content or looking for next param
-				continue // Move to next character
+				currentParamName = undefined
+				continue
 			} else {
-				// Partial param value is accumulating
-				continue // Move to next character
+				// partial param value is accumulating
+				continue
 			}
 		}
 
-		// --- State: Parsing a Tool Use (but not a specific parameter) ---
 		// no currentParamName
+
 		if (currentToolUse) {
 			const currentToolValue = accumulator.slice(currentToolUseStartIndex)
 			const toolUseClosingTag = `</${currentToolUse.name}>`
-
 			if (currentToolValue.endsWith(toolUseClosingTag)) {
-				// End of a tool use found
+				// end of a tool use
 				currentToolUse.partial = false
 				contentBlocks.push(currentToolUse)
-				currentToolUse = undefined // Go back to parsing text or looking for next tool
-				// Reset text start index in case text follows immediately
-				currentTextContentStartIndex = i + 1
-				continue // Move to next character
+				currentToolUse = undefined
+				continue
 			} else {
-				// Check if starting a new parameter within the current tool use
 				const possibleParamOpeningTags = toolParamNames.map((name) => `<${name}>`)
-				let foundParamStart = false
 				for (const paramOpeningTag of possibleParamOpeningTags) {
 					if (accumulator.endsWith(paramOpeningTag)) {
-						// Start of a new parameter found
+						// start of a new parameter
 						currentParamName = paramOpeningTag.slice(1, -1) as ToolParamName
 						currentParamValueStartIndex = accumulator.length
-						foundParamStart = true
 						break
 					}
 				}
-				if (foundParamStart) {
-					continue // Move to next character
-				}
 
-				// Special case for write_to_file/new_rule content param allowing nested tags
-				// Check if a </content> tag appears, potentially indicating the end of the content param
-				// even if the main tool closing tag hasn't been seen yet.
+				// there's no current param, and not starting a new param
+
+				// special case for write_to_file where file contents could contain the closing tag, in which case the param would have closed and we end up with the rest of the file contents here. To work around this, we get the string between the starting content tag and the LAST content tag.
 				const contentParamName: ToolParamName = "content"
 				if (
 					(currentToolUse.name === "write_to_file" || currentToolUse.name === "new_rule") &&
@@ -91,385 +63,73 @@ export function parseAssistantMessageV1(assistantMessage: string): AssistantMess
 					const contentStartTag = `<${contentParamName}>`
 					const contentEndTag = `</${contentParamName}>`
 					const contentStartIndex = toolContent.indexOf(contentStartTag) + contentStartTag.length
-					// Use lastIndexOf to handle cases where </content> might appear within the content itself
 					const contentEndIndex = toolContent.lastIndexOf(contentEndTag)
-
-					// Ensure we found valid start/end tags and end is after start
-					if (
-						contentStartIndex !== -1 &&
-						contentEndIndex !== -1 &&
-						contentEndIndex > contentStartIndex - contentStartTag.length // Ensure end tag is after start tag begins
-					) {
-						// Check if this content param was already being parsed. If so, update it.
-						// If not, and we just found the closing tag, assign it.
-						// This handles cases where the </content> detection might fire before
-						// the <content> tag detection logic, or if the content is very short.
-						if (currentParamName === contentParamName) {
-							// Already parsing content, now we found the end tag
-							currentToolUse.params[contentParamName] = toolContent.slice(contentStartIndex, contentEndIndex).trim()
-							currentParamName = undefined // Finished with this param
-						} else if (currentParamName === undefined) {
-							// Not parsing a param, but found </content>. Assume it closes the content block.
-							currentToolUse.params[contentParamName] = toolContent.slice(contentStartIndex, contentEndIndex).trim()
-							// We stay in the "parsing tool use" state, looking for more params or the tool end tag.
-						}
+					if (contentStartIndex !== -1 && contentEndIndex !== -1 && contentEndIndex > contentStartIndex) {
+						currentToolUse.params[contentParamName] = toolContent.slice(contentStartIndex, contentEndIndex).trim()
 					}
 				}
 
-				// If none of the above, partial tool value is accumulating
-				continue // Move to next character
+				// partial tool value is accumulating
+				continue
 			}
 		}
 
-		// --- State: Parsing Text (or looking for start of a tool use) ---
 		// no currentToolUse
+
 		let didStartToolUse = false
 		const possibleToolUseOpeningTags = toolUseNames.map((name) => `<${name}>`)
 		for (const toolUseOpeningTag of possibleToolUseOpeningTags) {
 			if (accumulator.endsWith(toolUseOpeningTag)) {
-				// Start of a new tool use found
-				const toolName = toolUseOpeningTag.slice(1, -1) as ToolUseName
+				// start of a new tool use
 				currentToolUse = {
 					type: "tool_use",
-					name: toolName,
+					name: toolUseOpeningTag.slice(1, -1) as ToolUseName,
 					params: {},
 					partial: true,
 				}
 				currentToolUseStartIndex = accumulator.length
-
-				// This also indicates the end of the current text content block (if any)
+				// this also indicates the end of the current text content
 				if (currentTextContent) {
 					currentTextContent.partial = false
-					// Extract text content, removing the part that formed the tool opening tag
-					const textEndIndex = accumulator.length - toolUseOpeningTag.length
-					currentTextContent.content = accumulator.slice(currentTextContentStartIndex, textEndIndex).trim()
-					// Only add if there's actual content
-					if (currentTextContent.content.length > 0) {
-						contentBlocks.push(currentTextContent)
-					}
+					// remove the partially accumulated tool use tag from the end of text (<tool)
+					currentTextContent.content = currentTextContent.content
+						.slice(0, -toolUseOpeningTag.slice(0, -1).length)
+						.trim()
+					contentBlocks.push(currentTextContent)
 					currentTextContent = undefined
-				} else {
-					// Check if there was text before this tool use started
-					const textEndIndex = accumulator.length - toolUseOpeningTag.length
-					const potentialText = accumulator.slice(currentTextContentStartIndex, textEndIndex).trim()
-					if (potentialText.length > 0) {
-						contentBlocks.push({
-							type: "text",
-							content: potentialText,
-							partial: false, // Ended because tool use started
-						})
-					}
 				}
 
 				didStartToolUse = true
-				break // Found tool start, stop checking for others
+				break
 			}
 		}
 
 		if (!didStartToolUse) {
-			// No tool use started, so it must be text content accumulating
-			// (or continuing after a closed tool use)
+			// no tool use, so it must be text either at the beginning or between tools
 			if (currentTextContent === undefined) {
-				// Start of a new text block
-				currentTextContentStartIndex = i - (accumulator.length - currentTextContentStartIndex - 1) // Adjust start index based on how much we've accumulated since the last block ended or the beginning
-				// If accumulator starts from 0, start index is i
-				if (contentBlocks.length === 0 && currentToolUse === undefined) {
-					currentTextContentStartIndex = accumulator.length - 1 // i
-				} else {
-					// Re-calculate based on the actual start of the current text segment
-					// Find the end of the last block
-					let lastBlockEndIndex = 0
-					if (contentBlocks.length > 0) {
-						const lastBlock = contentBlocks[contentBlocks.length - 1]
-						// Approximation: find where the accumulator matches the end of the message string representation of the last block. This is complex.
-						// Simpler: Assume text starts right after the last block ended implicitly at index i.
-						lastBlockEndIndex = i // Where the loop *was* when the last block finished processing
-						// Need a more robust way to track the end index of the *raw string* corresponding to the last block.
-						// Let's stick to the accumulator slice approach for simplicity in this version.
-						// The start index should be where the current *unmatched* text began.
-						let lastProcessedIndex = -1
-						if (contentBlocks.length > 0) {
-							// This requires knowing the raw string length of the previous block, which V1 doesn't explicitly track easily.
-							// We'll approximate based on the current accumulator and start index logic.
-							// The issue arises if a tool tag was just closed. accumulator contains everything up to i.
-							// lastBlockEndIndex should point to the character *after* the closing tag of the last block.
-						}
-						// Reset start index to the beginning of the *current* potential text block
-						currentTextContentStartIndex = accumulator.length - 1 // Start accumulating from the current character `i`
-					}
-
-					// If we just closed a tool, text starts *after* its closing tag
-					// The logic needs refinement here for accurate start index after a tool closure.
-					// Let's assume for now the start index logic inside the loop handles it via slicing.
-				}
-
-				currentTextContent = {
-					type: "text",
-					content: "", // Content will be filled by slicing accumulator
-					partial: true,
-				}
+				currentTextContentStartIndex = i
+			}
+			currentTextContent = {
+				type: "text",
+				content: accumulator.slice(currentTextContentStartIndex).trim(),
+				partial: true,
 			}
-			// Update text content based on the accumulator from its start index
-			currentTextContent.content = accumulator.slice(currentTextContentStartIndex).trimStart() // Trim start to avoid leading space if text follows tool
 		}
-	} // End of loop
+	}
 
-	// --- Finalization after loop ---
-
-	// If a tool use was open at the end
 	if (currentToolUse) {
-		// If a parameter was open within that tool use
+		// stream did not complete tool call, add it as partial
 		if (currentParamName) {
-			// The remaining accumulator content belongs to this partial parameter
+			// tool call has a parameter that was not completed
 			currentToolUse.params[currentParamName] = accumulator.slice(currentParamValueStartIndex).trim()
 		}
-		// Add the potentially partial tool use block
 		contentBlocks.push(currentToolUse)
 	}
-	// If text content was being accumulated at the end
-	// Note: Only one of currentToolUse or currentTextContent can be defined here,
-	// as starting a tool use finalizes the preceding text block.
-	else if (currentTextContent) {
-		// Update content one last time
-		currentTextContent.content = accumulator.slice(currentTextContentStartIndex).trim()
-		// Add the potentially partial text block only if it contains content
-		if (currentTextContent.content.length > 0) {
-			contentBlocks.push(currentTextContent)
-		}
-	}
 
-	return contentBlocks
-}
-
-/**
- * @description **Version 2**
- * Parses an assistant message string potentially containing mixed text and tool usage blocks
- * marked with XML-like tags into an array of structured content objects.
- *
- * This version aims for efficiency by avoiding the character-by-character accumulator of V1.
- * It iterates through the string using an index `i`. At each position, it checks if the substring
- * *ending* at `i` matches any known opening or closing tags for tools or parameters using `startsWith`
- * with an offset.
- * It uses pre-computed Maps (`toolUseOpenTags`, `toolParamOpenTags`) for quick tag lookups.
- * State is managed using indices (`currentTextContentStart`, `currentToolUseStart`, `currentParamValueStart`)
- * pointing to the start of the current block within the original `assistantMessage` string.
- * Slicing is used to extract content only when a block (text, parameter, or tool use) is completed.
- * Special handling for `write_to_file` and `new_rule` content parameters is included, using `indexOf`
- * and `lastIndexOf` on the relevant slice to handle potentially nested closing tags.
- * If the input string ends mid-block, the last open block is added and marked as partial.
- *
- * @param assistantMessage The raw string output from the assistant.
- * @returns An array of `AssistantMessageContent` objects, which can be `TextContent` or `ToolUse`.
- *          Blocks that were not fully closed by the end of the input string will have their `partial` flag set to `true`.
- */
-export function parseAssistantMessageV2(assistantMessage: string): AssistantMessageContent[] {
-	const contentBlocks: AssistantMessageContent[] = []
-	let currentTextContentStart = 0 // Index where the current text block started
-	let currentTextContent: TextContent | undefined = undefined
-	let currentToolUseStart = 0 // Index *after* the opening tag of the current tool use
-	let currentToolUse: ToolUse | undefined = undefined
-	let currentParamValueStart = 0 // Index *after* the opening tag of the current param
-	let currentParamName: ToolParamName | undefined = undefined
-
-	// Precompute tags for faster lookups
-	const toolUseOpenTags = new Map<string, ToolUseName>()
-	const toolParamOpenTags = new Map<string, ToolParamName>()
-	for (const name of toolUseNames) {
-		toolUseOpenTags.set(`<${name}>`, name)
-	}
-	for (const name of toolParamNames) {
-		toolParamOpenTags.set(`<${name}>`, name)
-	}
-
-	const len = assistantMessage.length
-	for (let i = 0; i < len; i++) {
-		const currentCharIndex = i
-
-		// --- State: Parsing a Tool Parameter ---
-		if (currentToolUse && currentParamName) {
-			const closeTag = `</${currentParamName}>`
-			// Check if the string *ending* at index `i` matches the closing tag
-			if (
-				currentCharIndex >= closeTag.length - 1 &&
-				assistantMessage.startsWith(
-					closeTag,
-					currentCharIndex - closeTag.length + 1, // Start checking from potential start of tag
-				)
-			) {
-				// Found the closing tag for the parameter
-				const value = assistantMessage
-					.slice(
-						currentParamValueStart, // Start after the opening tag
-						currentCharIndex - closeTag.length + 1, // End before the closing tag
-					)
-					.trim()
-				currentToolUse.params[currentParamName] = value
-				currentParamName = undefined // Go back to parsing tool content
-				// We don't continue loop here, need to check for tool close or other params at index i
-			} else {
-				continue // Still inside param value, move to next char
-			}
-		}
-
-		// --- State: Parsing a Tool Use (but not a specific parameter) ---
-		if (currentToolUse && !currentParamName) {
-			// Ensure we are not inside a parameter already
-			// Check if starting a new parameter
-			let startedNewParam = false
-			for (const [tag, paramName] of toolParamOpenTags.entries()) {
-				if (currentCharIndex >= tag.length - 1 && assistantMessage.startsWith(tag, currentCharIndex - tag.length + 1)) {
-					currentParamName = paramName
-					currentParamValueStart = currentCharIndex + 1 // Value starts after the tag
-					startedNewParam = true
-					break
-				}
-			}
-			if (startedNewParam) {
-				continue // Handled start of param, move to next char
-			}
-
-			// Check if closing the current tool use
-			const toolCloseTag = `</${currentToolUse.name}>`
-			if (
-				currentCharIndex >= toolCloseTag.length - 1 &&
-				assistantMessage.startsWith(toolCloseTag, currentCharIndex - toolCloseTag.length + 1)
-			) {
-				// End of the tool use found
-				// Special handling for content params *before* finalizing the tool
-				const toolContentSlice = assistantMessage.slice(
-					currentToolUseStart, // From after the tool opening tag
-					currentCharIndex - toolCloseTag.length + 1, // To before the tool closing tag
-				)
-
-				// Check if content parameter needs special handling (write_to_file/new_rule)
-				// This check is important if the closing </content> tag was missed by the parameter parsing logic
-				// (e.g., if content is empty or parsing logic prioritizes tool close)
-				const contentParamName: ToolParamName = "content"
-				if (
-					(currentToolUse.name === "write_to_file" || currentToolUse.name === "new_rule") &&
-					!(contentParamName in currentToolUse.params) && // Only if not already parsed
-					toolContentSlice.includes(`<${contentParamName}>`) // Check if tag exists
-				) {
-					const contentStartTag = `<${contentParamName}>`
-					const contentEndTag = `</${contentParamName}>`
-					const contentStart = toolContentSlice.indexOf(contentStartTag)
-					// Use lastIndexOf for robustness against nested tags
-					const contentEnd = toolContentSlice.lastIndexOf(contentEndTag)
-
-					if (contentStart !== -1 && contentEnd !== -1 && contentEnd > contentStart) {
-						const contentValue = toolContentSlice.slice(contentStart + contentStartTag.length, contentEnd).trim()
-						currentToolUse.params[contentParamName] = contentValue
-					}
-				}
-
-				currentToolUse.partial = false // Mark as complete
-				contentBlocks.push(currentToolUse)
-				currentToolUse = undefined // Reset state
-				currentTextContentStart = currentCharIndex + 1 // Potential text starts after this tag
-				continue // Move to next char
-			}
-			// If not starting a param and not closing the tool, continue accumulating tool content implicitly
-			continue
-		}
-
-		// --- State: Parsing Text / Looking for Tool Start ---
-		if (!currentToolUse) {
-			// Check if starting a new tool use
-			let startedNewTool = false
-			for (const [tag, toolName] of toolUseOpenTags.entries()) {
-				if (currentCharIndex >= tag.length - 1 && assistantMessage.startsWith(tag, currentCharIndex - tag.length + 1)) {
-					// End current text block if one was active
-					if (currentTextContent) {
-						currentTextContent.content = assistantMessage
-							.slice(
-								currentTextContentStart, // From where text started
-								currentCharIndex - tag.length + 1, // To before the tool tag starts
-							)
-							.trim()
-						currentTextContent.partial = false // Ended because tool started
-						if (currentTextContent.content.length > 0) {
-							contentBlocks.push(currentTextContent)
-						}
-						currentTextContent = undefined
-					} else {
-						// Check for any text between the last block and this tag
-						const potentialText = assistantMessage
-							.slice(
-								currentTextContentStart, // From where text *might* have started
-								currentCharIndex - tag.length + 1, // To before the tool tag starts
-							)
-							.trim()
-						if (potentialText.length > 0) {
-							contentBlocks.push({
-								type: "text",
-								content: potentialText,
-								partial: false,
-							})
-						}
-					}
-
-					// Start the new tool use
-					currentToolUse = {
-						type: "tool_use",
-						name: toolName,
-						params: {},
-						partial: true, // Assume partial until closing tag is found
-					}
-					currentToolUseStart = currentCharIndex + 1 // Tool content starts after the opening tag
-					startedNewTool = true
-					break
-				}
-			}
-
-			if (startedNewTool) {
-				continue // Handled start of tool, move to next char
-			}
-
-			// If not starting a tool, it must be text content
-			if (!currentTextContent) {
-				// Start a new text block if we aren't already in one
-				currentTextContentStart = currentCharIndex // Text starts at the current character
-				// Check if the current char is the start of potential text *immediately* after a tag
-				// This needs the previous state - simpler to let slicing handle it later.
-				// Resetting start index accurately is key.
-				// It should be the index *after* the last processed tag.
-				// The logic managing currentTextContentStart after closing tags handles this.
-
-				currentTextContent = {
-					type: "text",
-					content: "", // Will be determined by slicing at the end or when a tool starts
-					partial: true,
-				}
-			}
-			// Continue accumulating text implicitly; content is extracted later.
-		}
-	} // End of loop
-
-	// --- Finalization after loop ---
-
-	// Finalize any open parameter within an open tool use
-	if (currentToolUse && currentParamName) {
-		currentToolUse.params[currentParamName] = assistantMessage
-			.slice(currentParamValueStart) // From param start to end of string
-			.trim()
-		// Tool use remains partial
-	}
-
-	// Finalize any open tool use (which might contain the finalized partial param)
-	if (currentToolUse) {
-		// Tool use is partial because the loop finished before its closing tag
-		contentBlocks.push(currentToolUse)
-	}
-	// Finalize any trailing text content
-	// Only possible if a tool use wasn't open at the very end
-	else if (currentTextContent) {
-		currentTextContent.content = assistantMessage
-			.slice(currentTextContentStart) // From text start to end of string
-			.trim()
-		// Text is partial because the loop finished
-		if (currentTextContent.content.length > 0) {
-			contentBlocks.push(currentTextContent)
-		}
+	// Note: it doesn't matter if check for currentToolUse or currentTextContent, only one of them will be defined since only one can be partial at a time
+	if (currentTextContent) {
+		// stream did not complete text content, add it as partial
+		contentBlocks.push(currentTextContent)
 	}
 
 	return contentBlocks

src/core/controller/grpc-service-config.ts

@@ -12,7 +12,6 @@ import { handleStateServiceRequest, handleStateServiceStreamingRequest } from ".
 import { handleTaskServiceRequest, handleTaskServiceStreamingRequest } from "./task/index"
 import { handleWebServiceRequest, handleWebServiceStreamingRequest } from "./web/index"
 import { handleModelsServiceRequest, handleModelsServiceStreamingRequest } from "./models/index"
-import { handleSlashServiceRequest, handleSlashServiceStreamingRequest } from "./slash/index"
 
 /**
  * Configuration for a service handler
@@ -68,8 +67,4 @@ export const serviceHandlers: Record<string, ServiceHandlerConfig> = {
 		requestHandler: handleModelsServiceRequest,
 		streamingHandler: handleModelsServiceStreamingRequest,
 	},
-	"cline.SlashService": {
-		requestHandler: handleSlashServiceRequest,
-		streamingHandler: handleSlashServiceStreamingRequest,
-	},
 }

src/core/controller/index.ts

@@ -145,6 +145,7 @@ export class Controller {
 			browserSettings,
 			chatSettings,
 			shellIntegrationTimeout,
+			enableCheckpointsSetting,
 		} = await getAllExtensionState(this.context)
 
 		if (autoApprovalSettings) {
@@ -168,6 +169,7 @@ export class Controller {
 			browserSettings,
 			chatSettings,
 			shellIntegrationTimeout,
+			enableCheckpointsSetting ?? true,
 			customInstructions,
 			task,
 			images,
@@ -249,7 +251,7 @@ export class Controller {
 				// If user already opted in to telemetry, enable telemetry service
 				this.getStateToPostToWebview().then((state) => {
 					const { telemetrySetting } = state
-					const isOptedIn = telemetrySetting !== "disabled"
+					const isOptedIn = telemetrySetting === "enabled"
 					telemetryService.updateTelemetryState(isOptedIn)
 				})
 				break
@@ -271,6 +273,12 @@ export class Controller {
 				// initializing new instance of Cline will make sure that any agentically running promises in old instance don't affect our new task. this essentially creates a fresh slate for the new task
 				await this.initTask(message.text, message.images)
 				break
+			case "condense":
+				this.task?.handleWebviewAskResponse("yesButtonClicked")
+				break
+			case "reportBug":
+				this.task?.handleWebviewAskResponse("yesButtonClicked")
+				break
 			case "apiConfiguration":
 				if (message.apiConfiguration) {
 					await updateApiConfiguration(this.context, message.apiConfiguration)
@@ -373,6 +381,19 @@ export class Controller {
 				await this.fetchMcpMarketplace(message.bool)
 				break
 			}
+			case "downloadMcp": {
+				if (message.mcpId) {
+					// 1. Toggle to act mode if we are in plan mode
+					const { chatSettings } = await this.getStateToPostToWebview()
+					if (chatSettings.mode === "plan") {
+						await this.togglePlanActModeWithChatSettings({ mode: "act" })
+					}
+
+					// 2. download MCP
+					await this.downloadMcp(message.mcpId)
+				}
+				break
+			}
 			case "silentlyRefreshMcpMarketplace": {
 				await this.silentlyRefreshMcpMarketplace()
 				break
@@ -563,6 +584,22 @@ export class Controller {
 				// plan act setting
 				await updateGlobalState(this.context, "planActSeparateModelsSetting", message.planActSeparateModelsSetting)
 
+				if (typeof message.enableCheckpointsSetting === "boolean") {
+					await updateGlobalState(this.context, "enableCheckpointsSetting", message.enableCheckpointsSetting)
+				}
+
+				if (typeof message.mcpMarketplaceEnabled === "boolean") {
+					await updateGlobalState(this.context, "mcpMarketplaceEnabled", message.mcpMarketplaceEnabled)
+				}
+
+				// chat settings (including preferredLanguage and openAIReasoningEffort)
+				if (message.chatSettings) {
+					await updateGlobalState(this.context, "chatSettings", message.chatSettings)
+					if (this.task) {
+						this.task.chatSettings = message.chatSettings
+					}
+				}
+
 				// after settings are updated, post state to webview
 				await this.postStateToWebview()
 
@@ -590,6 +627,27 @@ export class Controller {
 				this.postMessageToWebview({ type: "relinquishControl" })
 				break
 			}
+			case "toggleFavoriteModel": {
+				if (message.modelId) {
+					const { apiConfiguration } = await getAllExtensionState(this.context)
+					const favoritedModelIds = apiConfiguration.favoritedModelIds || []
+
+					// Toggle favorite status
+					const updatedFavorites = favoritedModelIds.includes(message.modelId)
+						? favoritedModelIds.filter((id) => id !== message.modelId)
+						: [...favoritedModelIds, message.modelId]
+
+					await updateGlobalState(this.context, "favoritedModelIds", updatedFavorites)
+
+					// Capture telemetry for model favorite toggle
+					const isFavorited = !favoritedModelIds.includes(message.modelId)
+					telemetryService.captureModelFavoritesUsage(message.modelId, isFavorited)
+
+					// Post state to webview without changing any other configuration
+					await this.postStateToWebview()
+				}
+				break
+			}
 			case "grpc_request": {
 				if (message.grpc_request) {
 					await handleGrpcRequest(this, message.grpc_request)
@@ -633,7 +691,7 @@ export class Controller {
 
 	async updateTelemetrySetting(telemetrySetting: TelemetrySetting) {
 		await updateGlobalState(this.context, "telemetrySetting", telemetrySetting)
-		const isOptedIn = telemetrySetting !== "disabled"
+		const isOptedIn = telemetrySetting === "enabled"
 		telemetryService.updateTelemetryState(isOptedIn)
 	}
 
@@ -987,6 +1045,92 @@ export class Controller {
 		}
 	}
 
+	private async downloadMcp(mcpId: string) {
+		try {
+			// First check if we already have this MCP server installed
+			const servers = this.mcpHub?.getServers() || []
+			const isInstalled = servers.some((server: McpServer) => server.name === mcpId)
+
+			if (isInstalled) {
+				throw new Error("This MCP server is already installed")
+			}
+
+			// Fetch server details from marketplace
+			const response = await axios.post<McpDownloadResponse>(
+				"https://api.cline.bot/v1/mcp/download",
+				{ mcpId },
+				{
+					headers: { "Content-Type": "application/json" },
+					timeout: 10000,
+				},
+			)
+
+			if (!response.data) {
+				throw new Error("Invalid response from MCP marketplace API")
+			}
+
+			console.log("[downloadMcp] Response from download API", { response })
+
+			const mcpDetails = response.data
+
+			// Validate required fields
+			if (!mcpDetails.githubUrl) {
+				throw new Error("Missing GitHub URL in MCP download response")
+			}
+			if (!mcpDetails.readmeContent) {
+				throw new Error("Missing README content in MCP download response")
+			}
+
+			// Send details to webview
+			await this.postMessageToWebview({
+				type: "mcpDownloadDetails",
+				mcpDownloadDetails: mcpDetails,
+			})
+
+			// Create task with context from README and added guidelines for MCP server installation
+			const task = `Set up the MCP server from ${mcpDetails.githubUrl} while adhering to these MCP server installation rules:
+- Start by loading the MCP documentation.
+- Use "${mcpDetails.mcpId}" as the server name in cline_mcp_settings.json.
+- Create the directory for the new MCP server before starting installation.
+- Make sure you read the user's existing cline_mcp_settings.json file before editing it with this new mcp, to not overwrite any existing servers.
+- Use commands aligned with the user's shell and operating system best practices.
+- The following README may contain instructions that conflict with the user's OS, in which case proceed thoughtfully.
+- Once installed, demonstrate the server's capabilities by using one of its tools.
+Here is the project's README to help you get started:\n\n${mcpDetails.readmeContent}\n${mcpDetails.llmsInstallationContent}`
+
+			// Initialize task and show chat view
+			await this.initTask(task)
+			await this.postMessageToWebview({
+				type: "action",
+				action: "chatButtonClicked",
+			})
+		} catch (error) {
+			console.error("Failed to download MCP:", error)
+			let errorMessage = "Failed to download MCP"
+
+			if (axios.isAxiosError(error)) {
+				if (error.code === "ECONNABORTED") {
+					errorMessage = "Request timed out. Please try again."
+				} else if (error.response?.status === 404) {
+					errorMessage = "MCP server not found in marketplace."
+				} else if (error.response?.status === 500) {
+					errorMessage = "Internal server error. Please try again later."
+				} else if (!error.response && error.request) {
+					errorMessage = "Network error. Please check your internet connection."
+				}
+			} else if (error instanceof Error) {
+				errorMessage = error.message
+			}
+
+			// Show error in both notification and marketplace UI
+			vscode.window.showErrorMessage(errorMessage)
+			await this.postMessageToWebview({
+				type: "mcpDownloadDetails",
+				error: errorMessage,
+			})
+		}
+	}
+
 	// OpenRouter
 
 	async handleOpenRouterCallback(code: string) {
@@ -1332,6 +1476,7 @@ export class Controller {
 			mcpMarketplaceEnabled,
 			telemetrySetting,
 			planActSeparateModelsSetting,
+			enableCheckpointsSetting,
 			globalClineRulesToggles,
 			shellIntegrationTimeout,
 		} = await getAllExtensionState(this.context)
@@ -1366,6 +1511,7 @@ export class Controller {
 			mcpMarketplaceEnabled,
 			telemetrySetting,
 			planActSeparateModelsSetting,
+			enableCheckpointsSetting: enableCheckpointsSetting ?? true,
 			vscMachineId: vscode.env.machineId,
 			globalClineRulesToggles: globalClineRulesToggles || {},
 			localClineRulesToggles: localClineRulesToggles || {},

src/core/controller/mcp/downloadMcp.ts

@@ -1,114 +0,0 @@
-import { Controller } from ".."
-import { Empty, StringRequest } from "../../../shared/proto/common"
-import { McpServer, McpDownloadResponse } from "@shared/mcp"
-import axios from "axios"
-import * as vscode from "vscode"
-
-/**
- * Download an MCP server from the marketplace
- * @param controller The controller instance
- * @param request The request containing the MCP ID
- * @returns Empty response
- */
-export async function downloadMcp(controller: Controller, request: StringRequest): Promise<Empty> {
-	try {
-		// Check if mcpId is provided
-		if (!request.value) {
-			throw new Error("MCP ID is required")
-		}
-
-		const mcpId = request.value
-
-		// Check if we already have this MCP server installed
-		const servers = controller.mcpHub?.getServers() || []
-		const isInstalled = servers.some((server: McpServer) => server.name === mcpId)
-
-		if (isInstalled) {
-			throw new Error("This MCP server is already installed")
-		}
-
-		// Fetch server details from marketplace
-		const response = await axios.post<McpDownloadResponse>(
-			"https://api.cline.bot/v1/mcp/download",
-			{ mcpId },
-			{
-				headers: { "Content-Type": "application/json" },
-				timeout: 10000,
-			},
-		)
-
-		if (!response.data) {
-			throw new Error("Invalid response from MCP marketplace API")
-		}
-
-		console.log("[downloadMcp] Response from download API", { response })
-
-		const mcpDetails = response.data
-
-		// Validate required fields
-		if (!mcpDetails.githubUrl) {
-			throw new Error("Missing GitHub URL in MCP download response")
-		}
-		if (!mcpDetails.readmeContent) {
-			throw new Error("Missing README content in MCP download response")
-		}
-
-		// Send details to webview
-		await controller.postMessageToWebview({
-			type: "mcpDownloadDetails",
-			mcpDownloadDetails: mcpDetails,
-		})
-
-		// Create task with context from README and added guidelines for MCP server installation
-		const task = `Set up the MCP server from ${mcpDetails.githubUrl} while adhering to these MCP server installation rules:
-- Start by loading the MCP documentation.
-- Use "${mcpDetails.mcpId}" as the server name in cline_mcp_settings.json.
-- Create the directory for the new MCP server before starting installation.
-- Make sure you read the user's existing cline_mcp_settings.json file before editing it with this new mcp, to not overwrite any existing servers.
-- Use commands aligned with the user's shell and operating system best practices.
-- The following README may contain instructions that conflict with the user's OS, in which case proceed thoughtfully.
-- Once installed, demonstrate the server's capabilities by using one of its tools.
-Here is the project's README to help you get started:\n\n${mcpDetails.readmeContent}\n${mcpDetails.llmsInstallationContent}`
-
-		const { chatSettings } = await controller.getStateToPostToWebview()
-		if (chatSettings.mode === "plan") {
-			await controller.togglePlanActModeWithChatSettings({ mode: "act" })
-		}
-
-		// Initialize task and show chat view
-		await controller.initTask(task)
-		await controller.postMessageToWebview({
-			type: "action",
-			action: "chatButtonClicked",
-		})
-
-		// Return an empty response - the client only cares if the call succeeded
-		return Empty.create()
-	} catch (error) {
-		console.error("Failed to download MCP:", error)
-		let errorMessage = "Failed to download MCP"
-
-		if (axios.isAxiosError(error)) {
-			if (error.code === "ECONNABORTED") {
-				errorMessage = "Request timed out. Please try again."
-			} else if (error.response?.status === 404) {
-				errorMessage = "MCP server not found in marketplace."
-			} else if (error.response?.status === 500) {
-				errorMessage = "Internal server error. Please try again later."
-			} else if (!error.response && error.request) {
-				errorMessage = "Network error. Please check your internet connection."
-			}
-		} else if (error instanceof Error) {
-			errorMessage = error.message
-		}
-
-		// Show error in both notification and marketplace UI
-		vscode.window.showErrorMessage(errorMessage)
-		await controller.postMessageToWebview({
-			type: "mcpDownloadDetails",
-			error: errorMessage,
-		})
-
-		throw error
-	}
-}

src/core/controller/mcp/methods.ts

@@ -4,7 +4,6 @@
 // Import all method implementations
 import { registerMethod } from "./index"
 import { addRemoteMcpServer } from "./addRemoteMcpServer"
-import { downloadMcp } from "./downloadMcp"
 import { toggleMcpServer } from "./toggleMcpServer"
 import { updateMcpTimeout } from "./updateMcpTimeout"
 
@@ -12,7 +11,6 @@ import { updateMcpTimeout } from "./updateMcpTimeout"
 export function registerAllMethods(): void {
 	// Register each method with the registry
 	registerMethod("addRemoteMcpServer", addRemoteMcpServer)
-	registerMethod("downloadMcp", downloadMcp)
 	registerMethod("toggleMcpServer", toggleMcpServer)
 	registerMethod("updateMcpTimeout", updateMcpTimeout)
 }

src/core/controller/slash/condense.ts

@@ -1,10 +0,0 @@
-import { Controller } from ".."
-import { StringRequest, Empty } from "../../../shared/proto/common"
-
-/**
- * Command slash command logic
- */
-export async function condense(controller: Controller, request: StringRequest): Promise<Empty> {
-	await controller.task?.handleWebviewAskResponse("yesButtonClicked")
-	return Empty.create()
-}

src/core/controller/slash/index.ts

@@ -1,22 +0,0 @@
-// AUTO-GENERATED FILE - DO NOT MODIFY DIRECTLY
-// Generated by proto/build-proto.js
-
-import { createServiceRegistry, ServiceMethodHandler, StreamingMethodHandler } from "../grpc-service"
-import { StreamingResponseHandler } from "../grpc-handler"
-import { registerAllMethods } from "./methods"
-
-// Create slash service registry
-const slashService = createServiceRegistry("slash")
-
-// Export the method handler types and registration function
-export type SlashMethodHandler = ServiceMethodHandler
-export type SlashStreamingMethodHandler = StreamingMethodHandler
-export const registerMethod = slashService.registerMethod
-
-// Export the request handlers
-export const handleSlashServiceRequest = slashService.handleRequest
-export const handleSlashServiceStreamingRequest = slashService.handleStreamingRequest
-export const isStreamingMethod = slashService.isStreamingMethod
-
-// Register all slash methods
-registerAllMethods()

src/core/controller/slash/methods.ts

@@ -1,14 +0,0 @@
-// AUTO-GENERATED FILE - DO NOT MODIFY DIRECTLY
-// Generated by proto/build-proto.js
-
-// Import all method implementations
-import { registerMethod } from "./index"
-import { condense } from "./condense"
-import { reportBug } from "./reportBug"
-
-// Register all slash service methods
-export function registerAllMethods(): void {
-	// Register each method with the registry
-	registerMethod("condense", condense)
-	registerMethod("reportBug", reportBug)
-}

src/core/controller/slash/reportBug.ts

@@ -1,10 +0,0 @@
-import { Controller } from ".."
-import { StringRequest, Empty } from "../../../shared/proto/common"
-
-/**
- * Report bug slash command logic
- */
-export async function reportBug(controller: Controller, request: StringRequest): Promise<Empty> {
-	await controller.task?.handleWebviewAskResponse("yesButtonClicked")
-	return Empty.create()
-}

src/core/controller/state/methods.ts

@@ -5,7 +5,6 @@
 import { registerMethod } from "./index"
 import { getLatestState } from "./getLatestState"
 import { subscribeToState } from "./subscribeToState"
-import { toggleFavoriteModel } from "./toggleFavoriteModel"
 
 // Streaming methods for this service
 export const streamingMethods = ["subscribeToState"]
@@ -15,5 +14,4 @@ export function registerAllMethods(): void {
 	// Register each method with the registry
 	registerMethod("getLatestState", getLatestState)
 	registerMethod("subscribeToState", subscribeToState, { isStreaming: true })
-	registerMethod("toggleFavoriteModel", toggleFavoriteModel)
 }

src/core/controller/state/toggleFavoriteModel.ts

@@ -1,46 +0,0 @@
-import { telemetryService } from "@/services/posthog/telemetry/TelemetryService"
-import { Controller } from ".."
-import { Empty, StringRequest } from "../../../shared/proto/common"
-import { updateGlobalState } from "@/core/storage/state"
-
-/**
- * Toggles a model's favorite status
- * @param controller The controller instance
- * @param request The request containing the model ID to toggle
- * @returns An empty response
- */
-export async function toggleFavoriteModel(controller: Controller, request: StringRequest): Promise<Empty> {
-	try {
-		if (!request.value) {
-			throw new Error("Model ID is required")
-		}
-
-		const modelId = request.value
-		const { apiConfiguration } = await controller.getStateToPostToWebview()
-
-		if (!apiConfiguration) {
-			throw new Error("API configuration not found")
-		}
-
-		const favoritedModelIds = apiConfiguration.favoritedModelIds || []
-
-		// Toggle favorite status
-		const updatedFavorites = favoritedModelIds.includes(modelId)
-			? favoritedModelIds.filter((id) => id !== modelId)
-			: [...favoritedModelIds, modelId]
-
-		await updateGlobalState(controller.context, "favoritedModelIds", updatedFavorites)
-
-		// Capture telemetry for model favorite toggle
-		const isFavorited = !favoritedModelIds.includes(modelId)
-		telemetryService.captureModelFavoritesUsage(modelId, isFavorited)
-
-		// Post state to webview without changing any other configuration
-		await controller.postStateToWebview()
-
-		return Empty.create()
-	} catch (error) {
-		console.error(`Failed to toggle favorite status for model ${request.value}:`, error)
-		throw error
-	}
-}

src/core/storage/state-keys.ts

@@ -11,7 +11,6 @@ export type SecretKey =
 	| "deepSeekApiKey"
 	| "requestyApiKey"
 	| "togetherApiKey"
-	| "fireworksApiKey"
 	| "qwenApiKey"
 	| "doubaoApiKey"
 	| "mistralApiKey"
@@ -70,9 +69,6 @@ export type GlobalStateKey =
 	| "liteLlmModelId"
 	| "liteLlmModelInfo"
 	| "liteLlmUsePromptCache"
-	| "fireworksModelId"
-	| "fireworksModelMaxCompletionTokens"
-	| "fireworksModelMaxTokens"
 	| "qwenApiLine"
 	| "requestyModelId"
 	| "requestyModelInfo"
@@ -83,6 +79,8 @@ export type GlobalStateKey =
 	| "thinkingBudgetTokens"
 	| "reasoningEffort"
 	| "planActSeparateModelsSetting"
+	| "enableCheckpointsSetting"
+	| "mcpMarketplaceEnabled"
 	| "favoritedModelIds"
 	| "requestTimeoutMs"
 	| "shellIntegrationTimeout"

src/core/storage/state.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode"
-import { DEFAULT_CHAT_SETTINGS } from "@shared/ChatSettings"
+import { DEFAULT_CHAT_SETTINGS, OpenAIReasoningEffort } from "@shared/ChatSettings"
 import { DEFAULT_BROWSER_SETTINGS } from "@shared/BrowserSettings"
 import { DEFAULT_AUTO_APPROVAL_SETTINGS } from "@shared/AutoApprovalSettings"
 import { GlobalStateKey, SecretKey } from "./state-keys"
@@ -51,6 +51,29 @@ export async function getWorkspaceState(context: vscode.ExtensionContext, key: s
 	return await context.workspaceState.get(key)
 }
 
+async function migrateMcpMarketplaceEnableSetting(mcpMarketplaceEnabledRaw: boolean | undefined): Promise<boolean> {
+	const config = vscode.workspace.getConfiguration("cline")
+	const mcpMarketplaceEnabled = config.get<boolean>("mcpMarketplace.enabled")
+	if (mcpMarketplaceEnabled !== undefined) {
+		// Remove from VSCode configuration
+		await config.update("mcpMarketplace.enabled", undefined, true)
+
+		return !mcpMarketplaceEnabled
+	}
+	return mcpMarketplaceEnabledRaw ?? true
+}
+
+async function migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw: boolean | undefined): Promise<boolean> {
+	const config = vscode.workspace.getConfiguration("cline")
+	const enableCheckpoints = config.get<boolean>("enableCheckpoints")
+	if (enableCheckpoints !== undefined) {
+		// Remove from VSCode configuration
+		await config.update("enableCheckpoints", undefined, true)
+		return enableCheckpoints
+	}
+	return enableCheckpointsSettingRaw ?? true
+}
+
 export async function getAllExtensionState(context: vscode.ExtensionContext) {
 	const [
 		storedApiProvider,
@@ -109,10 +132,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		liteLlmModelId,
 		liteLlmModelInfo,
 		liteLlmUsePromptCache,
-		fireworksApiKey,
-		fireworksModelId,
-		fireworksModelMaxCompletionTokens,
-		fireworksModelMaxTokens,
 		userInfo,
 		previousModeApiProvider,
 		previousModeModelId,
@@ -136,6 +155,8 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		globalClineRulesToggles,
 		requestTimeoutMs,
 		shellIntegrationTimeout,
+		enableCheckpointsSettingRaw,
+		mcpMarketplaceEnabledRaw,
 	] = await Promise.all([
 		getGlobalState(context, "apiProvider") as Promise<ApiProvider | undefined>,
 		getGlobalState(context, "apiModelId") as Promise<string | undefined>,
@@ -193,10 +214,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "liteLlmModelId") as Promise<string | undefined>,
 		getGlobalState(context, "liteLlmModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "liteLlmUsePromptCache") as Promise<boolean | undefined>,
-		getSecret(context, "fireworksApiKey") as Promise<string | undefined>,
-		getGlobalState(context, "fireworksModelId") as Promise<string | undefined>,
-		getGlobalState(context, "fireworksModelMaxCompletionTokens") as Promise<number | undefined>,
-		getGlobalState(context, "fireworksModelMaxTokens") as Promise<number | undefined>,
 		getGlobalState(context, "userInfo") as Promise<UserInfo | undefined>,
 		getGlobalState(context, "previousModeApiProvider") as Promise<ApiProvider | undefined>,
 		getGlobalState(context, "previousModeModelId") as Promise<string | undefined>,
@@ -220,6 +237,9 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "globalClineRulesToggles") as Promise<ClineRulesToggles | undefined>,
 		getGlobalState(context, "requestTimeoutMs") as Promise<number | undefined>,
 		getGlobalState(context, "shellIntegrationTimeout") as Promise<number | undefined>,
+		getGlobalState(context, "enableCheckpointsSetting") as Promise<boolean | undefined>,
+		getGlobalState(context, "mcpMarketplaceEnabled") as Promise<boolean | undefined>,
+		fetch,
 	])
 
 	let apiProvider: ApiProvider
@@ -238,9 +258,8 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 
 	const localClineRulesToggles = (await getWorkspaceState(context, "localClineRulesToggles")) as ClineRulesToggles
 
-	const o3MiniReasoningEffort = vscode.workspace.getConfiguration("cline.modelSettings.o3Mini").get("reasoningEffort", "medium")
-
-	const mcpMarketplaceEnabled = vscode.workspace.getConfiguration("cline").get<boolean>("mcpMarketplace.enabled", true)
+	const mcpMarketplaceEnabled = await migrateMcpMarketplaceEnableSetting(mcpMarketplaceEnabledRaw)
+	const enableCheckpointsSetting = await migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw)
 
 	// Plan/Act separate models setting is a boolean indicating whether the user wants to use different models for plan and act. Existing users expect this to be enabled, while we want new users to opt in to this being disabled by default.
 	// On win11 state sometimes initializes as empty string instead of undefined
@@ -309,7 +328,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 			openRouterModelInfo,
 			openRouterProviderSorting,
 			vsCodeLmModelSelector,
-			o3MiniReasoningEffort,
 			thinkingBudgetTokens,
 			reasoningEffort,
 			liteLlmBaseUrl,
@@ -317,10 +335,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 			liteLlmModelInfo,
 			liteLlmApiKey,
 			liteLlmUsePromptCache,
-			fireworksApiKey,
-			fireworksModelId,
-			fireworksModelMaxCompletionTokens,
-			fireworksModelMaxTokens,
 			asksageApiKey,
 			asksageApiUrl,
 			xaiApiKey,
@@ -335,7 +349,10 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		globalClineRulesToggles: globalClineRulesToggles || {},
 		localClineRulesToggles: localClineRulesToggles || {},
 		browserSettings: { ...DEFAULT_BROWSER_SETTINGS, ...browserSettings }, // this will ensure that older versions of browserSettings (e.g. before remoteBrowserEnabled was added) are merged with the default values (false for remoteBrowserEnabled)
-		chatSettings: chatSettings || DEFAULT_CHAT_SETTINGS,
+		chatSettings: {
+			...DEFAULT_CHAT_SETTINGS, // Apply defaults first
+			...(chatSettings || {}), // Spread fetched chatSettings, which includes preferredLanguage, and openAIReasoningEffort
+		},
 		userInfo,
 		previousModeApiProvider,
 		previousModeModelId,
@@ -345,9 +362,10 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		previousModeReasoningEffort,
 		previousModeAwsBedrockCustomSelected,
 		previousModeAwsBedrockCustomModelBaseId,
-		mcpMarketplaceEnabled,
+		mcpMarketplaceEnabled: mcpMarketplaceEnabled,
 		telemetrySetting: telemetrySetting || "unset",
 		planActSeparateModelsSetting,
+		enableCheckpointsSetting: enableCheckpointsSetting,
 		shellIntegrationTimeout: shellIntegrationTimeout || 4000,
 	}
 }
@@ -497,7 +515,6 @@ export async function resetExtensionState(context: vscode.ExtensionContext) {
 		"mistralApiKey",
 		"clineApiKey",
 		"liteLlmApiKey",
-		"fireworksApiKey",
 		"asksageApiKey",
 		"xaiApiKey",
 		"sambanovaApiKey",

src/core/task/index.ts

@@ -60,7 +60,7 @@ import { fileExistsAtPath } from "@utils/fs"
 import { createAndOpenGitHubIssue } from "@utils/github-url-utils"
 import { arePathsEqual, getReadablePath, isLocatedInWorkspace } from "@utils/path"
 import { fixModelHtmlEscaping, removeInvalidChars } from "@utils/string"
-import { AssistantMessageContent, parseAssistantMessageV2, ToolParamName, ToolUseName } from "@core/assistant-message"
+import { AssistantMessageContent, parseAssistantMessage, ToolParamName, ToolUseName } from "@core/assistant-message"
 import { constructNewFileContent } from "@core/assistant-message/diff"
 import { ClineIgnoreController } from "@core/ignore/ClineIgnoreController"
 import { parseMentions } from "@core/mentions"
@@ -167,6 +167,7 @@ export class Task {
 	private didAlreadyUseTool = false
 	private didCompleteReadingStream = false
 	private didAutomaticallyRetryFailedApiRequest = false
+	private enableCheckpoints: boolean
 
 	constructor(
 		context: vscode.ExtensionContext,
@@ -182,6 +183,7 @@ export class Task {
 		browserSettings: BrowserSettings,
 		chatSettings: ChatSettings,
 		shellIntegrationTimeout: number,
+		enableCheckpointsSetting: boolean,
 		customInstructions?: string,
 		task?: string,
 		images?: string[],
@@ -207,6 +209,7 @@ export class Task {
 		this.autoApprovalSettings = autoApprovalSettings
 		this.browserSettings = browserSettings
 		this.chatSettings = chatSettings
+		this.enableCheckpoints = enableCheckpointsSetting
 
 		// Initialize taskId first
 		if (historyItem) {
@@ -222,11 +225,19 @@ export class Task {
 		// Initialize file context tracker
 		this.fileContextTracker = new FileContextTracker(context, this.taskId)
 		this.modelContextTracker = new ModelContextTracker(context, this.taskId)
-		// Now that taskId is initialized, we can build the API handler
-		this.api = buildApiHandler({
+
+		// Prepare effective API configuration
+		let effectiveApiConfiguration: ApiConfiguration = {
 			...apiConfiguration,
 			taskId: this.taskId,
-		})
+		}
+
+		if (apiConfiguration.apiProvider === "openai" || apiConfiguration.apiProvider === "openai-native") {
+			effectiveApiConfiguration.reasoningEffort = chatSettings.openAIReasoningEffort
+		}
+
+		// Now that taskId is initialized, we can build the API handler
+		this.api = buildApiHandler(effectiveApiConfiguration)
 
 		// Set taskId on browserSession for telemetry tracking
 		this.browserSession.setTaskId(this.taskId)
@@ -341,9 +352,19 @@ export class Task {
 				break
 			case "taskAndWorkspace":
 			case "workspace":
+				if (!this.enableCheckpoints) {
+					vscode.window.showErrorMessage("Checkpoints are disabled in settings.")
+					didWorkspaceRestoreFail = true
+					break
+				}
+
 				if (!this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
 					try {
-						this.checkpointTracker = await CheckpointTracker.create(this.taskId, this.context.globalStorageUri.fsPath)
+						this.checkpointTracker = await CheckpointTracker.create(
+							this.taskId,
+							this.context.globalStorageUri.fsPath,
+							this.enableCheckpoints,
+						)
 					} catch (error) {
 						const errorMessage = error instanceof Error ? error.message : "Unknown error"
 						console.error("Failed to initialize checkpoint tracker:", errorMessage)
@@ -450,6 +471,11 @@ export class Task {
 		const relinquishButton = () => {
 			this.postMessageToWebview({ type: "relinquishControl" })
 		}
+		if (!this.enableCheckpoints) {
+			vscode.window.showInformationMessage("Checkpoints are disabled in settings. Cannot show diff.")
+			relinquishButton()
+			return
+		}
 
 		console.log("presentMultifileDiff", messageTs)
 		const messageIndex = this.clineMessages.findIndex((m) => m.ts === messageTs)
@@ -467,9 +493,13 @@ export class Task {
 		}
 
 		// TODO: handle if this is called from outside original workspace, in which case we need to show user error message we can't show diff outside of workspace?
-		if (!this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
+		if (!this.checkpointTracker && this.enableCheckpoints && !this.checkpointTrackerErrorMessage) {
 			try {
-				this.checkpointTracker = await CheckpointTracker.create(this.taskId, this.context.globalStorageUri.fsPath)
+				this.checkpointTracker = await CheckpointTracker.create(
+					this.taskId,
+					this.context.globalStorageUri.fsPath,
+					this.enableCheckpoints,
+				)
 			} catch (error) {
 				const errorMessage = error instanceof Error ? error.message : "Unknown error"
 				console.error("Failed to initialize checkpoint tracker:", errorMessage)
@@ -567,6 +597,8 @@ export class Task {
 	}
 
 	async doesLatestTaskCompletionHaveNewChanges() {
+		if (!this.enableCheckpoints) return false
+
 		const messageIndex = findLastIndex(this.clineMessages, (m) => m.say === "completion_result")
 		const message = this.clineMessages[messageIndex]
 		if (!message) {
@@ -579,9 +611,13 @@ export class Task {
 			return false
 		}
 
-		if (!this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
+		if (this.enableCheckpoints && !this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
 			try {
-				this.checkpointTracker = await CheckpointTracker.create(this.taskId, this.context.globalStorageUri.fsPath)
+				this.checkpointTracker = await CheckpointTracker.create(
+					this.taskId,
+					this.context.globalStorageUri.fsPath,
+					this.enableCheckpoints,
+				)
 			} catch (error) {
 				const errorMessage = error instanceof Error ? error.message : "Unknown error"
 				console.error("Failed to initialize checkpoint tracker:", errorMessage)
@@ -1080,6 +1116,10 @@ export class Task {
 	// Checkpoints
 
 	async saveCheckpoint(isAttemptCompletionMessage: boolean = false) {
+		if (!this.enableCheckpoints) {
+			// If checkpoints are disabled, do nothing.
+			return
+		}
 		// Set isCheckpointCheckedOut to false for all checkpoint_created messages
 		this.clineMessages.forEach((message) => {
 			if (message.say === "checkpoint_created") {
@@ -1447,7 +1487,7 @@ export class Task {
 	 */
 	private async migrateDisableBrowserToolSetting(): Promise<void> {
 		const config = vscode.workspace.getConfiguration("cline")
-		const disableBrowserTool = vscode.workspace.getConfiguration("cline").get<boolean>("disableBrowserTool")
+		const disableBrowserTool = config.get<boolean>("disableBrowserTool")
 
 		if (disableBrowserTool !== undefined) {
 			this.browserSettings.disableToolUse = disableBrowserTool
@@ -1456,6 +1496,16 @@ export class Task {
 		}
 	}
 
+	private async migratePreferredLanguageToolSetting(): Promise<void> {
+		const config = vscode.workspace.getConfiguration("cline")
+		const preferredLanguage = config.get<LanguageDisplay>("preferredLanguage")
+		if (preferredLanguage !== undefined) {
+			this.chatSettings.preferredLanguage = preferredLanguage
+			// Remove from VSCode configuration
+			await config.update("preferredLanguage", undefined, true)
+		}
+	}
+
 	async *attemptApiRequest(previousApiReqIndex: number): ApiStream {
 		// Wait for MCP servers to be connected before generating system prompt
 		await pWaitFor(() => this.mcpHub.isConnecting !== true, { timeout: 10_000 }).catch(() => {
@@ -1472,9 +1522,8 @@ export class Task {
 		let systemPrompt = await SYSTEM_PROMPT(cwd, supportsBrowserUse, this.mcpHub, this.browserSettings)
 
 		let settingsCustomInstructions = this.customInstructions?.trim()
-		const preferredLanguage = getLanguageKey(
-			vscode.workspace.getConfiguration("cline").get<LanguageDisplay>("preferredLanguage"),
-		)
+		await this.migratePreferredLanguageToolSetting()
+		const preferredLanguage = getLanguageKey(this.chatSettings.preferredLanguage as LanguageDisplay)
 		const preferredLanguageInstructions =
 			preferredLanguage && preferredLanguage !== DEFAULT_LANGUAGE_SETTINGS
 				? `# Preferred Language\n\nSpeak in ${preferredLanguage}.`
@@ -3259,7 +3308,7 @@ export class Task {
 									await this.say("user_feedback", text ?? "", images)
 									pushToolResult(
 										formatResponse.toolResult(
-											`The user did not submit the bug, and provided feedback on the Github issue generated instead:\n<feedback>\n${text}\n</feedback>`,
+											`The user provided feedback on the Github issue generated:\n<feedback>\n${text}\n</feedback>`,
 											images,
 										),
 									)
@@ -3669,17 +3718,11 @@ export class Task {
 			}),
 		)
 
-		if (isFirstRequest) {
-			await this.say("checkpoint_created") // no hash since we need to wait for CheckpointTracker to be initialized
-		}
-
-		// use this opportunity to initialize the checkpoint tracker (can be expensive to initialize in the constructor)
-		// FIXME: right now we're letting users init checkpoints for old tasks, but this could be a problem if opening a task in the wrong workspace
-		// isNewTask &&
-		if (!this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
+		// Initialize checkpoint tracker first if enabled and it's the first request
+		if (isFirstRequest && this.enableCheckpoints && !this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
 			try {
 				this.checkpointTracker = await pTimeout(
-					CheckpointTracker.create(this.taskId, this.context.globalStorageUri.fsPath),
+					CheckpointTracker.create(this.taskId, this.context.globalStorageUri.fsPath, this.enableCheckpoints),
 					{
 						milliseconds: 15_000,
 						message:
@@ -3693,14 +3736,22 @@ export class Task {
 			}
 		}
 
-		// Now that checkpoint tracker is initialized, update the dummy checkpoint_created message with the commit hash. (This is necessary since we use the API request loading as an opportunity to initialize the checkpoint tracker, which can take some time)
-		if (isFirstRequest) {
-			const commitHash = await this.checkpointTracker?.commit()
+		// Now, if it's the first request AND checkpoints are enabled AND tracker was successfully initialized,
+		// then say "checkpoint_created" and perform the commit.
+		if (isFirstRequest && this.enableCheckpoints && this.checkpointTracker) {
+			await this.say("checkpoint_created") // Now this is conditional
+			const commitHash = await this.checkpointTracker.commit() // Actual commit
 			const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
 			if (lastCheckpointMessage) {
 				lastCheckpointMessage.lastCheckpointHash = commitHash
-				await this.saveClineMessagesAndUpdateHistory()
+				// saveClineMessagesAndUpdateHistory will be called later after API response,
+				// so no need to call it here unless this is the only modification to this message.
+				// For now, assuming it's handled later.
 			}
+		} else if (isFirstRequest && this.enableCheckpoints && !this.checkpointTracker && this.checkpointTrackerErrorMessage) {
+			// Checkpoints are enabled, but tracker failed to initialize.
+			// checkpointTrackerErrorMessage is already set and will be part of the state.
+			// No explicit UI message here, error message will be in ExtensionState.
 		}
 
 		const [parsedUserContent, environmentDetails, clinerulesError] = await this.loadContext(userContent, includeFileDetails)
@@ -3859,7 +3910,7 @@ export class Task {
 							assistantMessage += chunk.text
 							// parse raw assistant message into content blocks
 							const prevLength = this.assistantMessageContent.length
-							this.assistantMessageContent = parseAssistantMessageV2(assistantMessage)
+							this.assistantMessageContent = parseAssistantMessage(assistantMessage)
 							if (this.assistantMessageContent.length > prevLength) {
 								this.userMessageContentReady = false // new content we need to present, reset to false in case previous content set this to true
 							}

src/integrations/checkpoints/CheckpointTracker-old.ts

@@ -21,15 +21,17 @@ class CheckpointTracker {
 		this.cwd = cwd
 	}
 
-	public static async create(taskId: string, provider?: ClineProvider): Promise<CheckpointTracker | undefined> {
+	public static async create(
+		taskId: string,
+		enableCheckpointsSetting: boolean,
+		provider?: ClineProvider,
+	): Promise<CheckpointTracker | undefined> {
 		try {
 			if (!provider) {
 				throw new Error("Provider is required to create a checkpoint tracker")
 			}
 
-			// Check if checkpoints are disabled in VS Code settings
-			const enableCheckpoints = vscode.workspace.getConfiguration("cline").get<boolean>("enableCheckpoints") ?? true
-			if (!enableCheckpoints) {
+			if (!enableCheckpointsSetting) {
 				return undefined // Don't create tracker when disabled
 			}
 

src/integrations/checkpoints/CheckpointTracker.ts

@@ -90,7 +90,11 @@ class CheckpointTracker {
 	 * Configuration:
 	 * - Respects 'cline.enableCheckpoints' VS Code setting
 	 */
-	public static async create(taskId: string, globalStoragePath: string | undefined): Promise<CheckpointTracker | undefined> {
+	public static async create(
+		taskId: string,
+		globalStoragePath: string | undefined,
+		enableCheckpointsSetting: boolean,
+	): Promise<CheckpointTracker | undefined> {
 		if (!globalStoragePath) {
 			throw new Error("Global storage path is required to create a checkpoint tracker")
 		}
@@ -98,9 +102,9 @@ class CheckpointTracker {
 			console.info(`Creating new CheckpointTracker for task ${taskId}`)
 			const startTime = performance.now()
 
-			// Check if checkpoints are disabled in VS Code settings
-			const enableCheckpoints = vscode.workspace.getConfiguration("cline").get<boolean>("enableCheckpoints") ?? true
-			if (!enableCheckpoints) {
+			// Check if checkpoints are disabled by setting
+			if (!enableCheckpointsSetting) {
+				console.info(`Checkpoints disabled by setting for task ${taskId}`)
 				return undefined // Don't create tracker when disabled
 			}
 

src/integrations/editor/DiffViewProvider.ts

@@ -91,9 +91,9 @@ export class DiffViewProvider {
 				const currentFirstVisibleLine = e.visibleRanges[0]?.start.line || 0
 
 				// If the first visible line moved upward, user scrolled up
-				// if (currentFirstVisibleLine < this.lastFirstVisibleLine) {
-				// 	this.shouldAutoScroll = false
-				// }
+				if (currentFirstVisibleLine < this.lastFirstVisibleLine) {
+					this.shouldAutoScroll = false
+				}
 
 				// Always update our tracking variable
 				this.lastFirstVisibleLine = currentFirstVisibleLine

src/services/posthog/PostHogClientProvider.ts

@@ -9,7 +9,6 @@ class PostHogClientProvider {
 		this.client = new PostHog(posthogConfig.apiKey, {
 			host: posthogConfig.host,
 			enableExceptionAutocapture: false,
-			defaultOptIn: false,
 		})
 	}
 

src/shared/AutoApprovalSettings.ts

@@ -22,18 +22,18 @@ export interface AutoApprovalSettings {
 
 export const DEFAULT_AUTO_APPROVAL_SETTINGS: AutoApprovalSettings = {
 	version: 1,
-	enabled: true,
+	enabled: false,
 	actions: {
-		readFiles: true,
+		readFiles: false,
 		readFilesExternally: false,
 		editFiles: false,
 		editFilesExternally: false,
-		executeSafeCommands: true,
+		executeSafeCommands: false,
 		executeAllCommands: false,
 		useBrowser: false,
 		useMcp: false,
 	},
 	maxRequests: 20,
 	enableNotifications: false,
-	favorites: ["enableAll", "readFiles", "editFiles"],
+	favorites: [],
 }

src/shared/ChatSettings.ts

@@ -1,7 +1,15 @@
+export type OpenAIReasoningEffort = "low" | "medium" | "high"
+
 export interface ChatSettings {
 	mode: "plan" | "act"
+	preferredLanguage?: string
+	openAIReasoningEffort?: OpenAIReasoningEffort
 }
 
+export type PartialChatSettings = Partial<ChatSettings>
+
 export const DEFAULT_CHAT_SETTINGS: ChatSettings = {
 	mode: "act",
+	preferredLanguage: "English",
+	openAIReasoningEffort: "medium",
 }

src/shared/ExtensionMessage.ts

@@ -126,6 +126,7 @@ export interface ExtensionState {
 	customInstructions?: string
 	mcpMarketplaceEnabled?: boolean
 	planActSeparateModelsSetting: boolean
+	enableCheckpointsSetting?: boolean
 	platform: Platform
 	shouldShowAnnouncement: boolean
 	taskHistory: HistoryItem[]

src/shared/WebviewMessage.ts

@@ -37,6 +37,7 @@ export interface WebviewMessage {
 		| "authStateChanged"
 		| "authCallback"
 		| "fetchMcpMarketplace"
+		| "downloadMcp"
 		| "silentlyRefreshMcpMarketplace"
 		| "searchCommits"
 		| "fetchLatestMcpServersFromHub"
@@ -53,6 +54,7 @@ export interface WebviewMessage {
 		| "taskFeedback"
 		| "scrollToSettings"
 		| "searchFiles"
+		| "toggleFavoriteModel"
 		| "grpc_request"
 		| "grpc_request_cancel"
 		| "toggleClineRule"
@@ -90,6 +92,8 @@ export interface WebviewMessage {
 	// For openInBrowser
 	url?: string
 	planActSeparateModelsSetting?: boolean
+	enableCheckpointsSetting?: boolean
+	mcpMarketplaceEnabled?: boolean
 	telemetrySetting?: TelemetrySetting
 	customInstructionsSetting?: string
 	// For task feedback

src/shared/api.ts

@@ -19,7 +19,6 @@ export type ApiProvider =
 	| "vscode-lm"
 	| "cline"
 	| "litellm"
-	| "fireworks"
 	| "asksage"
 	| "xai"
 	| "sambanova"
@@ -71,16 +70,11 @@ export interface ApiHandlerOptions {
 	requestyModelInfo?: ModelInfo
 	togetherApiKey?: string
 	togetherModelId?: string
-	fireworksApiKey?: string
-	fireworksModelId?: string
-	fireworksModelMaxCompletionTokens?: number
-	fireworksModelMaxTokens?: number
 	qwenApiKey?: string
 	doubaoApiKey?: string
 	mistralApiKey?: string
 	azureApiVersion?: string
 	vsCodeLmModelSelector?: LanguageModelChatSelector
-	o3MiniReasoningEffort?: string
 	qwenApiLine?: string
 	asksageApiUrl?: string
 	asksageApiKey?: string

src/shared/proto/mcp.ts

@@ -6,7 +6,7 @@
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"
-import { Empty, Metadata, StringRequest } from "./common"
+import { Metadata } from "./common"
 
 export const protobufPackage = "cline"
 
@@ -1004,14 +1004,6 @@ export const McpServiceDefinition = {
 			responseStream: false,
 			options: {},
 		},
-		downloadMcp: {
-			name: "downloadMcp",
-			requestType: StringRequest,
-			requestStream: false,
-			responseType: Empty,
-			responseStream: false,
-			options: {},
-		},
 	},
 } as const
 

src/shared/proto/slash.ts

@@ -1,36 +0,0 @@
-// Code generated by protoc-gen-ts_proto. DO NOT EDIT.
-// versions:
-//   protoc-gen-ts_proto  v2.7.0
-//   protoc               v3.19.1
-// source: slash.proto
-
-/* eslint-disable */
-import { Empty, StringRequest } from "./common"
-
-export const protobufPackage = "cline"
-
-/** SlashService provides methods for managing slash */
-export type SlashServiceDefinition = typeof SlashServiceDefinition
-export const SlashServiceDefinition = {
-	name: "SlashService",
-	fullName: "cline.SlashService",
-	methods: {
-		/** Sends button click message */
-		reportBug: {
-			name: "reportBug",
-			requestType: StringRequest,
-			requestStream: false,
-			responseType: Empty,
-			responseStream: false,
-			options: {},
-		},
-		condense: {
-			name: "condense",
-			requestType: StringRequest,
-			requestStream: false,
-			responseType: Empty,
-			responseStream: false,
-			options: {},
-		},
-	},
-} as const

src/shared/proto/state.ts

@@ -6,7 +6,7 @@
 
 /* eslint-disable */
 import { BinaryReader, BinaryWriter } from "@bufbuild/protobuf/wire"
-import { Empty, EmptyRequest, StringRequest } from "./common"
+import { EmptyRequest } from "./common"
 
 export const protobufPackage = "cline"
 
@@ -93,14 +93,6 @@ export const StateServiceDefinition = {
 			responseStream: true,
 			options: {},
 		},
-		toggleFavoriteModel: {
-			name: "toggleFavoriteModel",
-			requestType: StringRequest,
-			requestStream: false,
-			responseType: Empty,
-			responseStream: false,
-			options: {},
-		},
 	},
 } as const
 

src/shared/services/config/posthog-config.ts

@@ -1,6 +1,5 @@
 // Public PostHog key (safe for open source)
 export const posthogConfig = {
 	apiKey: "phc_qfOAGxZw2TL5O8p9KYd9ak3bPBFzfjC8fy5L6jNWY7K",
-	host: "https://data.cline.bot",
-	uiHost: "https://us.posthog.com",
+	host: "https://us.i.posthog.com",
 }

webview-ui/package-lock.json

@@ -68,7 +68,6 @@
 				"vitest": "^3.0.5"
 			},
 			"optionalDependencies": {
-				"@rollup/rollup-linux-arm64-gnu": "^4.40.0",
 				"@rollup/rollup-linux-x64-gnu": "^4.40.0",
 				"@swc/core-linux-x64-gnu": "^1.11.0",
 				"@tailwindcss/oxide-linux-x64-gnu": "^4.0.1",
@@ -5440,34 +5439,6 @@
 				"react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0-rc.1"
 			}
 		},
-		"node_modules/@rollup/rollup-android-arm-eabi": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.40.1.tgz",
-			"integrity": "sha512-kxz0YeeCrRUHz3zyqvd7n+TVRlNyTifBsmnmNPtk3hQURUyG9eAB+usz6DAwagMusjx/zb3AjvDUvhFGDAexGw==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
-		"node_modules/@rollup/rollup-android-arm64": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.40.1.tgz",
-			"integrity": "sha512-PPkxTOisoNC6TpnDKatjKkjRMsdaWIhyuMkA4UsBXT9WEZY4uHezBTjs6Vl4PbqQQeu6oION1w2voYZv9yquCw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"android"
-			]
-		},
 		"node_modules/@rollup/rollup-darwin-arm64": {
 			"version": "4.40.1",
 			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.40.1.tgz",
@@ -5482,173 +5453,6 @@
 				"darwin"
 			]
 		},
-		"node_modules/@rollup/rollup-darwin-x64": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.40.1.tgz",
-			"integrity": "sha512-nIwkXafAI1/QCS7pxSpv/ZtFW6TXcNUEHAIA9EIyw5OzxJZQ1YDrX+CL6JAIQgZ33CInl1R6mHet9Y/UZTg2Bw==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"darwin"
-			]
-		},
-		"node_modules/@rollup/rollup-freebsd-arm64": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.40.1.tgz",
-			"integrity": "sha512-BdrLJ2mHTrIYdaS2I99mriyJfGGenSaP+UwGi1kB9BLOCu9SR8ZpbkmmalKIALnRw24kM7qCN0IOm6L0S44iWw==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			]
-		},
-		"node_modules/@rollup/rollup-freebsd-x64": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.40.1.tgz",
-			"integrity": "sha512-VXeo/puqvCG8JBPNZXZf5Dqq7BzElNJzHRRw3vjBE27WujdzuOPecDPc/+1DcdcTptNBep3861jNq0mYkT8Z6Q==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"freebsd"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.40.1.tgz",
-			"integrity": "sha512-ehSKrewwsESPt1TgSE/na9nIhWCosfGSFqv7vwEtjyAqZcvbGIg4JAcV7ZEh2tfj/IlfBeZjgOXm35iOOjadcg==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm-musleabihf": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.40.1.tgz",
-			"integrity": "sha512-m39iO/aaurh5FVIu/F4/Zsl8xppd76S4qoID8E+dSRQvTyZTOI2gVk3T4oqzfq1PtcvOfAVlwLMK3KRQMaR8lg==",
-			"cpu": [
-				"arm"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.40.2",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.2.tgz",
-			"integrity": "sha512-KlE8IC0HFOC33taNt1zR8qNlBYHj31qGT1UqWqtvR/+NuCVhfufAq9fxO8BMFC22Wu0rxOwGVWxtCMvZVLmhQg==",
-			"cpu": [
-				"arm64"
-			],
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-arm64-musl": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.40.1.tgz",
-			"integrity": "sha512-jEwjn3jCA+tQGswK3aEWcD09/7M5wGwc6+flhva7dsQNRZZTe30vkalgIzV4tjkopsTS9Jd7Y1Bsj6a4lzz8gQ==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.40.1.tgz",
-			"integrity": "sha512-ySyWikVhNzv+BV/IDCsrraOAZ3UaC8SZB67FZlqVwXwnFhPihOso9rPOxzZbjp81suB1O2Topw+6Ug3JNegejQ==",
-			"cpu": [
-				"loong64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.40.1.tgz",
-			"integrity": "sha512-BvvA64QxZlh7WZWqDPPdt0GH4bznuL6uOO1pmgPnnv86rpUpc8ZxgZwcEgXvo02GRIZX1hQ0j0pAnhwkhwPqWg==",
-			"cpu": [
-				"ppc64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-riscv64-gnu": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.40.1.tgz",
-			"integrity": "sha512-EQSP+8+1VuSulm9RKSMKitTav89fKbHymTf25n5+Yr6gAPZxYWpj3DzAsQqoaHAk9YX2lwEyAf9S4W8F4l3VBQ==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-riscv64-musl": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.40.1.tgz",
-			"integrity": "sha512-n/vQ4xRZXKuIpqukkMXZt9RWdl+2zgGNx7Uda8NtmLJ06NL8jiHxUawbwC+hdSq1rrw/9CghCpEONor+l1e2gA==",
-			"cpu": [
-				"riscv64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-linux-s390x-gnu": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.40.1.tgz",
-			"integrity": "sha512-h8d28xzYb98fMQKUz0w2fMc1XuGzLLjdyxVIbhbil4ELfk5/orZlSTpF/xdI9C8K0I8lCkq+1En2RJsawZekkg==",
-			"cpu": [
-				"s390x"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
 		"node_modules/@rollup/rollup-linux-x64-gnu": {
 			"version": "4.40.1",
 			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.40.1.tgz",
@@ -5662,62 +5466,6 @@
 				"linux"
 			]
 		},
-		"node_modules/@rollup/rollup-linux-x64-musl": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.40.1.tgz",
-			"integrity": "sha512-2BRORitq5rQ4Da9blVovzNCMaUlyKrzMSvkVR0D4qPuOy/+pMCrh1d7o01RATwVy+6Fa1WBw+da7QPeLWU/1mQ==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-arm64-msvc": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.40.1.tgz",
-			"integrity": "sha512-b2bcNm9Kbde03H+q+Jjw9tSfhYkzrDUf2d5MAd1bOJuVplXvFhWz7tRtWvD8/ORZi7qSCy0idW6tf2HgxSXQSg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-ia32-msvc": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.40.1.tgz",
-			"integrity": "sha512-DfcogW8N7Zg7llVEfpqWMZcaErKfsj9VvmfSyRjCyo4BI3wPEfrzTtJkZG6gKP/Z92wFm6rz2aDO7/JfiR/whA==",
-			"cpu": [
-				"ia32"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
-		"node_modules/@rollup/rollup-win32-x64-msvc": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.40.1.tgz",
-			"integrity": "sha512-ECyOuDeH3C1I8jH2MK1RtBJW+YPMvSfT0a5NN0nHfQYnDSJ6tUiZH3gzwVP5/Kfh/+Tt7tpWVF9LXNTnhTJ3kA==",
-			"cpu": [
-				"x64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"win32"
-			]
-		},
 		"node_modules/@rrweb/types": {
 			"version": "2.0.0-alpha.17",
 			"resolved": "https://registry.npmjs.org/@rrweb/types/-/types-2.0.0-alpha.17.tgz",
@@ -13645,20 +13393,6 @@
 				"fsevents": "~2.3.2"
 			}
 		},
-		"node_modules/rollup/node_modules/@rollup/rollup-linux-arm64-gnu": {
-			"version": "4.40.1",
-			"resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.40.1.tgz",
-			"integrity": "sha512-Y+GHnGaku4aVLSgrT0uWe2o2Rq8te9hi+MwqGF9r9ORgXhmHK5Q71N757u0F8yU1OIwUIFy6YiJtKjtyktk5hg==",
-			"cpu": [
-				"arm64"
-			],
-			"dev": true,
-			"license": "MIT",
-			"optional": true,
-			"os": [
-				"linux"
-			]
-		},
 		"node_modules/roughjs": {
 			"version": "4.6.6",
 			"resolved": "https://registry.npmjs.org/roughjs/-/roughjs-4.6.6.tgz",

webview-ui/package.json

@@ -74,7 +74,6 @@
 		"vitest": "^3.0.5"
 	},
 	"optionalDependencies": {
-		"@rollup/rollup-linux-arm64-gnu": "^4.40.0",
 		"@rollup/rollup-linux-x64-gnu": "^4.40.0",
 		"@swc/core-linux-x64-gnu": "^1.11.0",
 		"@tailwindcss/oxide-linux-x64-gnu": "^4.0.1",

webview-ui/src/CustomPostHogProvider.tsx

@@ -6,20 +6,15 @@ import { useExtensionState } from "./context/ExtensionStateContext"
 
 export function CustomPostHogProvider({ children }: { children: ReactNode }) {
 	const { telemetrySetting } = useExtensionState()
-	const isTelemetryEnabled = telemetrySetting !== "disabled"
+	const isTelemetryEnabled = telemetrySetting === "enabled"
 
 	useEffect(() => {
-		posthog.init(posthogConfig.apiKey, {
-			api_host: posthogConfig.host,
-			ui_host: posthogConfig.uiHost,
-			opt_out_capturing_by_default: true,
-			disable_session_recording: true,
-			capture_pageview: false,
-			capture_dead_clicks: true,
-		})
-
 		if (isTelemetryEnabled) {
-			posthog.opt_in_capturing()
+			posthog.init(posthogConfig.apiKey, {
+				api_host: posthogConfig.host,
+				autocapture: false,
+				disable_session_recording: true,
+			})
 		} else {
 			posthog.opt_out_capturing()
 		}

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

@@ -378,7 +378,7 @@ export const ChatRowContent = ({
 								marginBottom: "-1.5px",
 							}}></span>
 					),
-					<span className="ph-no-capture" style={{ color: normalColor, fontWeight: "bold", wordBreak: "break-word" }}>
+					<span style={{ color: normalColor, fontWeight: "bold", wordBreak: "break-word" }}>
 						Cline wants to {mcpServerUse.type === "use_mcp_tool" ? "use a tool" : "access a resource"} on the{" "}
 						<code style={{ wordBreak: "break-all" }}>
 							{getMcpServerDisplayName(mcpServerUse.serverName, mcpMarketplaceCatalog)}
@@ -493,7 +493,7 @@ export const ChatRowContent = ({
 		}
 		const toolIcon = (name: string, color?: string, rotation?: number, title?: string) => (
 			<span
-				className={`codicon codicon-${name} ph-no-capture`}
+				className={`codicon codicon-${name}`}
 				style={{
 					color: color ? colorMap[color as keyof typeof colorMap] || color : "var(--vscode-foreground)",
 					marginBottom: "-1.5px",
@@ -577,7 +577,6 @@ export const ChatRowContent = ({
 								}}>
 								{tool.path?.startsWith(".") && <span>.</span>}
 								<span
-									className="ph-no-capture"
 									style={{
 										whiteSpace: "nowrap",
 										overflow: "hidden",
@@ -1000,13 +999,12 @@ export const ChatRowContent = ({
 													}}
 												/>
 											</span>
-											<span className="ph-no-capture">{message.text}</span>
+											{message.text}
 										</div>
 									) : (
 										<div style={{ display: "flex", alignItems: "center" }}>
 											<span style={{ fontWeight: "bold", marginRight: "4px" }}>Thinking:</span>
 											<span
-												className="ph-no-capture"
 												style={{
 													whiteSpace: "nowrap",
 													overflow: "hidden",

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

@@ -1036,8 +1036,6 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 					return `vscode-lm:${apiConfiguration.vsCodeLmModelSelector ? `${apiConfiguration.vsCodeLmModelSelector.vendor ?? ""}/${apiConfiguration.vsCodeLmModelSelector.family ?? ""}` : unknownModel}`
 				case "together":
 					return `${selectedProvider}:${apiConfiguration.togetherModelId}`
-				case "fireworks":
-					return `fireworks:${apiConfiguration.fireworksModelId}`
 				case "lmstudio":
 					return `${selectedProvider}:${apiConfiguration.lmStudioModelId}`
 				case "ollama":

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

@@ -18,7 +18,7 @@ import { combineCommandSequences } from "@shared/combineCommandSequences"
 import { getApiMetrics } from "@shared/getApiMetrics"
 import { useExtensionState } from "@/context/ExtensionStateContext"
 import { vscode } from "@/utils/vscode"
-import { TaskServiceClient, SlashServiceClient } from "@/services/grpc-client"
+import { TaskServiceClient } from "@/services/grpc-client"
 import HistoryPreview from "@/components/history/HistoryPreview"
 import { normalizeApiConfiguration } from "@/components/settings/ApiOptions"
 import Announcement from "@/components/chat/Announcement"
@@ -147,62 +147,17 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 			if (window.getSelection) {
 				const selection = window.getSelection()
 				if (selection && selection.rangeCount > 0) {
+					// Get the selected HTML content
 					const range = selection.getRangeAt(0)
-					const commonAncestor = range.commonAncestorContainer
-					let textToCopy: string | null = null
+					const clonedSelection = range.cloneContents()
+					const div = document.createElement("div")
+					div.appendChild(clonedSelection)
+					const selectedHtml = div.innerHTML
 
-					// Check if the selection is inside an element where plain text copy is preferred
-					let currentElement =
-						commonAncestor.nodeType === Node.ELEMENT_NODE
-							? (commonAncestor as HTMLElement)
-							: commonAncestor.parentElement
-					let preferPlainTextCopy = false
-					while (currentElement) {
-						if (currentElement.tagName === "PRE" && currentElement.querySelector("code")) {
-							preferPlainTextCopy = true
-							break
-						}
-						// Check computed white-space style
-						const computedStyle = window.getComputedStyle(currentElement)
-						if (
-							computedStyle.whiteSpace === "pre" ||
-							computedStyle.whiteSpace === "pre-wrap" ||
-							computedStyle.whiteSpace === "pre-line"
-						) {
-							// If the element itself or an ancestor has pre-like white-space,
-							// and the selection is likely contained within it, prefer plain text.
-							// This helps with elements like the TaskHeader's text display.
-							preferPlainTextCopy = true
-							break
-						}
-
-						// Stop searching if we reach a known chat message boundary or body
-						if (
-							currentElement.classList.contains("chat-row-assistant-message-container") ||
-							currentElement.classList.contains("chat-row-user-message-container") ||
-							currentElement.tagName === "BODY"
-						) {
-							break
-						}
-						currentElement = currentElement.parentElement
-					}
-
-					if (preferPlainTextCopy) {
-						// For code blocks or elements with pre-formatted white-space, get plain text.
-						textToCopy = selection.toString()
-					} else {
-						// For other content, use the existing HTML-to-Markdown conversion
-						const clonedSelection = range.cloneContents()
-						const div = document.createElement("div")
-						div.appendChild(clonedSelection)
-						const selectedHtml = div.innerHTML
-						textToCopy = await convertHtmlToMarkdown(selectedHtml)
-					}
-
-					if (textToCopy !== null) {
-						vscode.postMessage({ type: "copyToClipboard", text: textToCopy })
-						e.preventDefault()
-					}
+					// Convert HTML to Markdown
+					const markdown = await convertHtmlToMarkdown(selectedHtml)
+					vscode.postMessage({ type: "copyToClipboard", text: markdown })
+					e.preventDefault()
 				}
 			}
 		}
@@ -556,10 +511,16 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 					})
 					break
 				case "condense":
-					await SlashServiceClient.condense({ value: lastMessage?.text }).catch((err) => console.error(err))
+					vscode.postMessage({
+						type: "condense",
+						text: lastMessage?.text,
+					})
 					break
 				case "report_bug":
-					await SlashServiceClient.reportBug({ value: lastMessage?.text }).catch((err) => console.error(err))
+					vscode.postMessage({
+						type: "reportBug",
+						text: lastMessage?.text,
+					})
 					break
 			}
 			setSendingDisabled(true)

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

@@ -93,11 +93,8 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
 				if (option.value) {
 					return (
 						<div style={{ display: "flex", flexDirection: "column", gap: 0 }}>
-							<span className="ph-no-capture" style={{ lineHeight: "1.2" }}>
-								{option.label}
-							</span>
+							<span style={{ lineHeight: "1.2" }}>{option.label}</span>
 							<span
-								className="ph-no-capture"
 								style={{
 									fontSize: "0.85em",
 									opacity: 0.7,
@@ -121,7 +118,6 @@ const ContextMenu: React.FC<ContextMenuProps> = ({
 							<span>/</span>
 							{option.value?.startsWith("/.") && <span>.</span>}
 							<span
-								className="ph-no-capture"
 								style={{
 									whiteSpace: "nowrap",
 									overflow: "hidden",

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

@@ -51,8 +51,6 @@ export const OptionsButtons = ({
 			</div> */}
 			{options.map((option, index) => (
 				<OptionButton
-					id={`options-button-${index}`}
-					className="options-button"
 					key={index}
 					isSelected={option === selected}
 					isNotSelectable={hasSelected || !isActive}
@@ -65,7 +63,7 @@ export const OptionsButtons = ({
 							text: option + (inputValue ? `: ${inputValue?.trim()}` : ""),
 						})
 					}}>
-					<span className="ph-no-capture">{option}</span>
+					{option}
 				</OptionButton>
 			))}
 		</div>

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

@@ -51,8 +51,7 @@ const SlashCommandMenu: React.FC<SlashCommandMenuProps> = ({ onSelect, selectedI
 					filteredCommands.map((command, index) => (
 						<div
 							key={command.name}
-							id={`slash-command-menu-item-${index}`}
-							className={`slash-command-menu-item py-2 px-3 cursor-pointer flex flex-col border-b border-[var(--vscode-editorGroup-border)] ${
+							className={`py-2 px-3 cursor-pointer flex flex-col border-b border-[var(--vscode-editorGroup-border)] ${
 								// Corrected padding
 								index === selectedIndex
 									? "bg-[var(--vscode-quickInputList-focusBackground)] text-[var(--vscode-quickInputList-focusForeground)]"
@@ -60,11 +59,9 @@ const SlashCommandMenu: React.FC<SlashCommandMenuProps> = ({ onSelect, selectedI
 							} hover:bg-[var(--vscode-list-hoverBackground)]`}
 							onClick={() => handleClick(command)}
 							onMouseEnter={() => setSelectedIndex(index)}>
-							<div className="font-bold whitespace-nowrap overflow-hidden text-ellipsis">
-								<span className="ph-no-capture">/{command.name}</span>
-							</div>
+							<div className="font-bold whitespace-nowrap overflow-hidden text-ellipsis">/{command.name}</div>
 							<div className="text-[0.85em] text-[var(--vscode-descriptionForeground)] whitespace-normal overflow-hidden text-ellipsis">
-								<span className="ph-no-capture">{command.description}</span>
+								{command.description}
 							</div>
 						</div>
 					))

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

@@ -256,11 +256,7 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
 								Task
 								{!isTaskExpanded && ":"}
 							</span>
-							{!isTaskExpanded && (
-								<span className="ph-no-capture" style={{ marginLeft: 4 }}>
-									{highlightText(task.text, false)}
-								</span>
-							)}
+							{!isTaskExpanded && <span style={{ marginLeft: 4 }}>{highlightText(task.text, false)}</span>}
 						</div>
 					</div>
 					{isCostAvailable && (
@@ -306,7 +302,7 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
 									wordBreak: "break-word",
 									overflowWrap: "anywhere",
 								}}>
-								<span className="ph-no-capture">{highlightText(task.text, false)}</span>
+								{highlightText(task.text, false)}
 							</div>
 							{!isTextExpanded && showSeeMore && (
 								<div

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

@@ -75,7 +75,7 @@ const UserMessage: React.FC<UserMessageProps> = ({ text, images, messageTs, send
 			setIsEditing(false)
 		} else if (e.key === "Enter" && e.metaKey && !checkpointTrackerErrorMessage) {
 			handleRestoreWorkspace("taskAndWorkspace")
-		} else if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing && e.keyCode !== 229) {
+		} else if (e.key === "Enter" && !e.shiftKey) {
 			e.preventDefault()
 			handleRestoreWorkspace("task")
 		}
@@ -141,9 +141,7 @@ const UserMessage: React.FC<UserMessageProps> = ({ text, images, messageTs, send
 					</div>
 				</>
 			) : (
-				<span className="ph-no-capture" style={{ display: "block" }}>
-					{highlightText(editedText || text)}
-				</span>
+				<span style={{ display: "block" }}>{highlightText(editedText || text)}</span>
 			)}
 			{images && images.length > 0 && <Thumbnails images={images} style={{ marginTop: "8px" }} />}
 		</div>

webview-ui/src/components/chat/__tests__/UserMessage.ime.test.tsx

@@ -1,44 +0,0 @@
-/**
- * UserMessage – IME composition Enter test
- * --------------------------------------------------
- * Confirm that sendMessageFromChatRow is not called
- * even if you confirm the IME conversion (Enter) in message re-edit mode.
- */
-
-import React from "react"
-import { render, fireEvent } from "@testing-library/react"
-import { describe, it, expect, vi } from "vitest"
-
-vi.mock("@/context/ExtensionStateContext", () => ({
-	__esModule: true,
-	useExtensionState: () => ({
-		state: {},
-		dispatch: vi.fn(),
-	}),
-}))
-
-import UserMessage from "../UserMessage"
-
-describe("UserMessage – IME composition handling", () => {
-	it("does NOT send when IME composition Enter is pressed while editing", () => {
-		const sendMessageFromChatRow = vi.fn()
-
-		const { getByText } = render(
-			<UserMessage text="変換テスト" images={[]} messageTs={Date.now()} sendMessageFromChatRow={sendMessageFromChatRow} />,
-		)
-
-		const editable = getByText("変換テスト") as HTMLElement
-		editable.setAttribute("contenteditable", "true")
-		editable.focus()
-
-		fireEvent.compositionStart(editable)
-		fireEvent.keyDown(editable, {
-			key: "Enter",
-			keyCode: 13,
-			nativeEvent: { isComposing: true },
-		})
-		fireEvent.compositionEnd(editable)
-
-		expect(sendMessageFromChatRow).not.toHaveBeenCalled()
-	})
-})

webview-ui/src/components/chat/auto-approve-menu/AutoApproveMenu.tsx

@@ -5,7 +5,7 @@ import { AutoApprovalSettings } from "@shared/AutoApprovalSettings"
 import { CODE_BLOCK_BG_COLOR } from "@/components/common/CodeBlock"
 import AutoApproveMenuItem from "./AutoApproveMenuItem"
 import { vscode } from "@/utils/vscode"
-import { getAsVar, VSC_FOREGROUND, VSC_TITLEBAR_INACTIVE_FOREGROUND, VSC_FOREGROUND_MUTED } from "@/utils/vscStyles"
+import { getAsVar, VSC_FOREGROUND, VSC_TITLEBAR_INACTIVE_FOREGROUND, VSC_DESCRIPTION_FOREGROUND } from "@/utils/vscStyles"
 import { useClickAway } from "react-use"
 import HeroTooltip from "@/components/common/HeroTooltip"
 
@@ -281,43 +281,6 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 		)
 	}
 
-	// Render a favorited item with a checkbox
-	const getQuickAccessItems = () => {
-		const notificationsEnabled = autoApprovalSettings.enableNotifications
-		const enabledActionsNames = Object.keys(autoApprovalSettings.actions).filter(
-			(key) => autoApprovalSettings.actions[key as keyof AutoApprovalSettings["actions"]],
-		)
-		const enabledActions = enabledActionsNames.map((action) => {
-			return ACTION_METADATA.flatMap((a) => [a, a.subAction]).find((a) => a?.id === action)
-		})
-
-		let minusFavorites = enabledActions.filter((action) => !favorites.includes(action?.id ?? "") && action?.shortName)
-
-		if (notificationsEnabled) {
-			minusFavorites.push(NOTIFICATIONS_SETTING)
-		}
-
-		return [
-			...favorites.map((favId) => renderFavoritedItem(favId)),
-			minusFavorites.length > 0 ? (
-				<span style={{ color: getAsVar(VSC_FOREGROUND_MUTED), paddingLeft: "10px", opacity: 0.6 }} key="separator">
-					✓
-				</span>
-			) : null,
-			...minusFavorites.map((action, index) => (
-				<span
-					style={{
-						color: getAsVar(VSC_FOREGROUND_MUTED),
-						opacity: 0.6,
-					}}
-					key={action?.id}>
-					{action?.shortName}
-					{index < minusFavorites.length - 1 && ","}
-				</span>
-			)),
-		]
-	}
-
 	const isChecked = (action: ActionMetadata): boolean => {
 		if (action.id === "enableNotifications") {
 			return autoApprovalSettings.enableNotifications
@@ -336,7 +299,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 		<div
 			ref={menuRef}
 			style={{
-				padding: "0 4px 0 10px",
+				padding: "0 10px",
 				margin: "0 5px",
 				userSelect: "none",
 				borderTop: `0.5px solid color-mix(in srgb, ${getAsVar(VSC_TITLEBAR_INACTIVE_FOREGROUND)} 20%, transparent)`,
@@ -352,27 +315,43 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 					style={{
 						cursor: "pointer",
 						paddingTop: "6px",
-						paddingRight: "2px",
 						display: "flex",
 						alignItems: "center",
 						justifyContent: "space-between",
 						gap: "8px",
 					}}>
-					<div
-						style={{
-							display: "flex",
-							flexWrap: "nowrap",
-							alignItems: "center",
-							overflowX: "auto",
-							msOverflowStyle: "none",
-							scrollbarWidth: "none",
-							WebkitOverflowScrolling: "touch",
-							gap: "4px",
-							whiteSpace: "nowrap", // Prevent text wrapping
-						}}>
-						<span>Auto-approve:</span>
-						{getQuickAccessItems()}
-					</div>
+					{favorites.length > 0 ? (
+						<div
+							style={{
+								display: "flex",
+								flexWrap: "nowrap",
+								alignItems: "center",
+								overflowX: "auto",
+								msOverflowStyle: "none",
+								scrollbarWidth: "none",
+								WebkitOverflowScrolling: "touch",
+								gap: "4px",
+								whiteSpace: "nowrap", // Prevent text wrapping
+							}}>
+							{favorites.map((favId) => renderFavoritedItem(favId))}
+						</div>
+					) : (
+						<div
+							style={{
+								display: "flex",
+								justifyContent: "space-between",
+								alignItems: "center",
+								cursor: "pointer",
+							}}>
+							<div style={{ display: "flex", alignItems: "center", gap: "8px" }}>
+								<HeroTooltip
+									content="Auto-approve allows Cline to perform the following actions without asking for permission. Please use with caution and only enable if you understand the risks."
+									placement="top">
+									<span style={{ color: getAsVar(VSC_FOREGROUND), left: "0" }}>Auto-approve</span>
+								</HeroTooltip>
+							</div>
+						</div>
+					)}
 					<span className="codicon codicon-chevron-right" />
 				</div>
 			)}
@@ -383,10 +362,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 					maxHeight: isExpanded ? "1000px" : favorites.length > 0 ? "40px" : "22px", // Large enough to fit content
 					opacity: isExpanded ? 1 : 0,
 					overflow: "hidden",
-					transition: "max-height 0.3s ease-in-out, opacity 0.3s ease-in-out",
-					display: "flex",
-					flexDirection: "column",
-					gap: "4px",
+					transition: "max-height 0.3s ease-in-out, opacity 0.3s ease-in-out", // Removed padding to transition
 				}}>
 				{isExpanded && ( // Re-added conditional rendering for content
 					<>
@@ -395,7 +371,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 								display: "flex",
 								justifyContent: "space-between",
 								alignItems: "center",
-								padding: "8px 4px 8px 0",
+								padding: "8px 0",
 								cursor: "pointer",
 								position: "relative", // Added for positioning context
 							}}
@@ -403,9 +379,9 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 							<HeroTooltip
 								content="Auto-approve allows Cline to perform the following actions without asking for permission. Please use with caution and only enable if you understand the risks."
 								placement="top">
-								<span style={{ color: getAsVar(VSC_FOREGROUND), fontWeight: 500 }}>Auto-approve:</span>
+								<span style={{ color: getAsVar(VSC_FOREGROUND) }}>Auto-approve</span>
 							</HeroTooltip>
-							<span className="codicon codicon-chevron-down" />
+							<span className="codicon codicon-chevron-down" style={{ paddingRight: "4px" }} />
 						</div>
 
 						<div
@@ -413,7 +389,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 							style={{
 								columnCount: containerWidth > breakpoint ? 2 : 1,
 								columnGap: "4px",
-								margin: "4px 0 16px 0",
+								margin: "4px 0 8px 0",
 								position: "relative", // For absolute positioning of the separator
 							}}>
 							{/* Vertical separator line - only visible in two-column mode */}
@@ -444,7 +420,14 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 								/>
 							))}
 						</div>
-						<span style={{ color: getAsVar(VSC_FOREGROUND), marginBottom: 4, fontWeight: 500 }}>Quick Settings:</span>
+						<div
+							style={{
+								height: "0.5px",
+								background: getAsVar(VSC_TITLEBAR_INACTIVE_FOREGROUND),
+								margin: "8px 0",
+								opacity: 0.2,
+							}}
+						/>
 						<AutoApproveMenuItem
 							key={NOTIFICATIONS_SETTING.id}
 							action={NOTIFICATIONS_SETTING}
@@ -458,7 +441,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 							placement="top">
 							<div
 								style={{
-									margin: "2px 10px 20px 5px",
+									margin: "2px 10px 10px 5px",
 									display: "flex",
 									alignItems: "center",
 									gap: "8px",
@@ -467,7 +450,7 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 								<span className="codicon codicon-settings" style={{ color: "#CCCCCC", fontSize: "14px" }} />
 								<span style={{ color: "#CCCCCC", fontSize: "12px", fontWeight: 500 }}>Max Requests:</span>
 								<VSCodeTextField
-									style={{ flex: "1", width: "100%", paddingRight: "35px" }}
+									style={{ flex: "1", width: "100%" }}
 									value={autoApprovalSettings.maxRequests.toString()}
 									onInput={(e) => {
 										const input = e.target as HTMLInputElement
@@ -492,19 +475,6 @@ const AutoApproveMenu = ({ style }: AutoApproveMenuProps) => {
 						</HeroTooltip>
 					</>
 				)}
-				{isExpanded && (
-					<span
-						className="codicon codicon-chevron-up"
-						style={{
-							paddingBottom: "4px",
-							paddingRight: "3px",
-							marginLeft: "auto",
-							marginTop: "-20px",
-							cursor: "pointer",
-						}}
-						onClick={() => setIsExpanded(false)}
-					/>
-				)}
 			</div>
 		</div>
 	)

webview-ui/src/components/chat/auto-approve-menu/AutoApproveMenuItem.tsx

@@ -22,8 +22,7 @@ const CheckboxContainer = styled.div<{
 	display: flex;
 	align-items: center;
 	justify-content: space-between; /* Push content to edges */
-	padding-left: 4px;
-	padding-right: 1px;
+	padding: 0 4px;
 	border-radius: 4px;
 	cursor: pointer;
 	transition: all 0.2s ease;
@@ -52,7 +51,7 @@ const CheckboxContainer = styled.div<{
 	.star {
 		color: ${(props) => (props.isFavorited ? "var(--vscode-terminal-ansiYellow)" : "var(--vscode-descriptionForeground)")};
 		opacity: ${(props) => (props.isFavorited ? 1 : 0.6)};
-		font-size: 14px;
+		font-size: 12px;
 	}
 `
 
@@ -98,14 +97,9 @@ const AutoApproveMenuItem = ({
 							<span className="label">{condensed ? action.shortName : action.label}</span>
 						</div>
 						{onToggleFavorite && !condensed && (
-							<HeroTooltip
-								delay={500}
-								content={favorited ? "Remove from quick-access menu" : "Add to quick-access menu"}>
+							<HeroTooltip content={favorited ? "Remove from quick-access menu" : "Add to quick-access menu"}>
 								<span
-									className={`p-0.5 codicon codicon-${favorited ? "star-full" : "star-empty"} star`}
-									style={{
-										cursor: "pointer",
-									}}
+									className={`codicon codicon-${favorited ? "star-full" : "star-empty"} star`}
 									onClick={(e) => {
 										e.stopPropagation()
 										onToggleFavorite?.(action.id)

webview-ui/src/components/cline-rules/RuleRow.tsx

@@ -74,7 +74,7 @@ const RuleRow: React.FC<{
 				}`}>
 				<span className="flex-1 overflow-hidden break-all whitespace-normal flex items-center mr-1" title={rulePath}>
 					{getRuleTypeIcon() && <span className="mr-1.5">{getRuleTypeIcon()}</span>}
-					<span className="ph-no-capture">{displayName}</span>
+					{displayName}
 				</span>
 
 				{/* Toggle Switch */}

webview-ui/src/components/common/CodeBlock.tsx

@@ -151,9 +151,7 @@ const CodeBlock = memo(({ source, forceWrap = false }: CodeBlockProps) => {
 				maxHeight: forceWrap ? "none" : "100%",
 				backgroundColor: CODE_BLOCK_BG_COLOR,
 			}}>
-			<StyledMarkdown className="ph-no-capture" forceWrap={forceWrap}>
-				{reactContent}
-			</StyledMarkdown>
+			<StyledMarkdown forceWrap={forceWrap}>{reactContent}</StyledMarkdown>
 		</div>
 	)
 })

webview-ui/src/components/common/MarkdownBlock.tsx

@@ -339,7 +339,7 @@ const MarkdownBlock = memo(({ markdown }: MarkdownBlockProps) => {
 
 	return (
 		<div>
-			<StyledMarkdown className="ph-no-capture">{reactContent}</StyledMarkdown>
+			<StyledMarkdown>{reactContent}</StyledMarkdown>
 		</div>
 	)
 })

webview-ui/src/components/common/TelemetryBanner.tsx

@@ -12,26 +12,6 @@ const BannerContainer = styled.div`
 	gap: 10px;
 	flex-shrink: 0;
 	margin-bottom: 6px;
-	position: relative;
-`
-
-const CloseButton = styled.button`
-	position: absolute;
-	top: 12px;
-	right: 12px;
-	background: none;
-	border: none;
-	color: var(--vscode-foreground);
-	cursor: pointer;
-	font-size: 16px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: 4px;
-	opacity: 0.7;
-	&:hover {
-		opacity: 1;
-	}
 `
 
 const ButtonContainer = styled.div`
@@ -45,31 +25,31 @@ const ButtonContainer = styled.div`
 `
 
 const TelemetryBanner = () => {
-	const handleOpenSettings = () => {
-		handleClose()
-		vscode.postMessage({ type: "openSettings" })
+	const [hasChosen, setHasChosen] = useState(false)
+
+	const handleAllow = () => {
+		setHasChosen(true)
+		vscode.postMessage({ type: "telemetrySetting", telemetrySetting: "enabled" satisfies TelemetrySetting })
 	}
 
-	const handleClose = () => {
-		vscode.postMessage({ type: "telemetrySetting", telemetrySetting: "enabled" satisfies TelemetrySetting })
+	const handleDeny = () => {
+		setHasChosen(true)
+		vscode.postMessage({ type: "telemetrySetting", telemetrySetting: "disabled" satisfies TelemetrySetting })
+	}
+
+	const handleOpenSettings = () => {
+		vscode.postMessage({ type: "openSettings" })
 	}
 
 	return (
 		<BannerContainer>
-			<CloseButton onClick={handleClose} aria-label="Close banner and enable telemetry">
-				✕
-			</CloseButton>
 			<div>
 				<strong>Help Improve Cline</strong>
-				<i>
-					<br />
-					(and access experimental features)
-				</i>
 				<div style={{ marginTop: 4 }}>
-					Cline collects anonymous error and usage data to help us fix bugs and improve the extension. No code, prompts,
-					or personal information is ever sent.
+					Send anonymous error and usage data to help us fix bugs and improve the extension. No code, prompts, or
+					personal information is ever sent.
 					<div style={{ marginTop: 4 }}>
-						You can turn this setting off in{" "}
+						You can always change this in{" "}
 						<VSCodeLink href="#" onClick={handleOpenSettings}>
 							settings
 						</VSCodeLink>
@@ -77,6 +57,14 @@ const TelemetryBanner = () => {
 					</div>
 				</div>
 			</div>
+			<ButtonContainer>
+				<VSCodeButton appearance="primary" onClick={handleAllow} disabled={hasChosen}>
+					Allow
+				</VSCodeButton>
+				<VSCodeButton appearance="secondary" onClick={handleDeny} disabled={hasChosen}>
+					Deny
+				</VSCodeButton>
+			</ButtonContainer>
 		</BannerContainer>
 	)
 }

webview-ui/src/components/history/HistoryPreview.tsx

@@ -105,8 +105,6 @@ const HistoryPreview = ({ showHistoryView }: HistoryPreviewProps) => {
 								)}
 
 								<div
-									id={`history-preview-task-${item.id}`}
-									className="history-preview-task"
 									style={{
 										fontSize: "var(--vscode-font-size)",
 										color: "var(--vscode-descriptionForeground)",
@@ -119,7 +117,7 @@ const HistoryPreview = ({ showHistoryView }: HistoryPreviewProps) => {
 										wordBreak: "break-word",
 										overflowWrap: "anywhere",
 									}}>
-									<span className="ph-no-capture">{item.task}</span>
+									{item.task}
 								</div>
 								<div
 									style={{

webview-ui/src/components/history/HistoryView.tsx

@@ -514,14 +514,11 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 												whiteSpace: "pre-wrap",
 												wordBreak: "break-word",
 												overflowWrap: "anywhere",
-											}}>
-											<span
-												className="ph-no-capture"
-												dangerouslySetInnerHTML={{
-													__html: item.task,
-												}}
-											/>
-										</div>
+											}}
+											dangerouslySetInnerHTML={{
+												__html: item.task,
+											}}
+										/>
 									</div>
 									<div
 										style={{

webview-ui/src/components/mcp/configuration/tabs/marketplace/McpMarketplaceCard.tsx

@@ -1,8 +1,8 @@
 import { useCallback, useState, useRef, useMemo } from "react"
 import styled from "styled-components"
 import { McpMarketplaceItem, McpServer } from "@shared/mcp"
+import { vscode } from "@/utils/vscode"
 import { useEvent } from "react-use"
-import { McpServiceClient } from "@/services/grpc-client"
 
 interface McpMarketplaceCardProps {
 	item: McpMarketplaceItem
@@ -107,17 +107,15 @@ const McpMarketplaceCard = ({ item, installedServers }: McpMarketplaceCardProps)
 								{item.name}
 							</h3>
 							<div
-								onClick={async (e) => {
+								onClick={(e) => {
 									e.preventDefault() // Prevent card click when clicking install
 									e.stopPropagation() // Stop event from bubbling up to parent link
 									if (!isInstalled && !isDownloading) {
 										setIsDownloading(true)
-										try {
-											await McpServiceClient.downloadMcp({ value: item.mcpId })
-										} catch (error) {
-											setIsDownloading(false)
-											console.error("Failed to download MCP:", error)
-										}
+										vscode.postMessage({
+											type: "downloadMcp",
+											mcpId: item.mcpId,
+										})
 									}
 								}}
 								style={{}}>

webview-ui/src/components/settings/ApiOptions.tsx

@@ -316,7 +316,6 @@ const ApiOptions = ({
 					<VSCodeOption value="openai-native">OpenAI</VSCodeOption>
 					<VSCodeOption value="vscode-lm">VS Code LM API</VSCodeOption>
 					<VSCodeOption value="requesty">Requesty</VSCodeOption>
-					<VSCodeOption value="fireworks">Fireworks</VSCodeOption>
 					<VSCodeOption value="together">Together</VSCodeOption>
 					<VSCodeOption value="qwen">Alibaba Qwen</VSCodeOption>
 					<VSCodeOption value="doubao">Bytedance Doubao</VSCodeOption>
@@ -1371,97 +1370,6 @@ const ApiOptions = ({
 				</div>
 			)}
 
-			{selectedProvider === "fireworks" && (
-				<div>
-					<VSCodeTextField
-						value={apiConfiguration?.fireworksApiKey || ""}
-						style={{ width: "100%" }}
-						type="password"
-						onInput={handleInputChange("fireworksApiKey")}
-						placeholder="Enter API Key...">
-						<span style={{ fontWeight: 500 }}>Fireworks API Key</span>
-					</VSCodeTextField>
-					<p
-						style={{
-							fontSize: "12px",
-							marginTop: 3,
-							color: "var(--vscode-descriptionForeground)",
-						}}>
-						This key is stored locally and only used to make API requests from this extension.
-						{!apiConfiguration?.fireworksApiKey && (
-							<VSCodeLink
-								href="https://fireworks.ai/settings/users/api-keys"
-								style={{
-									display: "inline",
-									fontSize: "inherit",
-								}}>
-								You can get a Fireworks API key by signing up here.
-							</VSCodeLink>
-						)}
-					</p>
-					<VSCodeTextField
-						value={apiConfiguration?.fireworksModelId || ""}
-						style={{ width: "100%" }}
-						onInput={handleInputChange("fireworksModelId")}
-						placeholder={"Enter Model ID..."}>
-						<span style={{ fontWeight: 500 }}>Model ID</span>
-					</VSCodeTextField>
-					<p
-						style={{
-							fontSize: "12px",
-							marginTop: 3,
-							color: "var(--vscode-descriptionForeground)",
-						}}>
-						<span style={{ color: "var(--vscode-errorForeground)" }}>
-							(<span style={{ fontWeight: 500 }}>Note:</span> Cline uses complex prompts and works best with Claude
-							models. Less capable models may not work as expected.)
-						</span>
-					</p>
-					<VSCodeTextField
-						value={apiConfiguration?.fireworksModelMaxCompletionTokens?.toString() || ""}
-						style={{ width: "100%", marginBottom: 8 }}
-						onInput={(e) => {
-							const value = (e.target as HTMLInputElement).value
-							if (!value) {
-								return
-							}
-							const num = parseInt(value, 10)
-							if (isNaN(num)) {
-								return
-							}
-							handleInputChange("fireworksModelMaxCompletionTokens")({
-								target: {
-									value: num,
-								},
-							})
-						}}
-						placeholder={"2000"}>
-						<span style={{ fontWeight: 500 }}>Max Completion Tokens</span>
-					</VSCodeTextField>
-					<VSCodeTextField
-						value={apiConfiguration?.fireworksModelMaxTokens?.toString() || ""}
-						style={{ width: "100%", marginBottom: 8 }}
-						onInput={(e) => {
-							const value = (e.target as HTMLInputElement).value
-							if (!value) {
-								return
-							}
-							const num = parseInt(value)
-							if (isNaN(num)) {
-								return
-							}
-							handleInputChange("fireworksModelMaxTokens")({
-								target: {
-									value: num,
-								},
-							})
-						}}
-						placeholder={"4000"}>
-						<span style={{ fontWeight: 500 }}>Max Context Tokens</span>
-					</VSCodeTextField>
-				</div>
-			)}
-
 			{selectedProvider === "together" && (
 				<div>
 					<VSCodeTextField

webview-ui/src/components/settings/FeatureSettingsSection.tsx

@@ -0,0 +1,75 @@
+import { VSCodeCheckbox, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"
+import { useExtensionState } from "@/context/ExtensionStateContext"
+import { memo } from "react"
+import { OpenAIReasoningEffort } from "@shared/ChatSettings"
+
+const FeatureSettingsSection = () => {
+	const {
+		enableCheckpointsSetting,
+		setEnableCheckpointsSetting,
+		mcpMarketplaceEnabled,
+		setMcpMarketplaceEnabled,
+		chatSettings,
+		setChatSettings,
+	} = useExtensionState()
+
+	return (
+		<div style={{ marginBottom: 20, borderTop: "1px solid var(--vscode-panel-border)", paddingTop: 15 }}>
+			<h3 style={{ color: "var(--vscode-foreground)", margin: "0 0 10px 0", fontSize: "14px" }}>Feature Settings</h3>
+			<div>
+				<VSCodeCheckbox
+					checked={enableCheckpointsSetting}
+					onChange={(e: any) => {
+						const checked = e.target.checked === true
+						setEnableCheckpointsSetting(checked)
+					}}>
+					Enable Checkpoints
+				</VSCodeCheckbox>
+				<p className="text-xs text-[var(--vscode-descriptionForeground)]">
+					Enables extension to save checkpoints of workspace throughout the task. Uses git under the hood which may not
+					work well with large workspaces.
+				</p>
+			</div>
+			<div style={{ marginTop: 10 }}>
+				<VSCodeCheckbox
+					checked={mcpMarketplaceEnabled}
+					onChange={(e: any) => {
+						const checked = e.target.checked === true
+						setMcpMarketplaceEnabled(checked)
+					}}>
+					Enable MCP Marketplace
+				</VSCodeCheckbox>
+				<p className="text-xs text-[var(--vscode-descriptionForeground)]">
+					Enables the MCP Marketplace tab for discovering and installing MCP servers.
+				</p>
+			</div>
+			<div style={{ marginTop: 10 }}>
+				<label
+					htmlFor="openai-reasoning-effort-dropdown"
+					className="block text-sm font-medium text-[var(--vscode-foreground)] mb-1">
+					OpenAI Reasoning Effort
+				</label>
+				<VSCodeDropdown
+					id="openai-reasoning-effort-dropdown"
+					currentValue={chatSettings.openAIReasoningEffort || "medium"}
+					onChange={(e: any) => {
+						const newValue = e.target.currentValue as OpenAIReasoningEffort
+						setChatSettings({
+							...chatSettings,
+							openAIReasoningEffort: newValue,
+						})
+					}}
+					className="w-full">
+					<VSCodeOption value="low">Low</VSCodeOption>
+					<VSCodeOption value="medium">Medium</VSCodeOption>
+					<VSCodeOption value="high">High</VSCodeOption>
+				</VSCodeDropdown>
+				<p className="text-xs mt-[5px] text-[var(--vscode-descriptionForeground)]">
+					Reasoning effort for the OpenAI family of models(applies to all OpenAI model providers)
+				</p>
+			</div>
+		</div>
+	)
+}
+
+export default memo(FeatureSettingsSection)

webview-ui/src/components/settings/OpenRouterModelPicker.tsx

@@ -6,7 +6,7 @@ import { useMount } from "react-use"
 import styled from "styled-components"
 import { openRouterDefaultModelId } from "@shared/api"
 import { useExtensionState } from "@/context/ExtensionStateContext"
-import { ModelsServiceClient, StateServiceClient } from "@/services/grpc-client"
+import { ModelsServiceClient } from "@/services/grpc-client"
 import { vscode } from "@/utils/vscode"
 import { highlight } from "../history/HistoryView"
 import { ModelInfoView, normalizeApiConfiguration } from "./ApiOptions"
@@ -292,9 +292,10 @@ const OpenRouterModelPicker: React.FC<OpenRouterModelPickerProps> = ({ isPopup }
 												isFavorite={isFavorite}
 												onClick={(e) => {
 													e.stopPropagation()
-													StateServiceClient.toggleFavoriteModel({ value: item.id }).catch((error) =>
-														console.error("Failed to toggle favorite model:", error),
-													)
+													vscode.postMessage({
+														type: "toggleFavoriteModel",
+														modelId: item.id,
+													})
 												}}
 											/>
 										</div>

webview-ui/src/components/settings/PreferredLanguageSetting.tsx

@@ -0,0 +1,53 @@
+import { VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"
+import React from "react"
+import { ChatSettings } from "@shared/ChatSettings"
+
+interface PreferredLanguageSettingProps {
+	chatSettings: ChatSettings
+	setChatSettings: (settings: ChatSettings) => void
+}
+
+const PreferredLanguageSetting: React.FC<PreferredLanguageSettingProps> = ({ chatSettings, setChatSettings }) => {
+	return (
+		<div style={{ marginTop: 10, marginBottom: 10 }}>
+			<label htmlFor="preferred-language-dropdown" className="block mb-1 text-sm font-medium">
+				Preferred Language
+			</label>
+			<VSCodeDropdown
+				id="preferred-language-dropdown"
+				currentValue={chatSettings.preferredLanguage || "English"}
+				onChange={(e: any) => {
+					const newLanguage = e.target.value
+					setChatSettings({
+						...chatSettings,
+						preferredLanguage: newLanguage,
+					}) // This constructs a full ChatSettings object
+				}}
+				style={{ width: "100%" }}>
+				<VSCodeOption value="English">English</VSCodeOption>
+				<VSCodeOption value="Arabic - العربية">Arabic - العربية</VSCodeOption>
+				<VSCodeOption value="Portuguese - Português (Brasil)">Portuguese - Português (Brasil)</VSCodeOption>
+				<VSCodeOption value="Czech - Čeština">Czech - Čeština</VSCodeOption>
+				<VSCodeOption value="French - Français">French - Français</VSCodeOption>
+				<VSCodeOption value="German - Deutsch">German - Deutsch</VSCodeOption>
+				<VSCodeOption value="Hindi - हिन्दी">Hindi - हिन्दी</VSCodeOption>
+				<VSCodeOption value="Hungarian - Magyar">Hungarian - Magyar</VSCodeOption>
+				<VSCodeOption value="Italian - Italiano">Italian - Italiano</VSCodeOption>
+				<VSCodeOption value="Japanese - 日本語">Japanese - 日本語</VSCodeOption>
+				<VSCodeOption value="Korean - 한국어">Korean - 한국어</VSCodeOption>
+				<VSCodeOption value="Polish - Polski">Polish - Polski</VSCodeOption>
+				<VSCodeOption value="Portuguese - Português (Portugal)">Portuguese - Português (Portugal)</VSCodeOption>
+				<VSCodeOption value="Russian - Русский">Russian - Русский</VSCodeOption>
+				<VSCodeOption value="Simplified Chinese - 简体中文">Simplified Chinese - 简体中文</VSCodeOption>
+				<VSCodeOption value="Spanish - Español">Spanish - Español</VSCodeOption>
+				<VSCodeOption value="Traditional Chinese - 繁體中文">Traditional Chinese - 繁體中文</VSCodeOption>
+				<VSCodeOption value="Turkish - Türkçe">Turkish - Türkçe</VSCodeOption>
+			</VSCodeDropdown>
+			<p className="text-xs text-[var(--vscode-descriptionForeground)] mt-1">
+				The language that Cline should use for communication.
+			</p>
+		</div>
+	)
+}
+
+export default React.memo(PreferredLanguageSetting)

webview-ui/src/components/settings/SettingsView.tsx

@@ -1,5 +1,14 @@
-import { VSCodeButton, VSCodeCheckbox, VSCodeLink, VSCodeTextArea } from "@vscode/webview-ui-toolkit/react"
+import {
+	VSCodeButton,
+	VSCodeCheckbox,
+	VSCodeDropdown,
+	VSCodeLink,
+	VSCodeOption,
+	VSCodeTextArea,
+} from "@vscode/webview-ui-toolkit/react"
 import { memo, useCallback, useEffect, useState } from "react"
+import PreferredLanguageSetting from "./PreferredLanguageSetting" // Added import
+import { OpenAIReasoningEffort } from "@shared/ChatSettings"
 import { useExtensionState } from "@/context/ExtensionStateContext"
 import { validateApiConfiguration, validateModelId } from "@/utils/validate"
 import { vscode } from "@/utils/vscode"
@@ -8,6 +17,7 @@ import ApiOptions from "./ApiOptions"
 import { TabButton } from "../mcp/configuration/McpConfigurationView"
 import { useEvent } from "react-use"
 import { ExtensionMessage } from "@shared/ExtensionMessage"
+import FeatureSettingsSection from "./FeatureSettingsSection"
 import BrowserSettingsSection from "./BrowserSettingsSection"
 import TerminalSettingsSection from "./TerminalSettingsSection"
 import { FEATURE_FLAGS } from "@shared/services/feature-flags/feature-flags"
@@ -27,8 +37,11 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 		telemetrySetting,
 		setTelemetrySetting,
 		chatSettings,
+		setChatSettings,
 		planActSeparateModelsSetting,
 		setPlanActSeparateModelsSetting,
+		enableCheckpointsSetting,
+		mcpMarketplaceEnabled,
 	} = useExtensionState()
 	const [apiErrorMessage, setApiErrorMessage] = useState<string | undefined>(undefined)
 	const [modelIdErrorMessage, setModelIdErrorMessage] = useState<string | undefined>(undefined)
@@ -67,6 +80,8 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 			planActSeparateModelsSetting,
 			customInstructionsSetting: customInstructions,
 			telemetrySetting,
+			enableCheckpointsSetting,
+			mcpMarketplaceEnabled,
 			apiConfiguration: apiConfigurationToSubmit,
 		})
 
@@ -198,6 +213,8 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 					</p>
 				</div>
 
+				{chatSettings && <PreferredLanguageSetting chatSettings={chatSettings} setChatSettings={setChatSettings} />}
+
 				<div className="mb-[5px]">
 					<VSCodeCheckbox
 						className="mb-[5px]"
@@ -238,21 +255,15 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 					</p>
 				</div>
 
+				{/* Feature Settings Section */}
+				<FeatureSettingsSection />
+
 				{/* Browser Settings Section */}
 				<BrowserSettingsSection />
 
 				{/* Terminal Settings Section */}
 				<TerminalSettingsSection />
 
-				<div className="mt-auto pr-2 flex justify-center">
-					<SettingsButton
-						onClick={() => vscode.postMessage({ type: "openExtensionSettings" })}
-						className="mt-0 mr-0 mb-4 ml-0">
-						<i className="codicon codicon-settings-gear" />
-						Advanced Settings
-					</SettingsButton>
-				</div>
-
 				{IS_DEV && (
 					<>
 						<div className="mt-[10px] mb-1">Debug</div>

webview-ui/src/components/settings/__tests__/APIOptions.spec.tsx

@@ -101,74 +101,6 @@ vi.mock("../../../context/ExtensionStateContext", async (importOriginal) => {
 	const actual = await importOriginal()
 	return {
 		...(actual || {}),
-		useExtensionState: vi.fn(() => ({
-			apiConfiguration: {
-				apiProvider: "fireworks",
-				fireworksApiKey: "",
-				fireworksModelId: "",
-				fireworksModelMaxCompletionTokens: 2000,
-				fireworksModelMaxTokens: 4000,
-			},
-			setApiConfiguration: vi.fn(),
-			uriScheme: "vscode",
-		})),
-	}
-})
-
-describe("ApiOptions Component", () => {
-	vi.clearAllMocks()
-	const mockPostMessage = vi.fn()
-
-	beforeEach(() => {
-		global.vscode = { postMessage: mockPostMessage } as any
-	})
-
-	it("renders Fireworks API Key input", () => {
-		render(
-			<ExtensionStateContextProvider>
-				<ApiOptions showModelOptions={true} />
-			</ExtensionStateContextProvider>,
-		)
-		const apiKeyInput = screen.getByPlaceholderText("Enter API Key...")
-		expect(apiKeyInput).toBeInTheDocument()
-	})
-
-	it("renders Fireworks Model ID input", () => {
-		render(
-			<ExtensionStateContextProvider>
-				<ApiOptions showModelOptions={true} />
-			</ExtensionStateContextProvider>,
-		)
-		const modelIdInput = screen.getByPlaceholderText("Enter Model ID...")
-		expect(modelIdInput).toBeInTheDocument()
-	})
-
-	it("renders Fireworks Max Completion Tokens input", () => {
-		render(
-			<ExtensionStateContextProvider>
-				<ApiOptions showModelOptions={true} />
-			</ExtensionStateContextProvider>,
-		)
-		const maxCompletionTokensInput = screen.getByPlaceholderText("2000")
-		expect(maxCompletionTokensInput).toBeInTheDocument()
-	})
-
-	it("renders Fireworks Max Tokens input", () => {
-		render(
-			<ExtensionStateContextProvider>
-				<ApiOptions showModelOptions={true} />
-			</ExtensionStateContextProvider>,
-		)
-		const maxTokensInput = screen.getByPlaceholderText("4000")
-		expect(maxTokensInput).toBeInTheDocument()
-	})
-})
-
-vi.mock("../../../context/ExtensionStateContext", async (importOriginal) => {
-	const actual = await importOriginal()
-	return {
-		...actual,
-		// your mocked methods
 		useExtensionState: vi.fn(() => ({
 			apiConfiguration: {
 				apiProvider: "openai",

webview-ui/src/context/ExtensionStateContext.tsx

@@ -17,7 +17,7 @@ import { McpMarketplaceCatalog, McpServer, McpViewTab } from "../../../src/share
 import { convertTextMateToHljs } from "../utils/textMateToHljs"
 import { vscode } from "../utils/vscode"
 import { DEFAULT_BROWSER_SETTINGS } from "@shared/BrowserSettings"
-import { DEFAULT_CHAT_SETTINGS } from "@shared/ChatSettings"
+import { ChatSettings, DEFAULT_CHAT_SETTINGS } from "@shared/ChatSettings"
 import { TelemetrySetting } from "@shared/TelemetrySetting"
 
 interface ExtensionStateContextType extends ExtensionState {
@@ -41,7 +41,10 @@ interface ExtensionStateContextType extends ExtensionState {
 	setTelemetrySetting: (value: TelemetrySetting) => void
 	setShowAnnouncement: (value: boolean) => void
 	setPlanActSeparateModelsSetting: (value: boolean) => void
+	setEnableCheckpointsSetting: (value: boolean) => void
+	setMcpMarketplaceEnabled: (value: boolean) => void
 	setShellIntegrationTimeout: (value: number) => void
+	setChatSettings: (value: ChatSettings) => void
 	setMcpServers: (value: McpServer[]) => void
 
 	// Navigation
@@ -70,6 +73,7 @@ export const ExtensionStateContextProvider: React.FC<{
 		telemetrySetting: "unset",
 		vscMachineId: "",
 		planActSeparateModelsSetting: true,
+		enableCheckpointsSetting: true,
 		globalClineRulesToggles: {},
 		localClineRulesToggles: {},
 		localCursorRulesToggles: {},
@@ -268,6 +272,7 @@ export const ExtensionStateContextProvider: React.FC<{
 		localClineRulesToggles: state.localClineRulesToggles || {},
 		localCursorRulesToggles: state.localCursorRulesToggles || {},
 		localWindsurfRulesToggles: state.localWindsurfRulesToggles || {},
+		enableCheckpointsSetting: state.enableCheckpointsSetting,
 		setApiConfiguration: (value) =>
 			setState((prevState) => ({
 				...prevState,
@@ -288,6 +293,16 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				planActSeparateModelsSetting: value,
 			})),
+		setEnableCheckpointsSetting: (value) =>
+			setState((prevState) => ({
+				...prevState,
+				enableCheckpointsSetting: value,
+			})),
+		setMcpMarketplaceEnabled: (value) =>
+			setState((prevState) => ({
+				...prevState,
+				mcpMarketplaceEnabled: value,
+			})),
 		setShowAnnouncement: (value) =>
 			setState((prevState) => ({
 				...prevState,
@@ -300,6 +315,22 @@ export const ExtensionStateContextProvider: React.FC<{
 			})),
 		setMcpServers: (mcpServers: McpServer[]) => setMcpServers(mcpServers),
 		setShowMcp,
+		setChatSettings: (value) => {
+			setState((prevState) => ({
+				...prevState,
+				chatSettings: value,
+			}))
+			vscode.postMessage({
+				type: "updateSettings",
+				chatSettings: value,
+				apiConfiguration: state.apiConfiguration,
+				customInstructionsSetting: state.customInstructions,
+				telemetrySetting: state.telemetrySetting,
+				planActSeparateModelsSetting: state.planActSeparateModelsSetting,
+				enableCheckpointsSetting: state.enableCheckpointsSetting,
+				mcpMarketplaceEnabled: state.mcpMarketplaceEnabled,
+			})
+		},
 		setMcpTab,
 	}
 

webview-ui/src/services/grpc-client.ts

@@ -11,7 +11,6 @@ import { StateServiceDefinition } from "@shared/proto/state"
 import { TaskServiceDefinition } from "@shared/proto/task"
 import { WebServiceDefinition } from "@shared/proto/web"
 import { ModelsServiceDefinition } from "@shared/proto/models"
-import { SlashServiceDefinition } from "@shared/proto/slash"
 
 const AccountServiceClient = createGrpcClient(AccountServiceDefinition)
 const BrowserServiceClient = createGrpcClient(BrowserServiceDefinition)
@@ -22,7 +21,6 @@ const StateServiceClient = createGrpcClient(StateServiceDefinition)
 const TaskServiceClient = createGrpcClient(TaskServiceDefinition)
 const WebServiceClient = createGrpcClient(WebServiceDefinition)
 const ModelsServiceClient = createGrpcClient(ModelsServiceDefinition)
-const SlashServiceClient = createGrpcClient(SlashServiceDefinition)
 
 export {
 	AccountServiceClient,
@@ -34,5 +32,4 @@ export {
 	TaskServiceClient,
 	WebServiceClient,
 	ModelsServiceClient,
-	SlashServiceClient,
 }

webview-ui/src/utils/validate.ts

@@ -73,11 +73,6 @@ export function validateApiConfiguration(apiConfiguration?: ApiConfiguration): s
 					return "You must provide a valid API key or choose a different provider."
 				}
 				break
-			case "fireworks":
-				if (!apiConfiguration.fireworksApiKey || !apiConfiguration.fireworksModelId) {
-					return "You must provide a valid API key or choose a different provider."
-				}
-				break
 			case "together":
 				if (!apiConfiguration.togetherApiKey || !apiConfiguration.togetherModelId) {
 					return "You must provide a valid API key or choose a different provider."