v3.17.14 Release Notes

v3.17.14 Release Notes

.changeset/angry-terms-mate.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-updating o3 model pricing

.changeset/calm-snails-hammer.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Sorting mcp marketplace by newest listings by default

.changeset/neat-guests-itch.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-fix(bedrock): remove Anthropic-Bedrock SDK

.changeset/purple-islands-move.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Remove ‘-beta’ from grok model id

.changeset/seven-insects-shop.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add prompt caching indicator to grok 3

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: true
+blank_issues_enabled: false
 contact_links:
     - name: ✨ Feature Request
       url: https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop
@@ -6,6 +6,3 @@ contact_links:
     - name: 👋 Cline Discord
       url: https://discord.gg/cline
       about: Join our Discord community for discussions and support
-    - name: ❓ Other Questions?
-      url: https://x.com/sdrzn
-      about: Contact the developer on X @sdrzn for other inquiries

.github/ISSUE_TEMPLATE/feature_proposal.yml

@@ -0,0 +1,130 @@
+name: 📝 Detailed Feature Proposal
+description: Propose a new feature or improvement
+labels: ["proposal"]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              **Feature Proposal for Cline**
+
+              Thank you for creating a feature proposal for Cline! This template is for clear, actionable proposals that define a specific problem and a high-confidence solution. Please provide enough detail to enable fast prioritization, discussion, and execution.
+
+              Detailed proposals will be prioritized, while vague proposals may be closed or require extensive back and forth communication.
+
+              Before submitting:
+              - Search existing [Issues](https://github.com/cline/cline/issues) and [Discussions](https://github.com/cline/cline/discussions) to avoid duplicates
+              - Don’t start implementation until the proposal is reviewed and approved
+
+    - type: textarea
+      id: problem-description
+      attributes:
+          label: What problem does this solve?
+          description: |
+              Describe the problem clearly from a user's point of view. Focus on why this matters, who it affects, and when it occurs.
+
+              ✅ Solid:
+              - "LLM provider returns 400 error when nearing the context window instead of truncating"
+              - "Submit button is invisible in dark mode"
+
+              ❌ Avoid:
+              - "Performance is bad"
+              - "UI needs work"
+
+              Your description should include:
+              - Who is affected?
+              - When does it happen?
+              - What's the current vs expected behavior?
+              - What is the impact?
+          placeholder: Be specific about the problem, who it affects, and the impact.
+      validations:
+          required: true
+
+    - type: textarea
+      id: proposed-solution
+      attributes:
+          label: What’s the proposed solution?
+          description: |
+              Describe how the problem should be solved. Be specific about UX, system behavior, and any flows that would change.
+
+              ✅ Solid:
+              - "Add error handling immediately after attempting to create the llm stream and retry after manually truncating"
+              - "Update button styling to ensure contrast in all themes"
+
+              ❌ Avoid:
+              - "Improve performance"
+              - "Fix the bug"
+
+              Your solution should include:
+              - What exactly will change?
+              - How will users interact with it?
+              - What’s the expected outcome?
+          placeholder: Describe the proposed changes and how they solve the problem.
+      validations:
+          required: true
+
+    - type: textarea
+      id: acceptance-criteria
+      attributes:
+          label: How will we know it works? (Acceptance Criteria)
+          description: Define clear, testable success criteria.
+          placeholder: Provide specific and testable conditions for success.
+      validations:
+          required: true
+
+    - type: textarea
+      id: estimated-effort
+      attributes:
+          label: Estimated effort and complexity
+          description: |
+              Help us understand scope and risks. Include:
+
+              - Size estimate (XS/S/M/L/XL or hours/days)
+              - Why this size? What’s technically involved?
+              - Any tricky parts, refactors, or risks?
+              - Performance or compatibility concerns?
+              - Any dependencies on systems, teams, or libraries?
+          placeholder: Size, reasoning, risks, and dependencies.
+      validations:
+          required: true
+
+    - type: textarea
+      id: technical-considerations
+      attributes:
+          label: Technical considerations, tradeoffs, and/or risks (optional)
+          description: |
+              Include any technical context that helps us evaluate or implement the proposal more effectively.
+
+              You may include:
+              - Architectural changes or required refactors
+              - Performance implications or system-level impacts
+              - Known limitations, risks, or tricky edge cases
+              - Compatibility concerns or migration steps
+              - Alternative approaches you considered and why they were not chosen
+              - Dependencies on other systems, teams, or libraries
+              - Were other approaches considered? Why is this one preferred?
+          placeholder: Technical considerations, tradeoffs, and/or risks.
+
+    - type: textarea
+      id: additional-context
+      attributes:
+          label: Additional context (optional)
+          description: Diagrams, mockups, logs, links, or anything else that helps explain or justify the proposal.
+          placeholder: Diagrams, mockups, logs, links, or anything else that helps explain or justify the proposal.
+
+    - type: checkboxes
+      id: checklist
+      attributes:
+          label: Proposal checklist
+          options:
+              - label: I’ve checked for existing issues or related proposals
+                required: true
+              - label: I understand this needs review before implementation can start
+                required: true
+
+    - type: checkboxes
+      id: willingness-to-contribute
+      attributes:
+          label: Interested in implementing this?
+          description: Optional
+          options:
+              - label: Yes, I’d like to help implement this feature

.github/pull_request_template.md

@@ -1,10 +1,47 @@
+<!--
+Thank you for contributing to Cline!
+
+⚠️ Important: Before submitting this PR, please ensure you have:
+- Opened an issue and discussed your proposed changes with the community / contributors
+- Received approval from a core Cline contributor prior to proceeding with the implementation
+- Link the associated issue in the "Related Issue" section
+
+Limited exceptions:
+Small bug fixes, typo corrections, minor wording improvements, or simple type fixes that don't change functionality may be submitted directly.
+
+Why this requirement?
+We deeply appreciate all community contributions - they are the core reason we're able to operate successfully and keep innovating! We welcome community input and want to make it as easy as possible for people to submit quality work. This process helps our core maintainers review new ideas faster and saves contributor time by ensuring you have the go-ahead before spending time on implementation.
+-->
+
+### Related Issue
+
+<!-- Replace XXXX with the issue number that this PR addresses -->
+**Issue:** #XXXX
+
 ### Description
 
-<!-- Describe your changes in detail. What problem does this PR solve? -->
+<!-- 
+Help reviewers understand your changes by making this PR readable and well-organized:
+
+- What problem does this PR solve?
+- Why were these changes introduced and what purpose do they serve?
+- For larger changes, provide context about your approach and reasoning
+
+Small PRs may need minimal description, but larger changes benefit from explaining where you're coming from. Much of this context can be in the linked issue above, so feel free to reference it rather than repeating everything here.
+-->
 
 ### Test Procedure
 
-<!-- How did you test this? Are you confident that it will not introduce bugs? If so, why? -->
+<!-- 
+Please walk us through your testing approach and thought process. This helps reviewers understand that you've thoroughly considered the impact of your changes:
+
+- How did you test this change?
+- What could potentially break and how did you verify it doesn't?
+- What existing functionality might be affected and how did you check it still works?
+- Why are you confident this is ready for merge?
+
+We're not looking for exhaustive documentation - just evidence that you've thought through the implications of your changes and tested accordingly.
+-->
 
 ### Type of Change
 
@@ -29,7 +66,15 @@
 
 ### Screenshots
 
-<!-- For UI changes, add screenshots here -->
+<!-- 
+Help reviewers quickly understand your changes:
+
+- **UI Changes**: Please include screenshots showing before/after states
+- **Complex Workflows**: Consider uploading a screen recording (video) if your changes involve multiple steps or state transitions
+- **Backend Changes**: Not required, but feel free to include terminal output or other evidence that demonstrates functionality
+
+This helps reviewers see what you've built without having to pull down and test your branch first.
+-->
 
 ### Additional Notes
 

.gitignore

@@ -21,7 +21,9 @@ coverage
 
 *evals.env
 
-# Generated proto files
+# Generated files
+src/generated/
+# Core
 src/core/controller/*/methods.ts
 src/core/controller/*/index.ts
 src/core/controller/grpc-service-config.ts
@@ -30,8 +32,6 @@ src/shared/proto/*.ts
 src/shared/proto/host/*.ts
 # Webview
 webview-ui/src/services/grpc-client.ts
-# Standalone
-src/standalone/server-setup.ts
 # Host bridge
 src/hosts/vscode/*/methods.ts
 src/hosts/vscode/*/index.ts

.husky/pre-commit

@@ -9,9 +9,9 @@ npm run lint || {
 
 # Run Prettier
 echo "Running Prettier..."
-npm run format || {
-    echo "❌ Prettier check failed. Run 'npm run format:fix' to automatically fix formatting issues."
-    exit 1
-}
+npx lint-staged --verbose || {
+     echo "❌ Prettier failed. Please fix the errors and try committing again."
+     exit 1
+ }
 
 echo "✅ All checks passed!"

.vscode/launch.json

@@ -42,7 +42,7 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run Standalone Extension",
+			"name": "Run Standalone Service",
 			"skipFiles": ["<node_internals>/**"],
 			"sourceMaps": true,
 			"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
@@ -53,7 +53,8 @@
 				"GRPC_TRACE": "all",
 				"GRPC_VERBOSITY": "DEBUG",
 				"NODE_PATH": "${workspaceFolder}/dist-standalone/node_modules",
-				"CLINE_DIR": "${userHome}/.cline-standalone"
+				"CLINE_DIR": "${userHome}/.cline-standalone",
+				"HOST_BRIDGE_ADDRESS": "localhost:50052"
 			},
 			"program": "standalone.js"
 		}

.vscode/tasks.json

@@ -128,7 +128,25 @@
 			"type": "npm",
 			"script": "watch:esbuild",
 			"group": "build",
-			"problemMatcher": "$esbuild-watch",
+			"problemMatcher": {
+				"pattern": [
+					{
+						"regexp": "^✘ \\[ERROR\\] (.*)$",
+						"message": 1
+					},
+					{
+						"regexp": "^\\s+(.*):(\\d+):(\\d+):$",
+						"file": 1,
+						"line": 2,
+						"column": 3
+					}
+				],
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": "^\\[watch\\] build started$",
+					"endsPattern": "^\\[watch\\] build finished$"
+				}
+			},
 			"isBackground": true,
 			"label": "npm: watch:esbuild",
 			"dependsOn": ["npm: protos"],
@@ -146,7 +164,25 @@
 			"type": "npm",
 			"script": "watch:esbuild:test",
 			"group": "build",
-			"problemMatcher": "$esbuild-watch",
+			"problemMatcher": {
+				"pattern": [
+					{
+						"regexp": "^✘ \\[ERROR\\] (.*)$",
+						"message": 1
+					},
+					{
+						"regexp": "^\\s+(.*):(\\d+):(\\d+):$",
+						"file": 1,
+						"line": 2,
+						"column": 3
+					}
+				],
+				"background": {
+					"activeOnStart": true,
+					"beginsPattern": "^\\[watch\\] build started$",
+					"endsPattern": "^\\[watch\\] build finished$"
+				}
+			},
 			"isBackground": true,
 			"label": "npm: watch:esbuild:test",
 			"dependsOn": ["npm: protos"],

CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## [3.17.14]
+
+-   Add Claude Code as a new API provider, allowing integration with Anthropic's Claude Code CLI tool and Claude Max Plan (Thanks @BarreiroT!)
+-   Add SAP AI Core as a new API provider with support for Claude and GPT models (Thanks @schardosin!)
+-   Add configurable default terminal profile setting, allowing users to specify which terminal Cline should use (Thanks @valinha!)
+-   Add terminal output size constraint setting to limit how much terminal output is processed
+-   Add MCP Rich Display settings to the settings page for persistent configuration (Thanks @Vl4diC0de!)
+-   Improve copy button functionality with refactored reusable components (Thanks @shouhanzen!)
+-   Improve AWS Bedrock provider by removing deprecated dependency and using standard AWS SDK (Thanks @watany-dev!)
+-   Fix list_files tool to properly return files when targeting hidden directories
+-   Fix search and replace edge case that could cause file deletion, making the algorithm more lenient for models using different diff formats
+-   Fix task restoration issues that could occur when resuming interrupted tasks
+-   Fix checkpoint saving to properly track all file changes
+-   Improve file context warnings to reduce diff edit errors when resuming restored tasks
+-   Clear chat input when switching between Plan/Act modes within a task
+-   Exclude .clinerules files from checkpoint tracking
+
+## [3.17.13]
+
+-   Add Thinking UX for Gemini models, providing visual feedback during model reasoning
+-   Add support for Notifications MCP integration with Cline
+-   Add prompt caching indicator for Grok 3 models
+-   Sort MCP marketplace by newest listings by default for easier discovery of recent servers
+-   Update O3 model family pricing to reflect latest OpenAI rates
+-   Remove '-beta' suffix from Grok model identifiers
+-   Fix AWS Bedrock provider by removing deprecated Anthropic-Bedrock SDK (Thanks @watany-dev!)
+-   Fix menu display issue for terminal timeout settings
+-   Improve chat input field styling and behavior
+
 ## [3.17.12]
 
 -   **Free Grok Model Available!** Access Grok 3 completely free through the Cline provider

CONTRIBUTING.md

@@ -18,6 +18,18 @@ We also welcome contributions to our [documentation](https://github.com/cline/cl
 
 If you're planning to work on a bigger feature, please create a [feature request](https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop) first so we can discuss whether it aligns with Cline's vision.
 
+## Before Contributing
+
+All contributions must begin with a GitHub Issue, unless the change is for small bug fixes, typo corrections, minor wording improvements, or simple type fixes that don't change functionality.
+
+- **Check existing issues**: Search [GitHub Issues](https://github.com/cline/cline/issues).
+- **Create an issue**: Use appropriate templates:
+    - **Bugs:** "Bug Report" template.
+    - **Features:** "Detailed Feature Proposal" template. Approval from a core Cline contributor required before starting.
+- **Claim issues**: Comment your interest.
+
+**PRs without approved issues may be closed.**
+
 ## Development Setup
 
 1. **VS Code Extensions**

buf.yaml

@@ -0,0 +1,22 @@
+version: v2
+modules:
+    - path: proto
+      name: cline/cline/lint
+
+lint:
+    use:
+        - STANDARD
+
+    except: # Add exceptions for current patterns that contradict STANDARD settings
+        - RPC_PASCAL_CASE # rpcs are camel case (start with lowercase)
+        - PACKAGE_DIRECTORY_MATCH # the protos in the cline package are not in a dir named cline.
+        - RPC_REQUEST_RESPONSE_UNIQUE # request messages are not unique.
+        - RPC_REQUEST_STANDARD_NAME # request messages dont all end with Request
+        - RPC_RESPONSE_STANDARD_NAME # response messages dont all end with Response
+        - PACKAGE_VERSION_SUFFIX # package name does not contain version.
+        - ENUM_VALUE_PREFIX # enum values dont start with the enum name.
+        - ENUM_ZERO_VALUE_SUFFIX # first value does not have to be UNSPECIFIED.
+
+# breaking:
+#   use:
+#     - WIRE_JSON # Detect changes that break the json wire format (this is the minimum recommended level.)

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.17.12",
+	"version": "3.17.14",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -331,12 +331,12 @@
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
 		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.js --production",
 		"protos": "node proto/build-proto.js && node scripts/generate-server-setup.mjs",
-		"postprotos": "prettier src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/standalone/server-setup.ts --write --log-level silent",
+		"postprotos": "prettier src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --log-level warn",
 		"compile-tests": "node ./scripts/build-tests.js",
 		"watch-tests": "tsc -p . -w --outDir out",
 		"pretest": "npm run compile-tests && npm run compile && npm run compile-standalone && npm run lint",
 		"check-types": "npm run protos && tsc --noEmit",
-		"lint": "eslint src --ext ts && eslint webview-ui/src --ext ts && cd webview-ui && npm run lint",
+		"lint": "eslint src --ext ts && eslint webview-ui/src --ext ts && buf lint && cd webview-ui && npm run lint",
 		"format": "prettier . --check",
 		"format:fix": "prettier . --write",
 		"test": "npm-run-all test:unit test:integration",
@@ -358,7 +358,13 @@
 		"docs:rename-file": "cd docs && mintlify rename",
 		"report-issue": "node scripts/report-issue.js"
 	},
+	"lint-staged": {
+		"*": [
+			"prettier --write --ignore-unknown --log-level=log"
+		]
+	},
 	"devDependencies": {
+		"@bufbuild/buf": "^1.54.0",
 		"@changesets/cli": "^2.27.12",
 		"@types/chai": "^5.0.1",
 		"@types/clone-deep": "^4.0.4",
@@ -384,6 +390,7 @@
 		"eslint-plugin-eslint-rules": "file:eslint-rules",
 		"grpc-tools": "^1.13.0",
 		"husky": "^9.1.7",
+		"lint-staged": "^16.1.0",
 		"mintlify": "^4.0.515",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.3.3",
@@ -397,14 +404,14 @@
 		"typescript": "^5.4.5"
 	},
 	"dependencies": {
-		"@anthropic-ai/bedrock-sdk": "^0.12.4",
 		"@anthropic-ai/sdk": "^0.37.0",
 		"@anthropic-ai/vertex-sdk": "^0.6.4",
-		"@aws-sdk/client-bedrock-runtime": "^3.821.0",
+		"@aws-sdk/client-bedrock-runtime": "^3.826.0",
+		"@aws-sdk/credential-providers": "^3.826.0",
 		"@bufbuild/protobuf": "^2.2.5",
 		"@cerebras/cerebras_cloud_sdk": "^1.35.0",
 		"@google-cloud/vertexai": "^1.9.3",
-		"@google/genai": "^0.13.0",
+		"@google/genai": "1.0.0",
 		"@grpc/grpc-js": "^1.9.15",
 		"@grpc/reflection": "^1.0.4",
 		"@mistralai/mistralai": "^1.5.0",
@@ -441,6 +448,7 @@
 		"jschardet": "^3.1.4",
 		"mammoth": "^1.8.0",
 		"monaco-vscode-textmate-theme-converter": "^0.1.7",
+		"nice-grpc": "^2.1.12",
 		"ollama": "^0.5.13",
 		"open": "^10.1.2",
 		"open-graph-scraper": "^6.9.0",

proto/build-proto.js

@@ -10,24 +10,23 @@ import os from "os"
 
 import { createRequire } from "module"
 const require = createRequire(import.meta.url)
-const protoc = path.join(require.resolve("grpc-tools"), "../bin/protoc")
+const PROTOC = path.join(require.resolve("grpc-tools"), "../bin/protoc")
 
-const __filename = fileURLToPath(import.meta.url)
-const SCRIPT_DIR = path.dirname(__filename)
+const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url))
 const ROOT_DIR = path.resolve(SCRIPT_DIR, "..")
 
-const isWindows = process.platform === "win32"
-const tsProtoPlugin = isWindows
-	? path.join(ROOT_DIR, "node_modules", ".bin", "protoc-gen-ts_proto.cmd") // Use the .bin directory path for Windows
-	: require.resolve("ts-proto/protoc-gen-ts_proto")
+const TS_OUT_DIR = path.join(ROOT_DIR, "src/shared/proto")
+const GRPC_JS_OUT_DIR = path.join(ROOT_DIR, "src/generated/grpc-js")
+const NICE_JS_OUT_DIR = path.join(ROOT_DIR, "src/generated/nice-grpc")
+const DESCRIPTOR_OUT_DIR = path.join(ROOT_DIR, "dist-standalone/proto")
 
+const isWindows = process.platform === "win32"
+const TS_PROTO_PLUGIN = require.resolve("ts-proto/protoc-gen-ts_proto") + (isWindows ? ".cmd" : "")
 const TS_PROTO_OPTIONS = [
 	"env=node",
 	"esModuleInterop=true",
-
+	"outputServices=generic-definitions", // output generic ServiceDefinitions
 	"outputIndex=true", // output an index file for each package which exports all protos in the package.
-	"outputServices=generic-definitions",
-
 	"useOptionals=messages", // Message fields are optional, scalars are not.
 	"useDate=false", // Timestamp fields will not be automatically converted to Date.
 ]
@@ -49,7 +48,7 @@ const serviceNameMap = {
 	ui: "cline.UiService",
 	// Add new services here - no other code changes needed!
 }
-const serviceDirs = Object.keys(serviceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src", "core", "controller", serviceKey))
+const serviceDirs = Object.keys(serviceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src/core/controller", serviceKey))
 
 // List of host gRPC services (IDE API bridge)
 // These services are implemented in the IDE extension and called by the standalone Cline Core
@@ -58,9 +57,7 @@ const hostServiceNameMap = {
 	watch: "host.WatchService",
 	// Add new host services here
 }
-const hostServiceDirs = Object.keys(hostServiceNameMap).map((serviceKey) =>
-	path.join(ROOT_DIR, "src", "hosts", "vscode", serviceKey),
-)
+const hostServiceDirs = Object.keys(hostServiceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src/hosts/vscode", serviceKey))
 
 async function main() {
 	console.log(chalk.bold.blue("Starting Protocol Buffer code generation..."))
@@ -68,63 +65,44 @@ async function main() {
 	// Check for Apple Silicon compatibility before proceeding
 	checkAppleSiliconCompatibility()
 
-	// Define output directories
-	const TS_OUT_DIR = path.join(ROOT_DIR, "src", "shared", "proto")
-
 	// Create output directories if they don't exist
-	await fs.mkdir(TS_OUT_DIR, { recursive: true })
-
-	// Clean up existing generated files
-	console.log(chalk.cyan("Cleaning up existing generated TypeScript files..."))
-	const existingFiles = await globby("**/*.ts", { cwd: TS_OUT_DIR })
-	for (const file of existingFiles) {
-		await fs.unlink(path.join(TS_OUT_DIR, file))
+	for (const dir of [TS_OUT_DIR, GRPC_JS_OUT_DIR, NICE_JS_OUT_DIR, DESCRIPTOR_OUT_DIR]) {
+		await fs.mkdir(dir, { recursive: true })
 	}
 
+	await cleanup()
+
 	// Check for missing proto files for services in serviceNameMap
 	await ensureProtoFilesExist()
 
 	// Process all proto files
-	console.log(chalk.cyan("Processing proto files from"), SCRIPT_DIR)
 	const protoFiles = await globby("**/*.proto", { cwd: SCRIPT_DIR, realpath: true })
+	console.log(chalk.cyan(`Processing ${protoFiles.length} proto files from`), SCRIPT_DIR)
 
-	// Build the protoc command with proper path handling for cross-platform
-	const tsProtocCommand = [
-		protoc,
-		`--proto_path="${SCRIPT_DIR}"`,
-		`--plugin=protoc-gen-ts_proto="${tsProtoPlugin}"`,
-		`--ts_proto_out="${TS_OUT_DIR}"`,
-		`--ts_proto_opt=${TS_PROTO_OPTIONS.join(",")} `,
-		...protoFiles,
-	].join(" ")
-	try {
-		console.log(chalk.cyan(`Generating TypeScript code for:\n${protoFiles.join("\n")}...`))
-		execSync(tsProtocCommand, { stdio: "inherit" })
-	} catch (error) {
-		console.error(chalk.red("Error generating TypeScript for proto files:"), error)
-		process.exit(1)
-	}
+	tsProtoc(TS_OUT_DIR, protoFiles, TS_PROTO_OPTIONS)
+	// grpc-js is used to generate service impls for the ProtoBus service.
+	tsProtoc(GRPC_JS_OUT_DIR, protoFiles, ["outputServices=grpc-js,outputClientImpl=false", ...TS_PROTO_OPTIONS])
+	// nice-js is used for the Host Bridge client impls because it uses promises.
+	tsProtoc(NICE_JS_OUT_DIR, protoFiles, ["outputServices=nice-grpc,useExactTypes=false", ...TS_PROTO_OPTIONS])
 
-	const descriptorOutDir = path.join(ROOT_DIR, "dist-standalone", "proto")
-	await fs.mkdir(descriptorOutDir, { recursive: true })
-	const descriptorFile = path.join(descriptorOutDir, "descriptor_set.pb")
+	const descriptorFile = path.join(DESCRIPTOR_OUT_DIR, "descriptor_set.pb")
 	const descriptorProtocCommand = [
-		protoc,
+		PROTOC,
 		`--proto_path="${SCRIPT_DIR}"`,
 		`--descriptor_set_out="${descriptorFile}"`,
 		"--include_imports",
 		...protoFiles,
 	].join(" ")
 	try {
-		console.log(chalk.cyan("Generating descriptor set..."))
+		log_verbose(chalk.cyan("Generating descriptor set..."))
 		execSync(descriptorProtocCommand, { stdio: "inherit" })
 	} catch (error) {
 		console.error(chalk.red("Error generating descriptor set for proto file:"), error)
 		process.exit(1)
 	}
 
-	console.log(chalk.green("Protocol Buffer code generation completed successfully."))
-	console.log(chalk.green(`TypeScript files generated in: ${TS_OUT_DIR}`))
+	log_verbose(chalk.green("Protocol Buffer code generation completed successfully."))
+	log_verbose(chalk.green(`TypeScript files generated in: ${TS_OUT_DIR}`))
 
 	await generateMethodRegistrations()
 	await generateHostMethodRegistrations()
@@ -132,6 +110,28 @@ async function main() {
 	await generateHostServiceConfig()
 	await generateGrpcClientConfig()
 	await generateHostGrpcClientConfig()
+
+	console.log(chalk.bold.blue("Finished Protocol Buffer code generation."))
+}
+
+async function tsProtoc(outDir, protoFiles, protoOptions) {
+	// Build the protoc command with proper path handling for cross-platform
+	const command = [
+		PROTOC,
+		`--proto_path="${SCRIPT_DIR}"`,
+		`--plugin=protoc-gen-ts_proto="${TS_PROTO_PLUGIN}"`,
+		`--ts_proto_out="${outDir}"`,
+		`--ts_proto_opt=${protoOptions.join(",")} `,
+		...protoFiles.map((s) => `"${s}"`),
+	].join(" ")
+	try {
+		log_verbose(chalk.cyan(`Generating TypeScript code in ${outDir} for:\n${protoFiles.join("\n")}...`))
+		log_verbose(command)
+		execSync(command, { stdio: "inherit" })
+	} catch (error) {
+		console.error(chalk.red("Error generating TypeScript for proto files:"), error)
+		process.exit(1)
+	}
 }
 
 /**
@@ -139,14 +139,14 @@ async function main() {
  * This eliminates the need for manual imports and client creation in grpc-client.ts
  */
 async function generateGrpcClientConfig() {
-	console.log(chalk.cyan("Generating gRPC client configuration..."))
+	log_verbose(chalk.cyan("Generating gRPC client configuration..."))
 
 	const serviceImports = []
 	const serviceClientCreations = []
 	const serviceExports = []
 
 	// Process each service in the serviceNameMap
-	for (const [dirName, fullServiceName] of Object.entries(serviceNameMap)) {
+	for (const [dirName, _fullServiceName] of Object.entries(serviceNameMap)) {
 		const capitalizedName = dirName.charAt(0).toUpperCase() + dirName.slice(1)
 
 		// Add import statement
@@ -176,7 +176,7 @@ export {
 
 	const configPath = path.join(ROOT_DIR, "webview-ui", "src", "services", "grpc-client.ts")
 	await fs.writeFile(configPath, content)
-	console.log(chalk.green(`Generated gRPC client at ${configPath}`))
+	log_verbose(chalk.green(`Generated gRPC client at ${configPath}`))
 }
 
 /**
@@ -186,7 +186,7 @@ export {
  * @returns Map of service names to their streaming methods
  */
 async function parseProtoForStreamingMethods(protoFiles, scriptDir) {
-	console.log(chalk.cyan("Parsing proto files for streaming methods..."))
+	log_verbose(chalk.cyan("Parsing proto files for streaming methods..."))
 
 	// Map of service name to array of streaming method names
 	const streamingMethodsMap = new Map()
@@ -238,7 +238,7 @@ async function parseProtoForStreamingMethods(protoFiles, scriptDir) {
 }
 
 async function generateMethodRegistrations() {
-	console.log(chalk.cyan("Generating method registration files..."))
+	log_verbose(chalk.cyan("Generating method registration files..."))
 
 	// Parse proto files for streaming methods
 	const protoFiles = await globby("*.proto", { cwd: SCRIPT_DIR })
@@ -248,7 +248,7 @@ async function generateMethodRegistrations() {
 		try {
 			await fs.access(serviceDir)
 		} catch (error) {
-			console.log(chalk.cyan(`Creating directory ${serviceDir} for new service`))
+			log_verbose(chalk.cyan(`Creating directory ${serviceDir} for new service`))
 			await fs.mkdir(serviceDir, { recursive: true })
 		}
 
@@ -259,7 +259,7 @@ async function generateMethodRegistrations() {
 		const fullServiceName = serviceNameMap[serviceName]
 		const streamingMethods = streamingMethodsMap.get(fullServiceName) || []
 
-		console.log(chalk.cyan(`Generating method registrations for ${serviceName}...`))
+		log_verbose(chalk.cyan(`Generating method registrations for ${serviceName}...`))
 
 		// Get all TypeScript files in the service directory
 		const files = await globby("*.ts", { cwd: serviceDir })
@@ -312,7 +312,7 @@ export function registerAllMethods(): void {
 
 		// Write the methods.ts file
 		await fs.writeFile(registryFile, methodsContent)
-		console.log(chalk.green(`Generated ${registryFile}`))
+		log_verbose(chalk.green(`Generated ${registryFile}`))
 
 		// Generate index.ts file
 		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1)
@@ -341,10 +341,10 @@ registerAllMethods()`
 
 		// Write the index.ts file
 		await fs.writeFile(indexFile, indexContent)
-		console.log(chalk.green(`Generated ${indexFile}`))
+		log_verbose(chalk.green(`Generated ${indexFile}`))
 	}
 
-	console.log(chalk.green("Method registration files generated successfully."))
+	log_verbose(chalk.green("Method registration files generated successfully."))
 }
 
 /**
@@ -352,7 +352,7 @@ registerAllMethods()`
  * This eliminates the need for manual switch/case statements in grpc-handler.ts
  */
 async function generateServiceConfig() {
-	console.log(chalk.cyan("Generating service configuration file..."))
+	log_verbose(chalk.cyan("Generating service configuration file..."))
 
 	const serviceImports = []
 	const serviceConfigs = []
@@ -393,7 +393,7 @@ export const serviceHandlers: Record<string, ServiceHandlerConfig> = {${serviceC
 
 	const configPath = path.join(ROOT_DIR, "src", "core", "controller", "grpc-service-config.ts")
 	await fs.writeFile(configPath, content)
-	console.log(chalk.green(`Generated service configuration at ${configPath}`))
+	log_verbose(chalk.green(`Generated service configuration at ${configPath}`))
 }
 
 /**
@@ -401,7 +401,7 @@ export const serviceHandlers: Record<string, ServiceHandlerConfig> = {${serviceC
  * If a .proto file doesn't exist, create a template file
  */
 async function ensureProtoFilesExist() {
-	console.log(chalk.cyan("Checking for missing proto files..."))
+	log_verbose(chalk.cyan("Checking for missing proto files..."))
 
 	// Get existing proto files
 	const existingProtoFiles = await globby("*.proto", { cwd: SCRIPT_DIR })
@@ -410,7 +410,7 @@ async function ensureProtoFilesExist() {
 	// Check each service in serviceNameMap
 	for (const [serviceName, fullServiceName] of Object.entries(serviceNameMap)) {
 		if (!existingProtoServices.includes(serviceName)) {
-			console.log(chalk.yellow(`Creating template proto file for ${serviceName}...`))
+			log_verbose(chalk.yellow(`Creating template proto file for ${serviceName}...`))
 
 			// Extract service class name from full name (e.g., "cline.ModelsService" -> "ModelsService")
 			const serviceClassName = fullServiceName.split(".").pop()
@@ -443,7 +443,7 @@ service ${serviceClassName} {
 			// Write the template proto file
 			const protoFilePath = path.join(SCRIPT_DIR, `${serviceName}.proto`)
 			await fs.writeFile(protoFilePath, protoContent)
-			console.log(chalk.green(`Created template proto file at ${protoFilePath}`))
+			log_verbose(chalk.green(`Created template proto file at ${protoFilePath}`))
 		}
 	}
 }
@@ -452,7 +452,7 @@ service ${serviceClassName} {
  * Generate method registration files for host services
  */
 async function generateHostMethodRegistrations() {
-	console.log(chalk.cyan("Generating host method registration files..."))
+	log_verbose(chalk.cyan("Generating host method registration files..."))
 
 	// Parse proto files for streaming methods
 	const hostProtoFiles = await globby("*.proto", { cwd: path.join(SCRIPT_DIR, "host") })
@@ -462,7 +462,7 @@ async function generateHostMethodRegistrations() {
 		try {
 			await fs.access(serviceDir)
 		} catch (error) {
-			console.log(chalk.cyan(`Creating directory ${serviceDir} for new host service`))
+			log_verbose(chalk.cyan(`Creating directory ${serviceDir} for new host service`))
 			await fs.mkdir(serviceDir, { recursive: true })
 		}
 
@@ -473,7 +473,7 @@ async function generateHostMethodRegistrations() {
 		const fullServiceName = hostServiceNameMap[serviceName]
 		const streamingMethods = streamingMethodsMap.get(fullServiceName) || []
 
-		console.log(chalk.cyan(`Generating method registrations for host ${serviceName}...`))
+		log_verbose(chalk.cyan(`Generating method registrations for host ${serviceName}...`))
 
 		// Get all TypeScript files in the service directory
 		const files = await globby("*.ts", { cwd: serviceDir })
@@ -526,7 +526,7 @@ export function registerAllMethods(): void {
 
 		// Write the methods.ts file
 		await fs.writeFile(registryFile, methodsContent)
-		console.log(chalk.green(`Generated ${registryFile}`))
+		log_verbose(chalk.green(`Generated ${registryFile}`))
 
 		// Generate index.ts file
 		const capitalizedServiceName = serviceName.charAt(0).toUpperCase() + serviceName.slice(1)
@@ -555,17 +555,17 @@ registerAllMethods()`
 
 		// Write the index.ts file
 		await fs.writeFile(indexFile, indexContent)
-		console.log(chalk.green(`Generated ${indexFile}`))
+		log_verbose(chalk.green(`Generated ${indexFile}`))
 	}
 
-	console.log(chalk.green("Host method registration files generated successfully."))
+	log_verbose(chalk.green("Host method registration files generated successfully."))
 }
 
 /**
  * Generate a service configuration file for host services
  */
 async function generateHostServiceConfig() {
-	console.log(chalk.cyan("Generating host service configuration file..."))
+	log_verbose(chalk.cyan("Generating host service configuration file..."))
 
 	const serviceImports = []
 	const serviceConfigs = []
@@ -606,21 +606,21 @@ export const hostServiceHandlers: Record<string, HostServiceHandlerConfig> = {${
 	const configPath = path.join(ROOT_DIR, "src", "hosts", "vscode", "host-grpc-service-config.ts")
 	await fs.mkdir(path.dirname(configPath), { recursive: true })
 	await fs.writeFile(configPath, content)
-	console.log(chalk.green(`Generated host service configuration at ${configPath}`))
+	log_verbose(chalk.green(`Generated host service configuration at ${configPath}`))
 }
 
 /**
  * Generate a gRPC client configuration file for host services
  */
 async function generateHostGrpcClientConfig() {
-	console.log(chalk.cyan("Generating host gRPC client configuration..."))
+	log_verbose(chalk.cyan("Generating host gRPC client configuration..."))
 
 	const serviceImports = []
 	const serviceClientCreations = []
 	const serviceExports = []
 
 	// Process each service in the hostServiceNameMap
-	for (const [dirName, fullServiceName] of Object.entries(hostServiceNameMap)) {
+	for (const [dirName, _fullServiceName] of Object.entries(hostServiceNameMap)) {
 		const capitalizedName = dirName.charAt(0).toUpperCase() + dirName.slice(1)
 
 		// Add import statement
@@ -651,7 +651,39 @@ export {
 	const configPath = path.join(ROOT_DIR, "src", "hosts", "vscode", "client", "host-grpc-client.ts")
 	await fs.mkdir(path.dirname(configPath), { recursive: true })
 	await fs.writeFile(configPath, content)
-	console.log(chalk.green(`Generated host gRPC client at ${configPath}`))
+	log_verbose(chalk.green(`Generated host gRPC client at ${configPath}`))
+}
+
+async function cleanup() {
+	// Clean up existing generated files
+	log_verbose(chalk.cyan("Cleaning up existing generated TypeScript files..."))
+	const existingFiles = await globby("**/*.ts", { cwd: TS_OUT_DIR })
+	for (const file of existingFiles) {
+		await fs.unlink(path.join(TS_OUT_DIR, file))
+	}
+
+	// Clean up generated files that were moved.
+	await fs.rm(path.join(ROOT_DIR, "src/standalone/services/host-grpc-client.ts"), { force: true })
+	await rmdir(path.join(ROOT_DIR, "src/standalone/services"))
+
+	await fs.rm(path.join(ROOT_DIR, "hosts/vscode"), { force: true, recursive: true })
+	await rmdir(path.join(ROOT_DIR, "hosts"))
+
+	await fs.rm(path.join(ROOT_DIR, "src/standalone/server-setup.ts"), { force: true })
+}
+
+/**
+ * Remove an empty dir, do nothing if the directory doesn't exist or is not empty.
+ */
+async function rmdir(path) {
+	try {
+		await fs.rmdir(path)
+	} catch (error) {
+		if (error.code !== "ENOTEMPTY" && error.code !== "ENOENT") {
+			// Only re-throw if it's not "not empty" or "doesn't exist"
+			throw error
+		}
+	}
 }
 
 // Check for Apple Silicon compatibility
@@ -684,6 +716,12 @@ function checkAppleSiliconCompatibility() {
 	}
 }
 
+function log_verbose(s) {
+	if (process.argv.includes("-v") || process.argv.includes("--verbose")) {
+		console.log(s)
+	}
+}
+
 // Run the main function
 main().catch((error) => {
 	console.error(chalk.red("Error:"), error)

proto/host/uri.proto

@@ -25,12 +25,12 @@ message Uri {
   string path = 3;
   string query = 4;
   string fragment = 5;
-  string fsPath = 6;
+  string fs_path = 6;
 }
 
 // Request for joining path segments to a URI
 message JoinPathRequest {
   cline.Metadata metadata = 1;
   Uri base = 2;
-  repeated string pathSegments = 3;
+  repeated string path_segments = 3;
 }

proto/models.proto

@@ -22,19 +22,21 @@ service ModelsService {
   rpc refreshRequestyModels(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
   // Subscribe to OpenRouter models updates
   rpc subscribeToOpenRouterModels(EmptyRequest) returns (stream OpenRouterCompatibleModelInfo);
+  // Updates API configuration
+  rpc updateApiConfigurationProto(UpdateApiConfigurationRequest) returns (Empty);
 }
 
 // List of VS Code LM models
 message VsCodeLmModelsArray {
-  repeated VsCodeLmModel models = 1;
+  repeated LanguageModelChatSelector models = 1;
 }
 
-// Structure representing a VS Code LM model
-message VsCodeLmModel {
-  string vendor = 1;
-  string family = 2;
-  string version = 3;
-  string id = 4;
+// Structure representing a language model chat selector
+message LanguageModelChatSelector {
+  optional string vendor = 1;
+  optional string family = 2;
+  optional string version = 3;
+  optional string id = 4;
 }
 
 // Price tier for tiered pricing models
@@ -83,6 +85,155 @@ message OpenRouterCompatibleModelInfo {
 // Request for fetching OpenAI models
 message OpenAiModelsRequest {
   Metadata metadata = 1;
-  string baseUrl = 2;
-  string apiKey = 3;
+  string base_url = 2;
+  string api_key = 3;
+}
+
+// Request for updating API configuration
+message UpdateApiConfigurationRequest {
+  Metadata metadata = 1;
+  ModelsApiConfiguration api_configuration = 2;
+}
+
+// API Provider enumeration
+enum ApiProvider {
+  ANTHROPIC = 0;
+  OPENROUTER = 1;
+  BEDROCK = 2;
+  VERTEX = 3;
+  OPENAI = 4;
+  OLLAMA = 5;
+  LMSTUDIO = 6;
+  GEMINI = 7;
+  OPENAI_NATIVE = 8;
+  REQUESTY = 9;
+  TOGETHER = 10;
+  DEEPSEEK = 11;
+  QWEN = 12;
+  DOUBAO = 13;
+  MISTRAL = 14;
+  VSCODE_LM = 15;
+  CLINE = 16;
+  LITELLM = 17;
+  NEBIUS = 18;
+  FIREWORKS = 19;
+  ASKSAGE = 20;
+  XAI = 21;
+  SAMBANOVA = 22;
+  CEREBRAS = 23;
+  SAPAICORE = 24;
+  CLAUDE_CODE = 25;
+}
+
+// Model info for OpenAI-compatible models
+message OpenAiCompatibleModelInfo {
+  optional int32 max_tokens = 1;
+  optional int32 context_window = 2;
+  optional bool supports_images = 3;
+  bool supports_prompt_cache = 4;
+  optional double input_price = 5;
+  optional double output_price = 6;
+  optional ThinkingConfig thinking_config = 7;
+  optional bool supports_global_endpoint = 8;
+  optional double cache_writes_price = 9;
+  optional double cache_reads_price = 10;
+  optional string description = 11;
+  repeated ModelTier tiers = 12;
+  optional double temperature = 13;
+  optional bool is_r1_format_required = 14;
+}
+
+// Model info for LiteLLM models
+message LiteLLMModelInfo {
+  optional int32 max_tokens = 1;
+  optional int32 context_window = 2;
+  optional bool supports_images = 3;
+  bool supports_prompt_cache = 4;
+  optional double input_price = 5;
+  optional double output_price = 6;
+  optional ThinkingConfig thinking_config = 7;
+  optional bool supports_global_endpoint = 8;
+  optional double cache_writes_price = 9;
+  optional double cache_reads_price = 10;
+  optional string description = 11;
+  repeated ModelTier tiers = 12;
+  optional double temperature = 13;
+}
+
+// Main ApiConfiguration message
+message ModelsApiConfiguration {
+  // From ApiHandlerOptions (excluding onRetryAttempt function)
+  optional string api_model_id = 1;
+  optional string api_key = 2;
+  optional string cline_api_key = 3;
+  optional string task_id = 4;
+  optional string lite_llm_base_url = 5;
+  optional string lite_llm_model_id = 6;
+  optional string lite_llm_api_key = 7;
+  optional bool lite_llm_use_prompt_cache = 8;
+  map<string, string> open_ai_headers = 9;
+  optional LiteLLMModelInfo lite_llm_model_info = 10;
+  optional string anthropic_base_url = 11;
+  optional string open_router_api_key = 12;
+  optional string open_router_model_id = 13;
+  optional OpenRouterModelInfo open_router_model_info = 14;
+  optional string open_router_provider_sorting = 15;
+  optional string aws_access_key = 16;
+  optional string aws_secret_key = 17;
+  optional string aws_session_token = 18;
+  optional string aws_region = 19;
+  optional bool aws_use_cross_region_inference = 20;
+  optional bool aws_bedrock_use_prompt_cache = 21;
+  optional bool aws_use_profile = 22;
+  optional string aws_profile = 23;
+  optional string aws_bedrock_endpoint = 24;
+  optional bool aws_bedrock_custom_selected = 25;
+  optional string aws_bedrock_custom_model_base_id = 26;
+  optional string vertex_project_id = 27;
+  optional string vertex_region = 28;
+  optional string open_ai_base_url = 29;
+  optional string open_ai_api_key = 30;
+  optional string open_ai_model_id = 31;
+  optional OpenAiCompatibleModelInfo open_ai_model_info = 32;
+  optional string ollama_model_id = 33;
+  optional string ollama_base_url = 34;
+  optional string ollama_api_options_ctx_num = 35;
+  optional string lm_studio_model_id = 36;
+  optional string lm_studio_base_url = 37;
+  optional string gemini_api_key = 38;
+  optional string gemini_base_url = 39;
+  optional string open_ai_native_api_key = 40;
+  optional string deep_seek_api_key = 41;
+  optional string requesty_api_key = 42;
+  optional string requesty_model_id = 43;
+  optional OpenRouterModelInfo requesty_model_info = 44;
+  optional string together_api_key = 45;
+  optional string together_model_id = 46;
+  optional string fireworks_api_key = 47;
+  optional string fireworks_model_id = 48;
+  optional int32 fireworks_model_max_completion_tokens = 49;
+  optional int32 fireworks_model_max_tokens = 50;
+  optional string qwen_api_key = 51;
+  optional string doubao_api_key = 52;
+  optional string mistral_api_key = 53;
+  optional string azure_api_version = 54;
+  optional LanguageModelChatSelector vs_code_lm_model_selector = 55;
+  optional string qwen_api_line = 56;
+  optional string nebius_api_key = 57;
+  optional string asksage_api_url = 58;
+  optional string asksage_api_key = 59;
+  optional string xai_api_key = 60;
+  optional int32 thinking_budget_tokens = 61;
+  optional string reasoning_effort = 62;
+  optional string sambanova_api_key = 63;
+  optional string cerebras_api_key = 64;
+  optional int32 request_timeout_ms = 65;
+  optional ApiProvider api_provider = 66;
+  repeated string favorited_model_ids = 67;
+  optional string sap_ai_core_client_id = 68;
+  optional string sap_ai_core_client_secret = 69;
+  optional string sap_ai_resource_group = 70;
+  optional string sap_ai_core_token_url = 71;
+  optional string sap_ai_core_base_url = 72;
+  optional string claude_code_path = 73;
 }

proto/state.proto

@@ -7,11 +7,14 @@ import "common.proto";
 
 service StateService {
   rpc getLatestState(EmptyRequest) returns (State);
+  rpc updateTerminalConnectionTimeout(Int64Request) returns (Int64);
+  rpc updateTerminalReuseEnabled(BooleanRequest) returns (Empty);
+  rpc updateDefaultTerminalProfile(StringRequest) returns (TerminalProfileUpdateResponse);
+  rpc getAvailableTerminalProfiles(EmptyRequest) returns (TerminalProfiles);
   rpc subscribeToState(EmptyRequest) returns (stream State);
   rpc toggleFavoriteModel(StringRequest) returns (Empty);
-  rpc resetState(EmptyRequest) returns (Empty);
+  rpc resetState(ResetStateRequest) returns (Empty);
   rpc togglePlanActMode(TogglePlanActModeRequest) returns (Empty);
-  rpc updateTerminalConnectionTimeout(Int64Request) returns (Int64);
   rpc updateAutoApprovalSettings(AutoApprovalSettingsRequest) returns (Empty);
   rpc updateSettings(UpdateSettingsRequest) returns (Empty);
 }
@@ -20,6 +23,23 @@ message State {
   string state_json = 1;
 }
 
+message TerminalProfiles {
+  repeated TerminalProfile profiles = 1;
+}
+
+message TerminalProfile {
+  string id = 1;
+  string name = 2;
+  optional string path = 3;
+  optional string description = 4;
+}
+
+message TerminalProfileUpdateResponse {
+  int32 closed_count = 1;
+  int32 busy_terminals_count = 2;
+  bool has_busy_terminals = 3;
+}
+
 message TogglePlanActModeRequest {
   Metadata metadata = 1;
   ChatSettings chat_settings = 2;
@@ -43,10 +63,13 @@ message ChatContent {
   repeated string files = 3;
 }
 
-// Message for auto approval settings
+message ResetStateRequest {
+  Metadata metadata = 1;
+  optional bool global = 2;
+}
+
 message AutoApprovalSettingsRequest {
   Metadata metadata = 1;
-
   message Actions {
     bool read_files = 1;
     bool read_files_externally = 2;
@@ -57,7 +80,6 @@ message AutoApprovalSettingsRequest {
     bool use_browser = 7;
     bool use_mcp = 8;
   }
-
   int32 version = 2;
   bool enabled = 3;
   Actions actions = 4;
@@ -70,15 +92,16 @@ message AutoApprovalSettingsRequest {
 message UpdateSettingsRequest {
   Metadata metadata = 1;
   optional ApiConfiguration api_configuration = 2;
-  optional string custom_instructions_setting = 3;
-  optional string telemetry_setting = 4;
-  optional bool plan_act_separate_models_setting = 5;
-  optional bool enable_checkpoints_setting = 6;
-  optional bool mcp_marketplace_enabled = 7;
-  optional ChatSettings chat_settings = 8;
-  optional int64 shell_integration_timeout = 9;
-  optional bool terminal_reuse_enabled = 10;
-  optional bool mcp_responses_collapsed = 11;
+  optional string telemetry_setting = 3;
+  optional bool plan_act_separate_models_setting = 4;
+  optional bool enable_checkpoints_setting = 5;
+  optional bool mcp_marketplace_enabled = 6;
+  optional ChatSettings chat_settings = 7;
+  optional int64 shell_integration_timeout = 8;
+  optional bool terminal_reuse_enabled = 9;
+  optional bool mcp_responses_collapsed = 10;
+  optional bool mcp_rich_display_enabled = 11;
+  optional int64 terminal_output_line_limit = 12;
 }
 
 // Complete API Configuration message
@@ -187,4 +210,14 @@ message ApiConfiguration {
   
   // Favorited model IDs
   repeated string favorited_model_ids = 71;
+
+  // SAP AI Core specific
+  optional string sap_ai_core_client_id = 72;
+  optional string sap_ai_core_client_secret = 73;
+  optional string sap_ai_core_base_url = 74;
+  optional string sap_ai_core_token_url = 75;
+  optional string sap_ai_resource_group = 76;
+
+  // Claude Code specific
+  optional string claude_code_path = 77;
 }

proto/ui.proto

@@ -15,7 +15,7 @@ enum WebviewProviderType {
 // Define a new message type for webview provider info
 message WebviewProviderTypeRequest {
   Metadata metadata = 1;
-  WebviewProviderType providerType = 2;
+  WebviewProviderType provider_type = 2;
 }
 
 // Enum for ClineMessage type
@@ -65,13 +65,14 @@ enum ClineSay {
   BROWSER_ACTION_RESULT = 16;
   MCP_SERVER_REQUEST_STARTED = 17;
   MCP_SERVER_RESPONSE = 18;
-  USE_MCP_SERVER_SAY = 19;
-  DIFF_ERROR = 20;
-  DELETED_API_REQS = 21;
-  CLINEIGNORE_ERROR = 22;
-  CHECKPOINT_CREATED = 23;
-  LOAD_MCP_DOCUMENTATION = 24;
-  INFO = 25;
+  MCP_NOTIFICATION = 19;
+  USE_MCP_SERVER_SAY = 20;
+  DIFF_ERROR = 21;
+  DELETED_API_REQS = 22;
+  CLINEIGNORE_ERROR = 23;
+  CHECKPOINT_CREATED = 24;
+  LOAD_MCP_DOCUMENTATION = 25;
+  INFO = 26;
 }
 
 // Enum for ClineSayTool tool types
@@ -255,4 +256,7 @@ service UiService {
   
   // Subscribe to relinquish control events
   rpc subscribeToRelinquishControl(EmptyRequest) returns (stream Empty);
+  
+  // Subscribe to focus chat input events with client ID
+  rpc subscribeToFocusChatInput(StringRequest) returns (stream Empty);
 }

scripts/generate-server-setup.mjs

@@ -1,11 +1,11 @@
-import * as fs from "fs"
 import * as grpc from "@grpc/grpc-js"
 import * as protoLoader from "@grpc/proto-loader"
+import * as fs from "fs"
 import * as health from "grpc-health-check"
+import path, { basename, dirname } from "path"
 import { fileURLToPath } from "url"
-import path from "path"
 
-const OUT_FILE = path.resolve("src/standalone/server-setup.ts")
+const OUT_FILE = path.resolve("src/generated/standalone/server-setup.ts")
 const DESCRIPTOR_SET = path.resolve("dist-standalone/proto/descriptor_set.pb")
 
 // Load service definitions.
@@ -29,17 +29,17 @@ function generateHandlersAndExports() {
 		const dir = domain.charAt(0).toLowerCase() + domain.slice(1)
 		imports.push(`// ${domain} Service`)
 		handlerSetup.push(`    // ${domain} Service`)
-		handlerSetup.push(`    server.addService(proto.cline.${name}.service, {`)
+		handlerSetup.push(`    server.addService(cline.${name}Service, {`)
 		for (const [rpcName, rpc] of Object.entries(def.service)) {
-			imports.push(`import { ${rpcName} } from "../core/controller/${dir}/${rpcName}"`)
-			const requestType = "proto.cline." + rpc.requestType.type.name
+			imports.push(`import { ${rpcName} } from "@core/controller/${dir}/${rpcName}"`)
+			const requestType = "cline." + rpc.requestType.type.name
 			if (rpc.requestStream) {
 				throw new Error("Request streaming is not supported")
 			}
 			if (rpc.responseStream) {
 				handlerSetup.push(`        ${rpcName}: wrapStreamingResponse<${requestType},void>(${rpcName}, controller),`)
 			} else {
-				const responseType = "proto.cline." + rpc.responseType.type.name
+				const responseType = "cline." + rpc.responseType.type.name
 				handlerSetup.push(`         ${rpcName}: wrapper<${requestType},${responseType}>(${rpcName}, controller),`)
 			}
 		}
@@ -60,14 +60,13 @@ const scriptName = path.basename(fileURLToPath(import.meta.url))
 let output = `// GENERATED CODE -- DO NOT EDIT!
 // Generated by ${scriptName}
 import * as grpc from "@grpc/grpc-js"
-import * as proto from "@/shared/proto"
-import { Controller } from "../core/controller"
-import { GrpcHandlerWrapper, GrpcStreamingResponseHandlerWrapper } from "./grpc-types"
+import { cline } from "@generated/grpc-js"
+import { Controller } from "@core/controller"
+import { GrpcHandlerWrapper, GrpcStreamingResponseHandlerWrapper } from "@/standalone/grpc-types"
 
 ${imports}
-export function addServices(
+export function addProtobusServices(
 	server: grpc.Server,
-	proto: any,
 	controller: Controller,
 	wrapper: GrpcHandlerWrapper,
 	wrapStreamingResponse: GrpcStreamingResponseHandlerWrapper,
@@ -76,6 +75,7 @@ ${handlerSetup}
 }
 `
 // Write output file
+fs.mkdirSync(dirname(OUT_FILE), { recursive: true })
 fs.writeFileSync(OUT_FILE, output)
 
 console.log(`Generated service handlers in ${OUT_FILE}.`)

src/api/index.ts

@@ -25,6 +25,8 @@ import { AskSageHandler } from "./providers/asksage"
 import { XAIHandler } from "./providers/xai"
 import { SambanovaHandler } from "./providers/sambanova"
 import { CerebrasHandler } from "./providers/cerebras"
+import { SapAiCoreHandler } from "./providers/sapaicore"
+import { ClaudeCodeHandler } from "./providers/claude-code"
 
 export interface ApiHandler {
 	createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream
@@ -87,6 +89,10 @@ export function buildApiHandler(configuration: ApiConfiguration): ApiHandler {
 			return new SambanovaHandler(options)
 		case "cerebras":
 			return new CerebrasHandler(options)
+		case "sapaicore":
+			return new SapAiCoreHandler(options)
+		case "claude-code":
+			return new ClaudeCodeHandler(options)
 		default:
 			return new AnthropicHandler(options)
 	}

src/api/providers/bedrock.ts

@@ -35,6 +35,59 @@ interface ExtendedMetadata {
 	}
 }
 
+// Define types for stream response content blocks
+interface ContentBlockStart {
+	contentBlockIndex?: number
+	start?: {
+		type?: string
+		thinking?: string
+	}
+	contentBlock?: {
+		type?: string
+		thinking?: string
+	}
+	type?: string
+	thinking?: string
+}
+
+// Define types for stream response deltas
+interface ContentBlockDelta {
+	contentBlockIndex?: number
+	delta?: {
+		type?: string
+		thinking?: string
+		text?: string
+		reasoningContent?: {
+			text?: string
+		}
+	}
+}
+
+// Define types for supported content types
+type SupportedContentType = "text" | "image" | "thinking"
+
+interface ContentItem {
+	type: SupportedContentType
+	text?: string
+	source?: {
+		data: string | Buffer | Uint8Array
+		media_type?: string
+	}
+}
+
+// Define cache point type for AWS Bedrock
+interface CachePointContentBlock {
+	cachePoint: {
+		type: "default"
+	}
+}
+
+// Define provider options type based on AWS SDK patterns
+interface ProviderChainOptions {
+	ignoreCache?: boolean
+	profile?: string
+}
+
 // https://docs.anthropic.com/en/api/claude-on-amazon-bedrock
 export class AwsBedrockHandler implements ApiHandler {
 	private options: ApiHandlerOptions
@@ -43,7 +96,7 @@ export class AwsBedrockHandler implements ApiHandler {
 		this.options = options
 	}
 
-	@withRetry()
+	@withRetry({ maxRetries: 4 })
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		// cross region inference requires prefixing the model id with the region
 		const modelId = await this.getModelId()
@@ -107,7 +160,7 @@ export class AwsBedrockHandler implements ApiHandler {
 		sessionToken?: string
 	}> {
 		// Configure provider options
-		const providerOptions: any = {}
+		const providerOptions: ProviderChainOptions = {}
 		if (this.options.awsUseProfile) {
 			// For profile-based auth, always use ignoreCache to detect credential file changes
 			// This solves the AWS Identity Manager issue where credential files change externally
@@ -461,7 +514,7 @@ export class AwsBedrockHandler implements ApiHandler {
 
 					// Handle content block start - check if Bedrock uses Anthropic SDK format
 					if (chunk.contentBlockStart) {
-						const blockStart = chunk.contentBlockStart as any
+						const blockStart = chunk.contentBlockStart as ContentBlockStart
 						const blockIndex = chunk.contentBlockStart.contentBlockIndex
 
 						// Check for thinking block in various possible formats
@@ -497,7 +550,7 @@ export class AwsBedrockHandler implements ApiHandler {
 
 							// Check if this is a thinking block
 							const blockType = blockTypes.get(blockIndex)
-							const delta = chunk.contentBlockDelta.delta as any
+							const delta = chunk.contentBlockDelta.delta as ContentBlockDelta["delta"]
 
 							// Handle thinking delta (Anthropic SDK format)
 							if (delta?.type === "thinking_delta" || delta?.thinking) {
@@ -727,7 +780,7 @@ export class AwsBedrockHandler implements ApiHandler {
 						}
 
 						// Log unsupported content types for debugging
-						console.warn(`Unsupported content type: ${(item as any).type}`)
+						console.warn(`Unsupported content type: ${(item as ContentItem).type}`)
 						return null
 					})
 					.filter((item): item is ContentBlock => item !== null)
@@ -771,7 +824,7 @@ export class AwsBedrockHandler implements ApiHandler {
 				imageData = new Uint8Array(Buffer.from(base64Data, "base64"))
 			} else if (item.source.data && typeof item.source.data === "object") {
 				// Try to convert to Uint8Array
-				imageData = new Uint8Array(Buffer.from(item.source.data as any))
+				imageData = new Uint8Array(Buffer.from(item.source.data as Buffer | Uint8Array))
 			} else {
 				throw new Error("Unsupported image data format")
 			}
@@ -817,7 +870,7 @@ export class AwsBedrockHandler implements ApiHandler {
 							cachePoint: {
 								type: "default",
 							},
-						} as any, // Type assertion needed for AWS SDK compatibility
+						} as CachePointContentBlock, // Properly typed cache point for AWS SDK
 					]
 				}
 

src/api/providers/claude-code.ts

@@ -0,0 +1,165 @@
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { claudeCodeDefaultModelId, ClaudeCodeModelId, claudeCodeModels, type ApiHandlerOptions } from "@/shared/api"
+import { type ApiHandler } from ".."
+import { ApiStreamUsageChunk, type ApiStream } from "../transform/stream"
+import { withRetry } from "../retry"
+import { runClaudeCode } from "@/integrations/claude-code/run"
+import { ClaudeCodeMessage } from "@/integrations/claude-code/types"
+
+export class ClaudeCodeHandler implements ApiHandler {
+	private options: ApiHandlerOptions
+
+	constructor(options: ApiHandlerOptions) {
+		this.options = options
+	}
+
+	@withRetry({
+		maxRetries: 4,
+		baseDelay: 2000,
+		maxDelay: 15000,
+	})
+	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
+		const claudeProcess = runClaudeCode({
+			systemPrompt,
+			messages,
+			path: this.options.claudeCodePath,
+			modelId: this.getModel().id,
+		})
+
+		const dataQueue: string[] = []
+		let processError = null
+		let errorOutput = ""
+		let exitCode: number | null = null
+
+		claudeProcess.stdout.on("data", (data) => {
+			const output = data.toString()
+			const lines = output.split("\n").filter((line: string) => line.trim() !== "")
+
+			for (const line of lines) {
+				dataQueue.push(line)
+			}
+		})
+
+		claudeProcess.stderr.on("data", (data) => {
+			errorOutput += data.toString()
+		})
+
+		claudeProcess.on("close", (code) => {
+			exitCode = code
+		})
+
+		claudeProcess.on("error", (error) => {
+			processError = error
+		})
+
+		// Usage is included with assistant messages,
+		// but cost is included in the result chunk
+		let usage: ApiStreamUsageChunk = {
+			type: "usage",
+			inputTokens: 0,
+			outputTokens: 0,
+			cacheReadTokens: 0,
+			cacheWriteTokens: 0,
+		}
+
+		while (exitCode !== 0 || dataQueue.length > 0) {
+			if (dataQueue.length === 0) {
+				await new Promise((resolve) => setImmediate(resolve))
+			}
+
+			if (exitCode !== null && exitCode !== 0) {
+				throw new Error(
+					`Claude Code process exited with code ${exitCode}.${errorOutput ? ` Error output: ${errorOutput.trim()}` : ""}`,
+				)
+			}
+
+			const data = dataQueue.shift()
+			if (!data) {
+				continue
+			}
+
+			const chunk = this.attemptParseChunk(data)
+
+			if (!chunk) {
+				yield {
+					type: "text",
+					text: data || "",
+				}
+
+				continue
+			}
+
+			if (chunk.type === "system" && chunk.subtype === "init") {
+				continue
+			}
+
+			if (chunk.type === "assistant" && "message" in chunk) {
+				const message = chunk.message
+
+				if (message.stop_reason !== null && message.stop_reason !== "tool_use") {
+					const errorMessage = message.content[0]?.text || `Claude Code stopped with reason: ${message.stop_reason}`
+
+					if (errorMessage.includes("Invalid model name")) {
+						throw new Error(
+							errorMessage +
+								`\n\nAPI keys and subscription plans allow different models. Make sure the selected model is included in your plan.`,
+						)
+					}
+
+					throw new Error(errorMessage)
+				}
+
+				for (const content of message.content) {
+					if (content.type === "text") {
+						yield {
+							type: "text",
+							text: content.text,
+						}
+					} else {
+						console.warn("Unsupported content type:", content.type)
+					}
+				}
+
+				usage.inputTokens += message.usage.input_tokens
+				usage.outputTokens += message.usage.output_tokens
+				usage.cacheReadTokens = (usage.cacheReadTokens || 0) + (message.usage.cache_read_input_tokens || 0)
+				usage.cacheWriteTokens = (usage.cacheWriteTokens || 0) + (message.usage.cache_creation_input_tokens || 0)
+
+				continue
+			}
+
+			if (chunk.type === "result" && "result" in chunk) {
+				usage.totalCost = chunk.cost_usd || 0
+
+				yield usage
+			}
+
+			if (processError) {
+				throw processError
+			}
+		}
+	}
+
+	getModel() {
+		const modelId = this.options.apiModelId
+		if (modelId && modelId in claudeCodeModels) {
+			const id = modelId as ClaudeCodeModelId
+			return { id, info: claudeCodeModels[id] }
+		}
+
+		return {
+			id: claudeCodeDefaultModelId,
+			info: claudeCodeModels[claudeCodeDefaultModelId],
+		}
+	}
+
+	// TOOD: Validate instead of parsing
+	private attemptParseChunk(data: string): ClaudeCodeMessage | null {
+		try {
+			return JSON.parse(data)
+		} catch (error) {
+			console.error("Error parsing chunk:", error)
+			return null
+		}
+	}
+}

src/api/providers/gemini.ts

@@ -2,6 +2,7 @@ import type { Anthropic } from "@anthropic-ai/sdk"
 // Restore GenerateContentConfig import and add GenerateContentResponseUsageMetadata
 import { GoogleGenAI, type GenerateContentConfig, type GenerateContentResponseUsageMetadata } from "@google/genai"
 import { withRetry } from "../retry"
+import { Part } from "@google/genai"
 import { ApiHandler } from "../"
 import { ApiHandlerOptions, geminiDefaultModelId, GeminiModelId, geminiModels, ModelInfo } from "@shared/api"
 import { convertAnthropicMessageToGemini } from "../transform/gemini-format"
@@ -96,9 +97,10 @@ export class GeminiHandler implements ApiHandler {
 		}
 
 		// Add thinking config if the model supports it
-		if (info.thinkingConfig?.outputPrice !== undefined && maxBudget > 0) {
+		if (thinkingBudget > 0) {
 			requestConfig.thinkingConfig = {
 				thinkingBudget: thinkingBudget,
+				includeThoughts: true,
 			}
 		}
 
@@ -111,6 +113,7 @@ export class GeminiHandler implements ApiHandler {
 		let promptTokens = 0
 		let outputTokens = 0
 		let cacheReadTokens = 0
+		let thoughtsTokenCount = 0 // Initialize thought token counts
 		let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined
 
 		try {
@@ -130,6 +133,31 @@ export class GeminiHandler implements ApiHandler {
 					isFirstSdkChunk = false
 				}
 
+				// Handle thinking content from Gemini's response
+				const candidateForThoughts = chunk?.candidates?.[0]
+				const partsForThoughts = candidateForThoughts?.content?.parts
+				let thoughts = "" // Initialize as empty string
+
+				if (partsForThoughts) {
+					// This ensures partsForThoughts is a Part[] array
+					for (const part of partsForThoughts) {
+						const { thought, text } = part as Part
+						if (thought && text) {
+							// Ensure part.text exists
+							// Handle the thought part
+							thoughts += text + "\n" // Append thought and a newline
+						}
+					}
+				}
+
+				if (thoughts.trim() !== "") {
+					yield {
+						type: "reasoning",
+						reasoning: thoughts.trim(),
+					}
+					thoughts = "" // Reset thoughts after yielding
+				}
+
 				if (chunk.text) {
 					yield {
 						type: "text",
@@ -141,6 +169,7 @@ export class GeminiHandler implements ApiHandler {
 					lastUsageMetadata = chunk.usageMetadata
 					promptTokens = lastUsageMetadata.promptTokenCount ?? promptTokens
 					outputTokens = lastUsageMetadata.candidatesTokenCount ?? outputTokens
+					thoughtsTokenCount = lastUsageMetadata.thoughtsTokenCount ?? thoughtsTokenCount
 					cacheReadTokens = lastUsageMetadata.cachedContentTokenCount ?? cacheReadTokens
 				}
 			}
@@ -151,12 +180,14 @@ export class GeminiHandler implements ApiHandler {
 					info,
 					inputTokens: promptTokens,
 					outputTokens,
+					thoughtsTokenCount,
 					cacheReadTokens,
 				})
 				yield {
 					type: "usage",
 					inputTokens: promptTokens,
 					outputTokens,
+					thoughtsTokenCount,
 					cacheReadTokens,
 					cacheWriteTokens: 0,
 					totalCost,
@@ -239,11 +270,13 @@ export class GeminiHandler implements ApiHandler {
 		info,
 		inputTokens,
 		outputTokens,
+		thoughtsTokenCount = 0,
 		cacheReadTokens = 0,
 	}: {
 		info: ModelInfo
 		inputTokens: number
 		outputTokens: number
+		thoughtsTokenCount: number
 		cacheReadTokens?: number
 	}) {
 		// Exit early if any required pricing information is missing
@@ -275,18 +308,18 @@ export class GeminiHandler implements ApiHandler {
 		const inputTokensCost = inputPrice * (uncachedInputTokens / 1_000_000)
 
 		// 2. Output token costs
-		const outputTokensCost = outputPrice * (outputTokens / 1_000_000)
+		const responseTokensCost = outputPrice * ((outputTokens + thoughtsTokenCount) / 1_000_000)
 
 		// 3. Cache read costs (immediate)
 		const cacheReadCost = (cacheReadTokens ?? 0) > 0 ? cacheReadsPrice * ((cacheReadTokens ?? 0) / 1_000_000) : 0
 
 		// Calculate total immediate cost (excluding cache write/storage costs)
-		const totalCost = inputTokensCost + outputTokensCost + cacheReadCost
+		const totalCost = inputTokensCost + responseTokensCost + cacheReadCost
 
 		// Create the trace object for debugging
 		const trace: Record<string, { price: number; tokens: number; cost: number }> = {
 			input: { price: inputPrice, tokens: uncachedInputTokens, cost: inputTokensCost },
-			output: { price: outputPrice, tokens: outputTokens, cost: outputTokensCost },
+			output: { price: outputPrice, tokens: outputTokens, cost: responseTokensCost },
 		}
 
 		// Only include cache read costs in the trace (cache write costs are tracked separately)

src/api/providers/sapaicore.ts

@@ -0,0 +1,540 @@
+import { Anthropic } from "@anthropic-ai/sdk"
+import axios from "axios"
+import OpenAI from "openai"
+import { ApiHandler } from "../"
+import { ApiHandlerOptions, ModelInfo, sapAiCoreDefaultModelId, SapAiCoreModelId, sapAiCoreModels } from "../../shared/api"
+import { convertToOpenAiMessages } from "../transform/openai-format"
+import { ApiStream } from "../transform/stream"
+
+interface Deployment {
+	id: string
+	name: string
+}
+interface Token {
+	access_token: string
+	expires_in: number
+	scope: string
+	jti: string
+	token_type: string
+	expires_at: number
+}
+export class SapAiCoreHandler implements ApiHandler {
+	private options: ApiHandlerOptions
+	private token?: Token
+	private deployments?: Deployment[]
+
+	constructor(options: ApiHandlerOptions) {
+		this.options = options
+	}
+
+	private async authenticate(): Promise<Token> {
+		const payload = {
+			grant_type: "client_credentials",
+			client_id: this.options.sapAiCoreClientId || "",
+			client_secret: this.options.sapAiCoreClientSecret || "",
+		}
+
+		const tokenUrl = (this.options.sapAiCoreTokenUrl || "").replace(/\/+$/, "") + "/oauth/token"
+		const response = await axios.post(tokenUrl, payload, {
+			headers: { "Content-Type": "application/x-www-form-urlencoded" },
+		})
+		const token = response.data as Token
+		token.expires_at = Date.now() + token.expires_in * 1000
+		return token
+	}
+
+	private async getToken(): Promise<string> {
+		if (!this.token || this.token.expires_at < Date.now()) {
+			this.token = await this.authenticate()
+		}
+		return this.token.access_token
+	}
+
+	private async getAiCoreDeployments(): Promise<Deployment[]> {
+		if (this.options.sapAiCoreClientSecret === "") {
+			return [{ id: "notconfigured", name: "ai-core-not-configured" }]
+		}
+
+		const token = await this.getToken()
+		const headers = {
+			Authorization: `Bearer ${token}`,
+			"AI-Resource-Group": this.options.sapAiResourceGroup || "default",
+			"Content-Type": "application/json",
+		}
+
+		const url = `${this.options.sapAiCoreBaseUrl}/v2/lm/deployments?$top=10000&$skip=0`
+
+		try {
+			const response = await axios.get(url, { headers })
+			const deployments = response.data.resources
+
+			return deployments
+				.filter((deployment: any) => deployment.targetStatus === "RUNNING")
+				.map((deployment: any) => {
+					const model = deployment.details?.resources?.backend_details?.model
+					if (!model?.name || !model?.version) {
+						return null // Skip this row
+					}
+					return {
+						id: deployment.id,
+						name: `${model.name}:${model.version}`,
+					}
+				})
+				.filter((deployment: any) => deployment !== null)
+		} catch (error) {
+			console.error("Error fetching deployments:", error)
+			throw new Error("Failed to fetch deployments")
+		}
+	}
+
+	private async getDeploymentForModel(modelId: string): Promise<string> {
+		// If deployments are not fetched yet or the model is not found in the fetched deployments, fetch deployments
+		if (!this.deployments || !this.hasDeploymentForModel(modelId)) {
+			this.deployments = await this.getAiCoreDeployments()
+		}
+
+		const deployment = this.deployments.find((d) => {
+			const deploymentBaseName = d.name.split(":")[0].toLowerCase()
+			const modelBaseName = modelId.split(":")[0].toLowerCase()
+			return deploymentBaseName === modelBaseName
+		})
+
+		if (!deployment) {
+			throw new Error(`No running deployment found for model ${modelId}`)
+		}
+
+		return deployment.id
+	}
+
+	private hasDeploymentForModel(modelId: string): boolean {
+		return this.deployments?.some((d) => d.name.split(":")[0].toLowerCase() === modelId.split(":")[0].toLowerCase()) ?? false
+	}
+
+	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
+		const token = await this.getToken()
+		const headers = {
+			Authorization: `Bearer ${token}`,
+			"AI-Resource-Group": this.options.sapAiResourceGroup || "default",
+			"Content-Type": "application/json",
+		}
+
+		const model = this.getModel()
+		const deploymentId = await this.getDeploymentForModel(model.id)
+
+		const anthropicModels = [
+			"anthropic--claude-3.7-sonnet",
+			"anthropic--claude-3.5-sonnet",
+			"anthropic--claude-3-sonnet",
+			"anthropic--claude-3-haiku",
+			"anthropic--claude-3-opus",
+		]
+
+		const openAIModels = ["gpt-4o", "gpt-4", "gpt-4o-mini", "o1", "gpt-4.1", "gpt-4.1-nano", "o3-mini", "o3", "o4-mini"]
+
+		let url: string
+		let payload: any
+		if (anthropicModels.includes(model.id)) {
+			url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/invoke-with-response-stream`
+
+			if (model.id === "anthropic--claude-3.7-sonnet") {
+				url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/converse-stream`
+				payload = {
+					inferenceConfig: {
+						maxTokens: model.info.maxTokens,
+						temperature: 0.0,
+					},
+					system: systemPrompt ? [{ text: systemPrompt }] : undefined,
+					messages: this.formatAnthropicMessages(messages),
+				}
+			} else {
+				payload = {
+					max_tokens: model.info.maxTokens,
+					system: systemPrompt,
+					messages,
+					anthropic_version: "bedrock-2023-05-31",
+				}
+			}
+		} else if (openAIModels.includes(model.id)) {
+			let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
+				{ role: "system", content: systemPrompt },
+				...convertToOpenAiMessages(messages),
+			]
+
+			url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/chat/completions?api-version=2024-12-01-preview`
+			payload = {
+				stream: true,
+				messages: openAiMessages,
+				max_tokens: model.info.maxTokens,
+				temperature: 0.0,
+				frequency_penalty: 0,
+				presence_penalty: 0,
+				stop: null,
+				stream_options: { include_usage: true },
+			}
+
+			if (["o1", "o3-mini", "o3", "o4-mini"].includes(model.id)) {
+				delete payload.max_tokens
+				delete payload.temperature
+			}
+
+			if (model.id === "o3-mini") {
+				delete payload.stream
+				delete payload.stream_options
+			}
+		} else {
+			throw new Error(`Unsupported model: ${model.id}`)
+		}
+
+		try {
+			const response = await axios.post(url, JSON.stringify(payload, null, 2), {
+				headers,
+				responseType: "stream",
+			})
+
+			if (model.id === "o3-mini") {
+				const response = await axios.post(url, JSON.stringify(payload, null, 2), { headers })
+
+				// Yield the usage information
+				if (response.data.usage) {
+					yield {
+						type: "usage",
+						inputTokens: response.data.usage.prompt_tokens,
+						outputTokens: response.data.usage.completion_tokens,
+					}
+				}
+
+				// Yield the content
+				if (response.data.choices && response.data.choices.length > 0) {
+					yield {
+						type: "text",
+						text: response.data.choices[0].message.content,
+					}
+				}
+
+				// Final usage yield
+				if (response.data.usage) {
+					yield {
+						type: "usage",
+						inputTokens: response.data.usage.prompt_tokens,
+						outputTokens: response.data.usage.completion_tokens,
+					}
+				}
+			} else if (openAIModels.includes(model.id)) {
+				yield* this.streamCompletionGPT(response.data, model)
+			} else if (model.id === "anthropic--claude-3.7-sonnet") {
+				yield* this.streamCompletionSonnet37(response.data, model)
+			} else {
+				yield* this.streamCompletion(response.data, model)
+			}
+		} catch (error) {
+			if (error.response) {
+				// The request was made and the server responded with a status code
+				// that falls out of the range of 2xx
+				console.error("Error status:", error.response.status)
+				console.error("Error data:", error.response.data)
+				console.error("Error headers:", error.response.headers)
+
+				if (error.response.status === 404) {
+					console.error("404 Error reason:", error.response.data)
+					throw new Error(`404 Not Found: ${error.response.data}`)
+				}
+			} else if (error.request) {
+				// The request was made but no response was received
+				console.error("Error request:", error.request)
+				throw new Error("No response received from server")
+			} else {
+				// Something happened in setting up the request that triggered an Error
+				console.error("Error message:", error.message)
+				throw new Error(`Error setting up request: ${error.message}`)
+			}
+
+			throw new Error("Failed to create message")
+		}
+	}
+
+	private async *streamCompletion(
+		stream: any,
+		model: { id: SapAiCoreModelId; info: ModelInfo },
+	): AsyncGenerator<any, void, unknown> {
+		let usage = { input_tokens: 0, output_tokens: 0 }
+
+		try {
+			for await (const chunk of stream) {
+				const lines = chunk.toString().split("\n").filter(Boolean)
+				for (const line of lines) {
+					if (line.startsWith("data: ")) {
+						const jsonData = line.slice(6)
+						try {
+							const data = JSON.parse(jsonData)
+							console.log("Received data:", data)
+							if (data.type === "message_start") {
+								usage.input_tokens = data.message.usage.input_tokens
+								yield {
+									type: "usage",
+									inputTokens: usage.input_tokens,
+									outputTokens: usage.output_tokens,
+								}
+							} else if (data.type === "content_block_start" || data.type === "content_block_delta") {
+								const contentBlock = data.type === "content_block_start" ? data.content_block : data.delta
+
+								if (contentBlock.type === "text" || contentBlock.type === "text_delta") {
+									yield {
+										type: "text",
+										text: contentBlock.text || "",
+									}
+								}
+							} else if (data.type === "message_delta") {
+								if (data.usage) {
+									usage.output_tokens = data.usage.output_tokens
+									yield {
+										type: "usage",
+										inputTokens: 0,
+										outputTokens: data.usage.output_tokens,
+									}
+								}
+							}
+						} catch (error) {
+							console.error("Failed to parse JSON data:", error)
+						}
+					}
+				}
+			}
+		} catch (error) {
+			console.error("Error streaming completion:", error)
+			throw error
+		}
+	}
+
+	private async *streamCompletionSonnet37(
+		stream: any,
+		model: { id: SapAiCoreModelId; info: ModelInfo },
+	): AsyncGenerator<any, void, unknown> {
+		function toStrictJson(str: string): string {
+			// Wrap it in parentheses so JS will treat it as an expression
+			const obj = new Function("return " + str)()
+			return JSON.stringify(obj)
+		}
+
+		let usage = { input_tokens: 0, output_tokens: 0 }
+
+		try {
+			// Iterate over the stream and process each chunk
+			for await (const chunk of stream) {
+				const lines = chunk.toString().split("\n").filter(Boolean)
+
+				for (const line of lines) {
+					if (line.startsWith("data: ")) {
+						const jsonData = line.slice(6)
+
+						try {
+							// Parse the incoming JSON data from the stream
+							const data = JSON.parse(toStrictJson(jsonData))
+							console.log("Received data:", data)
+
+							// Handle metadata (token usage)
+							if (data.metadata?.usage) {
+								const inputTokens = data.metadata.usage.inputTokens || 0
+								const outputTokens = data.metadata.usage.outputTokens || 0
+
+								yield {
+									type: "usage",
+									inputTokens,
+									outputTokens,
+								}
+							}
+
+							// Handle content block delta (text generation)
+							if (data.contentBlockDelta) {
+								if (data.contentBlockDelta?.delta?.text) {
+									yield {
+										type: "text",
+										text: data.contentBlockDelta.delta.text,
+									}
+								}
+
+								// Handle reasoning content if present
+								if (data.contentBlockDelta?.delta?.reasoningContent?.text) {
+									yield {
+										type: "reasoning",
+										reasoning: data.contentBlockDelta.delta.reasoningContent.text,
+									}
+								}
+							}
+						} catch (error) {
+							console.error("Failed to parse JSON data:", error)
+							yield {
+								type: "text",
+								text: `[ERROR] Failed to parse response data: ${error instanceof Error ? error.message : String(error)}`,
+							}
+						}
+					}
+				}
+			}
+		} catch (error) {
+			console.error("Error streaming completion:", error)
+			yield {
+				type: "text",
+				text: `[ERROR] Failed to process stream: ${error instanceof Error ? error.message : String(error)}`,
+			}
+		}
+	}
+
+	private async *streamCompletionGPT(
+		stream: any,
+		model: { id: SapAiCoreModelId; info: ModelInfo },
+	): AsyncGenerator<any, void, unknown> {
+		let currentContent = ""
+		let inputTokens = 0
+		let outputTokens = 0
+
+		try {
+			for await (const chunk of stream) {
+				const lines = chunk.toString().split("\n").filter(Boolean)
+				for (const line of lines) {
+					if (line.trim() === "data: [DONE]") {
+						// End of stream, yield final usage
+						yield {
+							type: "usage",
+							inputTokens,
+							outputTokens,
+						}
+						return
+					}
+
+					if (line.startsWith("data: ")) {
+						const jsonData = line.slice(6)
+						try {
+							const data = JSON.parse(jsonData)
+							console.log("Received GPT data:", data)
+
+							if (data.choices && data.choices.length > 0) {
+								const choice = data.choices[0]
+								if (choice.delta && choice.delta.content) {
+									yield {
+										type: "text",
+										text: choice.delta.content,
+									}
+									currentContent += choice.delta.content
+								}
+							}
+
+							// Handle usage information
+							if (data.usage) {
+								inputTokens = data.usage.prompt_tokens || inputTokens
+								outputTokens = data.usage.completion_tokens || outputTokens
+								yield {
+									type: "usage",
+									inputTokens,
+									outputTokens,
+								}
+							}
+
+							if (data.choices && data.choices[0].finish_reason === "stop") {
+								// Final usage yield, if not already provided
+								if (!data.usage) {
+									yield {
+										type: "usage",
+										inputTokens,
+										outputTokens,
+									}
+								}
+							}
+						} catch (error) {
+							console.error("Failed to parse GPT JSON data:", error)
+						}
+					}
+				}
+			}
+		} catch (error) {
+			console.error("Error streaming GPT completion:", error)
+			throw error
+		}
+	}
+
+	createUserReadableRequest(
+		userContent: Array<
+			Anthropic.TextBlockParam | Anthropic.ImageBlockParam | Anthropic.ToolUseBlockParam | Anthropic.ToolResultBlockParam
+		>,
+	): any {
+		return {
+			model: this.getModel().id,
+			max_tokens: this.getModel().info.maxTokens,
+			system: "(see SYSTEM_PROMPT in src/ClaudeDev.ts)",
+			messages: [{ conversation_history: "..." }, { role: "user", content: userContent }],
+			tools: "(see tools in src/ClaudeDev.ts)",
+			tool_choice: { type: "auto" },
+		}
+	}
+
+	getModel(): { id: SapAiCoreModelId; info: ModelInfo } {
+		const modelId = this.options.apiModelId
+		if (modelId && modelId in sapAiCoreModels) {
+			const id = modelId as SapAiCoreModelId
+			return { id, info: sapAiCoreModels[id] }
+		}
+		return { id: sapAiCoreDefaultModelId, info: sapAiCoreModels[sapAiCoreDefaultModelId] }
+	}
+
+	private getValidImageFormat(mediaType: string): string {
+		const format = mediaType.split("/")[1]?.toLowerCase()
+		const validFormats = ["png", "jpeg", "gif", "webp"]
+
+		if (validFormats.includes(format)) {
+			return format
+		}
+		throw new Error(`Unsupported image format: ${format}`)
+	}
+
+	private formatAnthropicMessages(messages: Anthropic.Messages.MessageParam[]): any[] {
+		return messages.map((m) => {
+			const contentBlocks: any[] = []
+
+			if (typeof m.content === "string") {
+				contentBlocks.push({ text: m.content })
+			} else if (Array.isArray(m.content)) {
+				for (const block of m.content) {
+					if (block.type === "text") {
+						if (!block.text) {
+							throw new Error('Text block is missing the "text" field.')
+						}
+						contentBlocks.push({ text: block.text })
+					} else if (block.type === "image") {
+						if (!block.source) {
+							throw new Error('Image block is missing the "source" field.')
+						}
+
+						const { type, media_type, data } = block.source
+
+						if (!type || !media_type || !data) {
+							throw new Error('Image source must have "type", "media_type", and "data" fields.')
+						}
+
+						if (type !== "base64") {
+							throw new Error(`Unsupported image source type: ${type}. Only "base64" is supported.`)
+						}
+
+						const format = this.getValidImageFormat(media_type)
+
+						contentBlocks.push({
+							image: {
+								format,
+								source: {
+									bytes: data,
+								},
+							},
+						})
+					} else {
+						throw new Error(`Unsupported content block type: ${block.type}`)
+					}
+				}
+			} else {
+				throw new Error("Unsupported content format.")
+			}
+
+			return {
+				role: m.role,
+				content: contentBlocks,
+			}
+		})
+	}
+}

src/api/transform/stream.ts

@@ -17,5 +17,6 @@ export interface ApiStreamUsageChunk {
 	outputTokens: number
 	cacheWriteTokens?: number
 	cacheReadTokens?: number
+	thoughtsTokenCount?: number // openrouter
 	totalCost?: number // openrouter
 }

src/core/assistant-message/diff.test.ts

@@ -19,14 +19,34 @@ new content
 			isFinal: true,
 		},
 		{
-			name: "full file replacement",
-			original: "old content",
-			diff: `------- SEARCH
+			name: "malformed search - mixed symbols",
+			original: "line1\nline2\nline3",
+			diff: `<<-- SEARCH
+line2
 =======
-new content
+replaced
 +++++++ REPLACE`,
-			expected: "new content\n",
-			isFinal: true,
+			shouldThrow: true,
+		},
+		{
+			name: "malformed search - insufficient dashes",
+			original: "line1\nline2\nline3",
+			diff: `-- SEARCH
+line2
+=======
+replaced
++++++++ REPLACE`,
+			shouldThrow: true,
+		},
+		{
+			name: "malformed search - missing space",
+			original: "line1\nline2\nline3",
+			diff: `-------SEARCH
+line2
+=======
+replaced
++++++++ REPLACE`,
+			shouldThrow: true,
 		},
 		{
 			name: "exact match replacement",
@@ -139,17 +159,33 @@ replaced
 	]
 	//.filter(({name}) => name === "multiple ordered replacements")
 	//.filter(({name}) => name === "delete then replace")
-	testCases.forEach(({ name, original, diff, expected, isFinal }) => {
+	testCases.forEach(({ name, original, diff, expected, isFinal, shouldThrow }) => {
 		it(`should handle ${name} case correctly`, async () => {
-			const result1 = await cnfc(diff, original, isFinal)
-			const result2 = await cnfc2(diff, original, isFinal)
-			const equal = result1 === result2
-			const equal2 = result1 === expected
-			// Verify both implementations produce same result
-			expect(result1).to.equal(result2)
+			if (shouldThrow) {
+				try {
+					await cnfc(diff, original, isFinal ?? true)
+					expect.fail("Expected an error to be thrown")
+				} catch (err) {
+					expect(err).to.be.an("error")
+				}
 
-			// Verify result matches expected
-			expect(result1).to.equal(expected)
+				try {
+					await cnfc2(diff, original, isFinal ?? true)
+					expect.fail("Expected an error to be thrown")
+				} catch (err) {
+					expect(err).to.be.an("error")
+				}
+			} else {
+				const result1 = await cnfc(diff, original, isFinal ?? true)
+				const result2 = await cnfc2(diff, original, isFinal ?? true)
+				const equal = result1 === result2
+				const equal2 = result1 === expected
+				// Verify both implementations produce same result
+				expect(result1).to.equal(result2)
+
+				// Verify result matches expected
+				expect(result1).to.equal(expected)
+			}
 		})
 	})
 

src/core/assistant-message/diff.ts

@@ -4,15 +4,19 @@ const REPLACE_BLOCK_END = "+++++++ REPLACE"
 
 const SEARCH_BLOCK_CHAR = "-"
 const REPLACE_BLOCK_CHAR = "+"
+const LEGACY_SEARCH_BLOCK_CHAR = "<"
+const LEGACY_REPLACE_BLOCK_CHAR = ">"
 
 // Replace the exact string constants with flexible regex patterns
 const SEARCH_BLOCK_START_REGEX = /^[-]{3,} SEARCH$/
 const SEARCH_BLOCK_END_REGEX = /^[=]{3,}$/
 const REPLACE_BLOCK_END_REGEX = /^[+]{3,} REPLACE$/
+const LEGACY_SEARCH_BLOCK_START_REGEX = /^[<]{3,} SEARCH$/
+const LEGACY_REPLACE_BLOCK_END_REGEX = /^[>]{3,} REPLACE$/
 
 // Helper functions to check if a line matches the flexible patterns
 function isSearchBlockStart(line: string): boolean {
-	return SEARCH_BLOCK_START_REGEX.test(line)
+	return SEARCH_BLOCK_START_REGEX.test(line) || LEGACY_SEARCH_BLOCK_START_REGEX.test(line)
 }
 
 function isSearchBlockEnd(line: string): boolean {
@@ -20,7 +24,7 @@ function isSearchBlockEnd(line: string): boolean {
 }
 
 function isReplaceBlockEnd(line: string): boolean {
-	return REPLACE_BLOCK_END_REGEX.test(line)
+	return REPLACE_BLOCK_END_REGEX.test(line) || LEGACY_REPLACE_BLOCK_END_REGEX.test(line)
 }
 
 /**
@@ -269,7 +273,11 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 	const lastLine = lines[lines.length - 1]
 	if (
 		lines.length > 0 &&
-		(lastLine.startsWith(SEARCH_BLOCK_CHAR) || lastLine.startsWith("=") || lastLine.startsWith(REPLACE_BLOCK_CHAR)) &&
+		(lastLine.startsWith(SEARCH_BLOCK_CHAR) ||
+			lastLine.startsWith(LEGACY_SEARCH_BLOCK_CHAR) ||
+			lastLine.startsWith("=") ||
+			lastLine.startsWith(REPLACE_BLOCK_CHAR) ||
+			lastLine.startsWith(LEGACY_REPLACE_BLOCK_CHAR)) &&
 		!isSearchBlockStart(lastLine) &&
 		!isSearchBlockEnd(lastLine) &&
 		!isReplaceBlockEnd(lastLine)
@@ -303,9 +311,12 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 					searchMatchIndex = 0
 					searchEndIndex = 0
 				} else {
-					// Complete file replacement scenario: treat the entire file as matched
-					searchMatchIndex = 0
-					searchEndIndex = originalContent.length
+					// ERROR: Empty search block with non-empty file indicates malformed SEARCH marker
+					throw new Error(
+						"Empty SEARCH block detected with non-empty file. This usually indicates a malformed SEARCH marker.\n" +
+							"Please ensure your SEARCH marker follows the correct format:\n" +
+							"- Use '------- SEARCH' (7+ dashes + space + SEARCH)\n",
+					)
 				}
 			} else {
 				// Add check for inefficient full-file search
@@ -570,7 +581,7 @@ class NewFileContentConstructor {
 		pendingNonStandardLineLimit: number,
 	): number {
 		let removeLineCount = 0
-		if (line === SEARCH_BLOCK_START) {
+		if (isSearchBlockStart(line)) {
 			removeLineCount = this.trimPendingNonStandardTrailingEmptyLines(pendingNonStandardLineLimit)
 			if (removeLineCount > 0) {
 				pendingNonStandardLineLimit = pendingNonStandardLineLimit - removeLineCount
@@ -580,7 +591,7 @@ class NewFileContentConstructor {
 				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
 			}
 			this.activateSearchState()
-		} else if (line === SEARCH_BLOCK_END) {
+		} else if (isSearchBlockEnd(line)) {
 			// 校验非标内容
 			if (!this.isSearchingActive()) {
 				this.tryFixSearchBlock(pendingNonStandardLineLimit)
@@ -588,7 +599,7 @@ class NewFileContentConstructor {
 			}
 			this.activateReplaceState()
 			this.beforeReplace()
-		} else if (line === REPLACE_BLOCK_END) {
+		} else if (isReplaceBlockEnd(line)) {
 			if (!this.isReplacingActive()) {
 				this.tryFixReplaceBlock(pendingNonStandardLineLimit)
 				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
@@ -695,7 +706,7 @@ class NewFileContentConstructor {
 		if (!lineLimit) {
 			throw new Error("Invalid SEARCH/REPLACE block structure - no lines available to process")
 		}
-		let searchTagRegexp = /^[-]{3,} SEARCH$/
+		let searchTagRegexp = /^([-]{3,}|[<]{3,}) SEARCH$/
 		const searchTagIndex = this.findLastMatchingLineIndex(searchTagRegexp, lineLimit)
 		if (searchTagIndex !== -1) {
 			let fixLines = this.pendingNonStandardLines.slice(searchTagIndex, lineLimit)
@@ -746,7 +757,7 @@ class NewFileContentConstructor {
 			throw new Error()
 		}
 
-		let replaceEndTagRegexp = /^[+]{3,} REPLACE$/
+		let replaceEndTagRegexp = /^([+]{3,}|[>]{3,}) REPLACE$/
 		const replaceEndTagIndex = this.findLastMatchingLineIndex(replaceEndTagRegexp, lineLimit)
 		const likeReplaceEndTag = replaceEndTagIndex === lineLimit - 1
 		if (likeReplaceEndTag) {
@@ -795,7 +806,11 @@ export async function constructNewFileContentV2(diffContent: string, originalCon
 	const lastLine = lines[lines.length - 1]
 	if (
 		lines.length > 0 &&
-		(lastLine.startsWith(SEARCH_BLOCK_CHAR) || lastLine.startsWith("=") || lastLine.startsWith(REPLACE_BLOCK_CHAR)) &&
+		(lastLine.startsWith(SEARCH_BLOCK_CHAR) ||
+			lastLine.startsWith(LEGACY_SEARCH_BLOCK_CHAR) ||
+			lastLine.startsWith("=") ||
+			lastLine.startsWith(REPLACE_BLOCK_CHAR) ||
+			lastLine.startsWith(LEGACY_REPLACE_BLOCK_CHAR)) &&
 		lastLine !== SEARCH_BLOCK_START &&
 		lastLine !== SEARCH_BLOCK_END &&
 		lastLine !== REPLACE_BLOCK_END

src/core/context/context-management/context-error-handling.ts

@@ -8,10 +8,7 @@ export function checkIsOpenRouterContextWindowError(error: any): boolean {
 
 export function checkIsAnthropicContextWindowError(response: any): boolean {
 	try {
-		return (
-			response?.error?.error?.type === "invalid_request_error" &&
-			response?.error?.error?.message?.includes("prompt is too long")
-		)
+		return response?.error?.error?.type === "invalid_request_error"
 	} catch (e: unknown) {
 		return false
 	}

src/core/context/context-tracking/FileContextTracker.ts

@@ -1,7 +1,10 @@
 import * as path from "path"
 import * as vscode from "vscode"
 import { getTaskMetadata, saveTaskMetadata } from "@core/storage/disk"
+import { getWorkspaceState, updateWorkspaceState } from "@core/storage/state"
+import { getGlobalState } from "@core/storage/state"
 import type { FileMetadataEntry } from "./ContextTrackerTypes"
+import type { ClineMessage } from "@shared/ExtensionMessage"
 
 // This class is responsible for tracking file operations that may result in stale context.
 // If a user modifies a file outside of Cline, the context may become stale and need to be updated.
@@ -11,10 +14,12 @@ import type { FileMetadataEntry } from "./ContextTrackerTypes"
 // a diff edit because the file was modified since Cline last read it.
 
 // FileContextTracker
-//
-// This class is responsible for tracking file operations.
-// If the full contents of a file are pass to Cline via a tool, mention, or edit, the file is marked as active.
-// If a file is modified outside of Cline, we detect and track this change to prevent stale context.
+/**
+This class is responsible for tracking file operations.
+If the full contents of a file are passed to Cline via a tool, mention, or edit, the file is marked as active.
+If a file is modified outside of Cline, we detect and track this change to prevent stale context.
+This is used when restoring a task (non-git "checkpoint" restore), and mid-task.
+*/
 export class FileContextTracker {
 	private context: vscode.ExtensionContext
 	readonly taskId: string
@@ -29,7 +34,9 @@ export class FileContextTracker {
 		this.taskId = taskId
 	}
 
-	// Gets the current working directory or returns undefined if it cannot be determined
+	/**
+	 * Gets the current working directory or returns undefined if it cannot be determined
+	 */
 	private getCwd(): string | undefined {
 		const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)
 		if (!cwd) {
@@ -38,7 +45,9 @@ export class FileContextTracker {
 		return cwd
 	}
 
-	// File watchers are set up for each file that is tracked in the task metadata.
+	/**
+	 * File watchers are set up for each file that is tracked in the task metadata.
+	 */
 	async setupFileWatcher(filePath: string) {
 		// Only setup watcher if it doesn't already exist for this file
 		if (this.fileWatchers.has(filePath)) {
@@ -70,8 +79,10 @@ export class FileContextTracker {
 		this.fileWatchers.set(filePath, watcher)
 	}
 
-	// Tracks a file operation in metadata and sets up a watcher for the file
-	// This is the main entry point for FileContextTracker and is called when a file is passed to Cline via a tool, mention, or edit.
+	/**
+	 * Tracks a file operation in metadata and sets up a watcher for the file
+	 * This is the main entry point for FileContextTracker and is called when a file is passed to Cline via a tool, mention, or edit.
+	 */
 	async trackFileContext(filePath: string, operation: "read_tool" | "user_edited" | "cline_edited" | "file_mentioned") {
 		try {
 			const cwd = this.getCwd()
@@ -89,9 +100,11 @@ export class FileContextTracker {
 		}
 	}
 
-	// Adds a file to the metadata tracker
-	// This handles the business logic of determining if the file is new, stale, or active.
-	// It also updates the metadata with the latest read/edit dates.
+	/**
+	 * Adds a file to the metadata tracker
+	 * This handles the business logic of determining if the file is new, stale, or active.
+	 * It also updates the metadata with the latest read/edit dates.
+	 */
 	async addFileToFileContextTracker(
 		context: vscode.ExtensionContext,
 		taskId: string,
@@ -154,23 +167,149 @@ export class FileContextTracker {
 		}
 	}
 
-	// Returns (and then clears) the set of recently modified files
+	/**
+	 * Returns (and then clears) the set of recently modified files
+	 */
 	getAndClearRecentlyModifiedFiles(): string[] {
 		const files = Array.from(this.recentlyModifiedFiles)
 		this.recentlyModifiedFiles.clear()
 		return files
 	}
 
-	// Marks a file as edited by Cline to prevent false positives in file watchers
+	/**
+	 * Marks a file as edited by Cline to prevent false positives in file watchers
+	 */
 	markFileAsEditedByCline(filePath: string): void {
 		this.recentlyEditedByCline.add(filePath)
 	}
 
-	// Disposes all file watchers
+	/**
+	 * Disposes all file watchers
+	 */
 	dispose(): void {
 		for (const watcher of this.fileWatchers.values()) {
 			watcher.dispose()
 		}
 		this.fileWatchers.clear()
 	}
+
+	/**
+	 * Detects files that were edited by Cline or users after a specific message timestamp
+	 * This is used when restoring checkpoints to warn about potential file content mismatches
+	 */
+	async detectFilesEditedAfterMessage(messageTs: number, deletedMessages: ClineMessage[]): Promise<string[]> {
+		const editedFiles: string[] = []
+
+		try {
+			// Check task metadata for files that were edited by Cline or users after the message timestamp
+			const taskMetadata = await getTaskMetadata(this.context, this.taskId)
+
+			if (taskMetadata?.files_in_context) {
+				for (const fileEntry of taskMetadata.files_in_context) {
+					const clineEditedAfter = fileEntry.cline_edit_date && fileEntry.cline_edit_date > messageTs
+					const userEditedAfter = fileEntry.user_edit_date && fileEntry.user_edit_date > messageTs
+
+					if (clineEditedAfter || userEditedAfter) {
+						editedFiles.push(fileEntry.path)
+					}
+				}
+			}
+		} catch (error) {
+			console.error("Error checking file context metadata:", error)
+		}
+
+		// Also check deleted task messages for file operations
+		for (const message of deletedMessages) {
+			if (message.say === "tool" && message.text) {
+				try {
+					const toolData = JSON.parse(message.text)
+					if ((toolData.tool === "editedExistingFile" || toolData.tool === "newFileCreated") && toolData.path) {
+						if (!editedFiles.includes(toolData.path)) {
+							editedFiles.push(toolData.path)
+						}
+					}
+				} catch (error) {
+					console.error("Error checking task messages:", error)
+				}
+			}
+		}
+		return [...new Set(editedFiles)]
+	}
+
+	/**
+	 * Stores pending file context warning in workspace state so it persists across task reinitialization
+	 */
+	async storePendingFileContextWarning(files: string[]): Promise<void> {
+		try {
+			const key = `pendingFileContextWarning_${this.taskId}`
+			await updateWorkspaceState(this.context, key, files)
+		} catch (error) {
+			console.error("Error storing pending file context warning:", error)
+		}
+	}
+
+	/**
+	 * Retrieves pending file context warning from workspace state (without clearing it)
+	 */
+	async retrievePendingFileContextWarning(): Promise<string[] | undefined> {
+		try {
+			const key = `pendingFileContextWarning_${this.taskId}`
+			const files = (await getWorkspaceState(this.context, key)) as string[]
+			return files
+		} catch (error) {
+			console.error("Error retrieving pending file context warning:", error)
+		}
+		return undefined
+	}
+
+	/**
+	 * Retrieves and clears pending file context warning from workspace state
+	 */
+	async retrieveAndClearPendingFileContextWarning(): Promise<string[] | undefined> {
+		try {
+			const files = await this.retrievePendingFileContextWarning()
+			if (files) {
+				await updateWorkspaceState(this.context, `pendingFileContextWarning_${this.taskId}`, undefined)
+				return files
+			}
+		} catch (error) {
+			console.error("Error retrieving pending file context warning:", error)
+		}
+		return undefined
+	}
+
+	/**
+	 * Static method to clean up orphaned pending file context warnings at startup
+	 * This removes warnings for tasks that may no longer exist
+	 */
+	static async cleanupOrphanedWarnings(context: vscode.ExtensionContext): Promise<void> {
+		const startTime = Date.now()
+		try {
+			const taskHistory = ((await getGlobalState(context, "taskHistory")) as Array<{ id: string }>) || []
+			const existingTaskIds = new Set(taskHistory.map((task) => task.id))
+			const allStateKeys = context.workspaceState.keys()
+			const pendingWarningKeys = allStateKeys.filter((key) => key.startsWith("pendingFileContextWarning_"))
+
+			const orphanedPendingContextTasks: string[] = []
+			for (const key of pendingWarningKeys) {
+				const taskId = key.replace("pendingFileContextWarning_", "")
+				if (!existingTaskIds.has(taskId)) {
+					orphanedPendingContextTasks.push(key)
+				}
+			}
+
+			if (orphanedPendingContextTasks.length > 0) {
+				for (const key of orphanedPendingContextTasks) {
+					await updateWorkspaceState(context, key, undefined)
+				}
+			}
+
+			const duration = Date.now() - startTime
+			console.log(
+				`FileContextTracker: Processed ${existingTaskIds.size} tasks, found ${pendingWarningKeys.length} pending warnings, ${orphanedPendingContextTasks.length} orphaned, deleted ${orphanedPendingContextTasks.length}, took ${duration}ms`,
+			)
+		} catch (error) {
+			console.error("Error cleaning up orphaned file context warnings:", error)
+		}
+	}
 }

src/core/controller/grpc-request-registry.ts

@@ -64,17 +64,17 @@ export class GrpcRequestRegistry {
 	 */
 	public cancelRequest(requestId: string): boolean {
 		const requestInfo = this.activeRequests.get(requestId)
-		if (requestInfo) {
-			try {
-				requestInfo.cleanup()
-				console.log(`[DEBUG] Cleaned up request: ${requestId}`)
-			} catch (error) {
-				console.error(`Error cleaning up request ${requestId}:`, error)
-			}
-			this.activeRequests.delete(requestId)
-			return true
+		if (!requestInfo) {
+			return false
 		}
-		return false
+		try {
+			requestInfo.cleanup()
+			console.log(`[DEBUG] Cleaned up request: ${requestId}`)
+		} catch (error) {
+			console.error(`Error cleaning up request ${requestId}:`, error)
+		}
+		this.activeRequests.delete(requestId)
+		return true
 	}
 
 	/**

src/core/controller/index.ts

@@ -130,12 +130,13 @@ export class Controller {
 		await this.clearTask() // ensures that an existing task doesn't exist before starting a new one, although this shouldn't be possible since user must clear task before starting a new one
 		const {
 			apiConfiguration,
-			customInstructions,
 			autoApprovalSettings,
 			browserSettings,
 			chatSettings,
 			shellIntegrationTimeout,
 			terminalReuseEnabled,
+			terminalOutputLineLimit,
+			defaultTerminalProfile,
 			enableCheckpointsSetting,
 			isNewUser,
 			taskHistory,
@@ -171,8 +172,9 @@ export class Controller {
 			chatSettings,
 			shellIntegrationTimeout,
 			terminalReuseEnabled ?? true,
+			terminalOutputLineLimit ?? 500,
+			defaultTerminalProfile ?? "default",
 			enableCheckpointsSetting ?? true,
-			customInstructions,
 			task,
 			images,
 			files,
@@ -204,15 +206,7 @@ export class Controller {
 				await this.setUserInfo(message.user || undefined)
 				await this.postStateToWebview()
 				break
-			case "apiConfiguration":
-				if (message.apiConfiguration) {
-					await updateApiConfiguration(this.context, message.apiConfiguration)
-					if (this.task) {
-						this.task.api = buildApiHandler(message.apiConfiguration)
-					}
-				}
-				await this.postStateToWebview()
-				break
+
 			case "fetchUserCreditsData": {
 				await this.fetchUserCreditsData()
 				break
@@ -230,6 +224,7 @@ export class Controller {
 				await this.postStateToWebview()
 				break
 			}
+
 			case "clearAllTaskHistory": {
 				const answer = await vscode.window.showWarningMessage(
 					"What would you like to delete?",
@@ -290,6 +285,12 @@ export class Controller {
 			previousModeReasoningEffort: newReasoningEffort,
 			previousModeAwsBedrockCustomSelected: newAwsBedrockCustomSelected,
 			previousModeAwsBedrockCustomModelBaseId: newAwsBedrockCustomModelBaseId,
+			previousModeSapAiCoreClientId: newSapAiCoreClientId,
+			previousModeSapAiCoreClientSecret: newSapAiCoreClientSecret,
+			previousModeSapAiCoreBaseUrl: newSapAiCoreBaseUrl,
+			previousModeSapAiCoreTokenUrl: newSapAiCoreTokenUrl,
+			previousModeSapAiCoreResourceGroup: newSapAiResourceGroup,
+			previousModeSapAiCoreModelId: newSapAiCoreModelId,
 			planActSeparateModelsSetting,
 		} = await getAllExtensionState(this.context)
 
@@ -355,6 +356,23 @@ export class Controller {
 					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.requestyModelId)
 					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.requestyModelInfo)
 					break
+				case "sapaicore":
+					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
+					await updateWorkspaceState(this.context, "previousModeSapAiCoreClientId", apiConfiguration.sapAiCoreClientId)
+					await updateWorkspaceState(
+						this.context,
+						"previousModeSapAiCoreClientSecret",
+						apiConfiguration.sapAiCoreClientSecret,
+					)
+					await updateWorkspaceState(this.context, "previousModeSapAiCoreBaseUrl", apiConfiguration.sapAiCoreBaseUrl)
+					await updateWorkspaceState(this.context, "previousModeSapAiCoreTokenUrl", apiConfiguration.sapAiCoreTokenUrl)
+					await updateWorkspaceState(
+						this.context,
+						"previousModeSapAiCoreResourceGroup",
+						apiConfiguration.sapAiResourceGroup,
+					)
+					await updateWorkspaceState(this.context, "previousModeSapAiCoreModelId", apiConfiguration.sapAiCoreModelId)
+					break
 			}
 
 			// Restore the model used in previous mode
@@ -410,6 +428,9 @@ export class Controller {
 						await updateWorkspaceState(this.context, "requestyModelId", newModelId)
 						await updateWorkspaceState(this.context, "requestyModelInfo", newModelInfo)
 						break
+					case "sapaicore":
+						await updateWorkspaceState(this.context, "apiModelId", newModelId)
+						break
 				}
 
 				if (this.task) {
@@ -468,14 +489,6 @@ export class Controller {
 		}
 	}
 
-	async updateCustomInstructions(instructions?: string) {
-		// User may be clearing the field
-		await updateGlobalState(this.context, "customInstructions", instructions || undefined)
-		if (this.task) {
-			this.task.customInstructions = instructions || undefined
-		}
-	}
-
 	// Account
 
 	async fetchUserCreditsData() {
@@ -957,13 +970,13 @@ export class Controller {
 		const {
 			apiConfiguration,
 			lastShownAnnouncementId,
-			customInstructions,
 			taskHistory,
 			autoApprovalSettings,
 			browserSettings,
 			chatSettings,
 			userInfo,
 			mcpMarketplaceEnabled,
+			mcpRichDisplayEnabled,
 			telemetrySetting,
 			planActSeparateModelsSetting,
 			enableCheckpointsSetting,
@@ -971,8 +984,10 @@ export class Controller {
 			globalWorkflowToggles,
 			shellIntegrationTimeout,
 			terminalReuseEnabled,
+			defaultTerminalProfile,
 			isNewUser,
 			mcpResponsesCollapsed,
+			terminalOutputLineLimit,
 		} = await getAllExtensionState(this.context)
 
 		const localClineRulesToggles =
@@ -989,7 +1004,6 @@ export class Controller {
 		return {
 			version: this.context.extension?.packageJSON?.version ?? "",
 			apiConfiguration,
-			customInstructions,
 			uriScheme: vscode.env.uriScheme,
 			currentTaskItem: this.task?.taskId ? (taskHistory || []).find((item) => item.id === this.task?.taskId) : undefined,
 			checkpointTrackerErrorMessage: this.task?.checkpointTrackerErrorMessage,
@@ -1005,6 +1019,7 @@ export class Controller {
 			chatSettings,
 			userInfo,
 			mcpMarketplaceEnabled,
+			mcpRichDisplayEnabled,
 			telemetrySetting,
 			planActSeparateModelsSetting,
 			enableCheckpointsSetting: enableCheckpointsSetting ?? true,
@@ -1017,8 +1032,10 @@ export class Controller {
 			globalWorkflowToggles: globalWorkflowToggles || {},
 			shellIntegrationTimeout,
 			terminalReuseEnabled,
+			defaultTerminalProfile,
 			isNewUser,
 			mcpResponsesCollapsed,
+			terminalOutputLineLimit,
 		}
 	}
 

src/core/controller/models/updateApiConfigurationProto.ts

@@ -0,0 +1,43 @@
+import type { Controller } from "../index"
+import { Empty } from "@shared/proto/common"
+import { UpdateApiConfigurationRequest } from "@shared/proto/models"
+import { updateApiConfiguration } from "../../storage/state"
+import { buildApiHandler } from "@api/index"
+import { convertProtoToApiConfiguration } from "@shared/proto-conversions/models/api-configuration-conversion"
+
+/**
+ * Updates API configuration
+ * @param controller The controller instance
+ * @param request The update API configuration request
+ * @returns Empty response
+ */
+export async function updateApiConfigurationProto(
+	controller: Controller,
+	request: UpdateApiConfigurationRequest,
+): Promise<Empty> {
+	try {
+		if (!request.apiConfiguration) {
+			console.log("[APICONFIG: updateApiConfigurationProto] API configuration is required")
+			throw new Error("API configuration is required")
+		}
+
+		// Convert proto ApiConfiguration to application ApiConfiguration
+		const appApiConfiguration = convertProtoToApiConfiguration(request.apiConfiguration)
+
+		// Update the API configuration in storage
+		await updateApiConfiguration(controller.context, appApiConfiguration)
+
+		// Update the task's API handler if there's an active task
+		if (controller.task) {
+			controller.task.api = buildApiHandler(appApiConfiguration)
+		}
+
+		// Post updated state to webview
+		await controller.postStateToWebview()
+
+		return Empty.create()
+	} catch (error) {
+		console.error(`Failed to update API configuration: ${error}`)
+		throw error
+	}
+}

src/core/controller/state/getAvailableTerminalProfiles.ts

@@ -0,0 +1,19 @@
+import { Controller } from "../index"
+import * as proto from "@/shared/proto"
+import { getAvailableTerminalProfiles as getTerminalProfilesFromShell } from "../../../utils/shell"
+
+export async function getAvailableTerminalProfiles(
+	controller: Controller,
+	request: proto.cline.EmptyRequest,
+): Promise<proto.cline.TerminalProfiles> {
+	const profiles = getTerminalProfilesFromShell()
+
+	return proto.cline.TerminalProfiles.create({
+		profiles: profiles.map((profile) => ({
+			id: profile.id,
+			name: profile.name,
+			path: profile.path || "",
+			description: profile.description || "",
+		})),
+	})
+}

src/core/controller/state/resetState.ts

@@ -1,19 +1,25 @@
 import { Controller } from ".."
-import { Empty, EmptyRequest } from "../../../shared/proto/common"
-import { resetExtensionState } from "../../../core/storage/state"
+import { Empty } from "../../../shared/proto/common"
+import { ResetStateRequest } from "../../../shared/proto/state"
+import { resetGlobalState, resetWorkspaceState } from "../../../core/storage/state"
 import * as vscode from "vscode"
 import { sendChatButtonClickedEvent } from "../ui/subscribeToChatButtonClicked"
 
 /**
  * Resets the extension state to its defaults
  * @param controller The controller instance
- * @param request An empty request (no parameters needed)
+ * @param request The reset state request containing the global flag
  * @returns An empty response
  */
-export async function resetState(controller: Controller, request: EmptyRequest): Promise<Empty> {
+export async function resetState(controller: Controller, request: ResetStateRequest): Promise<Empty> {
 	try {
-		vscode.window.showInformationMessage("Resetting state...")
-		await resetExtensionState(controller.context)
+		if (request.global) {
+			vscode.window.showInformationMessage("Resetting global state...")
+			await resetGlobalState(controller.context)
+		} else {
+			vscode.window.showInformationMessage("Resetting workspace state...")
+			await resetWorkspaceState(controller.context)
+		}
 
 		if (controller.task) {
 			controller.task.abortTask()

src/core/controller/state/updateDefaultTerminalProfile.ts

@@ -0,0 +1,50 @@
+import * as vscode from "vscode"
+import { Controller } from "../index"
+import * as proto from "@/shared/proto"
+import { updateGlobalState } from "../../storage/state"
+import { TerminalInfo } from "@/integrations/terminal/TerminalRegistry"
+
+export async function updateDefaultTerminalProfile(
+	controller: Controller,
+	request: proto.cline.StringRequest,
+): Promise<proto.cline.TerminalProfileUpdateResponse> {
+	const profileId = request.value
+
+	// Update the terminal profile in the state
+	await updateGlobalState(controller.context, "defaultTerminalProfile", profileId)
+
+	let closedCount = 0
+	let busyTerminals: TerminalInfo[] = []
+
+	// Update the terminal manager of the current task if it exists
+	if (controller.task) {
+		// Call the updated setDefaultTerminalProfile method that returns closed terminal info
+		const result = controller.task.terminalManager.setDefaultTerminalProfile(profileId)
+		closedCount = result.closedCount
+		busyTerminals = result.busyTerminals
+
+		// Show information message if terminals were closed
+		if (closedCount > 0) {
+			vscode.window.showInformationMessage(
+				`Closed ${closedCount} ${closedCount === 1 ? "terminal" : "terminals"} with different profile.`,
+			)
+		}
+
+		// Show warning if there are busy terminals that couldn't be closed
+		if (busyTerminals.length > 0) {
+			vscode.window.showWarningMessage(
+				`${busyTerminals.length} busy ${busyTerminals.length === 1 ? "terminal has" : "terminals have"} a different profile. ` +
+					`Close ${busyTerminals.length === 1 ? "it" : "them"} to use the new profile for all commands.`,
+			)
+		}
+	}
+
+	// Broadcast state update to all webviews
+	await controller.postStateToWebview()
+
+	return proto.cline.TerminalProfileUpdateResponse.create({
+		closedCount,
+		busyTerminalsCount: busyTerminals.length,
+		hasBusyTerminals: busyTerminals.length > 0,
+	})
+}

src/core/controller/state/updateSettings.ts

@@ -25,11 +25,6 @@ export async function updateSettings(controller: Controller, request: UpdateSett
 			}
 		}
 
-		// Update custom instructions
-		if (request.customInstructionsSetting !== undefined) {
-			await controller.updateCustomInstructions(request.customInstructionsSetting)
-		}
-
 		// Update telemetry setting
 		if (request.telemetrySetting) {
 			await controller.updateTelemetrySetting(request.telemetrySetting as TelemetrySetting)
@@ -55,6 +50,11 @@ export async function updateSettings(controller: Controller, request: UpdateSett
 			await controller.context.globalState.update("mcpResponsesCollapsed", request.mcpResponsesCollapsed)
 		}
 
+		// Update MCP responses collapsed setting
+		if (request.mcpRichDisplayEnabled !== undefined) {
+			await controller.context.globalState.update("mcpRichDisplayEnabled", request.mcpRichDisplayEnabled)
+		}
+
 		// Update chat settings
 		if (request.chatSettings) {
 			const chatSettings = convertProtoChatSettingsToChatSettings(request.chatSettings)
@@ -74,6 +74,11 @@ export async function updateSettings(controller: Controller, request: UpdateSett
 			await controller.context.globalState.update("terminalReuseEnabled", request.terminalReuseEnabled)
 		}
 
+		// Update terminal output line limit
+		if (request.terminalOutputLineLimit !== undefined) {
+			await controller.context.globalState.update("terminalOutputLineLimit", Number(request.terminalOutputLineLimit))
+		}
+
 		// Post updated state to webview
 		await controller.postStateToWebview()
 

src/core/controller/state/updateTerminalConnectionTimeout.ts

@@ -1,27 +1,18 @@
-import { Controller } from ".."
-import { Int64, Int64Request } from "../../../shared/proto/common"
+import { Controller } from "../index"
+import * as proto from "@/shared/proto"
 import { updateGlobalState } from "../../storage/state"
 
-/**
- * Updates the terminal connection timeout setting
- * @param controller The controller instance
- * @param request The request containing the timeout value in milliseconds
- * @returns The updated timeout value
- */
-export async function updateTerminalConnectionTimeout(controller: Controller, request: Int64Request): Promise<Int64> {
-	try {
-		const timeout = request.value
+export async function updateTerminalConnectionTimeout(
+	controller: Controller,
+	request: proto.cline.Int64Request,
+): Promise<proto.cline.Int64> {
+	const timeoutValue = request.value
 
-		if (typeof timeout === "number" && !isNaN(timeout) && timeout > 0) {
-			// Update the global state directly
-			await updateGlobalState(controller.context, "shellIntegrationTimeout", timeout)
-			return Int64.create({ value: timeout })
-		} else {
-			console.warn(`Invalid shell integration timeout value received: ${timeout}. Expected a positive number.`)
-			throw new Error("Invalid timeout value. Expected a positive number.")
-		}
-	} catch (error) {
-		console.error(`Failed to update terminal connection timeout: ${error}`)
-		throw error
-	}
+	// Update the terminal connection timeout setting in the state
+	await updateGlobalState(controller.context, "shellIntegrationTimeout", timeoutValue)
+
+	// Broadcast state update to all webviews
+	await controller.postStateToWebview()
+
+	return proto.cline.Int64.create({ value: timeoutValue })
 }

src/core/controller/state/updateTerminalReuseEnabled.ts

@@ -0,0 +1,18 @@
+import { Controller } from "../index"
+import * as proto from "@/shared/proto"
+import { updateGlobalState } from "../../storage/state"
+
+export async function updateTerminalReuseEnabled(
+	controller: Controller,
+	request: proto.cline.BooleanRequest,
+): Promise<proto.cline.Empty> {
+	const enabled = request.value
+
+	// Update the terminal reuse setting in the state
+	await updateGlobalState(controller.context, "terminalReuseEnabled", enabled)
+
+	// Broadcast state update to all webviews
+	await controller.postStateToWebview()
+
+	return proto.cline.Empty.create({})
+}

src/core/controller/ui/subscribeToFocusChatInput.ts

@@ -0,0 +1,62 @@
+import { StringRequest, Empty } from "@shared/proto/common"
+import { StreamingResponseHandler, getRequestRegistry } from "../grpc-handler"
+import type { Controller } from "../index"
+
+// Map client IDs to their subscription handlers
+const focusChatInputSubscriptions = new Map<string, StreamingResponseHandler>()
+
+/**
+ * Subscribe to focus chat input events
+ * @param controller The controller instance
+ * @param request The request containing the client ID
+ * @param responseStream The streaming response handler
+ * @param requestId The ID of the request
+ */
+export async function subscribeToFocusChatInput(
+	controller: Controller,
+	request: StringRequest,
+	responseStream: StreamingResponseHandler,
+	requestId?: string,
+): Promise<void> {
+	const clientId = request.value
+	if (!clientId) {
+		throw new Error("Client ID is required for focusChatInput subscription")
+	}
+
+	// Store this subscription with its client ID
+	focusChatInputSubscriptions.set(clientId, responseStream)
+
+	// Register cleanup when the connection is closed
+	const cleanup = () => {
+		focusChatInputSubscriptions.delete(clientId)
+	}
+
+	// Register the cleanup function with the request registry if we have a requestId
+	if (requestId) {
+		getRequestRegistry().registerRequest(requestId, cleanup, { type: "focus_chat_input_subscription" }, responseStream)
+	}
+}
+
+/**
+ * Send a focus chat input event to a specific webview by client ID
+ * @param clientId The ID of the client to send the event to
+ */
+export async function sendFocusChatInputEvent(clientId: string): Promise<void> {
+	const responseStream = focusChatInputSubscriptions.get(clientId)
+	if (!responseStream) {
+		console.warn(`No subscription found for client ID: ${clientId}`)
+		return
+	}
+
+	try {
+		const event = Empty.create({})
+		await responseStream(
+			event,
+			false, // Not the last message
+		)
+	} catch (error) {
+		console.error(`Error sending focus chat input event to client ${clientId}:`, error)
+		// Remove the subscription if there was an error
+		focusChatInputSubscriptions.delete(clientId)
+	}
+}

src/core/prompts/model_prompts/claude4.ts

@@ -663,7 +663,6 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
     }
 
 export function addUserInstructions(
-    settingsCustomInstructions?: string,
     globalClineRulesFileInstructions?: string,
     localClineRulesFileInstructions?: string,
     localCursorRulesFileInstructions?: string,
@@ -676,9 +675,6 @@ export function addUserInstructions(
     if (preferredLanguageInstructions) {
         customInstructions += preferredLanguageInstructions + "\n\n"
     }
-    if (settingsCustomInstructions) {
-        customInstructions += settingsCustomInstructions + "\n\n"
-    }
     if (globalClineRulesFileInstructions) {
         customInstructions += globalClineRulesFileInstructions + "\n\n"
     }

src/core/prompts/responses.ts

@@ -149,13 +149,14 @@ Otherwise, if you have not completed the task and do not need additional informa
 		cwd: string,
 		wasRecent: boolean | 0 | undefined,
 		responseText?: string,
+		hasPendingFileContextWarnings?: boolean,
 	): [string, string] => {
 		const taskResumptionMessage = `[TASK RESUMPTION] ${
 			mode === "plan"
 				? `This task was interrupted ${agoText}. The conversation may have been incomplete. Be aware that the project state may have changed since then. The current working directory is now '${cwd.toPosix()}'.\n\nNote: If you previously attempted a tool use that the user did not provide a result for, you should assume the tool use was not successful. However you are in PLAN MODE, so rather than continuing the task, you must respond to the user's message.`
 				: `This task was interrupted ${agoText}. It may or may not be complete, so please reassess the task context. Be aware that the project state may have changed since then. The current working directory is now '${cwd.toPosix()}'. If the task has not been completed, retry the last step before interruption and proceed with completing the task.\n\nNote: If you previously attempted a tool use that the user did not provide a result for, you should assume the tool use was not successful and assess whether you should retry. If the last tool was a browser_action, the browser has been closed and you must launch a new browser if needed.`
 		}${
-			wasRecent
+			wasRecent && !hasPendingFileContextWarnings
 				? "\n\nIMPORTANT: If the last tool use was a replace_in_file or write_to_file that was interrupted, the file was reverted back to its original state before the interrupted edit, and you do NOT need to re-read the file as you already have its up-to-date contents."
 				: ""
 		}`
@@ -240,6 +241,19 @@ Otherwise, if you have not completed the task and do not need additional informa
 
 	cursorRulesLocalDirectoryInstructions: (cwd: string, content: string) =>
 		`# .cursor/rules\n\nThe following is provided by a root-level .cursor/rules directory where the user has specified instructions for this working directory (${cwd.toPosix()})\n\n${content}`,
+
+	fileContextWarning: (editedFiles: string[]): string => {
+		const fileCount = editedFiles.length
+		const fileVerb = fileCount === 1 ? "file has" : "files have"
+		const fileDemonstrativePronoun = fileCount === 1 ? "this file" : "these files"
+		const filePersonalPronoun = fileCount === 1 ? "it" : "they"
+
+		return (
+			`<explicit_instructions>\nCRITICAL FILE STATE ALERT: ${fileCount} ${fileVerb} been externally modified since your last interaction. Your cached understanding of ${fileDemonstrativePronoun} is now stale and unreliable. Before making ANY modifications to ${fileDemonstrativePronoun}, you must execute read_file to obtain the current state, as ${filePersonalPronoun} may contain completely different content than what you expect:\n` +
+			`${editedFiles.map((file) => ` ${path.resolve(file).toPosix()}`).join("\n")}\n` +
+			`Failure to re-read before editing will result in replace_in_file edit errors, requiring subsequent attempts and wasting tokens. You DO NOT need to re-read these files after subsequent edits, unless instructed to do so.\n</explicit_instructions>`
+		)
+	},
 }
 
 // to avoid circular dependency

src/core/prompts/system.ts

@@ -651,7 +651,6 @@ You accomplish a given task iteratively, breaking it down into clear steps and w
 
 
 export function addUserInstructions(
-	settingsCustomInstructions?: string,
 	globalClineRulesFileInstructions?: string,
 	localClineRulesFileInstructions?: string,
 	localCursorRulesFileInstructions?: string,
@@ -664,9 +663,6 @@ export function addUserInstructions(
 	if (preferredLanguageInstructions) {
 		customInstructions += preferredLanguageInstructions + "\n\n"
 	}
-	if (settingsCustomInstructions) {
-		customInstructions += settingsCustomInstructions + "\n\n"
-	}
 	if (globalClineRulesFileInstructions) {
 		customInstructions += globalClineRulesFileInstructions + "\n\n"
 	}

src/core/storage/state-keys.ts

@@ -22,6 +22,8 @@ export type SecretKey =
 	| "nebiusApiKey"
 	| "sambanovaApiKey"
 	| "cerebrasApiKey"
+	| "sapAiCoreClientId"
+	| "sapAiCoreClientSecret"
 
 export type GlobalStateKey =
 	| "awsRegion"
@@ -33,7 +35,6 @@ export type GlobalStateKey =
 	| "vertexProjectId"
 	| "vertexRegion"
 	| "lastShownAnnouncementId"
-	| "customInstructions"
 	| "taskHistory"
 	| "openAiBaseUrl"
 	| "openAiModelId"
@@ -68,7 +69,17 @@ export type GlobalStateKey =
 	| "shellIntegrationTimeout"
 	| "mcpResponsesCollapsed"
 	| "terminalReuseEnabled"
+	| "defaultTerminalProfile"
 	| "isNewUser"
+	| "terminalOutputLineLimit"
+	| "mcpRichDisplayEnabled"
+	| "sapAiCoreTokenUrl"
+	| "sapAiCoreBaseUrl"
+	| "sapAiResourceGroup"
+	| "sapAiCoreClientId"
+	| "sapAiCoreClientSecret"
+	| "sapAiCoreModelId"
+	| "claudeCodePath"
 
 export type LocalStateKey =
 	| "localClineRulesToggles"
@@ -102,3 +113,9 @@ export type LocalStateKey =
 	| "previousModeReasoningEffort"
 	| "previousModeAwsBedrockCustomSelected"
 	| "previousModeAwsBedrockCustomModelBaseId"
+	| "previousModeSapAiCoreClientId"
+	| "previousModeSapAiCoreClientSecret"
+	| "previousModeSapAiCoreBaseUrl"
+	| "previousModeSapAiCoreTokenUrl"
+	| "previousModeSapAiCoreResourceGroup"
+	| "previousModeSapAiCoreModelId"

src/core/storage/state.ts

@@ -11,6 +11,9 @@ import { ChatSettings } from "@shared/ChatSettings"
 import { TelemetrySetting } from "@shared/TelemetrySetting"
 import { UserInfo } from "@shared/UserInfo"
 import { ClineRulesToggles } from "@shared/cline-rules"
+import { ensureRulesDirectoryExists } from "./disk"
+import fs from "fs/promises"
+import path from "path"
 /*
 	Storage
 	https://dev.to/kompotkot/how-to-use-secretstorage-in-your-vscode-extensions-2hco
@@ -125,6 +128,51 @@ async function migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw: bool
 	return enableCheckpointsSettingRaw ?? true
 }
 
+export async function migrateCustomInstructionsToGlobalRules(context: vscode.ExtensionContext) {
+	try {
+		const customInstructions = (await context.globalState.get("customInstructions")) as string | undefined
+
+		if (customInstructions?.trim()) {
+			console.log("Migrating custom instructions to global Cline rules...")
+
+			// Create global .clinerules directory if it doesn't exist
+			const globalRulesDir = await ensureRulesDirectoryExists()
+
+			// Use a fixed filename for custom instructions
+			const migrationFileName = "custom_instructions.md"
+			const migrationFilePath = path.join(globalRulesDir, migrationFileName)
+
+			try {
+				// Check if file already exists to determine if we should append
+				let existingContent = ""
+				try {
+					existingContent = await fs.readFile(migrationFilePath, "utf8")
+				} catch (readError) {
+					// File doesn't exist, which is fine
+				}
+
+				// Append or create the file with custom instructions
+				const contentToWrite = existingContent
+					? `${existingContent}\n\n---\n\n${customInstructions.trim()}`
+					: customInstructions.trim()
+
+				await fs.writeFile(migrationFilePath, contentToWrite)
+				console.log(`Successfully ${existingContent ? "appended to" : "created"} migration file: ${migrationFilePath}`)
+			} catch (fileError) {
+				console.error("Failed to write migration file:", fileError)
+				return
+			}
+
+			// Remove customInstructions from global state only after successful file creation
+			await context.globalState.update("customInstructions", undefined)
+			console.log("Successfully migrated custom instructions to global Cline rules")
+		}
+	} catch (error) {
+		console.error("Failed to migrate custom instructions to global rules:", error)
+		// Continue execution - migration failure shouldn't break extension startup
+	}
+}
+
 export async function getAllExtensionState(context: vscode.ExtensionContext) {
 	const [
 		isNewUser,
@@ -161,7 +209,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		azureApiVersion,
 		openRouterProviderSorting,
 		lastShownAnnouncementId,
-		customInstructions,
 		taskHistory,
 		autoApprovalSettings,
 		browserSettings,
@@ -187,9 +234,19 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		shellIntegrationTimeout,
 		enableCheckpointsSettingRaw,
 		mcpMarketplaceEnabledRaw,
+		mcpRichDisplayEnabled,
 		mcpResponsesCollapsedRaw,
 		globalWorkflowToggles,
 		terminalReuseEnabled,
+		terminalOutputLineLimit,
+		defaultTerminalProfile,
+		sapAiCoreClientId,
+		sapAiCoreClientSecret,
+		sapAiCoreBaseUrl,
+		sapAiCoreTokenUrl,
+		sapAiResourceGroup,
+		sapAiCoreModelId,
+		claudeCodePath,
 	] = await Promise.all([
 		getGlobalState(context, "isNewUser") as Promise<boolean | undefined>,
 		getSecret(context, "apiKey") as Promise<string | undefined>,
@@ -225,7 +282,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "azureApiVersion") as Promise<string | undefined>,
 		getGlobalState(context, "openRouterProviderSorting") as Promise<string | undefined>,
 		getGlobalState(context, "lastShownAnnouncementId") as Promise<string | undefined>,
-		getGlobalState(context, "customInstructions") as Promise<string | undefined>,
 		getGlobalState(context, "taskHistory") as Promise<HistoryItem[] | undefined>,
 		getGlobalState(context, "autoApprovalSettings") as Promise<AutoApprovalSettings | undefined>,
 		getGlobalState(context, "browserSettings") as Promise<BrowserSettings | undefined>,
@@ -251,9 +307,19 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "shellIntegrationTimeout") as Promise<number | undefined>,
 		getGlobalState(context, "enableCheckpointsSetting") as Promise<boolean | undefined>,
 		getGlobalState(context, "mcpMarketplaceEnabled") as Promise<boolean | undefined>,
+		getGlobalState(context, "mcpRichDisplayEnabled") as Promise<boolean | undefined>,
 		getGlobalState(context, "mcpResponsesCollapsed") as Promise<boolean | undefined>,
 		getGlobalState(context, "globalWorkflowToggles") as Promise<ClineRulesToggles | undefined>,
 		getGlobalState(context, "terminalReuseEnabled") as Promise<boolean | undefined>,
+		getGlobalState(context, "terminalOutputLineLimit") as Promise<number | undefined>,
+		getGlobalState(context, "defaultTerminalProfile") as Promise<string | undefined>,
+		getSecret(context, "sapAiCoreClientId") as Promise<string | undefined>,
+		getSecret(context, "sapAiCoreClientSecret") as Promise<string | undefined>,
+		getGlobalState(context, "sapAiCoreBaseUrl") as Promise<string | undefined>,
+		getGlobalState(context, "sapAiCoreTokenUrl") as Promise<string | undefined>,
+		getGlobalState(context, "sapAiResourceGroup") as Promise<string | undefined>,
+		getGlobalState(context, "sapAiCoreModelId") as Promise<string | undefined>,
+		getGlobalState(context, "claudeCodePath") as Promise<string | undefined>,
 	])
 
 	const localClineRulesToggles = (await getWorkspaceState(context, "localClineRulesToggles")) as ClineRulesToggles
@@ -287,6 +353,12 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		previousModeReasoningEffort,
 		previousModeAwsBedrockCustomSelected,
 		previousModeAwsBedrockCustomModelBaseId,
+		previousModeSapAiCoreClientId,
+		previousModeSapAiCoreClientSecret,
+		previousModeSapAiCoreBaseUrl,
+		previousModeSapAiCoreTokenUrl,
+		previousModeSapAiCoreResourceGroup,
+		previousModeSapAiCoreModelId,
 	] = await Promise.all([
 		getWorkspaceState(context, "chatSettings") as Promise<ChatSettings | undefined>,
 		getWorkspaceState(context, "apiProvider") as Promise<ApiProvider | undefined>,
@@ -316,6 +388,12 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getWorkspaceState(context, "previousModeReasoningEffort") as Promise<string | undefined>,
 		getWorkspaceState(context, "previousModeAwsBedrockCustomSelected") as Promise<boolean | undefined>,
 		getWorkspaceState(context, "previousModeAwsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
+		getWorkspaceState(context, "previousModeSapAiCoreClientId") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeSapAiCoreClientSecret") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeSapAiCoreBaseUrl") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeSapAiCoreTokenUrl") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeSapAiCoreResourceGroup") as Promise<string | undefined>,
+		getWorkspaceState(context, "previousModeSapAiCoreModelId") as Promise<string | undefined>,
 	])
 
 	let apiProvider: ApiProvider
@@ -361,6 +439,7 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 			apiKey,
 			openRouterApiKey,
 			clineApiKey,
+			claudeCodePath,
 			awsAccessKey,
 			awsSecretKey,
 			awsSessionToken,
@@ -422,10 +501,15 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 			nebiusApiKey,
 			favoritedModelIds,
 			requestTimeoutMs,
+			sapAiCoreClientId,
+			sapAiCoreClientSecret,
+			sapAiCoreBaseUrl,
+			sapAiCoreTokenUrl,
+			sapAiResourceGroup,
+			sapAiCoreModelId,
 		},
 		isNewUser: isNewUser ?? true,
 		lastShownAnnouncementId,
-		customInstructions,
 		taskHistory,
 		autoApprovalSettings: autoApprovalSettings || DEFAULT_AUTO_APPROVAL_SETTINGS, // default value can be 0 or empty string
 		globalClineRulesToggles: globalClineRulesToggles || {},
@@ -444,13 +528,22 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		previousModeReasoningEffort,
 		previousModeAwsBedrockCustomSelected,
 		previousModeAwsBedrockCustomModelBaseId,
+		previousModeSapAiCoreClientId,
+		previousModeSapAiCoreClientSecret,
+		previousModeSapAiCoreBaseUrl,
+		previousModeSapAiCoreTokenUrl,
+		previousModeSapAiCoreResourceGroup,
+		previousModeSapAiCoreModelId,
 		mcpMarketplaceEnabled: mcpMarketplaceEnabled,
+		mcpRichDisplayEnabled: mcpRichDisplayEnabled ?? true,
 		mcpResponsesCollapsed: mcpResponsesCollapsed,
 		telemetrySetting: telemetrySetting || "unset",
 		planActSeparateModelsSetting,
 		enableCheckpointsSetting: enableCheckpointsSetting,
 		shellIntegrationTimeout: shellIntegrationTimeout || 4000,
 		terminalReuseEnabled: terminalReuseEnabled ?? true,
+		terminalOutputLineLimit: terminalOutputLineLimit ?? 500,
+		defaultTerminalProfile: defaultTerminalProfile ?? "default",
 		globalWorkflowToggles: globalWorkflowToggles || {},
 	}
 }
@@ -522,6 +615,13 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 		fireworksModelId,
 		fireworksModelMaxCompletionTokens,
 		fireworksModelMaxTokens,
+		sapAiCoreClientId,
+		sapAiCoreClientSecret,
+		sapAiCoreBaseUrl,
+		sapAiCoreTokenUrl,
+		sapAiResourceGroup,
+		sapAiCoreModelId,
+		claudeCodePath,
 	} = apiConfiguration
 	// Workspace state updates
 	await updateWorkspaceState(context, "apiProvider", apiProvider)
@@ -570,6 +670,13 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
 	await updateGlobalState(context, "fireworksModelMaxCompletionTokens", fireworksModelMaxCompletionTokens)
 	await updateGlobalState(context, "fireworksModelMaxTokens", fireworksModelMaxTokens)
+	await updateGlobalState(context, "favoritedModelIds", favoritedModelIds)
+	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
+	await updateGlobalState(context, "sapAiCoreBaseUrl", sapAiCoreBaseUrl)
+	await updateGlobalState(context, "sapAiCoreTokenUrl", sapAiCoreTokenUrl)
+	await updateGlobalState(context, "sapAiResourceGroup", sapAiResourceGroup)
+	await updateGlobalState(context, "sapAiCoreModelId", sapAiCoreModelId)
+	await updateGlobalState(context, "claudeCodePath", claudeCodePath)
 
 	// Secret updates
 	await storeSecret(context, "apiKey", apiKey)
@@ -594,9 +701,18 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 	await storeSecret(context, "sambanovaApiKey", sambanovaApiKey)
 	await storeSecret(context, "cerebrasApiKey", cerebrasApiKey)
 	await storeSecret(context, "nebiusApiKey", nebiusApiKey)
+	await storeSecret(context, "sapAiCoreClientId", sapAiCoreClientId)
+	await storeSecret(context, "sapAiCoreClientSecret", sapAiCoreClientSecret)
 }
 
-export async function resetExtensionState(context: vscode.ExtensionContext) {
+export async function resetWorkspaceState(context: vscode.ExtensionContext) {
+	for (const key of context.workspaceState.keys()) {
+		await context.workspaceState.update(key, undefined)
+	}
+}
+
+export async function resetGlobalState(context: vscode.ExtensionContext) {
+	// TODO: Reset all workspace states?
 	for (const key of context.globalState.keys()) {
 		await context.globalState.update(key, undefined)
 	}

src/core/task/index.ts

@@ -113,6 +113,8 @@ import { isInTestMode } from "../../services/test/TestMode"
 import { processFilesIntoText } from "@integrations/misc/extract-text"
 import { featureFlagsService } from "@services/posthog/feature-flags/FeatureFlagsService"
 import { StreamingJsonReplacer, ChangeLocation } from "@core/assistant-message/diff-json"
+import { isClaude4ModelFamily } from "@utils/model-utils"
+import { saveClineMessagesAndUpdateHistory } from "./message-state"
 
 export const USE_EXPERIMENTAL_CLAUDE4_FEATURES = false
 
@@ -139,12 +141,11 @@ export class Task {
 	readonly taskId: string
 	private taskIsFavorited?: boolean
 	api: ApiHandler
-	private terminalManager: TerminalManager
+	terminalManager: TerminalManager
 	private urlContentFetcher: UrlContentFetcher
 	browserSession: BrowserSession
 	contextManager: ContextManager
 	private didEditFile: boolean = false
-	customInstructions?: string
 	autoApprovalSettings: AutoApprovalSettings
 	browserSettings: BrowserSettings
 	chatSettings: ChatSettings
@@ -203,8 +204,9 @@ export class Task {
 		chatSettings: ChatSettings,
 		shellIntegrationTimeout: number,
 		terminalReuseEnabled: boolean,
+		terminalOutputLineLimit: number,
+		defaultTerminalProfile: string,
 		enableCheckpointsSetting: boolean,
-		customInstructions?: string,
 		task?: string,
 		images?: string[],
 		files?: string[],
@@ -223,16 +225,23 @@ export class Task {
 		this.terminalManager = new TerminalManager()
 		this.terminalManager.setShellIntegrationTimeout(shellIntegrationTimeout)
 		this.terminalManager.setTerminalReuseEnabled(terminalReuseEnabled ?? true)
+		this.terminalManager.setTerminalOutputLineLimit(terminalOutputLineLimit)
+		this.terminalManager.setDefaultTerminalProfile(defaultTerminalProfile)
 		this.urlContentFetcher = new UrlContentFetcher(context)
 		this.browserSession = new BrowserSession(context, browserSettings)
 		this.contextManager = new ContextManager()
 		this.diffViewProvider = new DiffViewProvider(cwd)
-		this.customInstructions = customInstructions
 		this.autoApprovalSettings = autoApprovalSettings
 		this.browserSettings = browserSettings
 		this.chatSettings = chatSettings
 		this.enableCheckpoints = enableCheckpointsSetting
 
+		// Set up MCP notification callback for real-time notifications
+		this.mcpHub.setNotificationCallback(async (serverName: string, level: string, message: string) => {
+			// Display notification in chat immediately
+			await this.say("mcp_notification", `[${serverName}] ${message}`)
+		})
+
 		// Initialize taskId first
 		if (historyItem) {
 			this.taskId = historyItem.id
@@ -339,52 +348,28 @@ export class Task {
 		message.conversationHistoryIndex = this.apiConversationHistory.length - 1 // NOTE: this is the index of the last added message which is the user message, and once the clinemessages have been presented we update the apiconversationhistory with the completed assistant message. This means when resetting to a message, we need to +1 this index to get the correct assistant message that this tool use corresponds to
 		message.conversationHistoryDeletedRange = this.conversationHistoryDeletedRange
 		this.clineMessages.push(message)
-		await this.saveClineMessagesAndUpdateHistory()
+		await saveClineMessagesAndUpdateHistory(
+			this.getContext(),
+			this.taskId,
+			this.clineMessages,
+			this.taskIsFavorited ?? false,
+			this.conversationHistoryDeletedRange,
+			this.checkpointTracker,
+			this.updateTaskHistory,
+		)
 	}
 
 	private async overwriteClineMessages(newMessages: ClineMessage[]) {
 		this.clineMessages = newMessages
-		await this.saveClineMessagesAndUpdateHistory()
-	}
-
-	private async saveClineMessagesAndUpdateHistory() {
-		try {
-			await saveClineMessages(this.getContext(), this.taskId, this.clineMessages)
-
-			// combined as they are in ChatView
-			const apiMetrics = getApiMetrics(combineApiRequests(combineCommandSequences(this.clineMessages.slice(1))))
-			const taskMessage = this.clineMessages[0] // first message is always the task say
-			const lastRelevantMessage =
-				this.clineMessages[
-					findLastIndex(this.clineMessages, (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"))
-				]
-			const taskDir = await ensureTaskDirectoryExists(this.getContext(), this.taskId)
-			let taskDirSize = 0
-			try {
-				// getFolderSize.loose silently ignores errors
-				// returns # of bytes, size/1000/1000 = MB
-				taskDirSize = await getFolderSize.loose(taskDir)
-			} catch (error) {
-				console.error("Failed to get task directory size:", taskDir, error)
-			}
-			await this.updateTaskHistory({
-				id: this.taskId,
-				ts: lastRelevantMessage.ts,
-				task: taskMessage.text ?? "",
-				tokensIn: apiMetrics.totalTokensIn,
-				tokensOut: apiMetrics.totalTokensOut,
-				cacheWrites: apiMetrics.totalCacheWrites,
-				cacheReads: apiMetrics.totalCacheReads,
-				totalCost: apiMetrics.totalCost,
-				size: taskDirSize,
-				shadowGitConfigWorkTree: await this.checkpointTracker?.getShadowGitConfigWorkTree(),
-				cwdOnTaskInitialization: cwd,
-				conversationHistoryDeletedRange: this.conversationHistoryDeletedRange,
-				isFavorited: this.taskIsFavorited,
-			})
-		} catch (error) {
-			console.error("Failed to save cline messages:", error)
-		}
+		await saveClineMessagesAndUpdateHistory(
+			this.getContext(),
+			this.taskId,
+			this.clineMessages,
+			this.taskIsFavorited ?? false,
+			this.conversationHistoryDeletedRange,
+			this.checkpointTracker,
+			this.updateTaskHistory,
+		)
 	}
 
 	async restoreCheckpoint(messageTs: number, restoreType: ClineCheckpointRestore, offset?: number) {
@@ -444,6 +429,18 @@ export class Task {
 						vscode.window.showErrorMessage("Failed to restore offsetcheckpoint: " + errorMessage)
 						didWorkspaceRestoreFail = true
 					}
+				} else if (!offset && lastMessageWithHash.lastCheckpointHash && this.checkpointTracker) {
+					// Fallback: restore to most recent checkpoint when target message has no checkpoint hash
+					console.warn(`Message ${messageTs} has no checkpoint hash, falling back to previous checkpoint`)
+					try {
+						await this.checkpointTracker.resetHead(lastMessageWithHash.lastCheckpointHash)
+					} catch (error) {
+						const errorMessage = error instanceof Error ? error.message : "Unknown error"
+						vscode.window.showErrorMessage("Failed to restore checkpoint: " + errorMessage)
+						didWorkspaceRestoreFail = true
+					}
+				} else {
+					vscode.window.showErrorMessage("Failed to restore checkpoint")
 				}
 				break
 		}
@@ -469,6 +466,18 @@ export class Task {
 					const deletedMessages = this.clineMessages.slice(messageIndex + 1)
 					const deletedApiReqsMetrics = getApiMetrics(combineApiRequests(combineCommandSequences(deletedMessages)))
 
+					// Detect files edited after this message timestamp for file context warning
+					// Only needed for task-only restores when a user edits a message or restores the task context, but not the files.
+					if (restoreType === "task") {
+						const filesEditedAfterMessage = await this.fileContextTracker.detectFilesEditedAfterMessage(
+							messageTs,
+							deletedMessages,
+						)
+						if (filesEditedAfterMessage.length > 0) {
+							await this.fileContextTracker.storePendingFileContextWarning(filesEditedAfterMessage)
+						}
+					}
+
 					const newClineMessages = this.clineMessages.slice(0, messageIndex + 1)
 					await this.overwriteClineMessages(newClineMessages) // calls saveClineMessages which saves historyItem
 
@@ -511,9 +520,15 @@ export class Task {
 				})
 			}
 
-			await this.saveClineMessagesAndUpdateHistory()
-
-			sendRelinquishControlEvent()
+			await saveClineMessagesAndUpdateHistory(
+				this.getContext(),
+				this.taskId,
+				this.clineMessages,
+				this.taskIsFavorited ?? false,
+				this.conversationHistoryDeletedRange,
+				this.checkpointTracker,
+				this.updateTaskHistory,
+			)
 
 			this.cancelTask() // the task is already cancelled by the provider beforehand, but we need to re-init to get the updated messages
 		} else {
@@ -786,7 +801,15 @@ export class Task {
 					// lastMessage.ts = askTs
 					lastMessage.text = text
 					lastMessage.partial = false
-					await this.saveClineMessagesAndUpdateHistory()
+					await saveClineMessagesAndUpdateHistory(
+						this.getContext(),
+						this.taskId,
+						this.clineMessages,
+						this.taskIsFavorited ?? false,
+						this.conversationHistoryDeletedRange,
+						this.checkpointTracker,
+						this.updateTaskHistory,
+					)
 					// await this.postStateToWebview()
 					const protoMessage = convertClineMessageToProto(lastMessage)
 					await sendPartialMessageEvent(protoMessage)
@@ -894,7 +917,15 @@ export class Task {
 					lastMessage.partial = false
 
 					// instead of streaming partialMessage events, we do a save and post like normal to persist to disk
-					await this.saveClineMessagesAndUpdateHistory()
+					await saveClineMessagesAndUpdateHistory(
+						this.getContext(),
+						this.taskId,
+						this.clineMessages,
+						this.taskIsFavorited ?? false,
+						this.conversationHistoryDeletedRange,
+						this.checkpointTracker,
+						this.updateTaskHistory,
+					)
 					// await this.postStateToWebview()
 					const protoMessage = convertClineMessageToProto(lastMessage)
 					await sendPartialMessageEvent(protoMessage) // more performant than an entire postStateToWebview
@@ -943,8 +974,15 @@ export class Task {
 		const lastMessage = this.clineMessages.at(-1)
 		if (lastMessage?.partial && lastMessage.type === type && (lastMessage.ask === askOrSay || lastMessage.say === askOrSay)) {
 			this.clineMessages.pop()
-			await this.saveClineMessagesAndUpdateHistory()
-			await this.postStateToWebview()
+			await saveClineMessagesAndUpdateHistory(
+				this.getContext(),
+				this.taskId,
+				this.clineMessages,
+				this.taskIsFavorited ?? false,
+				this.conversationHistoryDeletedRange,
+				this.checkpointTracker,
+				this.updateTaskHistory,
+			)
 		}
 	}
 
@@ -1117,12 +1155,17 @@ export class Task {
 
 		const wasRecent = lastClineMessage?.ts && Date.now() - lastClineMessage.ts < 30_000
 
+		// Check if there are pending file context warnings before calling taskResumption
+		const pendingContextWarning = await this.fileContextTracker.retrieveAndClearPendingFileContextWarning()
+		const hasPendingFileContextWarnings = pendingContextWarning && pendingContextWarning.length > 0
+
 		const [taskResumptionMessage, userResponseMessage] = formatResponse.taskResumption(
 			this.chatSettings?.mode === "plan" ? "plan" : "act",
 			agoText,
 			cwd,
 			wasRecent,
 			responseText,
+			hasPendingFileContextWarnings,
 		)
 
 		if (taskResumptionMessage !== "") {
@@ -1153,6 +1196,15 @@ export class Task {
 			}
 		}
 
+		// Inject file context warning if there were pending warnings from message editing
+		if (pendingContextWarning && pendingContextWarning.length > 0) {
+			const fileContextWarning = formatResponse.fileContextWarning(pendingContextWarning)
+			newUserContent.push({
+				type: "text",
+				text: fileContextWarning,
+			})
+		}
+
 		await this.overwriteApiConversationHistory(modifiedApiConversationHistory)
 		await this.initiateTaskLoop(newUserContent)
 	}
@@ -1196,6 +1248,9 @@ export class Task {
 		this.clineIgnoreController.dispose()
 		this.fileContextTracker.dispose()
 		await this.diffViewProvider.revertChanges() // need to await for when we want to make sure directories/files are reverted before re-starting the task from a checkpoint
+
+		// Clear the notification callback when task is aborted
+		this.mcpHub.clearNotificationCallback()
 	}
 
 	// Checkpoints
@@ -1219,15 +1274,43 @@ export class Task {
 				return
 			}
 
-			// For non-attempt completion we just say checkpoints
-			await this.say("checkpoint_created")
-			this.checkpointTracker?.commit().then(async (commitHash) => {
-				const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
-				if (lastCheckpointMessage) {
-					lastCheckpointMessage.lastCheckpointHash = commitHash
-					await this.saveClineMessagesAndUpdateHistory()
+			// Initialize checkpoint tracker if it doesn't exist
+			if (!this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
+				try {
+					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)
+					this.checkpointTrackerErrorMessage = errorMessage
+					await this.postStateToWebview()
+					return
 				}
-			}) // silently fails for now
+			}
+
+			// Create a checkpoint commit and update clineMessages with a commitHash
+			if (this.checkpointTracker) {
+				const commitHash = await this.checkpointTracker.commit()
+				if (commitHash) {
+					await this.say("checkpoint_created")
+					const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
+					if (lastCheckpointMessage) {
+						lastCheckpointMessage.lastCheckpointHash = commitHash
+						await saveClineMessagesAndUpdateHistory(
+							this.getContext(),
+							this.taskId,
+							this.clineMessages,
+							this.taskIsFavorited ?? false,
+							this.conversationHistoryDeletedRange,
+							this.checkpointTracker,
+							this.updateTaskHistory,
+						)
+					}
+				}
+			} // silently fails for now
 
 			//
 		} else {
@@ -1257,7 +1340,15 @@ export class Task {
 				)
 				if (lastCompletionResultMessage) {
 					lastCompletionResultMessage.lastCheckpointHash = commitHash
-					await this.saveClineMessagesAndUpdateHistory()
+					await saveClineMessagesAndUpdateHistory(
+						this.getContext(),
+						this.taskId,
+						this.clineMessages,
+						this.taskIsFavorited ?? false,
+						this.conversationHistoryDeletedRange,
+						this.checkpointTracker,
+						this.updateTaskHistory,
+					)
 				}
 			} else {
 				console.error("Checkpoint tracker does not exist and could not be initialized for attempt completion")
@@ -1446,9 +1537,9 @@ export class Task {
 			chunkTimer = setTimeout(async () => await flushBuffer(), CHUNK_DEBOUNCE_MS)
 		}
 
-		let result = ""
+		const outputLines: string[] = []
 		process.on("line", async (line) => {
-			result += line + "\n"
+			outputLines.push(line)
 
 			if (!didContinue) {
 				outputBuffer.push(line)
@@ -1490,7 +1581,7 @@ export class Task {
 		// grouping command_output messages despite any gaps anyways)
 		await setTimeoutPromise(50)
 
-		result = result.trim()
+		let result = this.terminalManager.processOutput(outputLines)
 
 		if (userFeedback) {
 			await this.say("user_feedback", userFeedback.text, userFeedback.images, userFeedback.files)
@@ -1620,12 +1711,6 @@ export class Task {
 		}
 	}
 
-	private async isClaude4ModelFamily(): Promise<boolean> {
-		const model = this.api.getModel()
-		const modelId = model.id
-		return modelId.includes("sonnet-4") || modelId.includes("opus-4")
-	}
-
 	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(() => {
@@ -1639,10 +1724,9 @@ export class Task {
 
 		const supportsBrowserUse = modelSupportsBrowserUse && !disableBrowserTool // only enable browser use if the model supports it and the user hasn't disabled it
 
-		const isClaude4ModelFamily = await this.isClaude4ModelFamily()
-		let systemPrompt = await SYSTEM_PROMPT(cwd, supportsBrowserUse, this.mcpHub, this.browserSettings, isClaude4ModelFamily)
+		const isClaude4Model = isClaude4ModelFamily(this.api)
+		let systemPrompt = await SYSTEM_PROMPT(cwd, supportsBrowserUse, this.mcpHub, this.browserSettings, isClaude4Model)
 
-		let settingsCustomInstructions = this.customInstructions?.trim()
 		await this.migratePreferredLanguageToolSetting()
 		const preferredLanguage = getLanguageKey(this.chatSettings.preferredLanguage as LanguageDisplay)
 		const preferredLanguageInstructions =
@@ -1670,7 +1754,6 @@ export class Task {
 		}
 
 		if (
-			settingsCustomInstructions ||
 			globalClineRulesFileInstructions ||
 			localClineRulesFileInstructions ||
 			localCursorRulesFileInstructions ||
@@ -1681,7 +1764,6 @@ export class Task {
 		) {
 			// altering the system prompt mid-task will break the prompt cache, but in the grand scheme this will not change often so it's better to not pollute user messages with it the way we have to with <potentially relevant details>
 			const userInstructions = addUserInstructions(
-				settingsCustomInstructions,
 				globalClineRulesFileInstructions,
 				localClineRulesFileInstructions,
 				localCursorRulesFileInstructions,
@@ -1703,7 +1785,15 @@ export class Task {
 
 		if (contextManagementMetadata.updatedConversationHistoryDeletedRange) {
 			this.conversationHistoryDeletedRange = contextManagementMetadata.conversationHistoryDeletedRange
-			await this.saveClineMessagesAndUpdateHistory() // saves task history item which we use to keep track of conversation history deleted range
+			await saveClineMessagesAndUpdateHistory(
+				this.getContext(),
+				this.taskId,
+				this.clineMessages,
+				this.taskIsFavorited ?? false,
+				this.conversationHistoryDeletedRange,
+				this.checkpointTracker,
+				this.updateTaskHistory,
+			) // saves task history item which we use to keep track of conversation history deleted range
 		}
 
 		let stream = this.api.createMessage(systemPrompt, contextManagementMetadata.truncatedConversationHistory)
@@ -1728,7 +1818,15 @@ export class Task {
 					this.conversationHistoryDeletedRange,
 					"quarter", // Force aggressive truncation
 				)
-				await this.saveClineMessagesAndUpdateHistory()
+				await saveClineMessagesAndUpdateHistory(
+					this.getContext(),
+					this.taskId,
+					this.clineMessages,
+					this.taskIsFavorited ?? false,
+					this.conversationHistoryDeletedRange,
+					this.checkpointTracker,
+					this.updateTaskHistory,
+				)
 				await this.contextManager.triggerApplyStandardContextTruncationNoticeChange(
 					Date.now(),
 					await ensureTaskDirectoryExists(this.getContext(), this.taskId),
@@ -1742,7 +1840,15 @@ export class Task {
 						this.conversationHistoryDeletedRange,
 						"quarter", // Force aggressive truncation
 					)
-					await this.saveClineMessagesAndUpdateHistory()
+					await saveClineMessagesAndUpdateHistory(
+						this.getContext(),
+						this.taskId,
+						this.clineMessages,
+						this.taskIsFavorited ?? false,
+						this.conversationHistoryDeletedRange,
+						this.checkpointTracker,
+						this.updateTaskHistory,
+					)
 					await this.contextManager.triggerApplyStandardContextTruncationNoticeChange(
 						Date.now(),
 						await ensureTaskDirectoryExists(this.getContext(), this.taskId),
@@ -1921,7 +2027,6 @@ export class Task {
 
 			// Get final list of replacements
 			const allReplacements = this.streamingJsonReplacer.getSuccessfullyParsedItems()
-			// console.log(`Total replacements applied: ${allReplacements.length}`)
 
 			// Cleanup
 			this.streamingJsonReplacer = undefined
@@ -1951,7 +2056,6 @@ export class Task {
 			if (this.didCompleteReadingStream) {
 				this.userMessageContentReady = true
 			}
-			// console.log("no more content blocks to stream! this shouldn't happen?")
 			this.presentAssistantMessageLocked = false
 			return
 			//throw new Error("No more content blocks to stream! This shouldn't happen...") // remove and just return after testing
@@ -2087,11 +2191,11 @@ export class Task {
 					break
 				}
 
-				const pushToolResult = (content: ToolResponse, isClaude4ModelFamily: boolean = false) => {
+				const pushToolResult = (content: ToolResponse, isClaude4Model: boolean = false) => {
 					if (typeof content === "string") {
 						const resultText = content || "(tool did not return anything)"
 
-						if (isClaude4ModelFamily && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
+						if (isClaude4Model && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
 							// Claude 4 family: Use function_results format
 							this.userMessageContent.push({
 								type: "text",
@@ -2177,7 +2281,7 @@ export class Task {
 					}
 				}
 
-				const handleError = async (action: string, error: Error, isClaude4ModelFamily: boolean = false) => {
+				const handleError = async (action: string, error: Error, isClaude4Model: boolean = false) => {
 					if (this.abandoned) {
 						console.log("Ignoring error since task was abandoned (i.e. from task cancellation after resetting)")
 						return
@@ -2188,7 +2292,7 @@ export class Task {
 						`Error ${action}:\n${error.message ?? JSON.stringify(serializeError(error), null, 2)}`,
 					)
 
-					pushToolResult(formatResponse.toolError(errorString), isClaude4ModelFamily)
+					pushToolResult(formatResponse.toolError(errorString), isClaude4Model)
 				}
 
 				// If block is partial, remove partial closing tag so its not presented to user
@@ -2266,9 +2370,9 @@ export class Task {
 
 								const currentFullJson = block.params.diff
 								// Check if we should use streaming (e.g., for specific models)
-								const isClaude4ModelFamily = await this.isClaude4ModelFamily()
+								const isClaude4Model = isClaude4ModelFamily(this.api)
 								// Going through claude family of models
-								if (isClaude4ModelFamily && USE_EXPERIMENTAL_CLAUDE4_FEATURES && currentFullJson) {
+								if (isClaude4Model && USE_EXPERIMENTAL_CLAUDE4_FEATURES && currentFullJson) {
 									console.log("[EDIT] Streaming JSON replacement")
 									const streamingResult = await this.handleStreamingJsonReplacement(
 										block,
@@ -2660,7 +2764,7 @@ export class Task {
 						}
 					}
 					case "list_files": {
-						const isClaude4ModelFamily = await this.isClaude4ModelFamily()
+						const isClaude4Model = isClaude4ModelFamily(this.api)
 						const relDirPath: string | undefined = block.params.path
 						const recursiveRaw: string | undefined = block.params.recursive
 						const recursive = recursiveRaw?.toLowerCase() === "true"
@@ -2686,10 +2790,7 @@ export class Task {
 							} else {
 								if (!relDirPath) {
 									this.consecutiveMistakeCount++
-									pushToolResult(
-										await this.sayAndCreateMissingParamError("list_files", "path"),
-										isClaude4ModelFamily,
-									)
+									pushToolResult(await this.sayAndCreateMissingParamError("list_files", "path"), isClaude4Model)
 									await this.saveCheckpoint()
 									break
 								}
@@ -2740,12 +2841,12 @@ export class Task {
 										true,
 									)
 								}
-								pushToolResult(result, isClaude4ModelFamily)
+								pushToolResult(result, isClaude4Model)
 								await this.saveCheckpoint()
 								break
 							}
 						} catch (error) {
-							await handleError("listing files", error, isClaude4ModelFamily)
+							await handleError("listing files", error, isClaude4Model)
 							await this.saveCheckpoint()
 							break
 						}
@@ -2833,7 +2934,7 @@ export class Task {
 						}
 					}
 					case "search_files": {
-						const isClaude4ModelFamily = await this.isClaude4ModelFamily()
+						const isClaude4Model = isClaude4ModelFamily(this.api)
 						const relDirPath: string | undefined = block.params.path
 						const regex: string | undefined = block.params.regex
 						const filePattern: string | undefined = block.params.file_pattern
@@ -2863,7 +2964,7 @@ export class Task {
 									this.consecutiveMistakeCount++
 									pushToolResult(
 										await this.sayAndCreateMissingParamError("search_files", "path"),
-										isClaude4ModelFamily,
+										isClaude4Model,
 									)
 									await this.saveCheckpoint()
 									break
@@ -2872,7 +2973,7 @@ export class Task {
 									this.consecutiveMistakeCount++
 									pushToolResult(
 										await this.sayAndCreateMissingParamError("search_files", "regex"),
-										isClaude4ModelFamily,
+										isClaude4Model,
 									)
 									await this.saveCheckpoint()
 									break
@@ -2923,12 +3024,12 @@ export class Task {
 										true,
 									)
 								}
-								pushToolResult(results, isClaude4ModelFamily)
+								pushToolResult(results, isClaude4Model)
 								await this.saveCheckpoint()
 								break
 							}
 						} catch (error) {
-							await handleError("searching files", error, isClaude4ModelFamily)
+							await handleError("searching files", error, isClaude4Model)
 							await this.saveCheckpoint()
 							break
 						}
@@ -3323,8 +3424,21 @@ export class Task {
 
 								// now execute the tool
 								await this.say("mcp_server_request_started") // same as browser_action_result
+
+								// Check for any pending notifications before the tool call
+								const notificationsBefore = this.mcpHub.getPendingNotifications()
+								for (const notification of notificationsBefore) {
+									await this.say("mcp_notification", `[${notification.serverName}] ${notification.message}`)
+								}
+
 								const toolResult = await this.mcpHub.callTool(server_name, tool_name, parsedArguments)
 
+								// Check for any pending notifications after the tool call
+								const notificationsAfter = this.mcpHub.getPendingNotifications()
+								for (const notification of notificationsAfter) {
+									await this.say("mcp_notification", `[${notification.serverName}] ${notification.message}`)
+								}
+
 								// TODO: add progress indicator
 
 								const toolResultImages =
@@ -3498,8 +3612,15 @@ export class Task {
 											...sharedMessage,
 											selected: text,
 										} satisfies ClineAskQuestion)
-										await this.saveClineMessagesAndUpdateHistory()
-										telemetryService.captureOptionSelected(this.taskId, options.length, "act")
+										await saveClineMessagesAndUpdateHistory(
+											this.getContext(),
+											this.taskId,
+											this.clineMessages,
+											this.taskIsFavorited ?? false,
+											this.conversationHistoryDeletedRange,
+											this.checkpointTracker,
+											this.updateTaskHistory,
+										)
 									}
 								} else {
 									// Option not selected, send user feedback
@@ -3631,7 +3752,15 @@ export class Task {
 										this.conversationHistoryDeletedRange,
 										keepStrategy,
 									)
-									await this.saveClineMessagesAndUpdateHistory()
+									await saveClineMessagesAndUpdateHistory(
+										this.getContext(),
+										this.taskId,
+										this.clineMessages,
+										this.taskIsFavorited ?? false,
+										this.conversationHistoryDeletedRange,
+										this.checkpointTracker,
+										this.updateTaskHistory,
+									)
 									await this.contextManager.triggerApplyStandardContextTruncationNoticeChange(
 										Date.now(),
 										await ensureTaskDirectoryExists(this.getContext(), this.taskId),
@@ -3932,8 +4061,15 @@ export class Task {
 											...sharedMessage,
 											selected: text,
 										} satisfies ClinePlanModeResponse)
-										await this.saveClineMessagesAndUpdateHistory()
-										telemetryService.captureOptionSelected(this.taskId, options.length, "plan")
+										await saveClineMessagesAndUpdateHistory(
+											this.getContext(),
+											this.taskId,
+											this.clineMessages,
+											this.taskIsFavorited ?? false,
+											this.conversationHistoryDeletedRange,
+											this.checkpointTracker,
+											this.updateTaskHistory,
+										)
 									}
 								} else {
 									// Option not selected, send user feedback
@@ -4035,7 +4171,15 @@ export class Task {
 							) {
 								lastCompletionResultMessage.text += COMPLETION_RESULT_CHANGES_FLAG
 							}
-							await this.saveClineMessagesAndUpdateHistory()
+							await saveClineMessagesAndUpdateHistory(
+								this.getContext(),
+								this.taskId,
+								this.clineMessages,
+								this.taskIsFavorited ?? false,
+								this.conversationHistoryDeletedRange,
+								this.checkpointTracker,
+								this.updateTaskHistory,
+							)
 						}
 
 						try {
@@ -4329,8 +4473,8 @@ export class Task {
 		// 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
+			await this.say("checkpoint_created") // Now this is conditional
 			const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
 			if (lastCheckpointMessage) {
 				lastCheckpointMessage.lastCheckpointHash = commitHash
@@ -4370,7 +4514,15 @@ export class Task {
 		this.clineMessages[lastApiReqIndex].text = JSON.stringify({
 			request: userContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n"),
 		} satisfies ClineApiReqInfo)
-		await this.saveClineMessagesAndUpdateHistory()
+		await saveClineMessagesAndUpdateHistory(
+			this.getContext(),
+			this.taskId,
+			this.clineMessages,
+			this.taskIsFavorited ?? false,
+			this.conversationHistoryDeletedRange,
+			this.checkpointTracker,
+			this.updateTaskHistory,
+		)
 		await this.postStateToWebview()
 
 		try {
@@ -4441,7 +4593,15 @@ export class Task {
 
 				// update api_req_started to have cancelled and cost, so that we can display the cost of the partial stream
 				updateApiReqMsg(cancelReason, streamingFailedMessage)
-				await this.saveClineMessagesAndUpdateHistory()
+				await saveClineMessagesAndUpdateHistory(
+					this.getContext(),
+					this.taskId,
+					this.clineMessages,
+					this.taskIsFavorited ?? false,
+					this.conversationHistoryDeletedRange,
+					this.checkpointTracker,
+					this.updateTaskHistory,
+				)
 
 				telemetryService.captureConversationTurnEvent(
 					this.taskId,
@@ -4503,9 +4663,8 @@ export class Task {
 							assistantMessage += chunk.text
 							// parse raw assistant message into content blocks
 							const prevLength = this.assistantMessageContent.length
-							const isClaude4ModelFamily = await this.isClaude4ModelFamily()
-
-							if (isClaude4ModelFamily && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
+							const isClaude4Model = isClaude4ModelFamily(this.api)
+							if (isClaude4Model && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
 								this.assistantMessageContent = parseAssistantMessageV3(assistantMessage)
 							} else {
 								this.assistantMessageContent = parseAssistantMessageV2(assistantMessage)
@@ -4568,7 +4727,15 @@ export class Task {
 						totalCost = apiStreamUsage.totalCost
 					}
 					updateApiReqMsg()
-					await this.saveClineMessagesAndUpdateHistory()
+					await saveClineMessagesAndUpdateHistory(
+						this.getContext(),
+						this.taskId,
+						this.clineMessages,
+						this.taskIsFavorited ?? false,
+						this.conversationHistoryDeletedRange,
+						this.checkpointTracker,
+						this.updateTaskHistory,
+					)
 					await this.postStateToWebview()
 				})
 			}
@@ -4592,7 +4759,15 @@ export class Task {
 			}
 
 			updateApiReqMsg()
-			await this.saveClineMessagesAndUpdateHistory()
+			await saveClineMessagesAndUpdateHistory(
+				this.getContext(),
+				this.taskId,
+				this.clineMessages,
+				this.taskIsFavorited ?? false,
+				this.conversationHistoryDeletedRange,
+				this.checkpointTracker,
+				this.updateTaskHistory,
+			)
 			await this.postStateToWebview()
 
 			// now add to apiconversationhistory

src/core/task/message-state.ts

@@ -0,0 +1,66 @@
+import { combineApiRequests } from "@/shared/combineApiRequests"
+import { ensureTaskDirectoryExists, saveClineMessages } from "../storage/disk"
+import * as vscode from "vscode"
+import { ClineMessage } from "@/shared/ExtensionMessage"
+import { getApiMetrics } from "@/shared/getApiMetrics"
+import { combineCommandSequences } from "@/shared/combineCommandSequences"
+import { findLastIndex } from "@/shared/array"
+import getFolderSize from "get-folder-size"
+import os from "os"
+import * as path from "path"
+import CheckpointTracker from "@integrations/checkpoints/CheckpointTracker"
+import { HistoryItem } from "@/shared/HistoryItem"
+
+const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0) ?? path.join(os.homedir(), "Desktop") // may or may not exist but fs checking existence would immediately ask for permission which would be bad UX, need to come up with a better solution
+
+// need to call getContext() from the task object when passing in context
+export async function saveClineMessagesAndUpdateHistory(
+	context: vscode.ExtensionContext,
+	taskId: string,
+	clineMessages: ClineMessage[],
+	taskIsFavorited: boolean,
+	conversationHistoryDeletedRange: [number, number] | undefined,
+	checkpointTracker: CheckpointTracker | undefined,
+	updateTaskHistory: (historyItem: HistoryItem) => Promise<HistoryItem[]>,
+) {
+	try {
+		await saveClineMessages(context, taskId, clineMessages)
+
+		// combined as they are in ChatView
+		const apiMetrics = getApiMetrics(combineApiRequests(combineCommandSequences(clineMessages.slice(1))))
+		const taskMessage = clineMessages[0] // first message is always the task say
+		const lastRelevantMessage =
+			clineMessages[
+				findLastIndex(
+					clineMessages,
+					(message) => !(message.ask === "resume_task" || message.ask === "resume_completed_task"),
+				)
+			]
+		const taskDir = await ensureTaskDirectoryExists(context, taskId)
+		let taskDirSize = 0
+		try {
+			// getFolderSize.loose silently ignores errors
+			// returns # of bytes, size/1000/1000 = MB
+			taskDirSize = await getFolderSize.loose(taskDir)
+		} catch (error) {
+			console.error("Failed to get task directory size:", taskDir, error)
+		}
+		await updateTaskHistory({
+			id: taskId,
+			ts: lastRelevantMessage.ts,
+			task: taskMessage.text ?? "",
+			tokensIn: apiMetrics.totalTokensIn,
+			tokensOut: apiMetrics.totalTokensOut,
+			cacheWrites: apiMetrics.totalCacheWrites,
+			cacheReads: apiMetrics.totalCacheReads,
+			totalCost: apiMetrics.totalCost,
+			size: taskDirSize,
+			shadowGitConfigWorkTree: await checkpointTracker?.getShadowGitConfigWorkTree(),
+			cwdOnTaskInitialization: cwd,
+			conversationHistoryDeletedRange: conversationHistoryDeletedRange,
+			isFavorited: taskIsFavorited,
+		})
+	} catch (error) {
+		console.error("Failed to save cline messages:", error)
+	}
+}

src/core/webview/index.ts

@@ -9,6 +9,7 @@ import { readFile } from "fs/promises"
 import path from "node:path"
 import { WebviewProviderType } from "@/shared/webview/types"
 import { sendThemeEvent } from "@core/controller/ui/subscribeToTheme"
+import { v4 as uuidv4 } from "uuid"
 
 /*
 https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
@@ -19,9 +20,11 @@ export class WebviewProvider implements vscode.WebviewViewProvider {
 	public static readonly sideBarId = "claude-dev.SidebarProvider" // used in package.json as the view's id. This value cannot be changed due to how vscode caches views based on their id, and updating the id would break existing instances of the extension.
 	public static readonly tabPanelId = "claude-dev.TabPanelProvider"
 	private static activeInstances: Set<WebviewProvider> = new Set()
+	private static clientIdMap = new Map<WebviewProvider, string>()
 	public view?: vscode.WebviewView | vscode.WebviewPanel
 	private disposables: vscode.Disposable[] = []
 	controller: Controller
+	private clientId: string
 
 	constructor(
 		readonly context: vscode.ExtensionContext,
@@ -29,9 +32,21 @@ export class WebviewProvider implements vscode.WebviewViewProvider {
 		private readonly providerType: WebviewProviderType = WebviewProviderType.TAB, // Default to tab provider
 	) {
 		WebviewProvider.activeInstances.add(this)
+		this.clientId = uuidv4()
+		WebviewProvider.clientIdMap.set(this, this.clientId)
 		this.controller = new Controller(context, outputChannel, (message) => this.view?.webview.postMessage(message))
 	}
 
+	// Add a method to get the client ID
+	public getClientId(): string {
+		return this.clientId
+	}
+
+	// Add a static method to get the client ID for a specific instance
+	public static getClientIdForInstance(instance: WebviewProvider): string | undefined {
+		return WebviewProvider.clientIdMap.get(instance)
+	}
+
 	async dispose() {
 		if (this.view && "dispose" in this.view) {
 			this.view.dispose()
@@ -44,6 +59,8 @@ export class WebviewProvider implements vscode.WebviewViewProvider {
 		}
 		await this.controller.dispose()
 		WebviewProvider.activeInstances.delete(this)
+		// Remove from client ID map
+		WebviewProvider.clientIdMap.delete(this)
 	}
 
 	public static getVisibleInstance(): WebviewProvider | undefined {
@@ -245,6 +262,9 @@ export class WebviewProvider implements vscode.WebviewViewProvider {
 				 <script type="text/javascript" nonce="${nonce}">
                     // Inject the provider type
                     window.WEBVIEW_PROVIDER_TYPE = ${JSON.stringify(this.providerType)};
+                    
+                    // Inject the client ID
+                    window.clineClientId = "${this.clientId}";
                 </script>
 				<script type="module" nonce="${nonce}" src="${scriptUri}"></script>
 			</body>
@@ -358,6 +378,9 @@ export class WebviewProvider implements vscode.WebviewViewProvider {
 					<script type="text/javascript" nonce="${nonce}">
 						// Inject the provider type
 						window.WEBVIEW_PROVIDER_TYPE = ${JSON.stringify(this.providerType)};
+						
+						// Inject the client ID
+						window.clineClientId = "${this.clientId}";
 					</script>
 					${reactRefresh}
 					<script type="module" src="${scriptUri}"></script>

src/exports/README.md

@@ -18,13 +18,6 @@ The Cline extension exposes an API that can be used by other extensions. To use
     if (cline) {
     	// Now you can use the API
 
-    	// Set custom instructions
-    	await cline.setCustomInstructions("Talk like a pirate")
-
-    	// Get custom instructions
-    	const instructions = await cline.getCustomInstructions()
-    	console.log("Current custom instructions:", instructions)
-
     	// Start a new task with an initial message
     	await cline.startNewTask("Hello, Cline! Let's make a new project...")
 

src/exports/__tests__/cline-api.test.ts

@@ -65,59 +65,6 @@ describe("ClineAPI Core Functionality", () => {
 		sandbox.restore()
 	})
 
-	describe("setCustomInstructions", () => {
-		it("should update custom instructions in controller", async () => {
-			const testInstructions = "Test custom instructions"
-
-			await api.setCustomInstructions(testInstructions)
-
-			// Verify controller method was called
-			sinon.assert.calledOnce(mockController.updateCustomInstructions)
-			sinon.assert.calledWith(mockController.updateCustomInstructions, testInstructions)
-
-			// Verify output channel was updated
-			sinon.assert.calledWith(mockOutputChannel.appendLine, "Custom instructions set")
-		})
-
-		it("should handle empty instructions", async () => {
-			await api.setCustomInstructions("")
-
-			sinon.assert.calledWith(mockController.updateCustomInstructions, "")
-			sinon.assert.calledWith(mockOutputChannel.appendLine, "Custom instructions set")
-		})
-
-		it("should handle very long instructions", async () => {
-			const longInstructions = "a".repeat(10000)
-
-			await api.setCustomInstructions(longInstructions)
-
-			sinon.assert.calledWith(mockController.updateCustomInstructions, longInstructions)
-		})
-	})
-
-	describe("getCustomInstructions", () => {
-		it("should retrieve custom instructions from state", async () => {
-			const testInstructions = "Retrieved instructions"
-			// The real implementation uses getGlobalState from the state module
-			getGlobalStateStub.resolves(testInstructions)
-
-			const result = await api.getCustomInstructions()
-
-			result!.should.equal(testInstructions)
-			sinon.assert.calledWith(getGlobalStateStub, mockController.context, "customInstructions")
-		})
-
-		it("should return undefined when no instructions set", async () => {
-			// The real implementation uses getGlobalState from the state module
-			getGlobalStateStub.resolves(undefined)
-
-			const result = await api.getCustomInstructions()
-
-			should.not.exist(result)
-			sinon.assert.calledWith(getGlobalStateStub, mockController.context, "customInstructions")
-		})
-	})
-
 	describe("startNewTask", () => {
 		it("should clear existing task and start new one with description", async () => {
 			const taskDescription = "Create a test function"
@@ -260,17 +207,6 @@ describe("ClineAPI Core Functionality", () => {
 	})
 
 	describe("Error Handling", () => {
-		it("should handle errors in setCustomInstructions", async () => {
-			mockController.updateCustomInstructions.rejects(new Error("Update failed"))
-
-			try {
-				await api.setCustomInstructions("test")
-				should.fail("", "", "Should have thrown an error", "")
-			} catch (error: any) {
-				error.message.should.equal("Update failed")
-			}
-		})
-
 		it("should handle errors in task initialization", async () => {
 			mockController.initTask.rejects(new Error("Init failed"))
 

src/exports/cline.d.ts

@@ -1,16 +1,4 @@
 export interface ClineAPI {
-	/**
-	 * Sets the custom instructions in the global storage.
-	 * @param value The custom instructions to be saved.
-	 */
-	setCustomInstructions(value: string): Promise<void>
-
-	/**
-	 * Retrieves the custom instructions from the global storage.
-	 * @returns The saved custom instructions, or undefined if not set.
-	 */
-	getCustomInstructions(): Promise<string | undefined>
-
 	/**
 	 * Starts a new task with an optional initial message and images.
 	 * @param task Optional initial task message.

src/exports/index.ts

@@ -7,15 +7,6 @@ import { WebviewProviderType as WebviewProviderTypeEnum } from "@shared/proto/ui
 
 export function createClineAPI(outputChannel: vscode.OutputChannel, sidebarController: Controller): ClineAPI {
 	const api: ClineAPI = {
-		setCustomInstructions: async (value: string) => {
-			await sidebarController.updateCustomInstructions(value)
-			outputChannel.appendLine("Custom instructions set")
-		},
-
-		getCustomInstructions: async () => {
-			return (await getGlobalState(sidebarController.context, "customInstructions")) as string | undefined
-		},
-
 		startNewTask: async (task?: string, images?: string[]) => {
 			outputChannel.appendLine("Starting new task")
 			await sidebarController.clearTask()

src/extension.ts

@@ -22,8 +22,10 @@ import { WebviewProviderType as WebviewProviderTypeEnum } from "@shared/proto/ui
 import { WebviewProviderType } from "./shared/webview/types"
 import { sendHistoryButtonClickedEvent } from "./core/controller/ui/subscribeToHistoryButtonClicked"
 import { sendAccountButtonClickedEvent } from "./core/controller/ui/subscribeToAccountButtonClicked"
-import { migratePlanActGlobalToWorkspaceStorage } from "./core/storage/state"
+import { migratePlanActGlobalToWorkspaceStorage, migrateCustomInstructionsToGlobalRules } from "./core/storage/state"
 
+import { sendFocusChatInputEvent } from "./core/controller/ui/subscribeToFocusChatInput"
+import { FileContextTracker } from "./core/context/context-tracking/FileContextTracker"
 /*
 Built using https://github.com/microsoft/vscode-webview-ui-toolkit
 
@@ -48,6 +50,12 @@ export async function activate(context: vscode.ExtensionContext) {
 	// Migrate global storage values to workspace storage (one-time cleanup)
 	await migratePlanActGlobalToWorkspaceStorage(context)
 
+	// Migrate custom instructions to global Cline rules (one-time cleanup)
+	await migrateCustomInstructionsToGlobalRules(context)
+
+	// Clean up orphaned file context warnings (startup cleanup)
+	await FileContextTracker.cleanupOrphanedWarnings(context)
+
 	// Version checking for autoupdate notification
 	const currentVersion = context.extension.packageJSON.version
 	const previousVersion = context.globalState.get<string>("clineVersion")
@@ -589,10 +597,9 @@ export async function activate(context: vscode.ExtensionContext) {
 			// At this point, activeWebviewProvider should be the one we want to send the message to.
 			// It could still be undefined if opening a new tab failed or timed out.
 			if (activeWebviewProvider) {
-				activeWebviewProvider.controller.postMessageToWebview({
-					type: "action",
-					action: "focusChatInput",
-				})
+				// Use the gRPC streaming method instead of postMessageToWebview
+				const clientId = activeWebviewProvider.getClientId()
+				sendFocusChatInputEvent(clientId)
 			} else {
 				console.error("FocusChatInput: Could not find or activate a Cline webview to focus.")
 				vscode.window.showErrorMessage(

src/hosts/external/client/host-bridge-client.ts

@@ -1,23 +0,0 @@
-import { StringRequest } from "@/shared/proto/common"
-import { Uri } from "@/shared/proto/host/uri"
-import { FileChangeEvent_ChangeType, SubscribeToFileRequest } from "@/shared/proto/host/watch"
-
-const UriServiceClient = {
-	parse: function (_: StringRequest): Uri {
-		throw Error("Unimplemented")
-	},
-}
-const WatchServiceClient = {
-	subscribeToFile: function (
-		_r: SubscribeToFileRequest,
-		_h: {
-			onResponse?: (response: { type: FileChangeEvent_ChangeType }) => void | Promise<void>
-			onError?: (error: any) => void
-			onComplete?: () => void
-		},
-	) {
-		throw Error("Unimplemented")
-	},
-}
-
-export { UriServiceClient, WatchServiceClient }

src/hosts/host-bridge-client.ts

@@ -1,6 +1,5 @@
 import * as VscodeClient from "./vscode/client/host-grpc-client"
-import * as ExternalClient from "./external/client/host-bridge-client"
-
+import * as ExternalClient from "@/standalone/host-bridge-client-manager"
 const isHostBridgeExternal = process.env.HOST_BRIDGE_ADDRESS !== undefined && process.env.HOST_BRIDGE_ADDRESS !== "vscode"
 const Client = isHostBridgeExternal ? ExternalClient : VscodeClient
 

src/hosts/vscode/client/host-grpc-client-base.ts

@@ -33,10 +33,11 @@ export function createGrpcClient<T extends ProtoService>(service: T): GrpcClient
 	const grpcHandler = new GrpcHandler()
 
 	Object.values(service.methods).forEach((method) => {
+		// Use lowercase method name as the key in the client object
+		const methodKey = method.name.charAt(0).toLowerCase() + method.name.slice(1)
+
 		// Streaming method implementation
 		if (method.responseStream) {
-			// Use lowercase method name as the key in the client object
-			const methodKey = method.name.charAt(0).toLowerCase() + method.name.slice(1)
 			client[methodKey as keyof GrpcClientType<T>] = ((
 				request: any,
 				options: StreamingCallbacks<InstanceType<typeof method.responseType>>,
@@ -75,7 +76,6 @@ export function createGrpcClient<T extends ProtoService>(service: T): GrpcClient
 			}) as any
 		} else {
 			// Unary method implementation
-			const methodKey = method.name.charAt(0).toLowerCase() + method.name.slice(1)
 			client[methodKey as keyof GrpcClientType<T>] = ((request: any) => {
 				return new Promise(async (resolve, reject) => {
 					const requestId = uuidv4()
@@ -84,15 +84,12 @@ export function createGrpcClient<T extends ProtoService>(service: T): GrpcClient
 						const response = await grpcHandler.handleRequest(service.fullName, methodKey, request, requestId)
 						console.log(`[DEBUG] gRPC host resp to ${service.fullName}.${methodKey} req:${requestId}`)
 
-						// Check if the response is a function (streaming) or an object (unary)
+						// Check if the response is a function (streaming)
 						if (typeof response === "function") {
 							// This shouldn't happen for unary requests
 							throw new Error("Received streaming response for unary request")
-						} else if (response && response.message) {
-							resolve(response.message)
-						} else {
-							throw new Error("gRPC response didn't have a message")
 						}
+						resolve(response)
 					} catch (e) {
 						console.log(`[DEBUG] gRPC host ERR to ${service.fullName}.${methodKey} req:${requestId} err:${e}`)
 						reject(e)
@@ -101,6 +98,5 @@ export function createGrpcClient<T extends ProtoService>(service: T): GrpcClient
 			}) as any
 		}
 	})
-
 	return client
 }

src/hosts/vscode/host-grpc-handler.ts

@@ -1,5 +1,4 @@
-import { v4 as uuidv4 } from "uuid"
-import { hostServiceHandlers } from "./host-grpc-service-config"
+import { HostServiceHandlerConfig, hostServiceHandlers } from "./host-grpc-service-config"
 import { GrpcRequestRegistry } from "@core/controller/grpc-request-registry"
 
 /**
@@ -20,13 +19,13 @@ export interface StreamingCallbacks<T = any> {
 }
 
 /**
- * Handles gRPC requests from the webview
+ * Handles gRPC requests for the host bridge.
  */
 export class GrpcHandler {
 	constructor() {}
 
 	/**
-	 * Handle a gRPC request from the webview
+	 * Handle a gRPC request for the host bridge.
 	 * @param service The service name
 	 * @param method The method name
 	 * @param message The request message
@@ -37,90 +36,71 @@ export class GrpcHandler {
 	async handleRequest<T = any>(
 		service: string,
 		method: string,
-		message: any,
+		request: any,
 		requestId: string,
 		streamingCallbacks?: StreamingCallbacks<T>,
-	): Promise<
-		| {
-				message?: any
-				error?: string
-				request_id: string
-		  }
-		| (() => void)
-	> {
+	): Promise<any | (() => void)> {
+		if (!streamingCallbacks) {
+			return this.handleUnaryRequest(service, method, request)
+		}
+
 		// If streaming callbacks are provided, handle as a streaming request
-		if (streamingCallbacks) {
-			let completionCalled = false
+		let completionCalled = false
 
-			// Create a response handler that will call the client's callbacks
-			const responseHandler: StreamingResponseHandler = async (response, isLast = false, sequenceNumber) => {
-				try {
-					// Call the client's onResponse callback with the response
-					streamingCallbacks.onResponse(response)
-
-					// If this is the last response, call the onComplete callback
-					if (isLast && streamingCallbacks.onComplete && !completionCalled) {
-						completionCalled = true
-						streamingCallbacks.onComplete()
-					}
-				} catch (error) {
-					// If there's an error in the callback, call the onError callback
-					if (streamingCallbacks.onError) {
-						streamingCallbacks.onError(error instanceof Error ? error : new Error(String(error)))
-					}
-				}
-			}
-
-			// Register the response handler with the registry
-			requestRegistry.registerRequest(
-				requestId,
-				() => {
-					console.log(`[DEBUG] Cleaning up streaming request: ${requestId}`)
-					if (streamingCallbacks.onComplete && !completionCalled) {
-						completionCalled = true
-						streamingCallbacks.onComplete()
-					}
-				},
-				{ type: "streaming_request", service, method },
-				responseHandler,
-			)
-
-			// Call the streaming handler directly
-			console.log(`[DEBUG] Streaming gRPC host call to ${service}.${method} req:${requestId}`)
+		// Create a response handler that will call the client's callbacks
+		const responseHandler: StreamingResponseHandler = async (response, isLast = false, sequenceNumber) => {
 			try {
-				await this.handleStreamingRequest(service, method, message, requestId)
+				// Call the client's onResponse callback with the response
+				streamingCallbacks.onResponse(response)
+
+				// If this is the last response, call the onComplete callback
+				if (isLast && streamingCallbacks.onComplete && !completionCalled) {
+					completionCalled = true
+					streamingCallbacks.onComplete()
+				}
 			} catch (error) {
+				// If there's an error in the callback, call the onError callback
 				if (streamingCallbacks.onError) {
 					streamingCallbacks.onError(error instanceof Error ? error : new Error(String(error)))
 				}
 			}
-
-			// Return a function to cancel the stream
-			return () => {
-				console.log(`[DEBUG] Cancelling streaming request: ${requestId}`)
-				this.cancelRequest(requestId)
-			}
 		}
 
-		// Handle as a unary request
+		// Register the response handler with the registry
+		requestRegistry.registerRequest(
+			requestId,
+			() => {
+				console.log(`[DEBUG] Cleaning up streaming request: ${requestId}`)
+				if (streamingCallbacks.onComplete && !completionCalled) {
+					completionCalled = true
+					streamingCallbacks.onComplete()
+				}
+			},
+			{ type: "streaming_request", service, method },
+			responseHandler,
+		)
+
+		// Call the streaming handler directly
+		console.log(`[DEBUG] Streaming gRPC host call to ${service}.${method} req:${requestId}`)
 		try {
-			// Get the service handler from the config
-			const serviceConfig = hostServiceHandlers[service]
-			if (!serviceConfig) {
-				throw new Error(`Unknown service: ${service}`)
-			}
-
-			// Handle unary request
-			return {
-				message: await serviceConfig.requestHandler(method, message),
-				request_id: requestId,
-			}
+			await this.handleStreamingRequest(service, method, request, requestId)
 		} catch (error) {
-			return {
-				error: error instanceof Error ? error.message : String(error),
-				request_id: requestId,
+			if (streamingCallbacks.onError) {
+				streamingCallbacks.onError(error instanceof Error ? error : new Error(String(error)))
 			}
 		}
+
+		// Return a function to cancel the stream
+		return () => {
+			console.log(`[DEBUG] Cancelling streaming request: ${requestId}`)
+			this.cancelRequest(requestId)
+		}
+	}
+
+	private async handleUnaryRequest(service: string, method: string, request: any): Promise<any> {
+		const serviceConfig = this.getServiceHandlerConfig(service)
+		const response = await serviceConfig.requestHandler(method, request)
+		return response
 	}
 
 	/**
@@ -129,27 +109,25 @@ export class GrpcHandler {
 	 * @returns True if the request was found and cancelled, false otherwise
 	 */
 	public async cancelRequest(requestId: string): Promise<boolean> {
-		const cancelled = requestRegistry.cancelRequest(requestId)
-
-		if (cancelled) {
-			// Get the registered response handler from the registry
-			const requestInfo = requestRegistry.getRequestInfo(requestId)
-			if (requestInfo && requestInfo.responseStream) {
-				try {
-					// Send cancellation confirmation using the registered response handler
-					await requestInfo.responseStream(
-						{ cancelled: true },
-						true, // Mark as last message
-					)
-				} catch (e) {
-					console.error(`Error sending cancellation response for ${requestId}:`, e)
-				}
-			}
-		} else {
-			console.log(`[DEBUG] Request not found for cancellation: ${requestId}`)
+		const requestInfo = requestRegistry.getRequestInfo(requestId)
+		if (!requestInfo) {
+			return false
 		}
 
-		return cancelled
+		const cancelled = requestRegistry.cancelRequest(requestId)
+		if (!cancelled) {
+			console.log(`[DEBUG] Request not found for cancellation: ${requestId}`)
+			return false
+		}
+		if (requestInfo.responseStream) {
+			try {
+				// Send cancellation confirmation using the registered response handler
+				await requestInfo.responseStream({ cancelled: true }, true /* isLast */)
+			} catch (e) {
+				console.error(`Error sending cancellation response for ${requestId}:`, e)
+			}
+		}
+		return true
 	}
 
 	/**
@@ -160,11 +138,7 @@ export class GrpcHandler {
 	 * @param requestId The request ID for response correlation
 	 */
 	private async handleStreamingRequest(service: string, method: string, message: any, requestId: string): Promise<void> {
-		// Get the service handler from the config
-		const serviceConfig = hostServiceHandlers[service]
-		if (!serviceConfig) {
-			throw new Error(`Unknown service: ${service}`)
-		}
+		const serviceConfig = this.getServiceHandlerConfig(service)
 
 		// Check if the service supports streaming
 		if (!serviceConfig.streamingHandler) {
@@ -186,6 +160,13 @@ export class GrpcHandler {
 		// Don't send a final message here - the stream should stay open for future updates
 		// The stream will be closed when the client disconnects or when the service explicitly ends it
 	}
+
+	private getServiceHandlerConfig(serviceName: string): HostServiceHandlerConfig {
+		if (!(serviceName in hostServiceHandlers)) {
+			throw new Error(`Unknown service: ${serviceName}`)
+		}
+		return hostServiceHandlers[serviceName]
+	}
 }
 
 /**

src/integrations/checkpoints/CheckpointExclusions.ts

@@ -83,6 +83,7 @@ function getBuildArtifactPatterns(): string[] {
 		".sass-cache/",
 		".vs/",
 		".vscode/",
+		".clinerules/",
 		"Pods/",
 		"__pycache__/",
 		"bin/",

src/integrations/claude-code/run.ts

@@ -0,0 +1,45 @@
+import * as vscode from "vscode"
+import Anthropic from "@anthropic-ai/sdk"
+import { execa } from "execa"
+
+const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)
+
+export function runClaudeCode({
+	systemPrompt,
+	messages,
+	path,
+	modelId,
+}: {
+	systemPrompt: string
+	messages: Anthropic.Messages.MessageParam[]
+	path?: string
+	modelId?: string
+}) {
+	const claudePath = path || "claude"
+
+	// TODO: Is it worh using sessions? Where do we store the session ID?
+	const args = [
+		"-p",
+		JSON.stringify(messages),
+		"--system-prompt",
+		systemPrompt,
+		"--verbose",
+		"--output-format",
+		"stream-json",
+		// Cline will handle recursive calls
+		"--max-turns",
+		"1",
+	]
+
+	if (modelId) {
+		args.push("--model", modelId)
+	}
+
+	return execa(claudePath, args, {
+		stdin: "ignore",
+		stdout: "pipe",
+		stderr: "pipe",
+		env: process.env,
+		cwd,
+	})
+}

src/integrations/claude-code/types.ts

@@ -0,0 +1,52 @@
+type InitMessage = {
+	type: "system"
+	subtype: "init"
+	session_id: string
+	tools: string[]
+	mcp_servers: string[]
+}
+
+type ClaudeCodeContent = {
+	type: "text"
+	text: string
+}
+
+type AssistantMessage = {
+	type: "assistant"
+	message: {
+		id: string
+		type: "message"
+		role: "assistant"
+		model: string
+		content: ClaudeCodeContent[]
+		stop_reason: null
+		stop_sequence: null
+		usage: {
+			input_tokens: number
+			cache_creation_input_tokens?: number
+			cache_read_input_tokens?: number
+			output_tokens: number
+			service_tier: "standard"
+		}
+	}
+	session_id: string
+}
+
+type ErrorMessage = {
+	type: "error"
+}
+
+type ResultMessage = {
+	type: "result"
+	subtype: "success"
+	cost_usd: number
+	is_error: boolean
+	duration_ms: number
+	duration_api_ms: number
+	num_turns: number
+	result: string
+	total_cost: number
+	session_id: string
+}
+
+export type ClaudeCodeMessage = InitMessage | AssistantMessage | ErrorMessage | ResultMessage

src/integrations/terminal/TerminalManager.ts

@@ -1,6 +1,7 @@
 import pWaitFor from "p-wait-for"
 import * as vscode from "vscode"
 import { arePathsEqual } from "@utils/path"
+import { getShellForProfile } from "@utils/shell"
 import { mergePromise, TerminalProcess, TerminalProcessResultPromise } from "./TerminalProcess"
 import { TerminalInfo, TerminalRegistry } from "./TerminalRegistry"
 
@@ -95,6 +96,8 @@ export class TerminalManager {
 	private disposables: vscode.Disposable[] = []
 	private shellIntegrationTimeout: number = 4000
 	private terminalReuseEnabled: boolean = true
+	private terminalOutputLineLimit: number = 500
+	private defaultTerminalProfile: string = "default"
 
 	constructor() {
 		let disposable: vscode.Disposable | undefined
@@ -153,12 +156,16 @@ export class TerminalManager {
 	}
 
 	runCommand(terminalInfo: TerminalInfo, command: string): TerminalProcessResultPromise {
+		console.log(`[TerminalManager] Running command on terminal ${terminalInfo.id}: "${command}"`)
+		console.log(`[TerminalManager] Terminal ${terminalInfo.id} busy state before: ${terminalInfo.busy}`)
+
 		terminalInfo.busy = true
 		terminalInfo.lastCommand = command
 		const process = new TerminalProcess()
 		this.processes.set(terminalInfo.id, process)
 
 		process.once("completed", () => {
+			console.log(`[TerminalManager] Terminal ${terminalInfo.id} completed, setting busy to false`)
 			terminalInfo.busy = false
 		})
 
@@ -218,26 +225,40 @@ export class TerminalManager {
 
 	async getOrCreateTerminal(cwd: string): Promise<TerminalInfo> {
 		const terminals = TerminalRegistry.getAllTerminals()
+		const expectedShellPath =
+			this.defaultTerminalProfile !== "default" ? getShellForProfile(this.defaultTerminalProfile) : undefined
 
 		// Find available terminal from our pool first (created for this task)
+		console.log(`[TerminalManager] Looking for terminal in cwd: ${cwd}`)
+		console.log(`[TerminalManager] Available terminals: ${terminals.length}`)
+
 		const matchingTerminal = terminals.find((t) => {
 			if (t.busy) {
+				console.log(`[TerminalManager] Terminal ${t.id} is busy, skipping`)
+				return false
+			}
+			// Check if shell path matches current configuration
+			if (t.shellPath !== expectedShellPath) {
 				return false
 			}
 			const terminalCwd = t.terminal.shellIntegration?.cwd // one of cline's commands could have changed the cwd of the terminal
 			if (!terminalCwd) {
+				console.log(`[TerminalManager] Terminal ${t.id} has no cwd, skipping`)
 				return false
 			}
-			return arePathsEqual(vscode.Uri.file(cwd).fsPath, terminalCwd.fsPath)
+			const matches = arePathsEqual(vscode.Uri.file(cwd).fsPath, terminalCwd.fsPath)
+			console.log(`[TerminalManager] Terminal ${t.id} cwd: ${terminalCwd.fsPath}, matches: ${matches}`)
+			return matches
 		})
 		if (matchingTerminal) {
+			console.log(`[TerminalManager] Found matching terminal ${matchingTerminal.id} in correct cwd`)
 			this.terminalIds.add(matchingTerminal.id)
 			return matchingTerminal
 		}
 
 		// If no non-busy terminal in the current working dir exists and terminal reuse is enabled, try to find any non-busy terminal regardless of CWD
 		if (this.terminalReuseEnabled) {
-			const availableTerminal = terminals.find((t) => !t.busy)
+			const availableTerminal = terminals.find((t) => !t.busy && t.shellPath === expectedShellPath)
 			if (availableTerminal) {
 				// Set up promise and tracking for CWD change
 				const cwdPromise = new Promise<void>((resolve, reject) => {
@@ -246,7 +267,13 @@ export class TerminalManager {
 				})
 
 				// Navigate back to the desired directory
-				await this.runCommand(availableTerminal, `cd "${cwd}"`)
+				const cdProcess = this.runCommand(availableTerminal, `cd "${cwd}"`)
+
+				// Wait for the cd command to complete before proceeding
+				await cdProcess
+
+				// Add a small delay to ensure terminal is ready after cd
+				await new Promise((resolve) => setTimeout(resolve, 100))
 
 				// Either resolve immediately if CWD already updated or wait for event/timeout
 				if (this.isCwdMatchingExpected(availableTerminal)) {
@@ -275,8 +302,8 @@ export class TerminalManager {
 			}
 		}
 
-		// If all terminals are busy, create a new one
-		const newTerminalInfo = TerminalRegistry.createTerminal(cwd)
+		// If all terminals are busy or don't match shell profile, create a new one with the configured shell
+		const newTerminalInfo = TerminalRegistry.createTerminal(cwd, expectedShellPath)
 		this.terminalIds.add(newTerminalInfo.id)
 		return newTerminalInfo
 	}
@@ -318,4 +345,117 @@ export class TerminalManager {
 	setTerminalReuseEnabled(enabled: boolean): void {
 		this.terminalReuseEnabled = enabled
 	}
+
+	setTerminalOutputLineLimit(limit: number): void {
+		this.terminalOutputLineLimit = limit
+	}
+
+	public processOutput(outputLines: string[]): string {
+		if (outputLines.length > this.terminalOutputLineLimit) {
+			const halfLimit = Math.floor(this.terminalOutputLineLimit / 2)
+			const start = outputLines.slice(0, halfLimit)
+			const end = outputLines.slice(outputLines.length - halfLimit)
+			return `${start.join("\n")}\n... (output truncated) ...\n${end.join("\n")}`.trim()
+		}
+		return outputLines.join("\n").trim()
+	}
+
+	setDefaultTerminalProfile(profileId: string): { closedCount: number; busyTerminals: TerminalInfo[] } {
+		// Only handle terminal change if profile actually changed
+		if (this.defaultTerminalProfile === profileId) {
+			return { closedCount: 0, busyTerminals: [] }
+		}
+
+		const oldProfileId = this.defaultTerminalProfile
+		this.defaultTerminalProfile = profileId
+
+		// Get the shell path for the new profile
+		const newShellPath = profileId !== "default" ? getShellForProfile(profileId) : undefined
+
+		// Handle terminal management for the profile change
+		const result = this.handleTerminalProfileChange(newShellPath)
+
+		// Update lastActive for any remaining terminals
+		const allTerminals = TerminalRegistry.getAllTerminals()
+		allTerminals.forEach((terminal) => {
+			if (terminal.shellPath !== newShellPath) {
+				TerminalRegistry.updateTerminal(terminal.id, { lastActive: Date.now() })
+			}
+		})
+
+		return result
+	}
+
+	/**
+	 * Filters terminals based on a provided criteria function
+	 * @param filterFn Function that accepts TerminalInfo and returns boolean
+	 * @returns Array of terminals that match the criteria
+	 */
+	filterTerminals(filterFn: (terminal: TerminalInfo) => boolean): TerminalInfo[] {
+		const terminals = TerminalRegistry.getAllTerminals()
+		return terminals.filter(filterFn)
+	}
+
+	/**
+	 * Closes terminals that match the provided criteria
+	 * @param filterFn Function that accepts TerminalInfo and returns boolean for terminals to close
+	 * @param force If true, closes even busy terminals (with warning)
+	 * @returns Number of terminals closed
+	 */
+	closeTerminals(filterFn: (terminal: TerminalInfo) => boolean, force: boolean = false): number {
+		const terminalsToClose = this.filterTerminals(filterFn)
+		let closedCount = 0
+
+		for (const terminalInfo of terminalsToClose) {
+			// Skip busy terminals unless force is true
+			if (terminalInfo.busy && !force) {
+				continue
+			}
+
+			// Remove from our tracking
+			if (this.terminalIds.has(terminalInfo.id)) {
+				this.terminalIds.delete(terminalInfo.id)
+			}
+			this.processes.delete(terminalInfo.id)
+
+			// Dispose the actual terminal
+			terminalInfo.terminal.dispose()
+
+			// Remove from registry
+			TerminalRegistry.removeTerminal(terminalInfo.id)
+
+			closedCount++
+		}
+
+		return closedCount
+	}
+
+	/**
+	 * Handles terminal management when the terminal profile changes
+	 * @param newShellPath New shell path to use
+	 * @returns Object with information about closed terminals and remaining busy terminals
+	 */
+	handleTerminalProfileChange(newShellPath: string | undefined): {
+		closedCount: number
+		busyTerminals: TerminalInfo[]
+	} {
+		// Close non-busy terminals with different shell path
+		const closedCount = this.closeTerminals((terminal) => !terminal.busy && terminal.shellPath !== newShellPath, false)
+
+		// Get remaining busy terminals with different shell path
+		const busyTerminals = this.filterTerminals((terminal) => terminal.busy && terminal.shellPath !== newShellPath)
+
+		return {
+			closedCount,
+			busyTerminals,
+		}
+	}
+
+	/**
+	 * Forces closure of all terminals (including busy ones)
+	 * @returns Number of terminals closed
+	 */
+	closeAllTerminals(): number {
+		return this.closeTerminals(() => true, true)
+	}
 }

src/integrations/terminal/TerminalProcess.ts

@@ -23,20 +23,84 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 	private lastRetrievedIndex: number = 0
 	isHot: boolean = false
 	private hotTimer: NodeJS.Timeout | null = null
+	private command: string = ""
+	private gracePeriodTimer: NodeJS.Timeout | null = null
+	private hasEmittedCompleted: boolean = false
 
 	// constructor() {
 	// 	super()
 
 	async run(terminal: vscode.Terminal, command: string) {
+		// Clear any existing grace period timer from previous commands
+		if (this.gracePeriodTimer) {
+			clearTimeout(this.gracePeriodTimer)
+			this.gracePeriodTimer = null
+			console.log(`[TerminalProcess] Cleared existing grace period timer before starting new command`)
+		}
+
+		// Clear any existing hot timer
+		if (this.hotTimer) {
+			clearTimeout(this.hotTimer)
+			this.hotTimer = null
+		}
+
+		// Reset state for new command
+		this.hasEmittedCompleted = false
+		this.buffer = ""
+		this.fullOutput = ""
+		this.lastRetrievedIndex = 0
+		this.isListening = true
+		this.isHot = false
+
+		this.command = command
+		console.log(`[TerminalProcess] Starting command: "${command}"`)
+		console.log(`[TerminalProcess] Shell integration available: ${!!terminal.shellIntegration?.executeCommand}`)
+		console.log(`[TerminalProcess] Terminal ID: ${terminal.name}`)
 		if (terminal.shellIntegration && terminal.shellIntegration.executeCommand) {
-			const execution = terminal.shellIntegration.executeCommand(command)
-			const stream = execution.read()
+			let execution
+			let stream
+
+			try {
+				execution = terminal.shellIntegration.executeCommand(command)
+				stream = execution.read()
+			} catch (error) {
+				console.error(`[TerminalProcess] Failed to execute command: ${error}`)
+				this.emit("error", error as Error)
+				return
+			}
+
 			// todo: need to handle errors
 			let isFirstChunk = true
 			let didOutputNonCommand = false
 			let didEmitEmptyLine = false
+			let receivedFirstChunk = false
+
+			// Set up a timeout to emit empty line if no output is received within 3 seconds
+			// This ensures the "proceed while running" button appears even for commands with no/delayed output
+			const firstChunkTimeout = setTimeout(() => {
+				if (!receivedFirstChunk && !didEmitEmptyLine) {
+					console.log(`[TerminalProcess] First chunk timeout fired - no output received within 3s for: "${command}"`)
+					this.emit("line", "") // empty line to show proceed button
+					didEmitEmptyLine = true
+
+					// Also emit a message indicating the command might be running without output
+					this.emit("line", "[Command is running but producing no output]")
+				}
+			}, 3000) // 3 second timeout
 
 			for await (let data of stream) {
+				// Clear the timeout since we received output
+				if (!receivedFirstChunk) {
+					clearTimeout(firstChunkTimeout)
+					receivedFirstChunk = true
+					console.log(`[TerminalProcess] First chunk received for command: "${command}"`)
+				}
+
+				// Log raw data length
+				console.log(`[TerminalProcess] Raw data chunk received: ${data.length} chars`)
+				if (!data || data.trim() === "") {
+					console.log(`[TerminalProcess] WARNING: Received empty or whitespace-only chunk`)
+				}
 				// 1. Process chunk and remove artifacts
 				if (isFirstChunk) {
 					/*
@@ -176,14 +240,79 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 
 			this.emitRemainingBufferIfListening()
 
+			// Clean up the first chunk timeout if it's still active
+			if (!receivedFirstChunk) {
+				clearTimeout(firstChunkTimeout)
+				console.log(`[TerminalProcess] WARNING: Stream ended without receiving any chunks for command: "${command}"`)
+
+				// If we never received any chunks and haven't emitted anything yet, emit now
+				if (!didEmitEmptyLine) {
+					console.log(`[TerminalProcess] Emitting fallback empty line for no-output command`)
+					this.emit("line", "") // empty line to show proceed button
+					this.emit("line", "[Command completed with no output]")
+					didEmitEmptyLine = true
+				}
+			}
+
 			// for now we don't want this delaying requests since we don't send diagnostics automatically anymore (previous: "even though the command is finished, we still want to consider it 'hot' in case so that api request stalls to let diagnostics catch up")
 			if (this.hotTimer) {
 				clearTimeout(this.hotTimer)
 			}
 			this.isHot = false
 
-			this.emit("completed")
-			this.emit("continue")
+			console.log(`[TerminalProcess] Stream ended for command: "${command}"`)
+			console.log(`[TerminalProcess] Final output length: ${this.fullOutput.length} characters`)
+
+			// Check if this looks like a command that completed vs one that's still running
+			const quickCommands = ["cd ", "pwd", "ls ", "echo ", "mkdir ", "touch ", "rm ", "cp ", "mv "]
+			const isQuickCommand = quickCommands.some((cmd) => command.startsWith(cmd) || command.includes(" && " + cmd))
+
+			// Check if output suggests a long-running process
+			const longRunningIndicators = [
+				"listening on",
+				"server running",
+				"started on",
+				"watching for",
+				"compiled successfully",
+				"webpack",
+				"vite",
+				"nodemon",
+				"dev server",
+				"press ctrl",
+				"to quit",
+				"to exit",
+				"to stop",
+			]
+			const hasLongRunningOutput = longRunningIndicators.some((indicator) =>
+				this.fullOutput.toLowerCase().includes(indicator),
+			)
+
+			// Check if this is likely a command that starts a server or long-running process
+			const longRunningCommands = ["npm run", "npm start", "yarn", "node ", "python ", "serve", "dev", "watch"]
+			const isLongRunningCommand = longRunningCommands.some((cmd) => command.includes(cmd))
+
+			if (this.fullOutput.length === 0) {
+				console.log(`[TerminalProcess] WARNING: Process completed but no output was captured`)
+				// Ensure we emit at least one line for UI feedback
+				if (!didEmitEmptyLine) {
+					this.emit("line", "[Command completed silently]")
+				}
+			}
+
+			// Only skip grace period for truly quick commands that have no output or are known to complete instantly
+			if ((this.fullOutput.length === 0 || isQuickCommand) && !isLongRunningCommand && !hasLongRunningOutput) {
+				console.log(`[TerminalProcess] Command appears to have completed immediately, skipping grace period`)
+				this.emit("completed")
+				this.emit("continue")
+			} else {
+				console.log(
+					`[TerminalProcess] Command may still be running (longRunningCommand: ${isLongRunningCommand}, longRunningOutput: ${hasLongRunningOutput})`,
+				)
+				console.log(`[TerminalProcess] Starting grace period to detect true completion...`)
+				// Start grace period - wait 2.5 seconds to see if more output comes
+				// This prevents premature "proceed while running" for commands that clearly finished
+				this.startGracePeriod()
+			}
 		} else {
 			terminal.sendText(command, true)
 			// For terminals without shell integration, we can't know when the command completes
@@ -202,14 +331,24 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 	private emitIfEol(chunk: string) {
 		this.buffer += chunk
 		let lineEndIndex: number
+		let lineCount = 0
 		while ((lineEndIndex = this.buffer.indexOf("\n")) !== -1) {
 			let line = this.buffer.slice(0, lineEndIndex).trimEnd() // removes trailing \r
 			// Remove \r if present (for Windows-style line endings)
 			// if (line.endsWith("\r")) {
 			// 	line = line.slice(0, -1)
 			// }
+			if (!line || line.trim() === "") {
+				console.log(`[TerminalProcess] Emitting empty line`)
+			} else {
+				console.log(`[TerminalProcess] Emitting line: ${line.substring(0, 100)}${line.length > 100 ? "..." : ""}`)
+			}
 			this.emit("line", line)
 			this.buffer = this.buffer.slice(lineEndIndex + 1)
+			lineCount++
+		}
+		if (lineCount === 0 && chunk.length > 0) {
+			console.log(`[TerminalProcess] Buffering partial line, buffer size: ${this.buffer.length}`)
 		}
 	}
 
@@ -224,7 +363,41 @@ export class TerminalProcess extends EventEmitter<TerminalProcessEvents> {
 		}
 	}
 
+	private startGracePeriod() {
+		// Clear any existing grace period timer
+		if (this.gracePeriodTimer) {
+			clearTimeout(this.gracePeriodTimer)
+		}
+
+		// Emit completed event for UI to show "proceed while running" button
+		console.log(`[TerminalProcess] Emitting completed event for UI (grace period active)`)
+		this.emit("completed")
+
+		// Wait 2.5 seconds to see if the command is truly finished
+		this.gracePeriodTimer = setTimeout(() => {
+			// Double-check the timer hasn't been cleared
+			if (this.gracePeriodTimer && !this.hasEmittedCompleted) {
+				console.log(`[TerminalProcess] Grace period completed - command appears truly finished: "${this.command}"`)
+				console.log(`[TerminalProcess] Auto-continuing without user intervention`)
+				this.hasEmittedCompleted = true
+				this.gracePeriodTimer = null
+				// Only emit continue after the grace period, not immediately
+				this.emit("continue")
+			}
+		}, 2500) // 2.5 second grace period
+	}
+
 	continue() {
+		console.log(`[TerminalProcess] Manual continue() called for: "${this.command}"`)
+
+		// Clear grace period since user manually continued
+		if (this.gracePeriodTimer) {
+			console.log(`[TerminalProcess] Clearing grace period timer due to manual continue`)
+			clearTimeout(this.gracePeriodTimer)
+			this.gracePeriodTimer = null
+		}
+
+		this.hasEmittedCompleted = true
 		this.emitRemainingBufferIfListening()
 		this.isListening = false
 		this.removeAllListeners("line")

src/integrations/terminal/TerminalRegistry.ts

@@ -5,6 +5,8 @@ export interface TerminalInfo {
 	busy: boolean
 	lastCommand: string
 	id: number
+	shellPath?: string
+	lastActive: number
 	pendingCwdChange?: string
 	cwdResolved?: {
 		resolve: () => void
@@ -18,17 +20,26 @@ export class TerminalRegistry {
 	private static terminals: TerminalInfo[] = []
 	private static nextTerminalId = 1
 
-	static createTerminal(cwd?: string | vscode.Uri | undefined): TerminalInfo {
-		const terminal = vscode.window.createTerminal({
+	static createTerminal(cwd?: string | vscode.Uri | undefined, shellPath?: string): TerminalInfo {
+		const terminalOptions: vscode.TerminalOptions = {
 			cwd,
 			name: "Cline",
 			iconPath: new vscode.ThemeIcon("robot"),
-		})
+		}
+
+		// If a specific shell path is provided, use it
+		if (shellPath) {
+			terminalOptions.shellPath = shellPath
+		}
+
+		const terminal = vscode.window.createTerminal(terminalOptions)
 		const newInfo: TerminalInfo = {
 			terminal,
 			busy: false,
 			lastCommand: "",
 			id: this.nextTerminalId++,
+			shellPath,
+			lastActive: Date.now(),
 		}
 		this.terminals.push(newInfo)
 		return newInfo

src/services/glob/list-files.ts

@@ -1,55 +1,81 @@
 import { globby, Options } from "globby"
-import os from "os"
+import * as os from "os"
 import * as path from "path"
 import { arePathsEqual } from "@utils/path"
 
-export async function listFiles(dirPath: string, recursive: boolean, limit: number): Promise<[string[], boolean]> {
-	// First resolve the path normally - path.resolve doesn't care about glob special characters
-	const absolutePath = path.resolve(dirPath)
-	// Do not allow listing files in root or home directory, which cline tends to want to do when the user's prompt is vague.
+// Constants
+const DEFAULT_IGNORE_DIRECTORIES = [
+	"node_modules",
+	"__pycache__",
+	"env",
+	"venv",
+	"target/dependency",
+	"build/dependencies",
+	"dist",
+	"out",
+	"bundle",
+	"vendor",
+	"tmp",
+	"temp",
+	"deps",
+	"pkg",
+	"Pods",
+]
+
+// Helper functions
+function isRestrictedPath(absolutePath: string): boolean {
 	const root = process.platform === "win32" ? path.parse(absolutePath).root : "/"
 	const isRoot = arePathsEqual(absolutePath, root)
 	if (isRoot) {
-		return [[root], false]
+		return true
 	}
+
 	const homeDir = os.homedir()
 	const isHomeDir = arePathsEqual(absolutePath, homeDir)
 	if (isHomeDir) {
-		return [[homeDir], false]
+		return true
 	}
 
-	const dirsToIgnore = [
-		"node_modules",
-		"__pycache__",
-		"env",
-		"venv",
-		"target/dependency",
-		"build/dependencies",
-		"dist",
-		"out",
-		"bundle",
-		"vendor",
-		"tmp",
-		"temp",
-		"deps",
-		"pkg",
-		"Pods",
-		".*", // '!**/.*' excludes hidden directories, while '!**/.*/**' excludes only their contents. This way we are at least aware of the existence of hidden directories.
-	].map((dir) => `**/${dir}/**`)
+	return false
+}
+
+function isTargetingHiddenDirectory(absolutePath: string): boolean {
+	const dirName = path.basename(absolutePath)
+	return dirName.startsWith(".")
+}
+
+function buildIgnorePatterns(absolutePath: string): string[] {
+	const isTargetHidden = isTargetingHiddenDirectory(absolutePath)
+
+	const patterns = [...DEFAULT_IGNORE_DIRECTORIES]
+
+	// Only ignore hidden directories if we're not explicitly targeting a hidden directory
+	if (!isTargetHidden) {
+		patterns.push(".*")
+	}
+
+	return patterns.map((dir) => `**/${dir}/**`)
+}
+
+export async function listFiles(dirPath: string, recursive: boolean, limit: number): Promise<[string[], boolean]> {
+	const absolutePath = path.resolve(dirPath)
+
+	// Do not allow listing files in root or home directory
+	if (isRestrictedPath(absolutePath)) {
+		return [[], false]
+	}
 
 	const options: Options = {
 		cwd: dirPath,
 		dot: true, // do not ignore hidden files/directories
 		absolute: true,
-		markDirectories: true, // Append a / on any directories matched (/ is used on windows as well, so dont use path.sep)
+		markDirectories: true, // Append a / on any directories matched
 		gitignore: recursive, // globby ignores any files that are gitignored
-		ignore: recursive ? dirsToIgnore : undefined, // just in case there is no gitignore, we ignore sensible defaults
-		onlyFiles: false, // true by default, false means it will list directories on their own too
+		ignore: recursive ? buildIgnorePatterns(absolutePath) : undefined,
+		onlyFiles: false, // include directories in results
 		suppressErrors: true,
 	}
 
-	// * globs all files in one dir, ** globs files in nested directories
-	// For non-recursive listing, we still use a simple pattern
 	const filePaths = recursive ? await globbyLevelByLevel(limit, options) : (await globby("*", options)).slice(0, limit)
 
 	return [filePaths, filePaths.length >= limit]

src/services/mcp/McpHub.ts

@@ -54,6 +54,17 @@ export class McpHub {
 	connections: McpConnection[] = []
 	isConnecting: boolean = false
 
+	// Store notifications for display in chat
+	private pendingNotifications: Array<{
+		serverName: string
+		level: string
+		message: string
+		timestamp: number
+	}> = []
+
+	// Callback for sending notifications to active task
+	private notificationCallback?: (serverName: string, level: string, message: string) => void
+
 	constructor(
 		getMcpServersPath: () => Promise<string>,
 		getSettingsDirectoryPath: () => Promise<string>,
@@ -321,6 +332,88 @@ export class McpHub {
 			connection.server.status = "connected"
 			connection.server.error = ""
 
+			// Register notification handler for real-time messages
+			console.log(`[MCP Debug] Setting up notification handlers for server: ${name}`)
+			console.log(`[MCP Debug] Client instance:`, connection.client)
+			console.log(`[MCP Debug] Transport type:`, config.type)
+
+			// Try to set notification handler using the client's method
+			try {
+				// Import the notification schema from MCP SDK
+				const { z } = await import("zod")
+
+				// Define the notification schema for notifications/message
+				const NotificationMessageSchema = z.object({
+					method: z.literal("notifications/message"),
+					params: z
+						.object({
+							level: z.enum(["debug", "info", "warning", "error"]).optional(),
+							logger: z.string().optional(),
+							data: z.string().optional(),
+							message: z.string().optional(),
+						})
+						.optional(),
+				})
+
+				// Set the notification handler
+				connection.client.setNotificationHandler(NotificationMessageSchema as any, async (notification: any) => {
+					console.log(`[MCP Notification] ${name}:`, JSON.stringify(notification, null, 2))
+
+					const params = notification.params || {}
+					const level = params.level || "info"
+					const data = params.data || params.message || ""
+					const logger = params.logger || ""
+
+					console.log(`[MCP Message Notification] ${name}: level=${level}, data=${data}, logger=${logger}`)
+
+					// Format the message
+					const message = logger ? `[${logger}] ${data}` : data
+
+					// Send notification directly to active task if callback is set
+					if (this.notificationCallback) {
+						console.log(`[MCP Debug] Sending notification to active task: ${message}`)
+						this.notificationCallback(name, level, message)
+					} else {
+						// Fallback: store for later retrieval
+						console.log(`[MCP Debug] No active task, storing notification: ${message}`)
+						this.pendingNotifications.push({
+							serverName: name,
+							level,
+							message,
+							timestamp: Date.now(),
+						})
+					}
+
+					// Forward to webview if available
+					if (this.postMessageToWebview) {
+						await this.postMessageToWebview({
+							type: "mcpNotification",
+							serverName: name,
+							notification: {
+								level,
+								data,
+								logger,
+								timestamp: Date.now(),
+							},
+						} as any)
+					}
+				})
+				console.log(`[MCP Debug] Successfully set notifications/message handler for ${name}`)
+
+				// Also set a fallback handler for any other notification types
+				connection.client.fallbackNotificationHandler = async (notification: any) => {
+					console.log(`[MCP Fallback Notification] ${name}:`, JSON.stringify(notification, null, 2))
+
+					// Show in VS Code for visibility
+					vscode.window.showInformationMessage(
+						`MCP ${name}: ${notification.method || "unknown"} - ${JSON.stringify(notification.params || {})}`,
+					)
+				}
+				console.log(`[MCP Debug] Successfully set fallback notification handler for ${name}`)
+			} catch (error) {
+				console.error(`[MCP Debug] Error setting notification handlers for ${name}:`, error)
+			}
+
 			// Initial fetch of tools and resources
 			connection.server.tools = await this.fetchToolsList(name)
 			connection.server.resources = await this.fetchResourcesList(name)
@@ -949,6 +1042,38 @@ export class McpHub {
 		}
 	}
 
+	/**
+	 * Get and clear pending notifications
+	 * @returns Array of pending notifications
+	 */
+	getPendingNotifications(): Array<{
+		serverName: string
+		level: string
+		message: string
+		timestamp: number
+	}> {
+		const notifications = [...this.pendingNotifications]
+		this.pendingNotifications = []
+		return notifications
+	}
+
+	/**
+	 * Set the notification callback for real-time notifications
+	 * @param callback Function to call when notifications arrive
+	 */
+	setNotificationCallback(callback: (serverName: string, level: string, message: string) => void): void {
+		this.notificationCallback = callback
+		console.log("[MCP Debug] Notification callback set")
+	}
+
+	/**
+	 * Clear the notification callback
+	 */
+	clearNotificationCallback(): void {
+		this.notificationCallback = undefined
+		console.log("[MCP Debug] Notification callback cleared")
+	}
+
 	async dispose(): Promise<void> {
 		this.removeAllFileWatchers()
 		for (const connection of this.connections) {

src/services/mcp/schemas.ts

@@ -16,49 +16,71 @@ const createServerTypeSchema = () => {
 		// Stdio config (has command field)
 		BaseConfigSchema.extend({
 			type: z.literal("stdio").optional(),
+			transportType: z.string().optional(), // Support legacy field
 			command: z.string(),
 			args: z.array(z.string()).optional(),
 			cwd: z.string().optional(),
 			env: z.record(z.string()).optional(),
-			// Explicitly disallow other types' fields
-			url: z.undefined().optional(),
-			headers: z.undefined().optional(),
+			// Allow other fields for backward compatibility
+			url: z.string().optional(),
+			headers: z.record(z.string()).optional(),
 		})
-			.transform((data) => ({
-				...data,
-				type: "stdio" as const,
-			}))
-			.refine((data) => data.type === undefined || data.type === "stdio", { message: TYPE_ERROR_MESSAGE }),
+			.transform((data) => {
+				// Support both type and transportType fields
+				const finalType = data.type || (data.transportType === "stdio" ? "stdio" : undefined) || "stdio"
+				return {
+					...data,
+					type: finalType as "stdio",
+					// Remove the legacy field after transformation
+					transportType: undefined,
+				}
+			})
+			.refine((data) => data.type === "stdio", { message: TYPE_ERROR_MESSAGE }),
 		// SSE config (has url field)
 		BaseConfigSchema.extend({
 			type: z.literal("sse").optional(),
+			transportType: z.string().optional(), // Support legacy field
 			url: z.string().url("URL must be a valid URL format"),
 			headers: z.record(z.string()).optional(),
-			// Explicitly disallow other types' fields
-			command: z.undefined().optional(),
-			args: z.undefined().optional(),
-			env: z.undefined().optional(),
+			// Allow other fields for backward compatibility
+			command: z.string().optional(),
+			args: z.array(z.string()).optional(),
+			env: z.record(z.string()).optional(),
 		})
-			.transform((data) => ({
-				...data,
-				type: "sse" as const,
-			}))
-			.refine((data) => data.type === undefined || data.type === "sse", { message: TYPE_ERROR_MESSAGE }),
+			.transform((data) => {
+				// Support both type and transportType fields
+				const finalType = data.type || (data.transportType === "sse" ? "sse" : undefined) || "sse"
+				return {
+					...data,
+					type: finalType as "sse",
+					// Remove the legacy field after transformation
+					transportType: undefined,
+				}
+			})
+			.refine((data) => data.type === "sse", { message: TYPE_ERROR_MESSAGE }),
 		// Streamable HTTP config (has url field)
 		BaseConfigSchema.extend({
 			type: z.literal("streamableHttp").optional(),
+			transportType: z.string().optional(), // Support legacy field
 			url: z.string().url("URL must be a valid URL format"),
 			headers: z.record(z.string()).optional(),
-			// Explicitly disallow other types' fields
-			command: z.undefined().optional(),
-			args: z.undefined().optional(),
-			env: z.undefined().optional(),
+			// Allow other fields for backward compatibility
+			command: z.string().optional(),
+			args: z.array(z.string()).optional(),
+			env: z.record(z.string()).optional(),
 		})
-			.transform((data) => ({
-				...data,
-				type: "streamableHttp" as const,
-			}))
-			.refine((data) => data.type === undefined || data.type === "streamableHttp", {
+			.transform((data) => {
+				// Support both type and transportType fields
+				// Note: legacy transportType was "http" not "streamableHttp"
+				const finalType = data.type || (data.transportType === "http" ? "streamableHttp" : undefined) || "streamableHttp"
+				return {
+					...data,
+					type: finalType as "streamableHttp",
+					// Remove the legacy field after transformation
+					transportType: undefined,
+				}
+			})
+			.refine((data) => data.type === "streamableHttp", {
 				message: TYPE_ERROR_MESSAGE,
 			}),
 	])

src/shared/ExtensionMessage.ts

@@ -25,7 +25,7 @@ export interface ExtensionMessage {
 		| "userCreditsPayments"
 		| "grpc_response" // New type for gRPC responses
 	text?: string
-	action?: "didBecomeVisible" | "accountLogoutClicked" | "focusChatInput"
+	action?: "didBecomeVisible" | "accountLogoutClicked"
 	state?: ExtensionState
 	images?: string[]
 	files?: string[]
@@ -81,8 +81,8 @@ export interface ExtensionState {
 	checkpointTrackerErrorMessage?: string
 	clineMessages: ClineMessage[]
 	currentTaskItem?: HistoryItem
-	customInstructions?: string
 	mcpMarketplaceEnabled?: boolean
+	mcpRichDisplayEnabled: boolean
 	planActSeparateModelsSetting: boolean
 	enableCheckpointsSetting?: boolean
 	platform: Platform
@@ -91,6 +91,8 @@ export interface ExtensionState {
 	telemetrySetting: TelemetrySetting
 	shellIntegrationTimeout: number
 	terminalReuseEnabled?: boolean
+	terminalOutputLineLimit: number
+	defaultTerminalProfile?: string
 	uriScheme?: string
 	userInfo?: {
 		displayName: string | null
@@ -163,6 +165,7 @@ export type ClineSay =
 	| "browser_action_result"
 	| "mcp_server_request_started"
 	| "mcp_server_response"
+	| "mcp_notification"
 	| "use_mcp_server"
 	| "diff_error"
 	| "deleted_api_reqs"

src/shared/WebviewMessage.ts

@@ -8,7 +8,6 @@ import { McpViewTab } from "./mcp"
 
 export interface WebviewMessage {
 	type:
-		| "apiConfiguration"
 		| "requestVsCodeLmModels"
 		| "authStateChanged"
 		| "fetchMcpMarketplace"
@@ -46,7 +45,7 @@ export interface WebviewMessage {
 	mcpMarketplaceEnabled?: boolean
 	mcpResponsesCollapsed?: boolean
 	telemetrySetting?: TelemetrySetting
-	customInstructionsSetting?: string
+	mcpRichDisplayEnabled?: boolean
 	mentionsRequestId?: string
 	query?: string
 	// For toggleFavoriteModel
@@ -71,6 +70,7 @@ export interface WebviewMessage {
 	offset?: number
 	shellIntegrationTimeout?: number
 	terminalReuseEnabled?: boolean
+	defaultTerminalProfile?: string
 }
 
 export type ClineAskResponse = "yesButtonClicked" | "noButtonClicked" | "messageResponse"

src/shared/api.ts

@@ -2,6 +2,7 @@ import type { LanguageModelChatSelector } from "../api/providers/types"
 
 export type ApiProvider =
 	| "anthropic"
+	| "claude-code"
 	| "openrouter"
 	| "bedrock"
 	| "vertex"
@@ -25,6 +26,7 @@ export type ApiProvider =
 	| "xai"
 	| "sambanova"
 	| "cerebras"
+	| "sapaicore"
 
 export interface ApiHandlerOptions {
 	apiModelId?: string
@@ -53,6 +55,7 @@ export interface ApiHandlerOptions {
 	awsBedrockEndpoint?: string
 	awsBedrockCustomSelected?: boolean
 	awsBedrockCustomModelBaseId?: BedrockModelId
+	claudeCodePath?: string
 	vertexProjectId?: string
 	vertexRegion?: string
 	openAiBaseUrl?: string
@@ -92,6 +95,12 @@ export interface ApiHandlerOptions {
 	sambanovaApiKey?: string
 	cerebrasApiKey?: string
 	requestTimeoutMs?: number
+	sapAiCoreClientId?: string
+	sapAiCoreClientSecret?: string
+	sapAiResourceGroup?: string
+	sapAiCoreTokenUrl?: string
+	sapAiCoreBaseUrl?: string
+	sapAiCoreModelId?: string
 	onRetryAttempt?: (attempt: number, maxRetries: number, delay: number, error: any) => void
 }
 
@@ -217,6 +226,17 @@ export const anthropicModels = {
 	},
 } as const satisfies Record<string, ModelInfo> // as const assertion makes the object deeply readonly
 
+// Claude Code
+export type ClaudeCodeModelId = keyof typeof claudeCodeModels
+export const claudeCodeDefaultModelId: ClaudeCodeModelId = "claude-sonnet-4-20250514"
+export const claudeCodeModels = {
+	"claude-sonnet-4-20250514": anthropicModels["claude-sonnet-4-20250514"],
+	"claude-opus-4-20250514": anthropicModels["claude-opus-4-20250514"],
+	"claude-3-7-sonnet-20250219": anthropicModels["claude-3-7-sonnet-20250219"],
+	"claude-3-5-sonnet-20241022": anthropicModels["claude-3-5-sonnet-20241022"],
+	"claude-3-5-haiku-20241022": anthropicModels["claude-3-5-haiku-20241022"],
+} as const satisfies Record<string, ModelInfo>
+
 // AWS Bedrock
 // https://docs.aws.amazon.com/bedrock/latest/userguide/conversation-inference.html
 export type BedrockModelId = keyof typeof bedrockModels
@@ -598,6 +618,9 @@ export const vertexModels = {
 				cacheReadsPrice: 0.625,
 			},
 		],
+		thinkingConfig: {
+			maxBudget: 32768,
+		},
 	},
 	"gemini-2.5-flash-preview-04-17": {
 		maxTokens: 65536,
@@ -766,6 +789,9 @@ export const geminiModels = {
 				cacheReadsPrice: 0.625,
 			},
 		],
+		thinkingConfig: {
+			maxBudget: 32768,
+		},
 	},
 	"gemini-2.5-flash-preview-05-20": {
 		maxTokens: 65536,
@@ -2401,3 +2427,125 @@ export const requestyDefaultModelInfo: ModelInfo = {
 	cacheReadsPrice: 0.3,
 	description: "Anthropic's most intelligent model. Highest level of intelligence and capability.",
 }
+
+// SAP AI Core
+export type SapAiCoreModelId = keyof typeof sapAiCoreModels
+export const sapAiCoreDefaultModelId: SapAiCoreModelId = "anthropic--claude-3.5-sonnet"
+export const sapAiCoreModels = {
+	"anthropic--claude-3.7-sonnet": {
+		maxTokens: 64_000,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"anthropic--claude-3.5-sonnet": {
+		maxTokens: 8192,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"anthropic--claude-3-sonnet": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"anthropic--claude-3-haiku": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"anthropic--claude-3-opus": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"gpt-4o": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"gpt-4o-mini": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"gpt-4": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	o1: {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"o3-mini": {
+		maxTokens: 4096,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: false,
+		inputPrice: 3.0,
+		outputPrice: 15.0,
+	},
+	"gpt-4.1": {
+		maxTokens: 32_768,
+		contextWindow: 1_047_576,
+		supportsImages: true,
+		supportsPromptCache: true,
+		inputPrice: 2,
+		outputPrice: 8,
+		cacheReadsPrice: 0.5,
+	},
+	"gpt-4.1-nano": {
+		maxTokens: 32_768,
+		contextWindow: 1_047_576,
+		supportsImages: true,
+		supportsPromptCache: true,
+		inputPrice: 0.1,
+		outputPrice: 0.4,
+		cacheReadsPrice: 0.025,
+	},
+	o3: {
+		maxTokens: 100_000,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: true,
+		inputPrice: 10.0,
+		outputPrice: 40.0,
+		cacheReadsPrice: 2.5,
+	},
+	"o4-mini": {
+		maxTokens: 100_000,
+		contextWindow: 200_000,
+		supportsImages: true,
+		supportsPromptCache: true,
+		inputPrice: 1.1,
+		outputPrice: 4.4,
+		cacheReadsPrice: 0.275,
+	},
+} as const satisfies Record<string, ModelInfo>

src/shared/proto-conversions/cline-message.ts

@@ -89,6 +89,7 @@ function convertClineSayToProtoEnum(say: AppClineSay | undefined): ClineSay | un
 		browser_action_result: ClineSay.BROWSER_ACTION_RESULT,
 		mcp_server_request_started: ClineSay.MCP_SERVER_REQUEST_STARTED,
 		mcp_server_response: ClineSay.MCP_SERVER_RESPONSE,
+		mcp_notification: ClineSay.MCP_NOTIFICATION,
 		use_mcp_server: ClineSay.USE_MCP_SERVER_SAY,
 		diff_error: ClineSay.DIFF_ERROR,
 		deleted_api_reqs: ClineSay.DELETED_API_REQS,
@@ -132,6 +133,7 @@ function convertProtoEnumToClineSay(say: ClineSay): AppClineSay | undefined {
 		[ClineSay.BROWSER_ACTION_RESULT]: "browser_action_result",
 		[ClineSay.MCP_SERVER_REQUEST_STARTED]: "mcp_server_request_started",
 		[ClineSay.MCP_SERVER_RESPONSE]: "mcp_server_response",
+		[ClineSay.MCP_NOTIFICATION]: "mcp_notification",
 		[ClineSay.USE_MCP_SERVER_SAY]: "use_mcp_server",
 		[ClineSay.DIFF_ERROR]: "diff_error",
 		[ClineSay.DELETED_API_REQS]: "deleted_api_reqs",

src/shared/proto-conversions/models/api-configuration-conversion.ts

@@ -0,0 +1,462 @@
+import {
+	ApiConfiguration,
+	ApiProvider,
+	BedrockModelId,
+	ModelInfo,
+	OpenAiCompatibleModelInfo as AppOpenAiCompatibleModelInfo,
+	LiteLLMModelInfo as AppLiteLLMModelInfo,
+} from "../../api"
+import {
+	ModelsApiConfiguration as ProtoApiConfiguration,
+	ApiProvider as ProtoApiProvider,
+	LiteLLMModelInfo,
+	OpenAiCompatibleModelInfo,
+	OpenRouterModelInfo,
+	ThinkingConfig,
+} from "../../proto/models"
+
+// Convert application ThinkingConfig to proto ThinkingConfig
+function convertThinkingConfigToProto(config: ModelInfo["thinkingConfig"]): ThinkingConfig | undefined {
+	if (!config) {
+		return undefined
+	}
+
+	return {
+		maxBudget: config.maxBudget,
+		outputPrice: config.outputPrice,
+		outputPriceTiers: config.outputPriceTiers || [], // Provide empty array if undefined
+	}
+}
+
+// Convert proto ThinkingConfig to application ThinkingConfig
+function convertProtoToThinkingConfig(config: ThinkingConfig | undefined): ModelInfo["thinkingConfig"] | undefined {
+	if (!config) {
+		return undefined
+	}
+
+	return {
+		maxBudget: config.maxBudget,
+		outputPrice: config.outputPrice,
+		outputPriceTiers: config.outputPriceTiers.length > 0 ? config.outputPriceTiers : undefined,
+	}
+}
+
+// Convert application ModelInfo to proto OpenRouterModelInfo
+function convertModelInfoToProtoOpenRouter(info: ModelInfo | undefined): OpenRouterModelInfo | undefined {
+	if (!info) {
+		return undefined
+	}
+
+	return {
+		maxTokens: info.maxTokens,
+		contextWindow: info.contextWindow,
+		supportsImages: info.supportsImages,
+		supportsPromptCache: info.supportsPromptCache ?? false,
+		inputPrice: info.inputPrice,
+		outputPrice: info.outputPrice,
+		cacheWritesPrice: info.cacheWritesPrice,
+		cacheReadsPrice: info.cacheReadsPrice,
+		description: info.description,
+		thinkingConfig: convertThinkingConfigToProto(info.thinkingConfig),
+		supportsGlobalEndpoint: info.supportsGlobalEndpoint,
+		tiers: info.tiers || [],
+	}
+}
+
+// Convert proto OpenRouterModelInfo to application ModelInfo
+function convertProtoToModelInfo(info: OpenRouterModelInfo | undefined): ModelInfo | undefined {
+	if (!info) {
+		return undefined
+	}
+
+	return {
+		maxTokens: info.maxTokens,
+		contextWindow: info.contextWindow,
+		supportsImages: info.supportsImages,
+		supportsPromptCache: info.supportsPromptCache,
+		inputPrice: info.inputPrice,
+		outputPrice: info.outputPrice,
+		cacheWritesPrice: info.cacheWritesPrice,
+		cacheReadsPrice: info.cacheReadsPrice,
+		description: info.description,
+		thinkingConfig: convertProtoToThinkingConfig(info.thinkingConfig),
+		supportsGlobalEndpoint: info.supportsGlobalEndpoint,
+		tiers: info.tiers.length > 0 ? info.tiers : undefined,
+	}
+}
+
+// Convert application LiteLLMModelInfo to proto LiteLLMModelInfo
+function convertLiteLLMModelInfoToProto(info: AppLiteLLMModelInfo | undefined): LiteLLMModelInfo | undefined {
+	if (!info) {
+		return undefined
+	}
+
+	return {
+		maxTokens: info.maxTokens,
+		contextWindow: info.contextWindow,
+		supportsImages: info.supportsImages,
+		supportsPromptCache: info.supportsPromptCache ?? false,
+		inputPrice: info.inputPrice,
+		outputPrice: info.outputPrice,
+		thinkingConfig: convertThinkingConfigToProto(info.thinkingConfig),
+		supportsGlobalEndpoint: info.supportsGlobalEndpoint,
+		cacheWritesPrice: info.cacheWritesPrice,
+		cacheReadsPrice: info.cacheReadsPrice,
+		description: info.description,
+		tiers: info.tiers || [],
+		temperature: info.temperature,
+	}
+}
+
+// Convert proto LiteLLMModelInfo to application LiteLLMModelInfo
+function convertProtoToLiteLLMModelInfo(info: LiteLLMModelInfo | undefined): AppLiteLLMModelInfo | undefined {
+	if (!info) {
+		return undefined
+	}
+
+	return {
+		maxTokens: info.maxTokens,
+		contextWindow: info.contextWindow,
+		supportsImages: info.supportsImages,
+		supportsPromptCache: info.supportsPromptCache,
+		inputPrice: info.inputPrice,
+		outputPrice: info.outputPrice,
+		thinkingConfig: convertProtoToThinkingConfig(info.thinkingConfig),
+		supportsGlobalEndpoint: info.supportsGlobalEndpoint,
+		cacheWritesPrice: info.cacheWritesPrice,
+		cacheReadsPrice: info.cacheReadsPrice,
+		description: info.description,
+		tiers: info.tiers.length > 0 ? info.tiers : undefined,
+		temperature: info.temperature,
+	}
+}
+
+// Convert application OpenAiCompatibleModelInfo to proto OpenAiCompatibleModelInfo
+function convertOpenAiCompatibleModelInfoToProto(
+	info: AppOpenAiCompatibleModelInfo | undefined,
+): OpenAiCompatibleModelInfo | undefined {
+	if (!info) {
+		return undefined
+	}
+
+	return {
+		maxTokens: info.maxTokens,
+		contextWindow: info.contextWindow,
+		supportsImages: info.supportsImages,
+		supportsPromptCache: info.supportsPromptCache ?? false,
+		inputPrice: info.inputPrice,
+		outputPrice: info.outputPrice,
+		thinkingConfig: convertThinkingConfigToProto(info.thinkingConfig),
+		supportsGlobalEndpoint: info.supportsGlobalEndpoint,
+		cacheWritesPrice: info.cacheWritesPrice,
+		cacheReadsPrice: info.cacheReadsPrice,
+		description: info.description,
+		tiers: info.tiers || [],
+		temperature: info.temperature,
+		isR1FormatRequired: info.isR1FormatRequired,
+	}
+}
+
+// Convert proto OpenAiCompatibleModelInfo to application OpenAiCompatibleModelInfo
+function convertProtoToOpenAiCompatibleModelInfo(
+	info: OpenAiCompatibleModelInfo | undefined,
+): AppOpenAiCompatibleModelInfo | undefined {
+	if (!info) {
+		return undefined
+	}
+
+	return {
+		maxTokens: info.maxTokens,
+		contextWindow: info.contextWindow,
+		supportsImages: info.supportsImages,
+		supportsPromptCache: info.supportsPromptCache,
+		inputPrice: info.inputPrice,
+		outputPrice: info.outputPrice,
+		thinkingConfig: convertProtoToThinkingConfig(info.thinkingConfig),
+		supportsGlobalEndpoint: info.supportsGlobalEndpoint,
+		cacheWritesPrice: info.cacheWritesPrice,
+		cacheReadsPrice: info.cacheReadsPrice,
+		description: info.description,
+		tiers: info.tiers.length > 0 ? info.tiers : undefined,
+		temperature: info.temperature,
+		isR1FormatRequired: info.isR1FormatRequired,
+	}
+}
+
+// Convert application ApiProvider to proto ApiProvider
+function convertApiProviderToProto(provider: string | undefined): ProtoApiProvider {
+	switch (provider) {
+		case "anthropic":
+			return ProtoApiProvider.ANTHROPIC
+		case "openrouter":
+			return ProtoApiProvider.OPENROUTER
+		case "bedrock":
+			return ProtoApiProvider.BEDROCK
+		case "vertex":
+			return ProtoApiProvider.VERTEX
+		case "openai":
+			return ProtoApiProvider.OPENAI
+		case "ollama":
+			return ProtoApiProvider.OLLAMA
+		case "lmstudio":
+			return ProtoApiProvider.LMSTUDIO
+		case "gemini":
+			return ProtoApiProvider.GEMINI
+		case "openai-native":
+			return ProtoApiProvider.OPENAI_NATIVE
+		case "requesty":
+			return ProtoApiProvider.REQUESTY
+		case "together":
+			return ProtoApiProvider.TOGETHER
+		case "deepseek":
+			return ProtoApiProvider.DEEPSEEK
+		case "qwen":
+			return ProtoApiProvider.QWEN
+		case "doubao":
+			return ProtoApiProvider.DOUBAO
+		case "mistral":
+			return ProtoApiProvider.MISTRAL
+		case "vscode-lm":
+			return ProtoApiProvider.VSCODE_LM
+		case "cline":
+			return ProtoApiProvider.CLINE
+		case "litellm":
+			return ProtoApiProvider.LITELLM
+		case "nebius":
+			return ProtoApiProvider.NEBIUS
+		case "fireworks":
+			return ProtoApiProvider.FIREWORKS
+		case "asksage":
+			return ProtoApiProvider.ASKSAGE
+		case "xai":
+			return ProtoApiProvider.XAI
+		case "sambanova":
+			return ProtoApiProvider.SAMBANOVA
+		case "cerebras":
+			return ProtoApiProvider.CEREBRAS
+		case "sapaicore":
+			return ProtoApiProvider.SAPAICORE
+		case "claude-code":
+			return ProtoApiProvider.CLAUDE_CODE
+		default:
+			return ProtoApiProvider.ANTHROPIC
+	}
+}
+
+// Convert proto ApiProvider to application ApiProvider
+function convertProtoToApiProvider(provider: ProtoApiProvider): ApiProvider {
+	switch (provider) {
+		case ProtoApiProvider.ANTHROPIC:
+			return "anthropic"
+		case ProtoApiProvider.OPENROUTER:
+			return "openrouter"
+		case ProtoApiProvider.BEDROCK:
+			return "bedrock"
+		case ProtoApiProvider.VERTEX:
+			return "vertex"
+		case ProtoApiProvider.OPENAI:
+			return "openai"
+		case ProtoApiProvider.OLLAMA:
+			return "ollama"
+		case ProtoApiProvider.LMSTUDIO:
+			return "lmstudio"
+		case ProtoApiProvider.GEMINI:
+			return "gemini"
+		case ProtoApiProvider.OPENAI_NATIVE:
+			return "openai-native"
+		case ProtoApiProvider.REQUESTY:
+			return "requesty"
+		case ProtoApiProvider.TOGETHER:
+			return "together"
+		case ProtoApiProvider.DEEPSEEK:
+			return "deepseek"
+		case ProtoApiProvider.QWEN:
+			return "qwen"
+		case ProtoApiProvider.DOUBAO:
+			return "doubao"
+		case ProtoApiProvider.MISTRAL:
+			return "mistral"
+		case ProtoApiProvider.VSCODE_LM:
+			return "vscode-lm"
+		case ProtoApiProvider.CLINE:
+			return "cline"
+		case ProtoApiProvider.LITELLM:
+			return "litellm"
+		case ProtoApiProvider.NEBIUS:
+			return "nebius"
+		case ProtoApiProvider.FIREWORKS:
+			return "fireworks"
+		case ProtoApiProvider.ASKSAGE:
+			return "asksage"
+		case ProtoApiProvider.XAI:
+			return "xai"
+		case ProtoApiProvider.SAMBANOVA:
+			return "sambanova"
+		case ProtoApiProvider.CEREBRAS:
+			return "cerebras"
+		case ProtoApiProvider.SAPAICORE:
+			return "sapaicore"
+		case ProtoApiProvider.CLAUDE_CODE:
+			return "claude-code"
+		default:
+			return "anthropic"
+	}
+}
+
+// Converts application ApiConfiguration to proto ApiConfiguration
+export function convertApiConfigurationToProto(config: ApiConfiguration): ProtoApiConfiguration {
+	return {
+		apiModelId: config.apiModelId,
+		apiKey: config.apiKey,
+		clineApiKey: config.clineApiKey,
+		taskId: config.taskId,
+		liteLlmBaseUrl: config.liteLlmBaseUrl,
+		liteLlmModelId: config.liteLlmModelId,
+		liteLlmApiKey: config.liteLlmApiKey,
+		liteLlmUsePromptCache: config.liteLlmUsePromptCache,
+		openAiHeaders: config.openAiHeaders || {},
+		liteLlmModelInfo: convertLiteLLMModelInfoToProto(config.liteLlmModelInfo),
+		anthropicBaseUrl: config.anthropicBaseUrl,
+		openRouterApiKey: config.openRouterApiKey,
+		openRouterModelId: config.openRouterModelId,
+		openRouterModelInfo: convertModelInfoToProtoOpenRouter(config.openRouterModelInfo),
+		openRouterProviderSorting: config.openRouterProviderSorting,
+		awsAccessKey: config.awsAccessKey,
+		awsSecretKey: config.awsSecretKey,
+		awsSessionToken: config.awsSessionToken,
+		awsRegion: config.awsRegion,
+		awsUseCrossRegionInference: config.awsUseCrossRegionInference,
+		awsBedrockUsePromptCache: config.awsBedrockUsePromptCache,
+		awsUseProfile: config.awsUseProfile,
+		awsProfile: config.awsProfile,
+		awsBedrockEndpoint: config.awsBedrockEndpoint,
+		awsBedrockCustomSelected: config.awsBedrockCustomSelected,
+		awsBedrockCustomModelBaseId: config.awsBedrockCustomModelBaseId as string | undefined,
+		vertexProjectId: config.vertexProjectId,
+		vertexRegion: config.vertexRegion,
+		openAiBaseUrl: config.openAiBaseUrl,
+		openAiApiKey: config.openAiApiKey,
+		openAiModelId: config.openAiModelId,
+		openAiModelInfo: convertOpenAiCompatibleModelInfoToProto(config.openAiModelInfo),
+		ollamaModelId: config.ollamaModelId,
+		ollamaBaseUrl: config.ollamaBaseUrl,
+		ollamaApiOptionsCtxNum: config.ollamaApiOptionsCtxNum,
+		lmStudioModelId: config.lmStudioModelId,
+		lmStudioBaseUrl: config.lmStudioBaseUrl,
+		geminiApiKey: config.geminiApiKey,
+		geminiBaseUrl: config.geminiBaseUrl,
+		openAiNativeApiKey: config.openAiNativeApiKey,
+		deepSeekApiKey: config.deepSeekApiKey,
+		requestyApiKey: config.requestyApiKey,
+		requestyModelId: config.requestyModelId,
+		requestyModelInfo: convertModelInfoToProtoOpenRouter(config.requestyModelInfo),
+		togetherApiKey: config.togetherApiKey,
+		togetherModelId: config.togetherModelId,
+		fireworksApiKey: config.fireworksApiKey,
+		fireworksModelId: config.fireworksModelId,
+		fireworksModelMaxCompletionTokens: config.fireworksModelMaxCompletionTokens,
+		fireworksModelMaxTokens: config.fireworksModelMaxTokens,
+		qwenApiKey: config.qwenApiKey,
+		doubaoApiKey: config.doubaoApiKey,
+		mistralApiKey: config.mistralApiKey,
+		azureApiVersion: config.azureApiVersion,
+		vsCodeLmModelSelector: config.vsCodeLmModelSelector,
+		qwenApiLine: config.qwenApiLine,
+		nebiusApiKey: config.nebiusApiKey,
+		asksageApiUrl: config.asksageApiUrl,
+		asksageApiKey: config.asksageApiKey,
+		xaiApiKey: config.xaiApiKey,
+		thinkingBudgetTokens: config.thinkingBudgetTokens,
+		reasoningEffort: config.reasoningEffort,
+		sambanovaApiKey: config.sambanovaApiKey,
+		cerebrasApiKey: config.cerebrasApiKey,
+		requestTimeoutMs: config.requestTimeoutMs,
+		apiProvider: config.apiProvider ? convertApiProviderToProto(config.apiProvider) : undefined,
+		favoritedModelIds: config.favoritedModelIds || [],
+		sapAiCoreClientId: config.sapAiCoreClientId,
+		sapAiCoreClientSecret: config.sapAiCoreClientSecret,
+		sapAiResourceGroup: config.sapAiResourceGroup,
+		sapAiCoreTokenUrl: config.sapAiCoreTokenUrl,
+		sapAiCoreBaseUrl: config.sapAiCoreBaseUrl,
+		claudeCodePath: config.claudeCodePath,
+	}
+}
+
+// Converts proto ApiConfiguration to application ApiConfiguration
+export function convertProtoToApiConfiguration(protoConfig: ProtoApiConfiguration): ApiConfiguration {
+	return {
+		apiModelId: protoConfig.apiModelId,
+		apiKey: protoConfig.apiKey,
+		clineApiKey: protoConfig.clineApiKey,
+		taskId: protoConfig.taskId,
+		liteLlmBaseUrl: protoConfig.liteLlmBaseUrl,
+		liteLlmModelId: protoConfig.liteLlmModelId,
+		liteLlmApiKey: protoConfig.liteLlmApiKey,
+		liteLlmUsePromptCache: protoConfig.liteLlmUsePromptCache,
+		openAiHeaders: Object.keys(protoConfig.openAiHeaders).length > 0 ? protoConfig.openAiHeaders : undefined,
+		liteLlmModelInfo: convertProtoToLiteLLMModelInfo(protoConfig.liteLlmModelInfo),
+		anthropicBaseUrl: protoConfig.anthropicBaseUrl,
+		openRouterApiKey: protoConfig.openRouterApiKey,
+		openRouterModelId: protoConfig.openRouterModelId,
+		openRouterModelInfo: convertProtoToModelInfo(protoConfig.openRouterModelInfo),
+		openRouterProviderSorting: protoConfig.openRouterProviderSorting,
+		awsAccessKey: protoConfig.awsAccessKey,
+		awsSecretKey: protoConfig.awsSecretKey,
+		awsSessionToken: protoConfig.awsSessionToken,
+		awsRegion: protoConfig.awsRegion,
+		awsUseCrossRegionInference: protoConfig.awsUseCrossRegionInference,
+		awsBedrockUsePromptCache: protoConfig.awsBedrockUsePromptCache,
+		awsUseProfile: protoConfig.awsUseProfile,
+		awsProfile: protoConfig.awsProfile,
+		awsBedrockEndpoint: protoConfig.awsBedrockEndpoint,
+		awsBedrockCustomSelected: protoConfig.awsBedrockCustomSelected,
+		awsBedrockCustomModelBaseId: protoConfig.awsBedrockCustomModelBaseId as BedrockModelId | undefined,
+		vertexProjectId: protoConfig.vertexProjectId,
+		vertexRegion: protoConfig.vertexRegion,
+		openAiBaseUrl: protoConfig.openAiBaseUrl,
+		openAiApiKey: protoConfig.openAiApiKey,
+		openAiModelId: protoConfig.openAiModelId,
+		openAiModelInfo: convertProtoToOpenAiCompatibleModelInfo(protoConfig.openAiModelInfo),
+		ollamaModelId: protoConfig.ollamaModelId,
+		ollamaBaseUrl: protoConfig.ollamaBaseUrl,
+		ollamaApiOptionsCtxNum: protoConfig.ollamaApiOptionsCtxNum,
+		lmStudioModelId: protoConfig.lmStudioModelId,
+		lmStudioBaseUrl: protoConfig.lmStudioBaseUrl,
+		geminiApiKey: protoConfig.geminiApiKey,
+		geminiBaseUrl: protoConfig.geminiBaseUrl,
+		openAiNativeApiKey: protoConfig.openAiNativeApiKey,
+		deepSeekApiKey: protoConfig.deepSeekApiKey,
+		requestyApiKey: protoConfig.requestyApiKey,
+		requestyModelId: protoConfig.requestyModelId,
+		requestyModelInfo: convertProtoToModelInfo(protoConfig.requestyModelInfo),
+		togetherApiKey: protoConfig.togetherApiKey,
+		togetherModelId: protoConfig.togetherModelId,
+		fireworksApiKey: protoConfig.fireworksApiKey,
+		fireworksModelId: protoConfig.fireworksModelId,
+		fireworksModelMaxCompletionTokens: protoConfig.fireworksModelMaxCompletionTokens,
+		fireworksModelMaxTokens: protoConfig.fireworksModelMaxTokens,
+		qwenApiKey: protoConfig.qwenApiKey,
+		doubaoApiKey: protoConfig.doubaoApiKey,
+		mistralApiKey: protoConfig.mistralApiKey,
+		azureApiVersion: protoConfig.azureApiVersion,
+		vsCodeLmModelSelector: protoConfig.vsCodeLmModelSelector,
+		qwenApiLine: protoConfig.qwenApiLine,
+		nebiusApiKey: protoConfig.nebiusApiKey,
+		asksageApiUrl: protoConfig.asksageApiUrl,
+		asksageApiKey: protoConfig.asksageApiKey,
+		xaiApiKey: protoConfig.xaiApiKey,
+		thinkingBudgetTokens: protoConfig.thinkingBudgetTokens,
+		reasoningEffort: protoConfig.reasoningEffort,
+		sambanovaApiKey: protoConfig.sambanovaApiKey,
+		cerebrasApiKey: protoConfig.cerebrasApiKey,
+		requestTimeoutMs: protoConfig.requestTimeoutMs,
+		apiProvider: protoConfig.apiProvider !== undefined ? convertProtoToApiProvider(protoConfig.apiProvider) : undefined,
+		favoritedModelIds: protoConfig.favoritedModelIds.length > 0 ? protoConfig.favoritedModelIds : undefined,
+		sapAiCoreClientId: protoConfig.sapAiCoreClientId,
+		sapAiCoreClientSecret: protoConfig.sapAiCoreClientSecret,
+		sapAiResourceGroup: protoConfig.sapAiResourceGroup,
+		sapAiCoreTokenUrl: protoConfig.sapAiCoreTokenUrl,
+		sapAiCoreBaseUrl: protoConfig.sapAiCoreBaseUrl,
+		claudeCodePath: protoConfig.claudeCodePath,
+	}
+}

src/shared/proto-conversions/models/vscode-lm-models-conversion.ts

@@ -1,4 +1,4 @@
-import { VsCodeLmModel } from "../../proto/models"
+import { LanguageModelChatSelector } from "../../proto/models"
 
 /**
  * Represents a VS Code language model in the native VS Code format
@@ -13,7 +13,7 @@ export interface VsCodeNativeModel {
 /**
  * Converts VS Code native model format to protobuf format
  */
-export function convertVsCodeNativeModelsToProtoModels(models: VsCodeNativeModel[]): VsCodeLmModel[] {
+export function convertVsCodeNativeModelsToProtoModels(models: VsCodeNativeModel[]): LanguageModelChatSelector[] {
 	return (models || []).map((model) => ({
 		vendor: model.vendor || "",
 		family: model.family || "",

src/shared/proto-conversions/state/settings-conversion.ts

@@ -1,4 +1,4 @@
-import { ApiConfiguration } from "@shared/api"
+import { ApiConfiguration, ApiProvider, BedrockModelId } from "@shared/api"
 import { ChatSettings } from "@shared/ChatSettings"
 import {
 	ApiConfiguration as ProtoApiConfiguration,
@@ -102,6 +102,13 @@ export function convertApiConfigurationToProtoApiConfiguration(config: ApiConfig
 		// OpenRouter specific
 		openrouterProviderSorting: config.openRouterProviderSorting,
 
+		// SAP AI Core specific
+		sapAiCoreClientId: config.sapAiCoreClientId,
+		sapAiCoreClientSecret: config.sapAiCoreClientSecret,
+		sapAiCoreBaseUrl: config.sapAiCoreBaseUrl,
+		sapAiCoreTokenUrl: config.sapAiCoreTokenUrl,
+		sapAiResourceGroup: config.sapAiResourceGroup,
+
 		// Complex objects stored as JSON strings
 		vscodeLmModelSelector: config.vsCodeLmModelSelector ? JSON.stringify(config.vsCodeLmModelSelector) : undefined,
 		openrouterModelInfo: config.openRouterModelInfo ? JSON.stringify(config.openRouterModelInfo) : undefined,
@@ -110,6 +117,9 @@ export function convertApiConfigurationToProtoApiConfiguration(config: ApiConfig
 		litellmModelInfo: config.liteLlmModelInfo ? JSON.stringify(config.liteLlmModelInfo) : undefined,
 		openaiHeaders: config.openAiHeaders ? JSON.stringify(config.openAiHeaders) : undefined,
 
+		// Claude Code specific
+		claudeCodePath: config.claudeCodePath,
+
 		// Arrays
 		favoritedModelIds: config.favoritedModelIds || [],
 	})
@@ -122,7 +132,7 @@ export function convertProtoApiConfigurationToApiConfiguration(protoConfig: Prot
 	// eslint-disable-next-line eslint-rules/no-protobuf-object-literals
 	const config: ApiConfiguration = {
 		// Core API fields
-		apiProvider: protoConfig.apiProvider as any,
+		apiProvider: protoConfig.apiProvider as ApiProvider,
 		apiModelId: protoConfig.apiModelId,
 		apiKey: protoConfig.apiKey,
 
@@ -158,7 +168,7 @@ export function convertProtoApiConfigurationToApiConfiguration(protoConfig: Prot
 
 		// AWS Bedrock fields
 		awsBedrockCustomSelected: protoConfig.awsBedrockCustomSelected,
-		awsBedrockCustomModelBaseId: protoConfig.awsBedrockCustomModelBaseId as any,
+		awsBedrockCustomModelBaseId: protoConfig.awsBedrockCustomModelBaseId as BedrockModelId | undefined,
 		awsAccessKey: protoConfig.awsAccessKey,
 		awsSecretKey: protoConfig.awsSecretKey,
 		awsSessionToken: protoConfig.awsSessionToken,
@@ -208,6 +218,16 @@ export function convertProtoApiConfigurationToApiConfiguration(protoConfig: Prot
 		// OpenRouter specific
 		openRouterProviderSorting: protoConfig.openrouterProviderSorting,
 
+		// SAP AI Core specific
+		sapAiCoreClientId: protoConfig.sapAiCoreClientId,
+		sapAiCoreClientSecret: protoConfig.sapAiCoreClientSecret,
+		sapAiCoreBaseUrl: protoConfig.sapAiCoreBaseUrl,
+		sapAiCoreTokenUrl: protoConfig.sapAiCoreTokenUrl,
+		sapAiResourceGroup: protoConfig.sapAiResourceGroup,
+
+		// Claude Code specific
+		claudeCodePath: protoConfig.claudeCodePath,
+
 		// Arrays
 		favoritedModelIds: protoConfig.favoritedModelIds || [],
 	}

src/standalone/host-bridge-client-manager.ts

@@ -0,0 +1,51 @@
+import { Channel, createChannel, createClient } from "nice-grpc"
+import * as host from "@generated/nice-grpc/index.host"
+
+/**
+ * Singleton class to hold the gRPC clients for the host bridge. The clients should be re-used to avoid
+ * creating a new TCP connection every time a rpc is made.
+ */
+class HostBridgeClientManager {
+	private static instance: HostBridgeClientManager | null
+	private channel: Channel
+	uriClient: host.UriServiceClient
+	//watchClient: host.WatchServiceClient
+
+	private constructor() {
+		const address = process.env.HOST_BRIDGE_ADDRESS || "localhost:50052"
+		this.channel = createChannel(address)
+		this.uriClient = createClient(host.UriServiceDefinition, this.channel)
+		//this.watchClient =
+	}
+
+	public static getInstance(): HostBridgeClientManager {
+		if (!HostBridgeClientManager.instance) {
+			HostBridgeClientManager.instance = new HostBridgeClientManager()
+		}
+		return HostBridgeClientManager.instance
+	}
+
+	public close(): void {
+		this.channel.close()
+		HostBridgeClientManager.instance = null
+	}
+}
+
+// TODO(sjf) Replace this with nice-grpc client.
+const StubWatchServiceClient = {
+	subscribeToFile: function (
+		_r: host.SubscribeToFileRequest,
+		_h: {
+			onResponse?: (response: { type: host.FileChangeEvent_ChangeType }) => void | Promise<void>
+			onError?: (error: any) => void
+			onComplete?: () => void
+		},
+	) {
+		throw Error("Unimplemented")
+	},
+}
+
+const clientManager = HostBridgeClientManager.getInstance()
+
+export const UriServiceClient = clientManager.uriClient
+export const WatchServiceClient = StubWatchServiceClient

src/standalone/standalone.ts

@@ -5,12 +5,14 @@ import * as health from "grpc-health-check"
 import { activate } from "../extension"
 import { Controller } from "../core/controller"
 import { extensionContext, outputChannel, postMessage } from "./vscode-context"
-import { packageDefinition, proto, log, camelToSnakeCase, snakeToCamelCase } from "./utils"
+import { getPackageDefinition, log } from "./utils"
 import { GrpcHandler, GrpcStreamingResponseHandler } from "./grpc-types"
-import { addServices } from "./server-setup"
+import { addProtobusServices } from "@/generated/standalone/server-setup"
 import { StreamingResponseHandler } from "@/core/controller/grpc-handler"
+import { UriServiceClient } from "@/hosts/host-bridge-client"
+import { StringRequest } from "@/shared/proto/common"
 
-function main() {
+async function main() {
 	log("Starting service...")
 
 	activate(extensionContext)
@@ -22,10 +24,10 @@ function main() {
 	healthImpl.addToServer(server)
 
 	// Add all the handlers for the ProtoBus services to the server.
-	addServices(server, proto, controller, wrapHandler, wrapStreamingResponseHandler)
+	addProtobusServices(server, controller, wrapHandler, wrapStreamingResponseHandler)
 
 	// Set up reflection.
-	const reflection = new ReflectionService(packageDefinition)
+	const reflection = new ReflectionService(getPackageDefinition())
 	reflection.addToServer(server)
 
 	// Start the server.
@@ -58,10 +60,8 @@ function wrapHandler<TRequest, TResponse>(
 	return async (call: grpc.ServerUnaryCall<TRequest, TResponse>, callback: grpc.sendUnaryData<TResponse>) => {
 		try {
 			log(`gRPC request: ${call.getPath()}`)
-			const result = await handler(controller, snakeToCamelCase(call.request))
-			// The grpc-js serializer expects the proto message to be in the same
-			// case as the proto file. This is a work around until we find a solution.
-			callback(null, camelToSnakeCase(result))
+			const result = await handler(controller, call.request)
+			callback(null, result)
 		} catch (err: any) {
 			log(`gRPC handler error: ${call.getPath()}\n${err.stack}`)
 			callback({
@@ -83,9 +83,7 @@ function wrapStreamingResponseHandler<TRequest, TResponse>(
 
 			const responseHandler: StreamingResponseHandler = (response, isLast, sequenceNumber) => {
 				try {
-					// The grpc-js serializer expects the proto message to be in the same
-					// case as the proto file. This is a work around until we find a solution.
-					call.write(camelToSnakeCase(response)) // Use a bound version of call.write to maintain proper 'this' context
+					call.write(response) // Use a bound version of call.write to maintain proper 'this' context
 
 					if (isLast === true) {
 						log(`Closing stream for ${requestId}`)
@@ -96,7 +94,7 @@ function wrapStreamingResponseHandler<TRequest, TResponse>(
 					return Promise.reject(error)
 				}
 			}
-			await handler(controller, snakeToCamelCase(call.request), responseHandler, requestId)
+			await handler(controller, call.request, responseHandler, requestId)
 		} catch (err: any) {
 			log(`gRPC handler error: ${call.getPath()}\n${err.stack}`)
 			call.destroy({

src/standalone/utils.ts

@@ -8,58 +8,12 @@ const log = (...args: unknown[]) => {
 	console.log(`[${timestamp}]`, "#bot.cline.server.ts", ...args)
 }
 
-// Load service definitions.
-const descriptorSet = fs.readFileSync("proto/descriptor_set.pb")
-const clineDef = protoLoader.loadFileDescriptorSetFromBuffer(descriptorSet)
-const healthDef = protoLoader.loadSync(health.protoPath)
-const packageDefinition = { ...clineDef, ...healthDef }
-const proto = grpc.loadPackageDefinition(packageDefinition) as unknown
-
-// Helper function to convert camelCase to snake_case
-function camelToSnakeCase(obj: any): any {
-	if (obj === null || typeof obj !== "object") {
-		return obj
-	}
-
-	if (Array.isArray(obj)) {
-		return obj.map(camelToSnakeCase)
-	}
-
-	return Object.keys(obj).reduce((acc: any, key: string) => {
-		// Convert key from camelCase to snake_case
-		const snakeKey = key
-			.replace(/([A-Z])/g, "_$1")
-			.replace(/^_+/, "")
-			.toLowerCase()
-
-		// Convert value recursively if it's an object
-		const value = obj[key]
-		acc[snakeKey] = camelToSnakeCase(value)
-
-		return acc
-	}, {})
+function getPackageDefinition() {
+	// Load service definitions.
+	const descriptorSet = fs.readFileSync("proto/descriptor_set.pb")
+	const clineDef = protoLoader.loadFileDescriptorSetFromBuffer(descriptorSet)
+	const healthDef = protoLoader.loadSync(health.protoPath)
+	const packageDefinition = { ...clineDef, ...healthDef }
+	return packageDefinition
 }
-
-// Helper function to convert snake_case to camelCase
-function snakeToCamelCase(obj: any): any {
-	if (obj === null || typeof obj !== "object") {
-		return obj
-	}
-
-	if (Array.isArray(obj)) {
-		return obj.map(snakeToCamelCase)
-	}
-
-	return Object.keys(obj).reduce((acc: any, key: string) => {
-		// Convert key from snake_case to camelCase
-		const camelKey = key.replace(/_([a-z0-9])/g, (_, char) => char.toUpperCase())
-
-		// Convert value recursively if it's an object
-		const value = obj[key]
-		acc[camelKey] = snakeToCamelCase(value)
-
-		return acc
-	}, {})
-}
-
-export { packageDefinition, proto, log, camelToSnakeCase, snakeToCamelCase }
+export { getPackageDefinition, log }

src/utils/model-utils.ts

@@ -0,0 +1,7 @@
+import { ApiHandler } from "@api/index"
+
+export function isClaude4ModelFamily(api: ApiHandler): boolean {
+	const model = api.getModel()
+	const modelId = model.id
+	return modelId.includes("sonnet-4") || modelId.includes("opus-4")
+}

src/utils/shell.ts

@@ -179,7 +179,113 @@ function getShellFromEnv(): string | null {
 }
 
 // -----------------------------------------------------
-// 4) Publicly Exposed Shell Getter
+// 4) Terminal Profile Interface and Utilities
+// -----------------------------------------------------
+
+import { TerminalProfile } from "../shared/proto/state"
+
+/** Gets available terminal profiles for the current platform */
+export function getAvailableTerminalProfiles(): TerminalProfile[] {
+	const profiles: TerminalProfile[] = [
+		{
+			id: "default",
+			name: "Default",
+			description: "Use VSCode's default terminal configuration",
+		},
+	]
+
+	if (process.platform === "win32") {
+		// Windows terminal profiles
+		profiles.push(
+			{
+				id: "powershell-7",
+				name: "PowerShell 7",
+				path: SHELL_PATHS.POWERSHELL_7,
+				description: "PowerShell 7 (pwsh.exe)",
+			},
+			{
+				id: "powershell-legacy",
+				name: "Windows PowerShell",
+				path: SHELL_PATHS.POWERSHELL_LEGACY,
+				description: "Windows PowerShell 5.x",
+			},
+			{
+				id: "cmd",
+				name: "Command Prompt",
+				path: SHELL_PATHS.CMD,
+				description: "Command Prompt (cmd.exe)",
+			},
+			{
+				id: "wsl-bash",
+				name: "WSL Bash",
+				path: SHELL_PATHS.WSL_BASH,
+				description: "Windows Subsystem for Linux Bash",
+			},
+		)
+	} else if (process.platform === "darwin") {
+		// macOS terminal profiles
+		profiles.push(
+			{
+				id: "zsh",
+				name: "zsh",
+				path: SHELL_PATHS.ZSH,
+				description: "Z shell (default on macOS)",
+			},
+			{
+				id: "bash",
+				name: "bash",
+				path: SHELL_PATHS.BASH,
+				description: "Bourne Again Shell",
+			},
+		)
+	} else if (process.platform === "linux") {
+		// Linux terminal profiles
+		profiles.push(
+			{
+				id: "bash",
+				name: "bash",
+				path: SHELL_PATHS.BASH,
+				description: "Bourne Again Shell (default on most Linux)",
+			},
+			{
+				id: "zsh",
+				name: "zsh",
+				path: SHELL_PATHS.ZSH,
+				description: "Z shell",
+			},
+			{
+				id: "dash",
+				name: "dash",
+				path: SHELL_PATHS.DASH,
+				description: "Debian Almquist Shell",
+			},
+		)
+	}
+
+	return profiles
+}
+
+/** Gets the shell path for a specific terminal profile */
+export function getShellForProfile(profileId: string): string {
+	// If it's the default profile, use the existing getShell() logic
+	if (profileId === "default") {
+		return getShell()
+	}
+
+	// Find the profile
+	const profiles = getAvailableTerminalProfiles()
+	const profile = profiles.find((p) => p.id === profileId)
+
+	if (profile?.path) {
+		return profile.path
+	}
+
+	// Fallback to default shell if profile not found
+	return getShell()
+}
+
+// -----------------------------------------------------
+// 5) Publicly Exposed Shell Getter
 // -----------------------------------------------------
 
 export function getShell(): string {

tsconfig.json

@@ -24,12 +24,13 @@
 			"@/*": ["src/*"],
 			"@api/*": ["src/api/*"],
 			"@core/*": ["src/core/*"],
+			"@generated/*": ["src/generated/*"],
 			"@hosts/*": ["src/hosts/*"],
 			"@integrations/*": ["src/integrations/*"],
+			"@packages/*": ["src/packages/*"],
 			"@services/*": ["src/services/*"],
 			"@shared/*": ["src/shared/*"],
-			"@utils/*": ["src/utils/*"],
-			"@packages/*": ["src/packages/*"]
+			"@utils/*": ["src/utils/*"]
 		}
 	},
 	"include": ["src/**/*", "scripts/**/*"],

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

@@ -1,6 +1,8 @@
 import { VSCodeBadge, VSCodeButton, VSCodeProgressRing } from "@vscode/webview-ui-toolkit/react"
 import deepEqual from "fast-deep-equal"
 import React, { memo, MouseEvent, useCallback, useEffect, useMemo, useRef, useState } from "react"
+import styled from "styled-components"
+import { useEvent, useSize } from "react-use"
 
 import CreditLimitError from "@/components/chat/CreditLimitError"
 import { OptionsButtons } from "@/components/chat/OptionsButtons"
@@ -9,6 +11,8 @@ import { CheckmarkControl } from "@/components/common/CheckmarkControl"
 import CodeBlock, { CODE_BLOCK_BG_COLOR } from "@/components/common/CodeBlock"
 import MarkdownBlock from "@/components/common/MarkdownBlock"
 import SuccessButton from "@/components/common/SuccessButton"
+import { WithCopyButton } from "@/components/common/CopyButton"
+import Thumbnails from "@/components/common/Thumbnails"
 import McpResponseDisplay from "@/components/mcp/chat-display/McpResponseDisplay"
 import McpResourceRow from "@/components/mcp/configuration/tabs/installed/server-row/McpResourceRow"
 import McpToolRow from "@/components/mcp/configuration/tabs/installed/server-row/McpToolRow"
@@ -28,76 +32,19 @@ import {
 } from "@shared/ExtensionMessage"
 import { COMMAND_OUTPUT_STRING, COMMAND_REQ_APP_STRING } from "@shared/combineCommandSequences"
 import { Int64Request, StringRequest } from "@shared/proto/common"
-import { useEvent, useSize } from "react-use"
-import styled from "styled-components"
-import { CheckpointControls } from "../common/CheckpointControls"
+
 import CodeAccordian, { cleanPathPrefix } from "../common/CodeAccordian"
+import { CheckpointControls } from "../common/CheckpointControls"
 import NewTaskPreview from "./NewTaskPreview"
-import QuoteButton from "./QuoteButton"
 import ReportBugPreview from "./ReportBugPreview"
 import UserMessage from "./UserMessage"
-
-interface CopyButtonProps {
-	textToCopy: string | undefined
-}
+import QuoteButton from "./QuoteButton"
 
 const normalColor = "var(--vscode-foreground)"
 const errorColor = "var(--vscode-errorForeground)"
 const successColor = "var(--vscode-charts-green)"
 const cancelledColor = "var(--vscode-descriptionForeground)"
 
-const CopyButtonStyled = styled(VSCodeButton)`
-	position: absolute;
-	bottom: 2px;
-	right: 2px;
-	z-index: 1;
-	opacity: 0;
-`
-
-interface WithCopyButtonProps {
-	children: React.ReactNode
-	textToCopy?: string
-	style?: React.CSSProperties
-	ref?: React.Ref<HTMLDivElement>
-	onMouseUp?: (event: MouseEvent<HTMLDivElement>) => void
-}
-
-const StyledContainer = styled.div`
-	position: relative;
-
-	&:hover ${CopyButtonStyled} {
-		opacity: 1;
-	}
-`
-
-const WithCopyButton = React.forwardRef<HTMLDivElement, WithCopyButtonProps>(
-	({ children, textToCopy, style, onMouseUp, ...props }, ref) => {
-		const [copied, setCopied] = useState(false)
-
-		const handleCopy = () => {
-			if (!textToCopy) return
-
-			navigator.clipboard.writeText(textToCopy).then(() => {
-				setCopied(true)
-				setTimeout(() => {
-					setCopied(false)
-				}, 1500)
-			})
-		}
-
-		return (
-			<StyledContainer ref={ref} onMouseUp={onMouseUp} style={style} {...props}>
-				{children}
-				{textToCopy && (
-					<CopyButtonStyled appearance="icon" onClick={handleCopy} aria-label={copied ? "Copied" : "Copy"}>
-						<span className={`codicon codicon-${copied ? "check" : "copy"}`}></span>
-					</CopyButtonStyled>
-				)}
-			</StyledContainer>
-		)
-	},
-)
-
 const ChatRowContainer = styled.div`
 	padding: 10px 6px 10px 15px;
 	position: relative;
@@ -1054,9 +1001,43 @@ export const ChatRowContent = ({
 					return null // we should never see this message type
 				case "mcp_server_response":
 					return <McpResponseDisplay responseText={message.text || ""} />
+				case "mcp_notification":
+					return (
+						<div
+							style={{
+								display: "flex",
+								alignItems: "flex-start",
+								gap: "8px",
+								padding: "8px 12px",
+								backgroundColor: "var(--vscode-textBlockQuote-background)",
+								borderRadius: "4px",
+								fontSize: "13px",
+								color: "var(--vscode-foreground)",
+								opacity: 0.9,
+								marginBottom: "8px",
+							}}>
+							<i
+								className="codicon codicon-bell"
+								style={{
+									marginTop: "2px",
+									fontSize: "14px",
+									color: "var(--vscode-notificationsInfoIcon-foreground)",
+									flexShrink: 0,
+								}}
+							/>
+							<div style={{ flex: 1, wordBreak: "break-word" }}>
+								<span style={{ fontWeight: 500 }}>MCP Notification: </span>
+								<span className="ph-no-capture">{message.text}</span>
+							</div>
+						</div>
+					)
 				case "text":
 					return (
-						<WithCopyButton ref={contentRef} onMouseUp={handleMouseUp} textToCopy={message.text}>
+						<WithCopyButton
+							ref={contentRef}
+							onMouseUp={handleMouseUp}
+							textToCopy={message.text}
+							position="bottom-right">
 							<Markdown markdown={message.text} />
 							{quoteButtonState.visible && (
 								<QuoteButton
@@ -1293,6 +1274,7 @@ export const ChatRowContent = ({
 								ref={contentRef}
 								onMouseUp={handleMouseUp}
 								textToCopy={text}
+								position="bottom-right"
 								style={{
 									color: "var(--vscode-charts-green)",
 									paddingTop: 10,
@@ -1457,6 +1439,7 @@ export const ChatRowContent = ({
 									ref={contentRef}
 									onMouseUp={handleMouseUp}
 									textToCopy={text}
+									position="bottom-right"
 									style={{
 										color: "var(--vscode-charts-green)",
 										paddingTop: 10,
@@ -1527,6 +1510,7 @@ export const ChatRowContent = ({
 								ref={contentRef}
 								onMouseUp={handleMouseUp}
 								textToCopy={question}
+								position="bottom-right"
 								style={{ paddingTop: 10 }}>
 								<Markdown markdown={question} />
 								<OptionsButtons
@@ -1610,7 +1594,7 @@ export const ChatRowContent = ({
 						response = message.text
 					}
 					return (
-						<WithCopyButton ref={contentRef} onMouseUp={handleMouseUp} textToCopy={response}>
+						<WithCopyButton ref={contentRef} onMouseUp={handleMouseUp} textToCopy={response} position="bottom-right">
 							<Markdown markdown={response} />
 							<OptionsButtons
 								options={options}

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

@@ -6,7 +6,7 @@ import Thumbnails from "@/components/common/Thumbnails"
 import Tooltip from "@/components/common/Tooltip"
 import ApiOptions, { normalizeApiConfiguration } from "@/components/settings/ApiOptions"
 import { useExtensionState } from "@/context/ExtensionStateContext"
-import { FileServiceClient, StateServiceClient } from "@/services/grpc-client"
+import { FileServiceClient, StateServiceClient, ModelsServiceClient } from "@/services/grpc-client"
 import {
 	ContextMenuOptionType,
 	getContextMenuOptions,
@@ -34,6 +34,8 @@ import { mentionRegex, mentionRegexGlobal } from "@shared/context-mentions"
 import { ExtensionMessage } from "@shared/ExtensionMessage"
 import { EmptyRequest, StringRequest } from "@shared/proto/common"
 import { FileSearchRequest, RelativePathsRequest } from "@shared/proto/file"
+import { UpdateApiConfigurationRequest } from "@shared/proto/models"
+import { convertApiConfigurationToProto } from "@shared/proto-conversions/models/api-configuration-conversion"
 import { PlanActMode, TogglePlanActModeRequest } from "@shared/proto/state"
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
 import React, { forwardRef, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react"
@@ -79,6 +81,7 @@ interface ChatTextAreaProps {
 	shouldDisableFilesAndImages: boolean
 	onHeightChange?: (height: number) => void
 	onFocusChange?: (isFocused: boolean) => void
+	isTaskView: boolean
 }
 
 interface GitCommit {
@@ -266,6 +269,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 			shouldDisableFilesAndImages,
 			onHeightChange,
 			onFocusChange,
+			isTaskView,
 		},
 		ref,
 	) => {
@@ -962,12 +966,20 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 		)
 
 		// Separate the API config submission logic
-		const submitApiConfig = useCallback(() => {
+		const submitApiConfig = useCallback(async () => {
 			const apiValidationResult = validateApiConfiguration(apiConfiguration)
 			const modelIdValidationResult = validateModelId(apiConfiguration, openRouterModels)
 
-			if (!apiValidationResult && !modelIdValidationResult) {
-				vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
+			if (!apiValidationResult && !modelIdValidationResult && apiConfiguration) {
+				try {
+					await ModelsServiceClient.updateApiConfigurationProto(
+						UpdateApiConfigurationRequest.create({
+							apiConfiguration: convertApiConfigurationToProto(apiConfiguration),
+						}),
+					)
+				} catch (error) {
+					console.error("Failed to update API configuration:", error)
+				}
 			} else {
 				StateServiceClient.getLatestState(EmptyRequest.create())
 					.then(() => {
@@ -1005,6 +1017,9 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 				)
 				// Focus the textarea after mode toggle with slight delay
 				setTimeout(() => {
+					if (isTaskView) {
+						setInputValue("")
+					}
 					textAreaRef.current?.focus()
 				}, 100)
 			}, changeModeDelay)
@@ -1566,7 +1581,7 @@ const ChatTextArea = forwardRef<HTMLTextAreaElement, ChatTextAreaProps>(
 					/>
 					{!inputValue && selectedImages.length === 0 && selectedFiles.length === 0 && (
 						<div className="absolute bottom-4 left-[25px] right-[60px] text-[10px] text-[var(--vscode-input-placeholderForeground)] opacity-70 whitespace-nowrap overflow-hidden text-ellipsis pointer-events-none z-[1]">
-							Type @ for context, / for slash commands & workflows
+							Type @ for context, / for slash commands & workflows, hold shift to drag in files/images
 						</div>
 					)}
 					{(selectedImages.length > 0 || selectedFiles.length > 0) && (

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

@@ -95,7 +95,14 @@ export const MAX_IMAGES_AND_FILES_PER_MESSAGE = 20
 const QUICK_WINS_HISTORY_THRESHOLD = 300
 
 const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryView }: ChatViewProps) => {
-	const { version, clineMessages: messages, taskHistory, apiConfiguration, telemetrySetting } = useExtensionState()
+	const {
+		version,
+		clineMessages: messages,
+		taskHistory,
+		apiConfiguration,
+		telemetrySetting,
+		navigateToChat,
+	} = useExtensionState()
 	const shouldShowQuickWins = false // !taskHistory || taskHistory.length < QUICK_WINS_HISTORY_THRESHOLD
 	//const task = messages.length > 0 ? (messages[0].say === "task" ? messages[0] : undefined) : undefined) : undefined
 	const task = useMemo(() => messages.at(0), [messages]) // leaving this less safe version here since if the first message is not a task, then the extension is in a bad state and needs to be debugged (see Cline.abort)
@@ -125,8 +132,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 	const [selectedImages, setSelectedImages] = useState<string[]>([])
 	const [selectedFiles, setSelectedFiles] = useState<string[]>([])
 
-	// we need to hold on to the ask because useEffect > lastMessage will always let us know when an ask comes in and handle it, but by the time handleMessage is called, the last message might not be the ask anymore (it could be a say that followed)
-	const [clineAsk, setClineAsk] = useState<ClineAsk | undefined>(undefined)
 	const [enableButtons, setEnableButtons] = useState<boolean>(false)
 	const [primaryButtonText, setPrimaryButtonText] = useState<string | undefined>("Approve")
 	const [secondaryButtonText, setSecondaryButtonText] = useState<string | undefined>("Reject")
@@ -139,6 +144,14 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 	const [isAtBottom, setIsAtBottom] = useState(false)
 	const [pendingScrollToMessage, setPendingScrollToMessage] = useState<number | null>(null)
 
+	// UI layout depends on the last 2 messages
+	// (since it relies on the content of these messages, we are deep comparing. i.e. the button state after hitting button sets enableButtons to false, and this effect otherwise would have to true again even if messages didn't change
+	const lastMessage = useMemo(() => messages.at(-1), [messages])
+	const secondLastMessage = useMemo(() => messages.at(-2), [messages])
+
+	// Derive clineAsk directly from lastMessage to avoid race conditions
+	const clineAsk = useMemo(() => (lastMessage?.type === "ask" ? lastMessage.ask : undefined), [lastMessage])
+
 	useEffect(() => {
 		const handleCopy = async (e: ClipboardEvent) => {
 			const targetElement = e.target as HTMLElement | null
@@ -225,11 +238,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 			document.removeEventListener("copy", handleCopy)
 		}
 	}, [])
-
-	// UI layout depends on the last 2 messages
-	// (since it relies on the content of these messages, we are deep comparing. i.e. the button state after hitting button sets enableButtons to false, and this effect otherwise would have to true again even if messages didn't change
-	const lastMessage = useMemo(() => messages.at(-1), [messages])
-	const secondLastMessage = useMemo(() => messages.at(-2), [messages])
 	useDeepCompareEffect(() => {
 		// if last message is an ask, show user ask UI
 		// if user finished a task, then start a new task with a new conversation history since in this moment that the extension is waiting for user response, the user could close the extension and the conversation history would be lost.
@@ -241,42 +249,36 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 					switch (lastMessage.ask) {
 						case "api_req_failed":
 							setSendingDisabled(true)
-							setClineAsk("api_req_failed")
 							setEnableButtons(true)
 							setPrimaryButtonText("Retry")
 							setSecondaryButtonText("Start New Task")
 							break
 						case "mistake_limit_reached":
 							setSendingDisabled(false)
-							setClineAsk("mistake_limit_reached")
 							setEnableButtons(true)
 							setPrimaryButtonText("Proceed Anyways")
 							setSecondaryButtonText("Start New Task")
 							break
 						case "auto_approval_max_req_reached":
 							setSendingDisabled(true)
-							setClineAsk("auto_approval_max_req_reached")
 							setEnableButtons(true)
 							setPrimaryButtonText("Proceed")
 							setSecondaryButtonText("Start New Task")
 							break
 						case "followup":
 							setSendingDisabled(isPartial)
-							setClineAsk("followup")
 							setEnableButtons(false)
 							// setPrimaryButtonText(undefined)
 							// setSecondaryButtonText(undefined)
 							break
 						case "plan_mode_respond":
 							setSendingDisabled(isPartial)
-							setClineAsk("plan_mode_respond")
 							setEnableButtons(false)
 							// setPrimaryButtonText(undefined)
 							// setSecondaryButtonText(undefined)
 							break
 						case "tool":
 							setSendingDisabled(isPartial)
-							setClineAsk("tool")
 							setEnableButtons(!isPartial)
 							const tool = JSON.parse(lastMessage.text || "{}") as ClineSayTool
 							switch (tool.tool) {
@@ -293,28 +295,24 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 							break
 						case "browser_action_launch":
 							setSendingDisabled(isPartial)
-							setClineAsk("browser_action_launch")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Approve")
 							setSecondaryButtonText("Reject")
 							break
 						case "command":
 							setSendingDisabled(isPartial)
-							setClineAsk("command")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Run Command")
 							setSecondaryButtonText("Reject")
 							break
 						case "command_output":
 							setSendingDisabled(false)
-							setClineAsk("command_output")
 							setEnableButtons(true)
 							setPrimaryButtonText("Proceed While Running")
 							setSecondaryButtonText(undefined)
 							break
 						case "use_mcp_server":
 							setSendingDisabled(isPartial)
-							setClineAsk("use_mcp_server")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Approve")
 							setSecondaryButtonText("Reject")
@@ -322,14 +320,12 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 						case "completion_result":
 							// extension waiting for feedback. but we can just present a new task button
 							setSendingDisabled(isPartial)
-							setClineAsk("completion_result")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Start New Task")
 							setSecondaryButtonText(undefined)
 							break
 						case "resume_task":
 							setSendingDisabled(false)
-							setClineAsk("resume_task")
 							setEnableButtons(true)
 							setPrimaryButtonText("Resume Task")
 							setSecondaryButtonText(undefined)
@@ -337,7 +333,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 							break
 						case "resume_completed_task":
 							setSendingDisabled(false)
-							setClineAsk("resume_completed_task")
 							setEnableButtons(true)
 							setPrimaryButtonText("Start New Task")
 							setSecondaryButtonText(undefined)
@@ -345,21 +340,18 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 							break
 						case "new_task":
 							setSendingDisabled(isPartial)
-							setClineAsk("new_task")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Start New Task with Context")
 							setSecondaryButtonText(undefined)
 							break
 						case "condense":
 							setSendingDisabled(isPartial)
-							setClineAsk("condense")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Condense Conversation")
 							setSecondaryButtonText(undefined)
 							break
 						case "report_bug":
 							setSendingDisabled(isPartial)
-							setClineAsk("report_bug")
 							setEnableButtons(!isPartial)
 							setPrimaryButtonText("Report GitHub issue")
 							setSecondaryButtonText(undefined)
@@ -376,7 +368,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 								setSendingDisabled(true)
 								setSelectedImages([])
 								setSelectedFiles([])
-								setClineAsk(undefined)
 								setEnableButtons(false)
 							}
 							break
@@ -412,7 +403,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 	useEffect(() => {
 		if (messages.length === 0) {
 			setSendingDisabled(false)
-			setClineAsk(undefined)
 			setEnableButtons(false)
 			setPrimaryButtonText("Approve")
 			setSecondaryButtonText("Reject")
@@ -497,7 +487,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 				setSendingDisabled(true)
 				setSelectedImages([])
 				setSelectedFiles([])
-				setClineAsk(undefined)
 				setEnableButtons(false)
 				// setPrimaryButtonText(undefined)
 				// setSecondaryButtonText(undefined)
@@ -577,7 +566,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 					break
 			}
 			setSendingDisabled(true)
-			setClineAsk(undefined)
 			setEnableButtons(false)
 			// setPrimaryButtonText(undefined)
 			// setSecondaryButtonText(undefined)
@@ -630,7 +618,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 					break
 			}
 			setSendingDisabled(true)
-			setClineAsk(undefined)
 			setEnableButtons(false)
 			// setPrimaryButtonText(undefined)
 			// setSecondaryButtonText(undefined)
@@ -699,12 +686,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 								textAreaRef.current?.focus()
 							}
 							break
-						case "focusChatInput":
-							textAreaRef.current?.focus()
-							if (isHidden) {
-								window.dispatchEvent(new CustomEvent("chatButtonClicked"))
-							}
-							break
 					}
 					break
 			}
@@ -715,6 +696,22 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 
 	useEvent("message", handleMessage)
 
+	// Listen for local focusChatInput event
+	useEffect(() => {
+		const handleFocusChatInput = () => {
+			if (isHidden) {
+				navigateToChat()
+			}
+			textAreaRef.current?.focus()
+		}
+
+		window.addEventListener("focusChatInput", handleFocusChatInput)
+
+		return () => {
+			window.removeEventListener("focusChatInput", handleFocusChatInput)
+		}
+	}, [isHidden])
+
 	// Set up addToInput subscription
 	useEffect(() => {
 		const cleanup = UiServiceClient.subscribeToAddToInput(EmptyRequest.create({}), {
@@ -1289,6 +1286,7 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 						scrollToBottomAuto()
 					}
 				}}
+				isTaskView={!!task}
 			/>
 		</div>
 	)

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

@@ -94,27 +94,27 @@ const AutoApproveMenuItem = ({
 				<HeroTooltip content={action.description} delay={500}>
 					<CheckboxContainer isFavorited={favorited} onClick={onChange}>
 						<div className="left-content">
+							{onToggleFavorite && !condensed && (
+								<HeroTooltip
+									delay={500}
+									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",
+										}}
+										onClick={async (e) => {
+											e.stopPropagation()
+											if (action.id === "enableAll") return
+											await onToggleFavorite?.(action.id)
+										}}
+									/>
+								</HeroTooltip>
+							)}
 							<VSCodeCheckbox checked={checked} />
 							{showIcon && <span className={`codicon ${action.icon} icon`}></span>}
 							<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"}>
-								<span
-									className={`p-0.5 codicon codicon-${favorited ? "star-full" : "star-empty"} star`}
-									style={{
-										cursor: "pointer",
-									}}
-									onClick={async (e) => {
-										e.stopPropagation()
-										if (action.id === "enableAll") return
-										await onToggleFavorite?.(action.id)
-									}}
-								/>
-							</HeroTooltip>
-						)}
 					</CheckboxContainer>
 				</HeroTooltip>
 			</ActionButtonContainer>

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

@@ -5,7 +5,7 @@ import { CheckpointRestoreRequest } from "@shared/proto/checkpoints"
 import { Int64Request } from "@shared/proto/common"
 import { ClineCheckpointRestore } from "@shared/WebviewMessage"
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
-import { useEffect, useRef, useState } from "react"
+import { useCallback, useEffect, useRef, useState } from "react"
 import { createPortal } from "react-dom"
 import styled from "styled-components"
 import { useExtensionState } from "@/context/ExtensionStateContext"
@@ -21,11 +21,43 @@ export const CheckmarkControl = ({ messageTs, isCheckpointCheckedOut }: Checkmar
 	const [restoreWorkspaceDisabled, setRestoreWorkspaceDisabled] = useState(false)
 	const [restoreBothDisabled, setRestoreBothDisabled] = useState(false)
 	const [showRestoreConfirm, setShowRestoreConfirm] = useState(false)
-	const [hasMouseEntered, setHasMouseEntered] = useState(false)
-	const containerRef = useRef<HTMLDivElement>(null)
-	const tooltipRef = useRef<HTMLDivElement>(null)
 	const { onRelinquishControl } = useExtensionState()
 
+	// Debounce
+	const closeMenuTimeoutRef = useRef<NodeJS.Timeout | null>(null)
+	const scheduleCloseRestore = useCallback(() => {
+		if (closeMenuTimeoutRef.current) {
+			clearTimeout(closeMenuTimeoutRef.current)
+		}
+		closeMenuTimeoutRef.current = setTimeout(() => {
+			setShowRestoreConfirm(false)
+		}, 350)
+	}, [])
+
+	const cancelCloseRestore = useCallback(() => {
+		if (closeMenuTimeoutRef.current) {
+			clearTimeout(closeMenuTimeoutRef.current)
+			closeMenuTimeoutRef.current = null
+		}
+	}, [])
+
+	// Debounce cleanup
+	useEffect(() => {
+		return () => {
+			if (closeMenuTimeoutRef.current) {
+				clearTimeout(closeMenuTimeoutRef.current)
+				closeMenuTimeoutRef.current = null
+			}
+		}
+	}, [showRestoreConfirm])
+
+	// Clear "Restore Files" button when checkpoint is no longer checked out
+	useEffect(() => {
+		if (!isCheckpointCheckedOut && restoreWorkspaceDisabled) {
+			setRestoreWorkspaceDisabled(false)
+		}
+	}, [isCheckpointCheckedOut, restoreWorkspaceDisabled])
+
 	const { refs, floatingStyles, update, placement } = useFloating({
 		placement: "bottom-end",
 		middleware: [
@@ -112,38 +144,27 @@ export const CheckmarkControl = ({ messageTs, isCheckpointCheckedOut }: Checkmar
 	}
 
 	const handleMouseEnter = () => {
-		setHasMouseEntered(true)
+		cancelCloseRestore()
 	}
 
 	const handleMouseLeave = () => {
-		if (hasMouseEntered) {
-			setShowRestoreConfirm(false)
-			setHasMouseEntered(false)
-		}
+		scheduleCloseRestore()
 	}
 
-	const handleControlsMouseLeave = (e: React.MouseEvent) => {
-		const tooltipElement = tooltipRef.current
+	const handleControlsMouseEnter = () => {
+		cancelCloseRestore()
+	}
 
-		if (tooltipElement && showRestoreConfirm) {
-			const tooltipRect = tooltipElement.getBoundingClientRect()
-
-			if (
-				e.clientY >= tooltipRect.top &&
-				e.clientY <= tooltipRect.bottom &&
-				e.clientX >= tooltipRect.left &&
-				e.clientX <= tooltipRect.right
-			) {
-				return
-			}
-		}
-
-		setShowRestoreConfirm(false)
-		setHasMouseEntered(false)
+	const handleControlsMouseLeave = () => {
+		scheduleCloseRestore()
 	}
 
 	return (
-		<Container isMenuOpen={showRestoreConfirm} $isCheckedOut={isCheckpointCheckedOut} onMouseLeave={handleControlsMouseLeave}>
+		<Container
+			isMenuOpen={showRestoreConfirm}
+			$isCheckedOut={isCheckpointCheckedOut}
+			onMouseEnter={handleControlsMouseEnter}
+			onMouseLeave={handleControlsMouseLeave}>
 			<i
 				className="codicon codicon-bookmark"
 				style={{
@@ -196,9 +217,9 @@ export const CheckmarkControl = ({ messageTs, isCheckpointCheckedOut }: Checkmar
 								<RestoreOption>
 									<VSCodeButton
 										onClick={handleRestoreWorkspace}
-										disabled={restoreWorkspaceDisabled}
+										disabled={restoreWorkspaceDisabled || isCheckpointCheckedOut}
 										style={{
-											cursor: restoreWorkspaceDisabled ? "wait" : "pointer",
+											cursor: restoreWorkspaceDisabled || isCheckpointCheckedOut ? "wait" : "pointer",
 											width: "100%",
 											marginBottom: "10px",
 										}}>
@@ -318,9 +339,9 @@ const CustomButton = styled.button<{ disabled?: boolean; isActive?: boolean; $is
 			props.isActive || props.disabled
 				? "none"
 				: `linear-gradient(to right, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%),
-			linear-gradient(to bottom, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%),
-			linear-gradient(to right, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%),
-			linear-gradient(to bottom, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%)`};
+            linear-gradient(to bottom, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%),
+            linear-gradient(to right, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%),
+            linear-gradient(to bottom, ${props.$isCheckedOut ? "var(--vscode-textLink-foreground)" : "var(--vscode-descriptionForeground)"} 50%, transparent 50%)`};
 		background-size: ${(props) => (props.isActive || props.disabled ? "auto" : `4px 1px, 1px 4px, 4px 1px, 1px 4px`)};
 		background-repeat: repeat-x, repeat-y, repeat-x, repeat-y;
 		background-position:

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

@@ -0,0 +1,138 @@
+import React, { useState, useRef, forwardRef } from "react"
+import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
+import styled from "styled-components"
+
+// ======== Interfaces ========
+
+interface CopyButtonProps {
+	textToCopy?: string
+	onCopy?: () => string | void | null
+	className?: string
+	ariaLabel?: string
+}
+
+interface WithCopyButtonProps {
+	children: React.ReactNode
+	textToCopy?: string
+	onCopy?: () => string | void | null
+	position?: "top-right" | "bottom-right"
+	style?: React.CSSProperties
+	className?: string
+	onMouseUp?: (event: React.MouseEvent<HTMLDivElement>) => void
+	ariaLabel?: string
+}
+
+// ======== Styled Components ========
+
+const StyledButton = styled(VSCodeButton)`
+	z-index: 1;
+`
+
+// Unified container component
+const ContentContainer = styled.div`
+	position: relative;
+`
+
+// Unified button container with flexible positioning
+const ButtonContainer = styled.div<{ $position?: "top-right" | "bottom-right" }>`
+	position: absolute;
+	${(props) => {
+		switch (props.$position) {
+			case "bottom-right":
+				return "bottom: 2px; right: 2px;"
+			case "top-right":
+			default:
+				return "top: 5px; right: 5px;"
+		}
+	}}
+	z-index: 1;
+	opacity: 0;
+
+	${ContentContainer}:hover & {
+		opacity: 1;
+	}
+`
+
+// ======== Component Implementations ========
+
+/**
+ * Base copy button component with clipboard functionality
+ */
+export const CopyButton: React.FC<CopyButtonProps> = ({ textToCopy, onCopy, className = "", ariaLabel }) => {
+	const [copied, setCopied] = useState(false)
+
+	const handleCopy = () => {
+		if (!textToCopy && !onCopy) return
+
+		let textToCopyFinal = textToCopy
+
+		if (onCopy) {
+			const result = onCopy()
+			if (typeof result === "string") {
+				textToCopyFinal = result
+			}
+		}
+
+		if (textToCopyFinal) {
+			navigator.clipboard
+				.writeText(textToCopyFinal)
+				.then(() => {
+					setCopied(true)
+					setTimeout(() => setCopied(false), 1500)
+				})
+				.catch((err) => console.error("Copy failed", err))
+		}
+	}
+
+	return (
+		<StyledButton
+			appearance="icon"
+			onClick={handleCopy}
+			className={className}
+			aria-label={copied ? "Copied" : ariaLabel || "Copy"}>
+			<span className={`codicon codicon-${copied ? "check" : "copy"}`}></span>
+		</StyledButton>
+	)
+}
+
+/**
+ * Container component that wraps content with a copy button
+ */
+export const WithCopyButton = forwardRef<HTMLDivElement, WithCopyButtonProps>(
+	(
+		{
+			children,
+			textToCopy,
+			onCopy,
+			position = "top-right",
+			style,
+			className,
+			onMouseUp,
+			ariaLabel, // Destructure ariaLabel
+			...props
+		},
+		ref,
+	) => {
+		return (
+			<ContentContainer ref={ref} onMouseUp={onMouseUp} style={style} className={className} {...props}>
+				{children}
+				{(textToCopy || onCopy) && (
+					<ButtonContainer $position={position}>
+						<CopyButton
+							textToCopy={textToCopy}
+							onCopy={onCopy}
+							ariaLabel={ariaLabel} // Pass through the ariaLabel prop directly
+						/>
+					</ButtonContainer>
+				)}
+			</ContentContainer>
+		)
+	},
+)
+
+// Default export for convenience if needed, though named exports are preferred for clarity
+const CopyButtonComponents = {
+	CopyButton,
+	WithCopyButton,
+}
+export default CopyButtonComponents

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

@@ -1,17 +1,18 @@
-import { CODE_BLOCK_BG_COLOR } from "@/components/common/CodeBlock"
-import MermaidBlock from "@/components/common/MermaidBlock"
-import { useExtensionState } from "@/context/ExtensionStateContext"
-import { StateServiceClient } from "@/services/grpc-client"
-import { PlanActMode, TogglePlanActModeRequest } from "@shared/proto/state"
-import type { ComponentProps } from "react"
 import React, { memo, useEffect, useRef, useState } from "react"
+import type { ComponentProps } from "react"
 import { useRemark } from "react-remark"
 import rehypeHighlight, { Options } from "rehype-highlight"
 import rehypeKatex from "rehype-katex"
 import remarkMath from "remark-math"
 import styled from "styled-components"
-import type { Node } from "unist"
 import { visit } from "unist-util-visit"
+import type { Node } from "unist"
+import { useExtensionState } from "@/context/ExtensionStateContext"
+import CodeBlock, { CODE_BLOCK_BG_COLOR } from "@/components/common/CodeBlock"
+import MermaidBlock from "@/components/common/MermaidBlock"
+import { WithCopyButton } from "./CopyButton"
+import { StateServiceClient } from "@/services/grpc-client"
+import { PlanActMode, TogglePlanActModeRequest } from "@shared/proto/state"
 
 // Styled component for Act Mode text with more specific styling
 const ActModeHighlight: React.FC = () => (
@@ -178,24 +179,6 @@ const remarkPreventBoldFilenames = () => {
 	}
 }
 
-import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
-
-const CopyButton = styled(VSCodeButton)`
-	position: absolute;
-	top: 5px;
-	right: 5px;
-	z-index: 1;
-	opacity: 0;
-`
-
-const CodeBlockContainer = styled.div`
-	position: relative;
-
-	&:hover ${CopyButton} {
-		opacity: 1;
-	}
-`
-
 const StyledMarkdown = styled.div`
 	pre {
 		background-color: ${CODE_BLOCK_BG_COLOR};
@@ -337,7 +320,6 @@ const PreWithCopyButton = ({
 	...preProps
 }: { theme: Record<string, string> } & React.HTMLAttributes<HTMLPreElement>) => {
 	const preRef = useRef<HTMLPreElement>(null)
-	const [copied, setCopied] = useState(false)
 
 	const handleCopy = () => {
 		if (preRef.current) {
@@ -345,22 +327,19 @@ const PreWithCopyButton = ({
 			const textToCopy = codeElement ? codeElement.textContent : preRef.current.textContent
 
 			if (!textToCopy) return
-			navigator.clipboard.writeText(textToCopy).then(() => {
-				setCopied(true)
-				setTimeout(() => setCopied(false), 1500)
-			})
+			return textToCopy
 		}
+		return null
 	}
 
+	const styledPreProps = theme ? { ...preProps, theme } : preProps
+
 	return (
-		<CodeBlockContainer>
-			<CopyButton appearance="icon" onClick={handleCopy} aria-label={copied ? "Copied" : "Copy"}>
-				<span className={`codicon codicon-${copied ? "check" : "copy"}`}></span>
-			</CopyButton>
-			<StyledPre {...preProps} theme={theme} ref={preRef}>
+		<WithCopyButton onCopy={handleCopy} position="top-right" ariaLabel="Copy code">
+			<StyledPre {...styledPreProps} ref={preRef}>
 				{children}
 			</StyledPre>
-		</CodeBlockContainer>
+		</WithCopyButton>
 	)
 }
 

webview-ui/src/components/mcp/chat-display/McpResponseDisplay.tsx

@@ -117,36 +117,19 @@ interface UrlMatch {
 }
 
 const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText }) => {
-	const { mcpResponsesCollapsed } = useExtensionState() // Get setting from context
+	const { mcpResponsesCollapsed, mcpRichDisplayEnabled } = useExtensionState() // Get setting from context
 	const [isExpanded, setIsExpanded] = useState(!mcpResponsesCollapsed) // Initialize with context setting
 	const [isLoading, setIsLoading] = useState(false) // Initial loading state for rich content
 	const [displayMode, setDisplayMode] = useState<"rich" | "plain">(() => {
-		// Get saved preference from localStorage, default to 'rich'
-		const savedMode = localStorage.getItem("mcpDisplayMode")
-		return savedMode === "plain" ? "plain" : "rich"
+		// Initialize directly from the global setting.
+		return mcpRichDisplayEnabled ? "rich" : "plain"
 	})
 	const [urlMatches, setUrlMatches] = useState<UrlMatch[]>([])
 	const [error, setError] = useState<string | null>(null)
-	// Add a counter state for forcing re-renders to make toggling run smoother
-	const [forceUpdateCounter, setForceUpdateCounter] = useState(0)
 
 	const toggleDisplayMode = useCallback(() => {
-		const newMode = displayMode === "rich" ? "plain" : "rich"
-		// Force an immediate re-render
-		setForceUpdateCounter((prev) => prev + 1)
-		// Update display mode and save preference
-		setDisplayMode(newMode)
-		localStorage.setItem("mcpDisplayMode", newMode)
-		// If switching to plain mode, cancel any ongoing processing
-		if (newMode === "plain") {
-			console.log("Switching to plain mode - cancelling URL processing")
-			setUrlMatches([]) // Clear any existing matches when switching to plain mode
-		} else {
-			// If switching to rich mode, the useEffect will re-run and fetch data
-			console.log("Switching to rich mode - will start URL processing")
-			setUrlMatches([])
-		}
-	}, [displayMode])
+		setDisplayMode((prevMode) => (prevMode === "rich" ? "plain" : "rich"))
+	}, [])
 
 	const toggleExpand = useCallback(() => {
 		setIsExpanded((prev) => !prev)
@@ -155,14 +138,16 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 	// Effect to update isExpanded if mcpResponsesCollapsed changes from context
 	useEffect(() => {
 		setIsExpanded(!mcpResponsesCollapsed)
-	}, [])
+	}, [mcpResponsesCollapsed])
 
 	// Find all URLs in the text and determine if they're images
 	useEffect(() => {
 		// Skip all processing if in plain mode
 		if (!isExpanded || displayMode === "plain") {
 			setIsLoading(false)
-			setUrlMatches([]) // Clear any existing matches when in plain mode
+			if (urlMatches.length > 0) {
+				setUrlMatches([]) // Clear any existing matches when in plain mode
+			}
 			return
 		}
 
@@ -280,7 +265,7 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 			processingCanceled = true
 			console.log("Cleaning up URL processing")
 		}
-	}, [responseText, displayMode, forceUpdateCounter, isExpanded])
+	}, [responseText, displayMode, isExpanded])
 
 	// Function to render content based on display mode
 	const renderContent = () => {

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

@@ -16,6 +16,8 @@ import {
 	bedrockModels,
 	cerebrasDefaultModelId,
 	cerebrasModels,
+	claudeCodeDefaultModelId,
+	claudeCodeModels,
 	deepSeekDefaultModelId,
 	deepSeekModels,
 	doubaoDefaultModelId,
@@ -46,9 +48,12 @@ import {
 	vertexModels,
 	xaiDefaultModelId,
 	xaiModels,
+	sapAiCoreDefaultModelId,
+	sapAiCoreModels,
 } from "@shared/api"
 import { EmptyRequest, StringRequest } from "@shared/proto/common"
-import { OpenAiModelsRequest } from "@shared/proto/models"
+import { OpenAiModelsRequest, UpdateApiConfigurationRequest } from "@shared/proto/models"
+import { convertApiConfigurationToProto } from "@shared/proto-conversions/models/api-configuration-conversion"
 import {
 	VSCodeButton,
 	VSCodeCheckbox,
@@ -69,6 +74,7 @@ import OllamaModelPicker from "./OllamaModelPicker"
 import OpenRouterModelPicker, { ModelDescriptionMarkdown, OPENROUTER_MODEL_PICKER_Z_INDEX } from "./OpenRouterModelPicker"
 import RequestyModelPicker from "./RequestyModelPicker"
 import ThinkingBudgetSlider from "./ThinkingBudgetSlider"
+import { ExtensionMessage } from "@shared/ExtensionMessage"
 
 interface ApiOptionsProps {
 	showModelOptions: boolean
@@ -118,7 +124,14 @@ const OpenRouterBalanceDisplay = ({ apiKey }: { apiKey: string }) => {
 
 const SUPPORTED_THINKING_MODELS: Record<string, string[]> = {
 	anthropic: ["claude-3-7-sonnet-20250219", "claude-sonnet-4-20250514", "claude-opus-4-20250514"],
-	vertex: ["claude-3-7-sonnet@20250219", "claude-sonnet-4@20250514", "claude-opus-4@20250514"],
+	vertex: [
+		"claude-3-7-sonnet@20250219",
+		"claude-sonnet-4@20250514",
+		"claude-opus-4@20250514",
+		"gemini-2.5-flash-preview-05-20",
+		"gemini-2.5-flash-preview-04-17",
+		"gemini-2.5-pro-preview-06-05",
+	],
 	qwen: [
 		"qwen3-235b-a22b",
 		"qwen3-32b",
@@ -131,6 +144,7 @@ const SUPPORTED_THINKING_MODELS: Record<string, string[]> = {
 		"qwen-plus-latest",
 		"qwen-turbo-latest",
 	],
+	gemini: ["gemini-2.5-flash-preview-05-20", "gemini-2.5-flash-preview-04-17", "gemini-2.5-pro-preview-06-05"],
 }
 
 // This is necessary to ensure dropdown opens downward, important for when this is used in popup
@@ -192,12 +206,19 @@ const ApiOptions = ({
 		if (saveImmediately && field === "apiProvider") {
 			// Use apiConfiguration from the full extensionState context to send the most complete data
 			const currentFullApiConfig = extensionState.apiConfiguration
-			vscode.postMessage({
-				type: "apiConfiguration",
-				apiConfiguration: {
-					...currentFullApiConfig, // Send the most complete config available
-					apiProvider: newValue, // Override with the new provider
-				},
+
+			// Convert to proto format and send via gRPC
+			const updatedConfig = {
+				...currentFullApiConfig,
+				apiProvider: newValue,
+			}
+			const protoConfig = convertApiConfigurationToProto(updatedConfig)
+			ModelsServiceClient.updateApiConfigurationProto(
+				UpdateApiConfigurationRequest.create({
+					apiConfiguration: protoConfig,
+				}),
+			).catch((error) => {
+				console.error("Failed to update API configuration:", error)
 			})
 		}
 	}
@@ -337,6 +358,7 @@ const ApiOptions = ({
 					<VSCodeOption value="cline">Cline</VSCodeOption>
 					<VSCodeOption value="openrouter">OpenRouter</VSCodeOption>
 					<VSCodeOption value="anthropic">Anthropic</VSCodeOption>
+					<VSCodeOption value="claude-code">Claude Code</VSCodeOption>
 					<VSCodeOption value="bedrock">Amazon Bedrock</VSCodeOption>
 					<VSCodeOption value="openai">OpenAI Compatible</VSCodeOption>
 					<VSCodeOption value="vertex">GCP Vertex AI</VSCodeOption>
@@ -358,6 +380,7 @@ const ApiOptions = ({
 					<VSCodeOption value="xai">xAI</VSCodeOption>
 					<VSCodeOption value="sambanova">SambaNova</VSCodeOption>
 					<VSCodeOption value="cerebras">Cerebras</VSCodeOption>
+					<VSCodeOption value="sapaicore">SAP AI Core</VSCodeOption>
 				</VSCodeDropdown>
 			</DropdownContainer>
 
@@ -453,6 +476,27 @@ const ApiOptions = ({
 				</div>
 			)}
 
+			{selectedProvider === "claude-code" && (
+				<div>
+					<VSCodeTextField
+						value={apiConfiguration?.claudeCodePath || ""}
+						style={{ width: "100%", marginTop: 3 }}
+						type="text"
+						onInput={handleInputChange("claudeCodePath")}
+						placeholder="Default: claude"
+					/>
+
+					<p
+						style={{
+							fontSize: "12px",
+							marginTop: 3,
+							color: "var(--vscode-descriptionForeground)",
+						}}>
+						Path to the Claude Code CLI.
+					</p>
+				</div>
+			)}
+
 			{selectedProvider === "openai-native" && (
 				<div>
 					<VSCodeTextField
@@ -1049,15 +1093,6 @@ const ApiOptions = ({
 							</VSCodeLink>
 						)}
 					</p>
-
-					{/* Add Thinking Budget Slider specifically for gemini-2.5-flash-preview-04-17 */}
-					{selectedProvider === "gemini" && selectedModelId === "gemini-2.5-flash-preview-04-17" && (
-						<ThinkingBudgetSlider
-							apiConfiguration={apiConfiguration}
-							setApiConfiguration={setApiConfiguration}
-							maxBudget={selectedModelInfo.thinkingConfig?.maxBudget}
-						/>
-					)}
 				</div>
 			)}
 
@@ -2074,6 +2109,71 @@ const ApiOptions = ({
 				</div>
 			)}
 
+			{selectedProvider === "sapaicore" && (
+				<div style={{ display: "flex", flexDirection: "column", gap: 5 }}>
+					<VSCodeTextField
+						value={apiConfiguration?.sapAiCoreClientId || ""}
+						style={{ width: "100%" }}
+						type="password"
+						onInput={handleInputChange("sapAiCoreClientId")}
+						placeholder="Enter AI Core Client Id...">
+						<span style={{ fontWeight: 500 }}>AI Core Client Id</span>
+					</VSCodeTextField>
+					{apiConfiguration?.sapAiCoreClientId && (
+						<p style={{ fontSize: "12px", color: "var(--vscode-descriptionForeground)" }}>
+							Client Id is set. To change it, please re-enter the value.
+						</p>
+					)}
+					<VSCodeTextField
+						value={apiConfiguration?.sapAiCoreClientSecret ? "********" : ""}
+						style={{ width: "100%" }}
+						type="password"
+						onInput={handleInputChange("sapAiCoreClientSecret")}
+						placeholder="Enter AI Core Client Secret...">
+						<span style={{ fontWeight: 500 }}>AI Core Client Secret</span>
+					</VSCodeTextField>
+					{apiConfiguration?.sapAiCoreClientSecret && (
+						<p style={{ fontSize: "12px", color: "var(--vscode-descriptionForeground)" }}>
+							Client Secret is set. To change it, please re-enter the value.
+						</p>
+					)}
+					<VSCodeTextField
+						value={apiConfiguration?.sapAiCoreBaseUrl || ""}
+						style={{ width: "100%" }}
+						onInput={handleInputChange("sapAiCoreBaseUrl")}
+						placeholder="Enter AI Core Base URL...">
+						<span style={{ fontWeight: 500 }}>AI Core Base URL</span>
+					</VSCodeTextField>
+					<VSCodeTextField
+						value={apiConfiguration?.sapAiCoreTokenUrl || ""}
+						style={{ width: "100%" }}
+						onInput={handleInputChange("sapAiCoreTokenUrl")}
+						placeholder="Enter AI Core Auth URL...">
+						<span style={{ fontWeight: 500 }}>AI Core Auth URL</span>
+					</VSCodeTextField>
+					<VSCodeTextField
+						value={apiConfiguration?.sapAiResourceGroup || ""}
+						style={{ width: "100%" }}
+						onInput={handleInputChange("sapAiResourceGroup")}
+						placeholder="Enter AI Core Resource Group...">
+						<span style={{ fontWeight: 500 }}>AI Core Resource Group</span>
+					</VSCodeTextField>
+					<p
+						style={{
+							fontSize: "12px",
+							marginTop: "5px",
+							color: "var(--vscode-descriptionForeground)",
+						}}>
+						These credentials are stored locally and only used to make API requests from this extension.
+						<VSCodeLink
+							href="https://help.sap.com/docs/sap-ai-core/sap-ai-core-service-guide/access-sap-ai-core-via-api"
+							style={{ display: "inline" }}>
+							You can find more information about SAP AI Core API access here.
+						</VSCodeLink>
+					</p>
+				</div>
+			)}
+
 			{apiErrorMessage && (
 				<p
 					style={{
@@ -2177,6 +2277,7 @@ const ApiOptions = ({
 								<span style={{ fontWeight: 500 }}>Model</span>
 							</label>
 							{selectedProvider === "anthropic" && createDropdown(anthropicModels)}
+							{selectedProvider === "claude-code" && createDropdown(claudeCodeModels)}
 							{selectedProvider === "vertex" &&
 								createDropdown(apiConfiguration?.vertexRegion === "global" ? vertexGlobalModels : vertexModels)}
 							{selectedProvider === "gemini" && createDropdown(geminiModels)}
@@ -2193,6 +2294,7 @@ const ApiOptions = ({
 							{selectedProvider === "sambanova" && createDropdown(sambanovaModels)}
 							{selectedProvider === "cerebras" && createDropdown(cerebrasModels)}
 							{selectedProvider === "nebius" && createDropdown(nebiusModels)}
+							{selectedProvider === "sapaicore" && createDropdown(sapAiCoreModels)}
 						</DropdownContainer>
 
 						{SUPPORTED_THINKING_MODELS[selectedProvider]?.includes(selectedModelId) && (
@@ -2527,6 +2629,8 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration):
 	switch (provider) {
 		case "anthropic":
 			return getProviderData(anthropicModels, anthropicDefaultModelId)
+		case "claude-code":
+			return getProviderData(claudeCodeModels, claudeCodeDefaultModelId)
 		case "bedrock":
 			if (apiConfiguration?.awsBedrockCustomSelected) {
 				const baseModelId = apiConfiguration.awsBedrockCustomModelBaseId
@@ -2624,6 +2728,8 @@ export function normalizeApiConfiguration(apiConfiguration?: ApiConfiguration):
 			return getProviderData(sambanovaModels, sambanovaDefaultModelId)
 		case "cerebras":
 			return getProviderData(cerebrasModels, cerebrasDefaultModelId)
+		case "sapaicore":
+			return getProviderData(sapAiCoreModels, sapAiCoreDefaultModelId)
 		default:
 			return getProviderData(anthropicModels, anthropicDefaultModelId)
 	}

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

@@ -9,6 +9,8 @@ const FeatureSettingsSection = () => {
 		setEnableCheckpointsSetting,
 		mcpMarketplaceEnabled,
 		setMcpMarketplaceEnabled,
+		mcpRichDisplayEnabled,
+		setMcpRichDisplayEnabled,
 		mcpResponsesCollapsed,
 		setMcpResponsesCollapsed,
 		chatSettings,
@@ -44,6 +46,19 @@ const FeatureSettingsSection = () => {
 					Enables the MCP Marketplace tab for discovering and installing MCP servers.
 				</p>
 			</div>
+			<div style={{ marginTop: 10 }}>
+				<VSCodeCheckbox
+					checked={mcpRichDisplayEnabled}
+					onChange={(e: any) => {
+						const checked = e.target.checked === true
+						setMcpRichDisplayEnabled(checked)
+					}}>
+					Enable Rich MCP Display
+				</VSCodeCheckbox>
+				<p className="text-xs text-[var(--vscode-descriptionForeground)]">
+					Enables rich formatting for MCP responses. When disabled, responses will be shown in plain text.
+				</p>
+			</div>
 			<div style={{ marginTop: 10 }}>
 				<VSCodeCheckbox
 					checked={mcpResponsesCollapsed}

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

@@ -6,8 +6,8 @@ import { cn } from "@/utils/cn"
 import { validateApiConfiguration, validateModelId } from "@/utils/validate"
 import { vscode } from "@/utils/vscode"
 import { ExtensionMessage } from "@shared/ExtensionMessage"
-import { EmptyRequest } from "@shared/proto/common"
-import { PlanActMode, TogglePlanActModeRequest, UpdateSettingsRequest } from "@shared/proto/state"
+import { EmptyRequest, StringRequest } from "@shared/proto/common"
+import { PlanActMode, ResetStateRequest, TogglePlanActModeRequest, UpdateSettingsRequest } from "@shared/proto/state"
 import { VSCodeButton, VSCodeCheckbox, VSCodeLink, VSCodeTextArea } from "@vscode/webview-ui-toolkit/react"
 import { CheckCheck, FlaskConical, Info, LucideIcon, Settings, SquareMousePointer, SquareTerminal, Webhook } from "lucide-react"
 import { memo, useCallback, useEffect, useRef, useState } from "react"
@@ -115,8 +115,6 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 	const {
 		apiConfiguration,
 		version,
-		customInstructions,
-		setCustomInstructions,
 		openRouterModels,
 		telemetrySetting,
 		setTelemetrySetting,
@@ -128,10 +126,16 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 		setEnableCheckpointsSetting,
 		mcpMarketplaceEnabled,
 		setMcpMarketplaceEnabled,
+		mcpRichDisplayEnabled,
+		setMcpRichDisplayEnabled,
 		shellIntegrationTimeout,
 		setShellIntegrationTimeout,
+		terminalOutputLineLimit,
+		setTerminalOutputLineLimit,
 		terminalReuseEnabled,
 		setTerminalReuseEnabled,
+		defaultTerminalProfile,
+		setDefaultTerminalProfile,
 		mcpResponsesCollapsed,
 		setMcpResponsesCollapsed,
 		setApiConfiguration,
@@ -140,15 +144,17 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 	// Store the original state to detect changes
 	const originalState = useRef({
 		apiConfiguration,
-		customInstructions,
 		telemetrySetting,
 		planActSeparateModelsSetting,
 		enableCheckpointsSetting,
 		mcpMarketplaceEnabled,
+		mcpRichDisplayEnabled,
 		mcpResponsesCollapsed,
 		chatSettings,
 		shellIntegrationTimeout,
 		terminalReuseEnabled,
+		terminalOutputLineLimit,
+		defaultTerminalProfile,
 	})
 	const [apiErrorMessage, setApiErrorMessage] = useState<string | undefined>(undefined)
 	const [modelIdErrorMessage, setModelIdErrorMessage] = useState<string | undefined>(undefined)
@@ -163,10 +169,6 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 		if (!apiValidationResult && !modelIdValidationResult) {
 			// vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
 			// vscode.postMessage({
-			// 	type: "customInstructions",
-			// 	text: customInstructions,
-			// })
-			// vscode.postMessage({
 			// 	type: "telemetrySetting",
 			// 	text: telemetrySetting,
 			// })
@@ -184,10 +186,10 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 			await StateServiceClient.updateSettings(
 				UpdateSettingsRequest.create({
 					planActSeparateModelsSetting,
-					customInstructionsSetting: customInstructions,
 					telemetrySetting,
 					enableCheckpointsSetting,
 					mcpMarketplaceEnabled,
+					mcpRichDisplayEnabled,
 					shellIntegrationTimeout,
 					terminalReuseEnabled,
 					mcpResponsesCollapsed,
@@ -195,8 +197,32 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 						? convertApiConfigurationToProtoApiConfiguration(apiConfigurationToSubmit)
 						: undefined,
 					chatSettings: chatSettings ? convertChatSettingsToProtoChatSettings(chatSettings) : undefined,
+					terminalOutputLineLimit,
 				}),
 			)
+
+			// Update default terminal profile if it has changed
+			if (defaultTerminalProfile !== originalState.current.defaultTerminalProfile) {
+				await StateServiceClient.updateDefaultTerminalProfile({
+					value: defaultTerminalProfile || "default",
+				} as StringRequest)
+			}
+
+			// Update the original state to reflect the saved changes
+			originalState.current = {
+				apiConfiguration,
+				telemetrySetting,
+				planActSeparateModelsSetting,
+				enableCheckpointsSetting,
+				mcpMarketplaceEnabled,
+				mcpRichDisplayEnabled,
+				mcpResponsesCollapsed,
+				chatSettings,
+				shellIntegrationTimeout,
+				terminalReuseEnabled,
+				terminalOutputLineLimit,
+				defaultTerminalProfile,
+			}
 		} catch (error) {
 			console.error("Failed to update settings:", error)
 		}
@@ -215,28 +241,33 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 	useEffect(() => {
 		const hasChanges =
 			JSON.stringify(apiConfiguration) !== JSON.stringify(originalState.current.apiConfiguration) ||
-			customInstructions !== originalState.current.customInstructions ||
 			telemetrySetting !== originalState.current.telemetrySetting ||
 			planActSeparateModelsSetting !== originalState.current.planActSeparateModelsSetting ||
 			enableCheckpointsSetting !== originalState.current.enableCheckpointsSetting ||
 			mcpMarketplaceEnabled !== originalState.current.mcpMarketplaceEnabled ||
+			mcpRichDisplayEnabled !== originalState.current.mcpRichDisplayEnabled ||
+			JSON.stringify(chatSettings) !== JSON.stringify(originalState.current.chatSettings) ||
 			mcpResponsesCollapsed !== originalState.current.mcpResponsesCollapsed ||
 			JSON.stringify(chatSettings) !== JSON.stringify(originalState.current.chatSettings) ||
 			shellIntegrationTimeout !== originalState.current.shellIntegrationTimeout ||
-			terminalReuseEnabled !== originalState.current.terminalReuseEnabled
+			terminalOutputLineLimit !== originalState.current.terminalOutputLineLimit ||
+			terminalReuseEnabled !== originalState.current.terminalReuseEnabled ||
+			defaultTerminalProfile !== originalState.current.defaultTerminalProfile
 
 		setHasUnsavedChanges(hasChanges)
 	}, [
 		apiConfiguration,
-		customInstructions,
 		telemetrySetting,
 		planActSeparateModelsSetting,
 		enableCheckpointsSetting,
 		mcpMarketplaceEnabled,
+		mcpRichDisplayEnabled,
 		mcpResponsesCollapsed,
 		chatSettings,
 		shellIntegrationTimeout,
 		terminalReuseEnabled,
+		terminalOutputLineLimit,
+		defaultTerminalProfile,
 	])
 
 	// Handle cancel button click
@@ -246,7 +277,6 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 			setIsUnsavedChangesDialogOpen(true)
 			pendingAction.current = () => {
 				// Reset all tracked state to original values
-				setCustomInstructions(originalState.current.customInstructions)
 				setTelemetrySetting(originalState.current.telemetrySetting)
 				setPlanActSeparateModelsSetting(originalState.current.planActSeparateModelsSetting)
 				setChatSettings(originalState.current.chatSettings)
@@ -267,13 +297,26 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 							: false,
 					)
 				}
+				if (typeof setMcpRichDisplayEnabled === "function") {
+					setMcpRichDisplayEnabled(
+						typeof originalState.current.mcpRichDisplayEnabled === "boolean"
+							? originalState.current.mcpRichDisplayEnabled
+							: true,
+					)
+				}
 				// Reset terminal settings
 				if (typeof setShellIntegrationTimeout === "function") {
 					setShellIntegrationTimeout(originalState.current.shellIntegrationTimeout)
 				}
+				if (typeof setTerminalOutputLineLimit === "function") {
+					setTerminalOutputLineLimit(originalState.current.terminalOutputLineLimit)
+				}
 				if (typeof setTerminalReuseEnabled === "function") {
 					setTerminalReuseEnabled(originalState.current.terminalReuseEnabled ?? true)
 				}
+				if (typeof setDefaultTerminalProfile === "function") {
+					setDefaultTerminalProfile(originalState.current.defaultTerminalProfile ?? "default")
+				}
 				if (typeof setMcpResponsesCollapsed === "function") {
 					setMcpResponsesCollapsed(originalState.current.mcpResponsesCollapsed ?? false)
 				}
@@ -287,13 +330,13 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 	}, [
 		hasUnsavedChanges,
 		onDone,
-		setCustomInstructions,
 		setTelemetrySetting,
 		setPlanActSeparateModelsSetting,
 		setChatSettings,
 		setApiConfiguration,
 		setEnableCheckpointsSetting,
 		setMcpMarketplaceEnabled,
+		setMcpRichDisplayEnabled,
 		setMcpResponsesCollapsed,
 	])
 
@@ -363,9 +406,13 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 
 	useEvent("message", handleMessage)
 
-	const handleResetState = async () => {
+	const handleResetState = async (resetGlobalState?: boolean) => {
 		try {
-			await StateServiceClient.resetState(EmptyRequest.create({}))
+			await StateServiceClient.resetState(
+				ResetStateRequest.create({
+					global: resetGlobalState,
+				}),
+			)
 		} catch (error) {
 			console.error("Failed to reset state:", error)
 		}
@@ -585,24 +632,6 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 												architect a plan for a cheaper coding model to act on.
 											</p>
 										</div>
-
-										<div className="mb-[5px]">
-											<VSCodeTextArea
-												value={customInstructions ?? ""}
-												className="w-full"
-												resize="vertical"
-												rows={4}
-												placeholder={
-													'e.g. "Run unit tests at the end", "Use TypeScript with async/await", "Speak in Spanish"'
-												}
-												onInput={(e: any) => setCustomInstructions(e.target?.value ?? "")}>
-												<span className="font-medium">Custom Instructions</span>
-											</VSCodeTextArea>
-											<p className="text-xs mt-[5px] text-[var(--vscode-descriptionForeground)]">
-												These instructions are added to the end of the system prompt sent with every
-												request.
-											</p>
-										</div>
 									</Section>
 								</div>
 							)}
@@ -684,10 +713,16 @@ const SettingsView = ({ onDone, targetSection }: SettingsViewProps) => {
 									{renderSectionHeader("debug")}
 									<Section>
 										<VSCodeButton
-											onClick={handleResetState}
+											onClick={() => handleResetState()}
 											className="mt-[5px] w-auto"
 											style={{ backgroundColor: "var(--vscode-errorForeground)", color: "black" }}>
-											Reset State
+											Reset Workspace State
+										</VSCodeButton>
+										<VSCodeButton
+											onClick={() => handleResetState(true)}
+											className="mt-[5px] w-auto"
+											style={{ backgroundColor: "var(--vscode-errorForeground)", color: "black" }}>
+											Reset Global State
 										</VSCodeButton>
 										<p className="text-xs mt-[5px] text-[var(--vscode-descriptionForeground)]">
 											This will reset all global state and secret storage in the extension.

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

@@ -0,0 +1,38 @@
+import React from "react"
+import { useExtensionState } from "@/context/ExtensionStateContext"
+
+const TerminalOutputLineLimitSlider: React.FC = () => {
+	const { terminalOutputLineLimit, setTerminalOutputLineLimit } = useExtensionState()
+
+	const handleSliderChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+		const value = parseInt(event.target.value, 10)
+		setTerminalOutputLineLimit(value)
+	}
+
+	return (
+		<div style={{ marginBottom: 15 }}>
+			<label htmlFor="terminal-output-limit" style={{ fontWeight: "500", display: "block", marginBottom: 5 }}>
+				Terminal output limit
+			</label>
+			<div style={{ display: "flex", alignItems: "center" }}>
+				<input
+					type="range"
+					id="terminal-output-limit"
+					min="100"
+					max="5000"
+					step="100"
+					value={terminalOutputLineLimit ?? 500}
+					onChange={handleSliderChange}
+					style={{ flexGrow: 1, marginRight: "1rem" }}
+				/>
+				<span>{terminalOutputLineLimit ?? 500}</span>
+			</div>
+			<p style={{ fontSize: "12px", color: "var(--vscode-descriptionForeground)", margin: "5px 0 0 0" }}>
+				Maximum number of lines to include in terminal output when executing commands. When exceeded, lines will be
+				removed from the middle, saving tokens.
+			</p>
+		</div>
+	)
+}
+
+export default TerminalOutputLineLimitSlider

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

@@ -1,12 +1,22 @@
-import React, { useState } from "react"
-import { VSCodeTextField, VSCodeCheckbox } from "@vscode/webview-ui-toolkit/react"
+import React, { useState, useEffect } from "react"
+import { VSCodeTextField, VSCodeCheckbox, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"
 import { useExtensionState } from "@/context/ExtensionStateContext"
-import { StateServiceClient } from "@/services/grpc-client"
+import TerminalOutputLineLimitSlider from "./TerminalOutputLineLimitSlider"
+import { StateServiceClient } from "../../services/grpc-client"
 import { Int64, Int64Request } from "@shared/proto/common"
 
 export const TerminalSettingsSection: React.FC = () => {
-	const { shellIntegrationTimeout, setShellIntegrationTimeout, terminalReuseEnabled, setTerminalReuseEnabled } =
-		useExtensionState()
+	const {
+		shellIntegrationTimeout,
+		setShellIntegrationTimeout,
+		terminalReuseEnabled,
+		setTerminalReuseEnabled,
+		defaultTerminalProfile,
+		setDefaultTerminalProfile,
+		availableTerminalProfiles,
+		platform,
+	} = useExtensionState()
+
 	const [inputValue, setInputValue] = useState((shellIntegrationTimeout / 1000).toString())
 	const [inputError, setInputError] = useState<string | null>(null)
 
@@ -23,12 +33,10 @@ export const TerminalSettingsSection: React.FC = () => {
 		}
 
 		setInputError(null)
-		const timeout = Math.round(seconds * 1000) // Convert to milliseconds
+		const timeout = Math.round(seconds * 1000)
 
-		// Update local state
 		setShellIntegrationTimeout(timeout)
 
-		// Send to extension using gRPC
 		StateServiceClient.updateTerminalConnectionTimeout({
 			value: timeout,
 		} as Int64Request)
@@ -42,7 +50,6 @@ export const TerminalSettingsSection: React.FC = () => {
 	}
 
 	const handleInputBlur = () => {
-		// If there was an error, reset the input to the current valid value
 		if (inputError) {
 			setInputValue((shellIntegrationTimeout / 1000).toString())
 			setInputError(null)
@@ -52,16 +59,44 @@ export const TerminalSettingsSection: React.FC = () => {
 	const handleTerminalReuseChange = (event: Event) => {
 		const target = event.target as HTMLInputElement
 		const checked = target.checked
-
-		// Update local state
 		setTerminalReuseEnabled(checked)
-
-		// TODO: Send to extension using gRPC when the backend is ready
-		// For now, we'll just update the local state
+		StateServiceClient.updateTerminalReuseEnabled({ value: checked } as any).catch((error) => {
+			console.error("Failed to update terminal reuse enabled:", error)
+		})
 	}
 
+	// Use any to avoid type conflicts between Event and FormEvent
+	const handleDefaultTerminalProfileChange = (event: any) => {
+		const target = event.target as HTMLSelectElement
+		const profileId = target.value
+		// Only update the local state, let the Save button handle the backend update
+		setDefaultTerminalProfile(profileId)
+	}
+
+	const profilesToShow = availableTerminalProfiles
+
 	return (
 		<div id="terminal-settings-section" style={{ marginBottom: 20 }}>
+			<div style={{ marginBottom: 15 }}>
+				<label htmlFor="default-terminal-profile" style={{ fontWeight: "500", display: "block", marginBottom: 5 }}>
+					Default Terminal Profile
+				</label>
+				<VSCodeDropdown
+					id="default-terminal-profile"
+					value={defaultTerminalProfile || "default"}
+					onChange={handleDefaultTerminalProfileChange}
+					style={{ width: "100%" }}>
+					{profilesToShow.map((profile) => (
+						<VSCodeOption key={profile.id} value={profile.id} title={profile.description}>
+							{profile.name}
+						</VSCodeOption>
+					))}
+				</VSCodeDropdown>
+				<p style={{ fontSize: "12px", color: "var(--vscode-descriptionForeground)", margin: "5px 0 0 0" }}>
+					Select the default terminal Cline will use. 'Default' uses your VSCode global setting.
+				</p>
+			</div>
+
 			<div style={{ marginBottom: 15 }}>
 				<div style={{ marginBottom: 8 }}>
 					<label style={{ fontWeight: "500", display: "block", marginBottom: 5 }}>
@@ -99,6 +134,7 @@ export const TerminalSettingsSection: React.FC = () => {
 					this if you experience issues with task lockout after a terminal command.
 				</p>
 			</div>
+			<TerminalOutputLineLimitSlider />
 		</div>
 	)
 }

webview-ui/src/components/welcome/WelcomeView.tsx

@@ -5,8 +5,10 @@ import { validateApiConfiguration } from "@/utils/validate"
 import { vscode } from "@/utils/vscode"
 import ApiOptions from "@/components/settings/ApiOptions"
 import ClineLogoWhite from "@/assets/ClineLogoWhite"
-import { AccountServiceClient } from "@/services/grpc-client"
+import { AccountServiceClient, ModelsServiceClient } from "@/services/grpc-client"
 import { EmptyRequest } from "@shared/proto/common"
+import { UpdateApiConfigurationRequest } from "@shared/proto/models"
+import { convertApiConfigurationToProto } from "@shared/proto-conversions/models/api-configuration-conversion"
 
 const WelcomeView = memo(() => {
 	const { apiConfiguration } = useExtensionState()
@@ -21,8 +23,18 @@ const WelcomeView = memo(() => {
 		)
 	}
 
-	const handleSubmit = () => {
-		vscode.postMessage({ type: "apiConfiguration", apiConfiguration })
+	const handleSubmit = async () => {
+		if (apiConfiguration) {
+			try {
+				await ModelsServiceClient.updateApiConfigurationProto(
+					UpdateApiConfigurationRequest.create({
+						apiConfiguration: convertApiConfigurationToProto(apiConfiguration),
+					}),
+				)
+			} catch (error) {
+				console.error("Failed to update API configuration:", error)
+			}
+		}
 	}
 
 	useEffect(() => {

webview-ui/src/context/ExtensionStateContext.tsx

@@ -7,10 +7,12 @@ import {
 	FileServiceClient,
 	McpServiceClient,
 } from "../services/grpc-client"
-import { EmptyRequest } from "@shared/proto/common"
+import { EmptyRequest, StringRequest } from "@shared/proto/common"
 import { UpdateSettingsRequest } from "@shared/proto/state"
 import { WebviewProviderType as WebviewProviderTypeEnum, WebviewProviderTypeRequest } from "@shared/proto/ui"
+import { TerminalProfile } from "@shared/proto/state"
 import { convertProtoToClineMessage } from "@shared/proto-conversions/cline-message"
+import { convertProtoMcpServersToMcpServers } from "@shared/proto-conversions/mcp/mcp-server-conversion"
 import { DEFAULT_AUTO_APPROVAL_SETTINGS } from "@shared/AutoApprovalSettings"
 import { DEFAULT_BROWSER_SETTINGS } from "@shared/BrowserSettings"
 import { ChatSettings, DEFAULT_CHAT_SETTINGS } from "@shared/ChatSettings"
@@ -26,9 +28,7 @@ import {
 	requestyDefaultModelInfo,
 } from "../../../src/shared/api"
 import { McpMarketplaceCatalog, McpServer, McpViewTab } from "../../../src/shared/mcp"
-import { convertProtoMcpServersToMcpServers } from "@shared/proto-conversions/mcp/mcp-server-conversion"
 import { convertTextMateToHljs } from "../utils/textMateToHljs"
-import { vscode } from "../utils/vscode"
 import { OpenRouterCompatibleModelInfo } from "@shared/proto/models"
 
 interface ExtensionStateContextType extends ExtensionState {
@@ -42,6 +42,7 @@ interface ExtensionStateContextType extends ExtensionState {
 	mcpMarketplaceCatalog: McpMarketplaceCatalog
 	filePaths: string[]
 	totalTasksSize: number | null
+	availableTerminalProfiles: TerminalProfile[]
 
 	// View state
 	showMcp: boolean
@@ -53,16 +54,18 @@ interface ExtensionStateContextType extends ExtensionState {
 
 	// Setters
 	setApiConfiguration: (config: ApiConfiguration) => void
-	setCustomInstructions: (value?: string) => void
 	setTelemetrySetting: (value: TelemetrySetting) => void
 	setShowAnnouncement: (value: boolean) => void
 	setShouldShowAnnouncement: (value: boolean) => void
 	setPlanActSeparateModelsSetting: (value: boolean) => void
 	setEnableCheckpointsSetting: (value: boolean) => void
 	setMcpMarketplaceEnabled: (value: boolean) => void
+	setMcpRichDisplayEnabled: (value: boolean) => void
 	setMcpResponsesCollapsed: (value: boolean) => void
 	setShellIntegrationTimeout: (value: number) => void
 	setTerminalReuseEnabled: (value: boolean) => void
+	setTerminalOutputLineLimit: (value: number) => void
+	setDefaultTerminalProfile: (value: string) => void
 	setChatSettings: (value: ChatSettings) => void
 	setMcpServers: (value: McpServer[]) => void
 	setGlobalClineRulesToggles: (toggles: Record<string, boolean>) => void
@@ -73,6 +76,7 @@ interface ExtensionStateContextType extends ExtensionState {
 	setGlobalWorkflowToggles: (toggles: Record<string, boolean>) => void
 	setMcpMarketplaceCatalog: (value: McpMarketplaceCatalog) => void
 	setTotalTasksSize: (value: number | null) => void
+	setAvailableTerminalProfiles: (profiles: TerminalProfile[]) => void // Setter for profiles
 
 	// Refresh functions
 	refreshOpenRouterModels: () => void
@@ -182,14 +186,17 @@ export const ExtensionStateContextProvider: React.FC<{
 		distinctId: "",
 		planActSeparateModelsSetting: true,
 		enableCheckpointsSetting: true,
+		mcpRichDisplayEnabled: true,
 		globalClineRulesToggles: {},
 		localClineRulesToggles: {},
 		localCursorRulesToggles: {},
 		localWindsurfRulesToggles: {},
 		localWorkflowToggles: {},
 		globalWorkflowToggles: {},
-		shellIntegrationTimeout: 4000, // default timeout for shell integration
-		terminalReuseEnabled: true, // default to enabled for backward compatibility
+		shellIntegrationTimeout: 4000,
+		terminalReuseEnabled: true,
+		terminalOutputLineLimit: 500,
+		defaultTerminalProfile: "default",
 		isNewUser: false,
 		mcpResponsesCollapsed: false, // Default value (expanded), will be overwritten by extension state
 	})
@@ -201,6 +208,7 @@ export const ExtensionStateContextProvider: React.FC<{
 		[openRouterDefaultModelId]: openRouterDefaultModelInfo,
 	})
 	const [totalTasksSize, setTotalTasksSize] = useState<number | null>(null)
+	const [availableTerminalProfiles, setAvailableTerminalProfiles] = useState<TerminalProfile[]>([])
 
 	const [openAiModels, setOpenAiModels] = useState<string[]>([])
 	const [requestyModels, setRequestyModels] = useState<Record<string, ModelInfo>>({
@@ -231,6 +239,9 @@ export const ExtensionStateContextProvider: React.FC<{
 
 	// References to store subscription cancellation functions
 	const stateSubscriptionRef = useRef<(() => void) | null>(null)
+
+	// Reference for focusChatInput subscription
+	const focusChatInputUnsubscribeRef = useRef<(() => void) | null>(null)
 	const mcpButtonUnsubscribeRef = useRef<(() => void) | null>(null)
 	const historyButtonClickedSubscriptionRef = useRef<(() => void) | null>(null)
 	const chatButtonUnsubscribeRef = useRef<(() => void) | null>(null)
@@ -306,6 +317,7 @@ export const ExtensionStateContextProvider: React.FC<{
 										config.asksageApiKey,
 										config.xaiApiKey,
 										config.sambanovaApiKey,
+										config.sapAiCoreClientId,
 									].some((key) => key !== undefined)
 								: false
 
@@ -540,6 +552,15 @@ export const ExtensionStateContextProvider: React.FC<{
 			},
 		})
 
+		// Fetch available terminal profiles on launch
+		StateServiceClient.getAvailableTerminalProfiles(EmptyRequest.create({}))
+			.then((response) => {
+				setAvailableTerminalProfiles(response.profiles)
+			})
+			.catch((error) => {
+				console.error("Failed to fetch available terminal profiles:", error)
+			})
+
 		// Subscribe to relinquish control events
 		relinquishControlUnsubscribeRef.current = UiServiceClient.subscribeToRelinquishControl(EmptyRequest.create({}), {
 			onResponse: () => {
@@ -552,6 +573,24 @@ export const ExtensionStateContextProvider: React.FC<{
 			onComplete: () => {},
 		})
 
+		// Subscribe to focus chat input events
+		const clientId = (window as any).clineClientId
+		if (clientId) {
+			const request = StringRequest.create({ value: clientId })
+			focusChatInputUnsubscribeRef.current = UiServiceClient.subscribeToFocusChatInput(request, {
+				onResponse: () => {
+					// Dispatch a local DOM event within this webview only
+					window.dispatchEvent(new CustomEvent("focusChatInput"))
+				},
+				onError: (error: Error) => {
+					console.error("Error in focusChatInput subscription:", error)
+				},
+				onComplete: () => {},
+			})
+		} else {
+			console.error("Client ID not found in window object")
+		}
+
 		// Clean up subscriptions when component unmounts
 		return () => {
 			if (stateSubscriptionRef.current) {
@@ -602,7 +641,10 @@ export const ExtensionStateContextProvider: React.FC<{
 				relinquishControlUnsubscribeRef.current()
 				relinquishControlUnsubscribeRef.current = null
 			}
-
+			if (focusChatInputUnsubscribeRef.current) {
+				focusChatInputUnsubscribeRef.current()
+				focusChatInputUnsubscribeRef.current = null
+			}
 			if (mcpServersSubscriptionRef.current) {
 				mcpServersSubscriptionRef.current()
 				mcpServersSubscriptionRef.current = null
@@ -634,6 +676,7 @@ export const ExtensionStateContextProvider: React.FC<{
 		mcpMarketplaceCatalog,
 		filePaths,
 		totalTasksSize,
+		availableTerminalProfiles,
 		showMcp,
 		mcpTab,
 		showSettings,
@@ -665,11 +708,6 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				apiConfiguration: value,
 			})),
-		setCustomInstructions: (value) =>
-			setState((prevState) => ({
-				...prevState,
-				customInstructions: value,
-			})),
 		setTelemetrySetting: (value) =>
 			setState((prevState) => ({
 				...prevState,
@@ -690,6 +728,11 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				mcpMarketplaceEnabled: value,
 			})),
+		setMcpRichDisplayEnabled: (value) =>
+			setState((prevState) => ({
+				...prevState,
+				mcpRichDisplayEnabled: value,
+			})),
 		setMcpResponsesCollapsed: (value) => {
 			setState((prevState) => ({
 				...prevState,
@@ -712,8 +755,19 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				terminalReuseEnabled: value,
 			})),
+		setTerminalOutputLineLimit: (value) =>
+			setState((prevState) => ({
+				...prevState,
+				terminalOutputLineLimit: value,
+			})),
+		setDefaultTerminalProfile: (value) =>
+			setState((prevState) => ({
+				...prevState,
+				defaultTerminalProfile: value,
+			})),
 		setMcpServers: (mcpServers: McpServer[]) => setMcpServers(mcpServers),
 		setMcpMarketplaceCatalog: (catalog: McpMarketplaceCatalog) => setMcpMarketplaceCatalog(catalog),
+		setAvailableTerminalProfiles,
 		setShowMcp,
 		closeMcpView,
 		setChatSettings: async (value) => {
@@ -721,7 +775,6 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				chatSettings: value,
 			}))
-
 			try {
 				// Import the conversion functions
 				const { convertApiConfigurationToProtoApiConfiguration } = await import(
@@ -737,11 +790,11 @@ export const ExtensionStateContextProvider: React.FC<{
 						apiConfiguration: state.apiConfiguration
 							? convertApiConfigurationToProtoApiConfiguration(state.apiConfiguration)
 							: undefined,
-						customInstructionsSetting: state.customInstructions,
 						telemetrySetting: state.telemetrySetting,
 						planActSeparateModelsSetting: state.planActSeparateModelsSetting,
 						enableCheckpointsSetting: state.enableCheckpointsSetting,
 						mcpMarketplaceEnabled: state.mcpMarketplaceEnabled,
+						mcpRichDisplayEnabled: state.mcpRichDisplayEnabled,
 						mcpResponsesCollapsed: state.mcpResponsesCollapsed,
 					}),
 				)

webview-ui/src/utils/validate.ts

@@ -113,6 +113,20 @@ export function validateApiConfiguration(apiConfiguration?: ApiConfiguration): s
 					return "You must provide a valid API key or choose a different provider."
 				}
 				break
+			case "sapaicore":
+				if (!apiConfiguration.sapAiCoreBaseUrl) {
+					return "You must provide a valid Base URL key or choose a different provider."
+				}
+				if (!apiConfiguration.sapAiCoreClientId) {
+					return "You must provide a valid Client Id or choose a different provider."
+				}
+				if (!apiConfiguration.sapAiCoreClientSecret) {
+					return "You must provide a valid Client Secret or choose a different provider."
+				}
+				if (!apiConfiguration.sapAiCoreTokenUrl) {
+					return "You must provide a valid Auth URL or choose a different provider."
+				}
+				break
 		}
 	}
 	return undefined