Update bug report template to make system information and logs fields optional

.changeset/famous-baboons-vanish.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixed issue with sap ai core client credentials storage

.changeset/hungry-gifts-relate.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Prevent non-error logs from being misclassified as errors

.changeset/light-kids-learn.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Focus chain regex matching moved into /shared

.changeset/olive-eyes-decide.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix credit balance out of sync issue on account switching

.changeset/silly-hornets-raise.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix Claude Code CLAUDE_CODE_MAX_OUTPUT_TOKENS

.clinerules/cline-overview.md

@@ -716,7 +716,7 @@ The Controller class manages MCP servers through the McpHub service:
 class Controller {
   mcpHub?: McpHub
 
-  constructor(context: vscode.ExtensionContext, webviewProvider: WebviewProvider) {
+  constructor(context: vscode.ExtensionContext, outputChannel: vscode.OutputChannel, webviewProvider: WebviewProvider) {
     this.mcpHub = new McpHub(this)
   }
 

.clinerules/workflows/git-branch-analysis.md

@@ -6,14 +6,28 @@ Analyze the current branch's changes against main to provide informed insights a
 ## Step 1: Gather Git Information
 <important>Do not return any text or conversation other than what is necessary to run these commands</important>
 
-**Run the following command to get the latest changes (bash):**
-```bash
-B=$(for c in main master origin/main origin/master; do git rev-parse --verify -q "$c" >/dev/null && echo "$c" && break; done); B=${B:-HEAD}; r(){ git branch --show-current; printf "=== STATUS ===\n"; git status --porcelain | cat; printf "=== COMMIT MESSAGES ===\n"; git log "$B"..HEAD --oneline | cat; printf "=== CHANGED FILES ===\n"; git diff "$B" --name-only | cat; printf "=== FULL DIFF ===\n"; git diff "$B" | cat; }; L=$(r | wc -l); if [ "$L" -gt 500 ]; then r > cline-git-analysis.temp && echo "::OUTPUT_FILE=cline-git-analysis.temp"; else r; fi
-```
+**First, check the expected output size:**
+   ```shell
+   (git branch --show-current && echo "=== STATUS ===" && git status --porcelain | cat && echo "=== COMMIT MESSAGES ===" && git log main..HEAD --oneline | cat && echo "=== CHANGED FILES ===" && git diff main --name-only | cat && echo "=== FULL DIFF ===" && git diff main | cat) | wc -l
+   ```
 
-```powershell
-$B=$null;foreach($c in 'main','master','origin/main','origin/master'){git rev-parse --verify -q $c *> $null;if($LASTEXITCODE -eq 0){$B=$c;break}};if(-not $B){$B='HEAD'};function r([string]$b){git rev-parse --abbrev-ref HEAD; '=== STATUS ==='; git status --porcelain | cat; '=== COMMIT MESSAGES ==='; git log "$b"..HEAD --oneline | cat; '=== CHANGED FILES ==='; git diff "$b" --name-only | cat; '=== FULL DIFF ==='; git diff "$b" | cat};$out=r $B|Out-String;$lines=($out -split "`r?`n").Count;if($lines -gt 500){$out|Set-Content -NoNewline cline-git-analysis.temp; '::OUTPUT_FILE=cline-git-analysis.temp'}else{$out}
-```
+**If the expected line count is greater than 500 lines, use the file-based approach:**
+   ```shell
+   git branch --show-current > cline-git-analysis.temp && echo "=== STATUS ===" >> cline-git-analysis.temp && git status --porcelain >> cline-git-analysis.temp && echo "=== COMMIT MESSAGES ===" >> cline-git-analysis.temp && git log main..HEAD --oneline >> cline-git-analysis.temp && echo "=== CHANGED FILES ===" >> cline-git-analysis.temp && git diff main --name-only >> cline-git-analysis.temp && echo "=== FULL DIFF ===" >> cline-git-analysis.temp && git diff main >> cline-git-analysis.temp
+   ```
+
+   Then, read the file using the read_file tool. After you have read the file but before you proceed with subsequent steps, delete it:
+   ```shell
+   rm cline-git-analysis.temp
+   ```
+
+**If the expected line count is 500 lines or fewer, use the direct approach:**
+   ```shell
+   git branch --show-current && echo "=== STATUS ===" && git status --porcelain | cat && echo "=== COMMIT MESSAGES ===" && git log main..HEAD --oneline | cat && echo "=== CHANGED FILES ===" && git diff main --name-only | cat && echo "=== FULL DIFF ===" && git diff main | cat
+   ```
+
+<important>If using the direct approach, pipe outputs through `cat` to avoid interactive terminals. If the user's shell is not bash/zsh, adjust the command and chaining
+ syntax accordingly.</important>
 
 ## Step 2: Silent, Structured Analysis Phase
 - Analyze all git output without providing commentary or narration

.clinerules/workflows/pr-review.md

@@ -219,9 +219,6 @@ EOF
 
 ## Basic PR Commands
 ```bash
-# Get current PR number
-gh pr view --json number -q .number
-
 # List open PRs
 gh pr list
 

.eslintrc.json

@@ -21,7 +21,6 @@
 		"semi": "off",
 		"react-hooks/exhaustive-deps": "off",
 		"eslint-rules/no-direct-vscode-api": "warn",
-		"eslint-rules/no-direct-vscode-state-api": "error",
 		"no-restricted-syntax": [
 			"error",
 			{
@@ -30,5 +29,5 @@
 			}
 		]
 	},
-	"ignorePatterns": ["out", "dist", "dist-standalone", "**/*.d.ts", "node_modules"]
+	"ignorePatterns": ["out", "dist", "**/*.d.ts"]
 }

.github/CODEOWNERS

@@ -1,3 +1 @@
-/docs/
-/.github/   @saoudrizwan @dcbartlett
-/README.md  @saoudrizwan @nickbaumann98
+*       @saoudrizwan @ocasta181 @NightTrek @pashpashpash @dcbartlett @saito-sv @Garoth

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -5,7 +5,7 @@ body:
     - type: markdown
       attributes:
           value: |
-              **Important:** All bug reports must be reproducible using Claude 4 Sonnet. Cline uses complex prompts so less capable models may not work as expected.
+              **Important:** All bug reports must be reproducible using Claude 3.5 Sonnet. Cline uses complex prompts so less capable models may not work as expected.
     - type: textarea
       id: what-happened
       attributes:
@@ -39,21 +39,22 @@ body:
           placeholder: "e.g., cline:anthropic/claude-3.7-sonnet, gemini:gemini-2.5-pro-exp-03-25"
       validations:
           required: true
+    - type: input
+      id: operating-system
+      attributes:
+          label: Operating System
+          description: What operating system are you using?
+          placeholder: "e.g., Windows 11, macOS Sonoma, Ubuntu 22.04"
+      validations:
+          required: true
     - type: textarea
       id: system-info
       attributes:
-          label: System Information
-          description: What operating system and hardware are you using?
-          placeholder: |
-              Operating System: Windows 11, macOS Sonoma, Ubuntu 22.04, etc.
-              Hardware: CPU, GPU, RAM specifications if relevant
-              e.g.,
-              OS: Windows 11
-              CPU: Intel Core i7-11700K
-              GPU: NVIDIA GeForce RTX 3070
-              RAM: 32GB DDR4
+          label: System Info
+          description: What system information is relevant to the issue?
+          placeholder: "e.g., CPU: Intel Core i7-11700K, GPU: NVIDIA GeForce RTX 3070, RAM: 32GB DDR4"
       validations:
-          required: true
+          required: false
     - type: input
       id: cline-version
       attributes:
@@ -62,3 +63,8 @@ body:
           placeholder: "e.g., 1.2.3"
       validations:
           required: true
+    - type: textarea
+      id: additional-context
+      attributes:
+          label: Additional context
+          description: Add any other context about the problem here, such as screenshots or related issues.

.github/ISSUE_TEMPLATE/feature_contribution.yml

@@ -0,0 +1,116 @@
+name: 💡 Feature Proposal & Contribution
+description: Propose a new feature or improvement, and optionally offer to implement feature as a contributor
+labels: ["proposal"]
+body:
+    - type: markdown
+      attributes:
+          value: |
+              **Feature Proposal & Contribution for Cline**
+
+              Thank you for proposing a feature or improvement for Cline! This template helps us understand the problem, evaluate the solution, and coordinate implementation.
+
+              **For detailed proposals:** Please provide comprehensive information to enable fast prioritization and discussion.
+              **For contribution offers:** You can indicate your willingness to implement the feature yourself.
+
+              Before submitting:
+              - Search existing [Issues](https://github.com/cline/cline/issues) and [Discussions](https://github.com/cline/cline/discussions) to avoid duplicates
+              - Read the [Contributing Guide](https://github.com/cline/cline/blob/main/CONTRIBUTING.md) if you plan to contribute
+              - 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.
+
+              ✅ Good examples:
+              - "LLM provider returns 400 error when nearing the context window instead of truncating"
+              - "Submit button is invisible in dark mode"
+              - "Users can't easily share their Cline configurations with team members"
+
+              ❌ Avoid vague descriptions:
+              - "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.
+
+              ✅ Good examples:
+              - "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"
+              - "Add export/import functionality in settings with JSON format"
+
+              ❌ Avoid vague solutions:
+              - "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: false
+
+    - type: dropdown
+      id: contribution-intent
+      attributes:
+          label: Are you interested in implementing this?
+          description: Let us know if you'd like to contribute to this feature
+          options:
+              - "No, just proposing the idea"
+              - "Yes, I'd like to implement this myself"
+              - "Yes, I'd like to collaborate with others"
+              - "Maybe, depending on complexity and guidance"
+      validations:
+          required: false
+
+    - type: textarea
+      id: implementation-approach
+      attributes:
+          label: Implementation approach (if contributing)
+          description: |
+              **Only fill this out if you selected "Yes" above.**
+
+              How do you plan to implement this? Include:
+              - High-level technical approach
+              - Files/components that would be affected
+              - Any new dependencies required
+              - Potential challenges or considerations you've identified
+
+              This helps us provide better guidance and ensures alignment before you start coding.
+          placeholder: "My implementation approach would be..."
+
+    - 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: contribution-checklist
+      attributes:
+          label: Contribution checklist (if contributing)
+          description: Only check these if you plan to contribute
+          options:
+              - label: I've read the [Contributing Guide](https://github.com/cline/cline/blob/main/CONTRIBUTING.md)
+              - label: I'm willing to make changes based on feedback
+              - label: I understand the code review process and requirements

.github/pull_request_template.md

@@ -2,14 +2,15 @@
 Thank you for contributing to Cline!
 
 ⚠️ Important: Before submitting this PR, please ensure you have:
-- For feature requests: Created a discussion in our Feature Requests discussions board https://github.com/cline/cline/discussions/categories/feature-requests and received approval from core maintainers before implementation
-- For all changes: Link the associated issue/discussion in the "Related Issue" section below
+- 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 without prior discussion.
+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 essential to Cline's success! To ensure the best use of everyone's time and maintain project direction, we use our Feature Requests discussions board to gauge community interest and validate feature ideas before implementation begins. This helps us focus development efforts on features that will benefit the most users.
+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

.github/workflows/test.yml

@@ -96,15 +96,16 @@ jobs:
             - name: Build Tests and Extension
               run: npm run pretest
 
-            - name: Unit Tests
-              run: npm run test:unit
+            # Unit Tests disabled due to module system conflicts between backend and webview-ui
+            # - name: Unit Tests
+            #   run: npm run test:unit
 
             # Run extension tests with coverage
-            - name: Extension Integration Tests with Coverage
+            - name: Extension Tests with Coverage
               id: extension_coverage
               continue-on-error: true
               run: |
-                  node ./scripts/test-ci.js 2>&1 | tee extension_coverage.txt
+                  node ./scripts/test-ci.js > extension_coverage.txt 2>&1
                   # Default the encoding to UTF-8 - It's not the default on Windows
                   PYTHONUTF8=1 PYTHONPATH=.github/scripts python -m coverage_check extract-coverage extension_coverage.txt --type=extension --github-output --verbose
 
@@ -116,7 +117,7 @@ jobs:
                   cd webview-ui
                   # Ensure coverage dependency is installed
                   npm install --no-save @vitest/coverage-v8
-                  npm run test:coverage 2>&1 | tee webview_coverage.txt
+                  npm run test:coverage > webview_coverage.txt 2>&1
                   cd ..
                   # Default the encoding to UTF-8 - It's not the default on Windows
                   PYTHONUTF8=1 PYTHONPATH=.github/scripts python -m coverage_check extract-coverage webview-ui/webview_coverage.txt --type=webview --github-output --verbose
@@ -131,19 +132,21 @@ jobs:
                   path: |
                       extension_coverage.txt
                       webview-ui/webview_coverage.txt
+                  retention-period: workflow # Artifacts are automatically deleted when the workflow completes
 
             # Set the check as failed if any of the tests failed
-            - name: Check for test failures
+            - name: Print test results and check for failures
               run: |
+                  echo "Extension Tests Result: ${{ steps.extension_coverage.outcome }}"
+                  cat extension_coverage.txt
+
+                  echo "Webview Tests Result: ${{ steps.webview_coverage.outcome }}"
+                  cat webview-ui/webview_coverage.txt
+
                   # Check if any of the test steps failed
                   # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#steps-context
-                  if [ "${{ steps.extension_coverage.outcome }}" != "success" ]; then
-                      echo "Extension Integration Tests failed, see previous step for test output."
-                  fi
-                  if [ "${{ steps.webview_coverage.outcome }}" != "success" ]; then
-                      echo "Webview Tests failed, see previous step for test output."
-                  fi
                   if [ "${{ steps.extension_coverage.outcome }}" != "success" ] || [ "${{ steps.webview_coverage.outcome }}" != "success" ]; then
+                      echo "Tests failed."
                       exit 1
                   fi
 

.vscode/launch.json

@@ -71,7 +71,7 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Run cline-core service",
+			"name": "Run Standalone Service",
 			"skipFiles": ["<node_internals>/**"],
 			"sourceMaps": true,
 			"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
@@ -82,9 +82,11 @@
 				// Turns on grpc debug log.
 				//"GRPC_TRACE": "all",
 				//"GRPC_VERBOSITY": "DEBUG",
-				"NODE_PATH": "${workspaceFolder}/dist-standalone/node_modules"
+				"NODE_PATH": "${workspaceFolder}/dist-standalone/node_modules",
+
+				"HOST_BRIDGE_ADDRESS": "localhost:50052"
 			},
-			"program": "cline-core.js"
+			"program": "standalone.js"
 		}
 	]
 }

.vscode/settings.json

@@ -9,9 +9,5 @@
 		"dist": true // set this to false to include "dist" folder in search results
 	},
 	// Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-	"typescript.tsc.autoDetect": "off",
-	// Protobuf settings
-	"protoc": {
-		"options": ["--proto_path=proto"]
-	}
+	"typescript.tsc.autoDetect": "off"
 }

.vscodeignore

@@ -61,6 +61,6 @@ old_docs/**
 !assets/icons/**
 
 # Ignore E2E build files
-e2e-build.mjs
+e2e-build.js
 e2e.vsix
 test-results/

CHANGELOG.md

@@ -1,122 +1,5 @@
 # Changelog
 
-## [3.25.2]
-
-- Fix attempt_completion showing twice in chat due to partial logic not being handled correctly
-- Fix OpenRouter showing cline credits error after 402 response
-
-## [3.25.1]
-
-- Fix attempt_completion command showing twice in chat view when updating progress checklist
-- Fix bug where announcement banner could not be dismissed
-- Add GPT-OSS models to AWS Bedrock
-
-## [3.25.0]
-
-- **Focus Chain:** Automatically creates and maintains todo lists as you work with Cline, breaking down complex tasks into manageable steps with real-time progress tracking
-- **Auto Compact:** Intelligently manages conversation context to prevent token limit errors by automatically compacting older messages while preserving important context
-- **Deep Planning:** New `/deep-planning` slash command for structured 4-step implementation planning that integrates with Focus Chain for automatic progress tracking
-- Add support for 200k context window for Claude Sonnet 4 in OpenRouter and Cline providers
-- Add option to configure custom base URL for Requesty provider
-
-## [3.24.0]
-
-- Add OpenAI GPT-5 Chat(gpt-5-chat-latest)
-- Add custom browser arguments setting to allow passing flags to the Chrome executable for better headless compatibility.
-- Add 1m context window model support for claude sonnet 4
-- Fis the API Keys URL for Requesty
-- Set gpt5 max tokens to 8_192 to fix 'context window exceeded' error
-- Fix issue where fallback request to retrieve cost was not using correct auth token
-- Add OpenAI context window exceeded error handling
-- Calibrate input token counts when using anthropic models of sap ai core provider
-
-## [3.23.0]
-
-- Add caching support for Bedrock inferences using SAP AI Core and minor refactor
-- Improve visibility for mode switch background color on different themes
-- Fix terminal commands putting webview in blocked state
-
-## [3.22.0]
-
-- Implemented a retry strategy for Cerebras to handle rate limit issues due to its generation speed
-- Add support for GPT-5 models to SAP AI Core Provider
-- Support sending context to active webview when editor panels are opened.
-- Fix bug where running out of credits on Cline accounts would show '402 empty body' response instead of 'buy credits' component
-- Fix LiteLLM Proxy Provider Cost Tracking
-
-## [3.21.0]
-
-- Add support for GPT-5 model family including GPT-5, GPT-5 Mini, and GPT-5 Nano with prompt caching support and set GPT-5 as the new default model
-- Add "Take a Tour" button for new users to easily access the VSCode walkthrough and improve onboarding experience
-- Enhance plan mode response handling with better exploration parameter support
-
-## [3.20.13]
-
-- Fix prompt caching support for Opus 4.1 on OpenRouter/Cline
-
-## [3.20.12]
-
-- Add Claude Opus 4.1 model support to AWS Bedrock provider (Thanks @omercelik!)
-- Fix prompt caching and extended thinking support for Claude Opus 4.1 in Anthropic provider
-
-## [3.20.11]
-
-Add gpt-oss-120b as a Cerebras model
-Add Opus 4.1 through Claude Code
-
-## [3.20.10]
-
-- Add OpenAI's new open-source models (GPT-OSS-120B and GPT-OSS-20B) to Hugging Face and Groq providers
-
-## [3.20.9]
-
-- Add support for Claude Opus 4.1 model in Anthropic provider
-- Add Baseten as a new API provider with support for DeepSeek, Llama, and Kimi K2 models (Thanks @AlexKer!)
-- Fix error messages not clearing from UI when retrying failed tasks
-- Fix chat input box positioning issues
-
-## [3.20.8]
-
-- Add navbar tooltips on hover
-
-## [3.20.7]
-
-- Fix circular dependency that affect the github workflow Tests / test (pull_request)
-
-## [3.20.6]
-
-- Fix login check on extension restart
-
-## [3.20.5]
-
-- Fix authentication persistence issues that could cause users to be logged out unexpectedly
-
-## [3.20.4]
-
-- Add new Cerebras models
-- Update rate limits for existing Cerebras models
-- Fix for delete task dialog
-
-## [3.20.3]
-
-- Add Huawei Cloud MaaS Provider (Thanks @ddling!)
-- Add Cerebras Qwen 3 235B instruct model (Thanks @kevint-cerebras!)
-- Add DeepSeek R1 0528 support under Hugging Face (Thanks @0ne0rZer0!)
-- Fix Global Rules directory documentation for Linux/WSL systems
-- Fix token counting when using VSCode LM API provider
-- Fix input field stealing focus issue by only focusing on visible and active editor panels
-- Fix duplicate tool registration for claude4-experimental
-- Trim input value for URL fields
-
-## [3.20.2]
-
-- Fixed issue with sap ai core client credentials storage
-- Fix Qwen Api option inconsistency between UI and API layer
-- Fix credit balance out of sync issue on account switching
-- Fix Claude Code CLAUDE_CODE_MAX_OUTPUT_TOKENS
-- Fix cursor state after restoring files to be disabled after checked out
-- Fix issue where checkpointing blocked UI
-
 ## [3.20.1]
 
 - Fix for files being deleted when switching modes or closing tasks

CONTRIBUTING.md

@@ -14,11 +14,14 @@ Bug reports help make Cline better for everyone! Before creating a new issue, pl
 ## 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.
-**For features and contributions**:
-- First check the [Feature Requests discussions board](https://github.com/cline/cline/discussions/categories/feature-requests) for similar ideas
-- If your idea is new, create a new feature request  
-- Wait for approval from core maintainers before starting implementation
-- Once approved, feel free to begin working on a PR with the help of our community!
+
+- **Check existing issues**: Search [GitHub Issues](https://github.com/cline/cline/issues).
+- **Create an issue**: Use appropriate templates:
+    - **Contributions:** Use the "Contribution Request" template to propose what you'd like to work on.
+    - **Bugs:** "Bug Report" template for reporting issues.
+    - **Features:** "Detailed Feature Proposal" template for suggesting new features.
+- **Wait for approval**: A core Cline contributor must approve your contribution request before you start implementation.
+- **Claim issues**: Once approved, the issue will be assigned to you.
 
 **PRs without approved issues may be closed.**
 

buf.yaml

@@ -9,6 +9,7 @@ lint:
 
     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

docs/docs.json

@@ -79,8 +79,6 @@
 					"features/drag-and-drop",
 					"features/plan-and-act",
 					"features/slash-commands/workflows",
-					"features/focus-chain",
-					"features/auto-compact",
 					"features/editing-messages",
 					{
 						"group": "@ Mentions",
@@ -99,8 +97,7 @@
 							"features/slash-commands/new-task",
 							"features/slash-commands/new-rule",
 							"features/slash-commands/smol",
-							"features/slash-commands/report-bug",
-							"features/slash-commands/deep-planning"
+							"features/slash-commands/report-bug"
 						]
 					},
 					{
@@ -149,14 +146,9 @@
 				"pages": [
 					"provider-config/anthropic",
 					"provider-config/claude-code",
-					{
-						"group": "AWS Bedrock",
-						"pages": [
-							"provider-config/aws-bedrock/api-key",
-							"provider-config/aws-bedrock/iam-credentials",
-							"provider-config/aws-bedrock/cli-profile"
-						]
-					},
+					"provider-config/aws-bedrock-with-apikey-authentication",
+					"provider-config/aws-bedrock-with-credentials-authentication",
+					"provider-config/aws-bedrock-with-profile-authentication",
 					"provider-config/gcp-vertex-ai",
 					"provider-config/litellm-and-cline-using-codestral",
 					"provider-config/vscode-language-model-api",

docs/features/auto-compact.mdx

@@ -1,55 +0,0 @@
----
-title: "Automatic Context Summarization"
-sidebarTitle: "Auto Compact"
----
-
-When your conversation approaches the model's context window limit, Cline automatically summarizes it to free up space and keep working. 
-
-## How It Works
-
-Cline monitors token usage during your conversation. When you're getting close to the limit, he:
-
-1. Creates a comprehensive summary of everything that's happened
-2. Preserves all the technical details, code changes, and decisions
-3. Replaces the conversation history with the summary
-4. Continues exactly where he left off
-
-You'll see a summarization tool call when this happens, showing the total cost like any other api call in the chat view.
-
-## Why This Matters
-
-Previously, Cline would truncate older messages when hitting context limits. This meant losing important context from earlier in the conversation.
-
-Now with summarization:
-- All technical decisions and code patterns are preserved
-- File changes and project context remain intact
-- Cline remembers everything he's done
-- You can work on much larger projects without interruption
-
-<Tip>
-Context Summarization synergizes beautifully with [Focus Chain](/features/focus-chain). When Focus Chain is enabled, todo lists persist across summarizations. This means Cline can work on long-horizon tasks that span multiple context windows while staying on track with the todo list guiding him through each reset.
-</Tip>
-
-## Technical Details
-
-The summarization happens through your configured API provider using the same model you're already using. It leverages prompt caching to minimize costs.
-
-1. Cline uses a [summarization prompt](https://github.com/cline/cline/blob/main/src/core/prompts/contextManagement.ts) to request a summary of the conversation.
-
-2. Once the summary is generated, Cline replaces the conversation history with a [continuation prompt](https://github.com/cline/cline/blob/main/src/core/prompts/contextManagement.ts#L69) that asks Cline to keep working and provides the summary as context.
-
-Different models have different context window thresholds for when auto-summarization kicks in. You can see how thresholds are determined in [context-window-utils.ts](https://github.com/cline/cline/blob/main/src/core/context/context-management/context-window-utils.ts). 
-
-## Cost Considerations
-
-Summarization leverages your existing prompt cache from the conversation, so it costs about the same as any other tool call.
-
-Since most input tokens are already cached, you're primarily paying for the summary generation (output tokens), making it very cost-effective.
-
-## Restoring Context with Checkpoints
-
-You can use [checkpoints](/features/checkpoints) to restore your task state from before a summarization occurred. This means you never truly lose context - you can always roll back to previous versions of your conversation. 
-
-<Note>
-  Editing a message before a summarization tool call will work similarly to a checkpoint, allowing you to restore the conversation to that point.
-</Note>

docs/features/cline-rules.mdx

@@ -11,19 +11,7 @@ You can create a rule by clicking the `+` button in the Rules tab. This will ope
 Once you save the file:
 
 -   Your rule will be stored in the `.clinerules/` directory in your project (if it's a Workspace Rule)
--   Or in the Global Rules directory (if it's a Global Rule):
-
-### Global Rules Directory Location
-
-The location of your Global Rules directory depends on your operating system:
-
-| Operating System | Default Location | Notes |
-|------------------|------------------|-------|
-| **Windows** | `Documents\Cline\Rules` | Uses system Documents folder |
-| **macOS** | `~/Documents/Cline/Rules` | Uses user Documents folder |
-| **Linux/WSL** | `~/Documents/Cline/Rules` | May fall back to `~/Cline/Rules` on some systems |
-
-> **Note for Linux/WSL users**: If you don't find your global rules in `~/Documents/Cline/Rules`, check `~/Cline/Rules` as the location may vary depending on your system configuration and whether the Documents directory exists.
+-   Or in the `Documents/Cline/Rules` directory (if it's a Global Rule).
 
 You can also have Cline create a rule for you by using the [`/newrule` slash command](/features/slash-commands/new-rule) in the chat.
 

docs/features/drag-and-drop.mdx

@@ -11,4 +11,4 @@ Dragging and dropping workspace files into Cline will automatically create a [fi
 
 ### Supported File Types
 
-Cline supports dragging external images, pdfs, csv, excel, and other text files from your file system, as well as files from your workspace.
+Cline supports dragging external images from your file system, as well as files from your workspace.

docs/features/focus-chain.mdx

@@ -1,296 +0,0 @@
----
-title: "Focus Chain"
-sidebarTitle: "Focus Chain"
----
-
-Focus Chain is a task management enhancement feature in Cline that provides automatic todo list management with real-time progress tracking throughout your tasks. 
-
-This enables Cline to work on long-horizon tasks, seamlessly managing the context sent to LLMs, and keeping Cline on track across many context window resets.
-
-<Tip>
-  Focus Chain works particularly well with Cline's [Deep Planning slash command](/features/slash-commands/deep-planning), providing seamless progress tracking for implementation tasks created through the [planning process](/features/plan-and-act).
-</Tip>
-
-## Key Features
-
-### Automatic Todo List Generation
-
-Cline analyzes your task and automatically creates a comprehensive todo list with:
-- Clear, actionable items in markdown checklist format
-- Logical breakdown of complex tasks into manageable steps
-- Real-time updates as work progresses
-
-### User-Editable Todo Lists
-
-Todo lists are stored as editable markdown files:
-- Direct editing through your preferred markdown editor
-- Automatic detection of changes you make
-- Seamless integration back into Cline's workflow
-- Quick access through the edit button in the task header
-
-### Visual Progress Tracking
-
-The task header displays clear progress indicators:
-- **Step counters** showing current progress (e.g., "3/8")
-- **Completed items** clearly marked with checkmarks
-- **Current work** highlighted with indicators
-- **Expandable view** to see the full todo list
-
-### Smart Reminder System
-
-Configurable reminders ensure todo lists stay current:
-- Default reminder every 6 messages (customizable 1-100)
-- Automatic prompts when switching from Plan Mode to Act Mode
-- User-triggered updates when todo lists are manually edited
-
-
-## Getting Started
-
-<Steps>
-  <Step title="Open Cline Settings">
-      - Click the gear icon in the Cline sidebar
-      - Navigate to the "Features" section
-  </Step>
-  <Step title="Enable Focus Chain">
-      - Check "Enable Focus Chain"
-      - Optionally adjust "Remind Cline Interval" (default: 6 messages)
-  </Step>
-  <Step title="Start a New Task">
-      - Begin a new task
-      - Cline will automatically start creating and managing todo lists
-  </Step>
-</Steps>
-
-| Setting | Default | Range | Description |
-|---------|---------|-------|-------------|
-| Enable Focus Chain | Disabled | On/Off | Enables enhanced task progress tracking |
-| Remind Cline Interval | 6 | 1-100 messages | How often Cline updates the todo list |
-
-## Usage Examples
-
-#### 1. Task Initiation
-
-When you start a new task with Focus Chain enabled:
-
-``` markdown User Request
-User: "Create a user authentication system for my React app"
-
-Cline: [Analyzes request and creates todo list]
-```
-
-#### 2. Todo List Created
-
-Cline creates a comprehensive plan for the task, stored in a markdown file:
-
-```markdown Todo List Created
-- [ ] Set up project structure
-- [ ] Install authentication dependencies
-- [ ] Create user registration component
-- [ ] Implement login functionality
-- [ ] Add password validation
-- [ ] Set up user database schema
-- [ ] Write authentication tests
-- [ ] Deploy to staging environment
-```
-
-#### 3. Progress Tracking
-
-As Cline works, the task header shows real-time progress:
-
-```markdown Todo List Header
-[3/8] Implement login functionality     ⌄
-```
-
-Click to expand and see the full list:
-
-```markdown Full Todo List
-✓ Set up project structure
-✓ Install authentication dependencies
-✓ Create user registration component
-○ Implement login functionality  ← Currently working
-○ Add password validation
-○ Set up user database schema
-○ Write authentication tests
-○ Deploy to staging environment
-```
-
-#### 4. User Editing
-
-Need to tweak the todo list? No problem.
-
-<Steps>
-  <Step title="Open the todo list">
-    Click the edit button in the expanded todo view
-  </Step>
-  <Step title="Edit the markdown file">
-    A markdown file opens in your editor:
-
-    ```markdown Editing Todo List
-    # Focus Chain Todo List for Task abc123
-
-    <!-- Edit this markdown file to update your focus chain todo list -->
-    <!-- Use - [ ] for incomplete items and - [x] for completed items -->
-
-    - [x] Set up project structure
-    - [x] Install authentication dependencies (e.g., Firebase Auth)
-    - [x] Create user registration component
-    - [ ] Implement login functionality
-    - [ ] Add password reset feature
-    - [ ] Set up protected routes
-    - [ ] Implement logout functionality
-    - [ ] Add user profile page
-    - [ ] Write authentication tests
-    - [ ] Deploy to staging environment
-
-    <!-- Save this file to update the task's todo list -->
-    ```
-  </Step>
-  <Step title="Make your changes">
-    Add, remove, or reorder items as needed
-  </Step>
-  <Step title="Save the file">
-    Cline automatically detects and uses your updates
-  </Step>
-</Steps>
-
-## File Structure
-
-### Todo List Storage
-
-Todo lists are stored as markdown files in your task directory:
-
-``` markdown
-<VSCode Global Storage>/
-  tasks/
-    <taskId>/
-      focus_chain_taskid_<taskId>.md
-      ... other task files
-```
-
-### Markdown Format
-
-Todo files use standard markdown checklist syntax:
-
-```markdown Example Todo Syntax
-# Focus Chain Todo List for Task abc123
-
-<!-- Edit this markdown file to update your focus chain todo list -->
-<!-- Use the format: - [ ] for incomplete items and - [x] for completed items -->
-
-- [x] Set up project structure
-- [x] Install authentication dependencies
-- [ ] Create user registration component
-- [ ] Implement login functionality
-- [ ] Add password validation
-- [ ] Set up user database schema
-- [ ] Write authentication tests
-- [ ] Deploy to staging environment
-
-<!-- Save this file and the todo list will be updated in the task -->
-```
-
-
-## Integration with Plan/Act Mode
-
-Focus Chain works seamlessly with Cline's [Plan/Act mode](/features/plan-and-act):
-
-- **Plan Mode**: Optional todo lists for presenting concrete steps
-- **Act Mode**: Automatic todo creation when switching from Plan Mode
-
-<Tip>
-  For complex projects, start in Plan Mode to discuss and refine your approach before switching to Act Mode for implementation.
-</Tip>
-
-## Best Practices
-
-<AccordionGroup>
-  <Accordion title="For Effective Todo Lists">
-    1. **Start with Clear Requests**
-      - Provide detailed initial task descriptions
-      - Include specific requirements and constraints
-      - Mention any preferred technologies or approaches
-
-    2. **Review Generated Lists**
-      - Check that Cline's breakdown aligns with your expectations
-      - Verify that all important steps are included
-      - Ensure the order makes sense for your project
-
-    3. **Edit When Needed**
-      - Add missing steps you identify
-      - Remove unnecessary items
-      - Reorder steps for better workflow
-      - Add more specific details to general items
-  </Accordion>
-  <Accordion title="For Complex Projects">
-    1. **Use Plan Mode First**
-      - Discuss the approach before implementation
-      - Refine requirements through conversation
-      - Switch to Act Mode when ready to begin work
-
-    2. **Break Down Large Tasks**
-      - Split complex projects into smaller, manageable tasks
-      - Create separate todo lists for different components
-      - Focus on one major area at a time
-
-    3. **Regular Reviews**
-      - Check progress periodically during long tasks
-      - Update todo lists as requirements evolve
-      - Communicate changes to Cline through edits
-  </Accordion>
-  <Accordion title="For Collaboration">
-    1. **Share Todo Files**
-      - Todo markdown files can be shared with team members
-      - Include in version control for project documentation
-      - Use as basis for project planning discussions
-
-    2. **Consistent Format**
-      - Follow the standard markdown checklist format
-      - Keep item descriptions clear and actionable
-      - Use consistent terminology across todo lists
-  </Accordion>
-</AccordionGroup>
-
-
-## Troubleshooting
-
-Having issues? Try these quick fixes:
-
-<AccordionGroup>
-  <Accordion title="Todo list not updating?">
-    - Check that Focus Chain is enabled in settings
-    - Focus Chain may not work as well with smaller, less capable models
-    - Ensure file permissions are correct in the task directory
-  </Accordion>
-  <Accordion title="Can't edit todo file?">
-    - Verify your editor supports markdown
-    - Check VSCode has write permissions for the directory
-  </Accordion>
-  <Accordion title="Progress not displaying?">
-    - Ensure todo items use correct syntax (`- [ ]` and `- [x]`)
-    - Verify the markdown file is properly formatted
-  </Accordion>
-</AccordionGroup>
-
-Still stuck? Use the [/reportbug](/features/slash-commands/report-bug) command in Cline to get help.
-
-## Technical Details (for the curious)
-
-<AccordionGroup>
-  <Accordion title="File Monitoring">
-    - Real-time file watching detects changes to todo markdown files
-    - Automatic synchronization between file edits and UI updates
-    - Graceful handling of file creation, modification, and deletion
-  </Accordion>
-  <Accordion title="Progress Calculation">
-    - Dynamic counting of completed vs. total todo items
-    - Support for both `- [x]` and `- [X]` completion syntax
-    - Unicode symbols (✓, ○) for enhanced visual display
-  </Accordion>
-  <Accordion title="Privacy Considerations">
-    - Todo lists stored locally in VSCode workspace
-    - No todo content transmitted to external services
-    - Usage telemetry (can be disabled in settings)
-  </Accordion>
-</AccordionGroup>
-
-Focus Chain turns Cline into your personal project manager, keeping you on track and your tasks organized. Give it a try on your next project!

docs/features/slash-commands/deep-planning.mdx

@@ -1,153 +0,0 @@
----
-title: "Deep Planning Command"
-sidebarTitle: "/deep-planning"
----
-
-`/deep-planning` transforms Cline into a meticulous architect who investigates your codebase, asks clarifying questions, and creates a comprehensive implementation plan before writing a single line of code. 
-
-When you use `/deep-planning`, Cline follows a four-step process that mirrors how senior developers approach complex features: thorough investigation, discussion & clarification of requirements, detailed planning, and structured task creation with progress tracking.
-
-## The Four-Step Process
-
-### Step 1: Silent Investigation
-
-Cline becomes a detective, silently exploring your codebase to understand its structure, patterns, and constraints. He examines source files, analyzes import patterns, discovers class hierarchies, and identifies technical debt markers. No commentary, no narration - just focused research.
-
-During this phase, Cline runs commands like:
-- Finding all class and function definitions across your codebase
-- Analyzing import patterns to understand dependencies
-- Discovering project structure and file organization
-- Identifying TODOs and technical debt
-
-### Step 2: Discussion and Questions
-
-Once Cline understands your codebase, he asks targeted questions that will shape the implementation. These aren't generic questions - they're specific to your project and the feature you're building.
-
-Questions might cover:
-- Clarifying ambiguous requirements
-- Choosing between equally valid implementation approaches
-- Confirming assumptions about system behavior
-- Understanding preferences for technical decisions
-
-### Step 3: Implementation Plan Document
-
-Cline creates a structured markdown document (`implementation_plan.md`) that serves as your implementation blueprint. This isn't a vague outline - it's a detailed specification with exact file paths, function signatures, and implementation order.
-
-The plan includes eight comprehensive sections:
-- **Overview**: The goal and high-level approach
-- **Types**: Complete type definitions and data structures
-- **Files**: Exact files to create, modify, or delete
-- **Functions**: New and modified functions with signatures
-- **Classes**: Class modifications and inheritance details
-- **Dependencies**: Package requirements and versions
-- **Testing**: Validation strategies and test requirements
-- **Implementation Order**: Step-by-step execution sequence
-
-### Step 4: Implementation Task Creation
-
-Cline creates a new task that references the plan document and includes trackable implementation steps. The task comes with specific commands to read each section of the plan, ensuring the implementing agent (whether that's you or Cline in Act Mode) can navigate the blueprint efficiently.
-
-<Tip>
-  Deep Planning works beautifully with [Focus Chain](/features/focus-chain). The implementation steps automatically become a todo list with real-time progress tracking, keeping complex projects organized and on track.
-</Tip>
-
-## Using Deep Planning
-
-Start a deep planning session by typing `/deep-planning` followed by your feature description:
-
-```
-/deep-planning Add user authentication with JWT tokens and role-based access control
-```
-
-Cline will begin his investigation immediately. You'll see him reading files and running commands to understand your codebase. Once he's gathered enough context, he'll engage you in discussion before creating the plan.
-
-## Example Workflow
-
-Here's how I use `/deep-planning` for a real feature:
-
-<Steps>
-  <Step title="Initiate Planning">
-    I type `/deep-planning implement a caching layer for API responses`
-  </Step>
-  <Step title="Silent Investigation">
-    Cline explores my codebase, examining:
-    - Current API structure and endpoints
-    - Existing data flow patterns
-    - Database queries and performance bottlenecks
-    - Configuration and environment setup
-  </Step>
-  <Step title="Targeted Discussion">
-    Cline asks me:
-    - "Should we use Redis or in-memory caching?"
-    - "What's the acceptable cache staleness for user data?"
-    - "Do you need cache invalidation webhooks?"
-  </Step>
-  <Step title="Plan Creation">
-    Cline generates `implementation_plan.md` with:
-    - Cache service class specifications
-    - Redis connection configuration
-    - Modified API endpoints with caching logic
-    - Cache key generation strategies
-    - TTL configurations for different data types
-  </Step>
-  <Step title="Task Generation">
-    Cline creates a new task with:
-    - Reference to the implementation plan
-    - Commands to read specific sections
-    - Trackable todo items for each implementation step
-    - Request to switch to Act Mode for execution
-  </Step>
-</Steps>
-
-## Integration with Plan/Act Mode
-
-Deep Planning is designed to work seamlessly with [Plan/Act Mode](/features/plan-and-act):
-
-- Use `/deep-planning` in Plan Mode for the investigation and planning phases
-- The generated task requests switching to Act Mode for implementation
-- Focus Chain automatically tracks progress through the implementation steps
-
-This separation ensures planning stays focused on architecture while implementation stays focused on execution.
-
-## Best Practices
-
-### When to Use Deep Planning
-
-Use `/deep-planning` for:
-- Features touching multiple parts of your codebase
-- Architectural changes requiring careful coordination
-- Complex integrations with external services
-- Refactoring efforts that need systematic execution
-- Any feature where you'd normally spend time whiteboarding
-
-### Making the Most of Investigation
-
-Let Cline complete his investigation thoroughly. The quality of the plan directly correlates with how well he understands your codebase. If you have specific areas he should examine, mention them in your initial request.
-
-### Reviewing the Plan
-
-Always review `implementation_plan.md` before starting implementation. The plan is comprehensive but not immutable - you can edit it directly if needed. Think of it as a collaborative document between you and Cline.
-
-### Tracking Progress
-
-With Focus Chain enabled, your implementation progress displays in the task header. Each completed step gets checked off automatically as Cline works through the plan, giving you real-time visibility into complex implementations.
-
-## Inspiration
-
-I use `/deep-planning` whenever I'm about to build something that would normally require a design document. Recent examples from my workflow:
-
-- **Migrating authentication systems**: Deep Planning mapped every endpoint, identified all authentication touchpoints, and created a migration plan that avoided breaking changes.
-
-- **Adding real-time features**: The plan covered WebSocket integration, event handling, state synchronization, and fallback mechanisms for disconnections.
-
-- **Database schema refactoring**: Cline identified all affected queries, created migration scripts, and planned the rollout to minimize downtime.
-
-- **API versioning implementation**: The plan detailed route changes, backward compatibility layers, deprecation notices, and client migration paths.
-
-The power of `/deep-planning` is that it forces thoughtful architecture before implementation. It's like having a senior developer review your approach before you write code, except that developer has perfect knowledge of your entire codebase.
-
-<Note>
-  Deep Planning requires models with strong reasoning capabilities. It works best with the latest generation of models, like GPT-5, Claude 4, Gemini 2.5, or Grok 4. Smaller models may struggle with the comprehensive analysis required.
-</Note>
-
-For simpler tasks that don't require extensive planning, consider using [/newtask](/features/slash-commands/new-task) to create focused tasks with context, or jump straight into implementation if the path forward is clear.

docs/getting-started/understanding-context-management.mdx

@@ -55,8 +55,7 @@ Think of context like a whiteboard you and Cline share:
     -   Each model has a fixed size:
         -   Claude 3.5 Sonnet: 200,000 tokens
         -   DeepSeek: 64,000 tokens
-    -   When the whiteboard is full, Cline automatically summarizes the conversation to free up space
-        -   [Learn about Automatic Context Summarization](/features/automatic-context-summarization)
+    -   When the whiteboard is full, you need to erase (clear context) to write more
         -   [How Cline manages context under the hood](https://cline.bot/blog/understanding-the-new-context-window-progress-bar-in-cline)
 
 ⚠️ **Important**: Having a large context window (like Claude's 200k tokens) doesn't mean you should fill it completely. Just like a cluttered whiteboard, too much information can make it harder to focus on what's important.
@@ -86,28 +85,7 @@ Cline provides a visual way to monitor your context window usage through a progr
 -   Before starting complex tasks
 -   When Cline seems to lose context
 
-💡 **Tip**: With [Automatic Context Summarization](/features/automatic-context-summarization), Cline can now handle long conversations automatically. When combined with [Focus Chain](/features/focus-chain), you can work on complex projects that span multiple context windows without losing progress.
-
-## Automatic Context Management
-
-Cline now includes intelligent features to manage context automatically:
-
-### Automatic Context Summarization
-
-When your conversation approaches the context window limit, Cline automatically:
-- Creates a comprehensive summary of the conversation
-- Preserves all essential technical details and decisions
-- Seamlessly continues work without interruption
-- Maintains full task continuity
-
-This means you can work on larger projects without manually managing context. [Learn more about Automatic Context Summarization](/features/automatic-context-summarization).
-
-### Focus Chain Integration
-
-When combined with [Focus Chain](/features/focus-chain), Cline can:
-- Maintain todo lists across context resets
-- Track progress through multiple summarizations
-- Keep working on long-horizon tasks without losing direction
+💡 **Tip**: Consider starting a fresh session when usage reaches 70-80% to maintain optimal performance.
 
 ## Working with Context Files
 

docs/mcp/adding-mcp-servers-from-github.mdx

@@ -17,7 +17,6 @@ There are multiple places online to find MCP servers:
     -   [mcpservers.org](https://mcpservers.org/)
     -   [mcp.so](https://mcp.so/)
     -   [glama.ai/mcp/servers](https://glama.ai/mcp/servers)
-    -   [mcp.composio.dev](https://mcp.composio.dev/)
 
     These directories allow users to sort the servers by various criteria such as downloads, date, stars, and use case. Each entry provides information such as features, tools, and configuration instructions.
 

docs/more-info/telemetry.mdx

@@ -4,17 +4,17 @@ title: "Telemetry"
 
 ### Overview
 
-To help make Cline better for everyone, we collect usage data that helps us understand how developers are using our open-source AI coding agent. This feedback loop is crucial for improving Cline's capabilities and user experience.
+To help make Cline better for everyone, we collect anonymous usage data that helps us understand how developers are using our open-source AI coding agent. This feedback loop is crucial for improving Cline's capabilities and user experience.
 
 We use PostHog, an open-source analytics platform, for data collection and analysis. Our telemetry implementation is fully transparent - you can review the [source code](https://github.com/cline/cline/blob/main/src/services/posthog/telemetry/TelemetryService.ts) to see exactly what we track.
 
 ### Tracking Policy
 
-Privacy is our priority. By default, all collected data is anonymized. If you log in with a Cline account, your telemetry data will be associated with your account to help us improve the product and provide better support when you encounter issues. Your code, prompts, and conversation content always remain private and are never collected.
+Privacy is our priority. All collected data is anonymized before being sent to PostHog, with no personally identifiable information (PII) included. Your code, prompts, and conversation content always remain private and are never collected.
 
 ### What We Track
 
-We collect basic usage data including:
+We collect basic anonymous usage data including:
 
 **Task Interactions:** When tasks start and finish, conversation flow (without content)\
 **Mode and Tool Usage:** Switches between plan/act modes, which tools are being used\
@@ -28,7 +28,7 @@ For complete transparency, you can inspect our [telemetry implementation](https:
 
 Telemetry in Cline is entirely optional:
 
--   When you update or install our VS Code extension, you'll see a message about our telemetry
+-   When you update or install our VS Code extension, you'll see a message about our anonymous telemetry
 -   You can change your preference anytime in settings
 
 Cline also respects VS Code's global telemetry settings. If you've disabled telemetry at the VS Code level, Cline's telemetry will automatically be disabled as well.

docs/provider-config/anthropic.mdx

@@ -16,7 +16,6 @@ description: "Learn how to configure and use Anthropic Claude models with Cline.
 
 Cline supports the following Anthropic Claude models:
 
--   `claude-opus-4-1-20250805`
 -   `claude-opus-4-20250514`
 -   `claude-opus-4-20250514:thinking` (Extended Thinking variant)
 -   `claude-sonnet-4-20250514` (Recommended)

docs/provider-config/aws-bedrock-with-apikey-authentication.mdx

@@ -1,7 +1,6 @@
 ---
-title: "API Key (Simple Setup)"
-sidebarTitle: "API Key"
-description: "Set up AWS Bedrock with Cline using Bedrock API Keys. Simplest setup for individual developers to access frontier models."
+title: "AWS Bedrock"
+description: "Learn how to set up AWS Bedrock with Cline using credentials authentication. This guide covers AWS environment setup, regional access verification, and secure integration with the Cline VS Code extension."
 ---
 
 ### Overview
@@ -122,14 +121,14 @@ You can create a custom IAM policy with these permissions and attach it to your
 
 ### Conclusion
 
-By following these steps, you can quickly integrate AWS Bedrock with the Cline VS Code extension to accelerate development:
+By following these steps, your enterprise team can securely integrate AWS Bedrock with the Cline VS Code extension to accelerate development:
 
-1. **Prepare Your AWS Environment:** Create a Bedrock API Key with the necessary permissions.
+1. **Prepare Your AWS Environment:** Create or use a secure IAM role/user, attach the `AmazonBedrockLimitedAccess` policy, and ensure necessary permissions.
 2. **Verify Region and Model Access:** Confirm that your selected region supports your required models.
-3. **Configure Cline in VS Code:** Install and set up Cline with your AWS API Key and choose an appropriate model.
+3. **Configure Cline in VS Code:** Install and set up Cline with your AWS credentials and choose an appropriate model.
 4. **Implement Security and Monitoring:** Use best practices for IAM, network security, monitoring, and cost management.
 
-For further details, consult the [AWS Bedrock Documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html). Happy coding!
+For further details, consult the [AWS Bedrock Documentation](https://docs.aws.amazon.com/bedrock/latest/userguide/what-is-bedrock.html) and coordinate with your internal cloud team. Happy coding!
 
 ---
 

docs/provider-config/aws-bedrock-with-credentials-authentication.mdx

@@ -1,7 +1,6 @@
 ---
-title: "IAM Credentials"
-sidebarTitle: "IAM Credentials"
-description: "Set up AWS Bedrock with Cline using IAM Access Key and Secret Key credentials. Best for enterprise environments with established IAM policies."
+title: "AWS Bedrock"
+description: "Learn how to set up AWS Bedrock with Cline using credentials authentication. This guide covers AWS environment setup, regional access verification, and secure integration with the Cline VS Code extension."
 ---
 
 ### Overview

docs/provider-config/aws-bedrock-with-profile-authentication.mdx

@@ -1,7 +1,6 @@
 ---
-title: "CLI Profile (SSO)"
-sidebarTitle: "CLI Profile (SSO)"
-description: "Configure AWS Bedrock to use AWS CLI profiles for authentication with Cline. Best for SSO/federated roles and secure enterprise access."
+title: "AWS Bedrock w/ Profile Authentication"
+description: "Learn how to configure AWS Bedrock to use AWS Profiles for authentication with Cline, focusing on SSO/Federated roles for secure access."
 ---
 
 ### Overview

docs/provider-config/claude-code.mdx

@@ -52,7 +52,6 @@ If you're not sure where Claude Code is installed:
 The Claude Code provider supports these models:
 
 -   `claude-sonnet-4-20250514` (Recommended)
--   `claude-opus-4-1-20250805`
 -   `claude-opus-4-20250514`
 -   `claude-3-7-sonnet-20250219`
 -   `claude-3-5-sonnet-20241022`

docs/provider-config/openai-compatible.mdx

@@ -43,6 +43,7 @@ While the "OpenAI Compatible" provider type allows connecting to various endpoin
 -   `o1`
 -   `o1-preview`
 -   `o1-mini`
+-   `gpt-4.5-preview`
 -   `gpt-4o`
 -   `gpt-4o-mini`
 

docs/provider-config/openai.mdx

@@ -26,6 +26,7 @@ Cline is compatible with a variety of OpenAI models, including but not limited t
 -   `o1`
 -   `o1-preview`
 -   `o1-mini`
+-   `gpt-4.5-preview`
 -   `gpt-4o`
 -   `gpt-4o-mini`
 -   'gpt-4.1'

docs/provider-config/requesty.mdx

@@ -10,7 +10,7 @@ Cline supports accessing models through the [Requesty](https://www.requesty.ai/)
 ### Getting an API Key
 
 1.  **Sign Up/Sign In:** Go to the [Requesty website](https://www.requesty.ai/) and create an account or sign in.
-2.  **Get API Key:** You can get an API key from the [API Management](https://app.requesty.ai/api-keys) section of your Requesty dashboard.
+2.  **Get API Key:** You can get an API key from the [API Management](https://app.requesty.ai/manage-api) section of your Requesty dashboard.
 
 ### Supported Models
 
@@ -26,7 +26,7 @@ Requesty provides access to a wide range of models. Cline will automatically fet
 ### Tips and Notes
 
 -   **Optimizations**: Requesty offers a range of in-flight cost optimizations to lower your costs.
--   **Unified and simplified billing**: Unrestricted access to all providers and models, automatic balance top ups and more via a single [API key](https://app.requesty.ai/api-keys).
+-   **Unified and simplified billing**: Unrestricted access to all providers and models, automatic balance top ups and more via a single [API key](https://app.requesty.ai/manage-api).
 -   **Cost tracking**: Track cost per model, coding language, changed file, and more via the [Cost dashboard](https://app.requesty.ai/cost-management) or the [Requesty VS Code extension](https://marketplace.visualstudio.com/items?itemName=Requesty.requesty).
 -   **Stats and logs**: See your [coding stats dashboard](https://app.requesty.ai/usage-stats) or go through your [LLM interaction logs](https://app.requesty.ai/logs).
 -   **Fallback policies**: Keep your LLM working for you with fallback policies when providers are down.

esbuild.js

@@ -1,10 +1,6 @@
-import fs from "node:fs"
-import path from "node:path"
-import { fileURLToPath } from "node:url"
-import * as esbuild from "esbuild"
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
+const esbuild = require("esbuild")
+const fs = require("fs")
+const path = require("path")
 
 const production = process.argv.includes("--production")
 const watch = process.argv.includes("--watch")
@@ -131,8 +127,10 @@ const baseConfig = {
 	sourcemap: !production,
 	logLevel: "silent",
 	define: production
-		? { "import.meta.url": "_importMetaUrl", "process.env.IS_DEV": JSON.stringify(!production) }
-		: { "import.meta.url": "_importMetaUrl" },
+		? {
+				"process.env.IS_DEV": JSON.stringify(!production),
+			}
+		: undefined,
 	tsconfig: path.resolve(__dirname, "tsconfig.json"),
 	plugins: [
 		copyWasmFiles,
@@ -143,9 +141,6 @@ const baseConfig = {
 	format: "cjs",
 	sourcesContent: false,
 	platform: "node",
-	banner: {
-		js: "const _importMetaUrl=require('url').pathToFileURL(__filename)",
-	},
 }
 
 // Extension-specific configuration
@@ -170,7 +165,7 @@ const standaloneConfig = {
 const e2eBuildConfig = {
 	...baseConfig,
 	entryPoints: ["src/test/e2e/utils/build.ts"],
-	outfile: `${destDir}/e2e-build.mjs`,
+	outfile: `${destDir}/e2e-build.js`,
 	external: ["@vscode/test-electron", "execa"],
 	sourcemap: false,
 	plugins: [aliasResolverPlugin, esbuildProblemMatcherPlugin],

eslint-rules/__tests__/no-direct-vscode-api.test.ts

@@ -34,30 +34,25 @@ directApiRuleTester.run("no-direct-vscode-api", noDirectVscodeApiRule, {
 		},
 		// Should allow other vscode API calls
 		{
-			code: `vscode.commands.registerCommand("Hello")`,
-			filename: "/foo/bar.ts",
+			code: `vscode.window.showInformationMessage("Hello")`,
+			filename: "test.ts",
 		},
 		// Should allow postMessage calls on other objects
 		{
 			code: `window.postMessage({ type: "test" }, "*")`,
-			filename: "/foo/bar.ts",
+			filename: "test.ts",
 		},
 		// Should allow variables named vscode but not calling postMessage
 		{
 			code: `const vscode = { other: "method" }; vscode.other()`,
-			filename: "/foo/bar.ts",
-		},
-		// Should allow vscode.postMessage in test files
-		{
-			code: `vscode.postMessage({ type: "newTask", text: message.text })`,
-			filename: "/foo/bar.test.ts",
+			filename: "test.ts",
 		},
 	],
 	invalid: [
 		// Should disallow vscode.postMessage in regular files
 		{
 			code: `vscode.postMessage({ type: "test", data: {} })`,
-			filename: "/foo/bar.ts",
+			filename: "test.ts",
 			errors: [
 				{
 					messageId: "useGrpcClient",
@@ -74,13 +69,23 @@ directApiRuleTester.run("no-direct-vscode-api", noDirectVscodeApiRule, {
 				},
 			],
 		},
+		// Should disallow vscode.postMessage in test files
+		{
+			code: `vscode.postMessage({ type: "newTask", text: message.text })`,
+			filename: "test.test.ts",
+			errors: [
+				{
+					messageId: "useGrpcClient",
+				},
+			],
+		},
 		// Should disallow property access for disallowed APIs
 		{
 			code: `const folders = vscode.workspace.workspaceFolders;`,
 			filename: "workspace.ts",
 			errors: [
 				{
-					messageId: "useHostBridgeWorkspace",
+					messageId: "useHostBridge",
 				},
 			],
 		},

eslint-rules/__tests__/no-direct-vscode-state-api.test.ts

@@ -1,171 +0,0 @@
-const { RuleTester: StateApiRuleTester } = require("eslint")
-const noDirectVscodeStateApiRule = require("../no-direct-vscode-state-api")
-
-const stateApiRuleTester = new StateApiRuleTester({
-	parser: require.resolve("@typescript-eslint/parser"),
-	parserOptions: {
-		ecmaVersion: 2020,
-		sourceType: "module",
-		ecmaFeatures: {
-			jsx: true,
-		},
-	},
-})
-
-stateApiRuleTester.run("no-direct-vscode-state-api", noDirectVscodeStateApiRule, {
-	valid: [
-		// Should allow state APIs in CacheService.ts
-		{
-			code: `await context.globalState.update("myKey", value);`,
-			filename: "CacheService.ts",
-		},
-		{
-			code: `const value = context.globalState.get("myKey");`,
-			filename: "/src/core/storage/CacheService.ts",
-		},
-		{
-			code: `await context.secrets.store("apiKey", value);`,
-			filename: "CacheService.ts",
-		},
-		// Should allow state APIs in state-helpers.ts
-		{
-			code: `const value = context.globalState.get("myKey");`,
-			filename: "state-helpers.ts",
-		},
-		{
-			code: `await context.secrets.get("apiKey");`,
-			filename: "/src/core/storage/utils/state-helpers.ts",
-		},
-		// Should allow state APIs in state-migrations.ts
-		{
-			code: `await context.globalState.update("myKey", value);`,
-			filename: "state-migrations.ts",
-		},
-		{
-			code: `const value = context.workspaceState.get("myKey");`,
-			filename: "/src/core/storage/state-migrations.ts",
-		},
-		// Should allow state APIs in extension.ts
-		{
-			code: `const distinctId = context.globalState.get<string>("cline.distinctId");`,
-			filename: "extension.ts",
-		},
-		{
-			code: `await context.globalState.update("clineVersion", currentVersion);`,
-			filename: "/src/extension.ts",
-		},
-		{
-			code: `const secret = await context.secrets.get("clineAccountId");`,
-			filename: "extension.ts",
-		},
-		// Should allow state APIs in test files
-		{
-			code: `context.globalState.get("testKey")`,
-			filename: "/foo/bar.test.ts",
-		},
-		// Should allow non-state API calls
-		{
-			code: `const value = someOtherObject.globalState.get("myKey");`,
-			filename: "some-file.ts",
-		},
-		{
-			code: `await myContext.secrets.store("key", "value");`,
-			filename: "some-file.ts",
-		},
-	],
-	invalid: [
-		// Should disallow context.globalState.get
-		{
-			code: `const value = context.globalState.get("myKey");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceGlobalGet",
-				},
-			],
-		},
-		// Should disallow context.globalState.update
-		{
-			code: `await context.globalState.update("myKey", "myValue");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceGlobalSet",
-				},
-			],
-		},
-		// Should disallow context.workspaceState.get
-		{
-			code: `const value = context.workspaceState.get("myKey");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceWorkspaceGet",
-				},
-			],
-		},
-		// Should disallow context.workspaceState.update
-		{
-			code: `await context.workspaceState.update("myKey", "myValue");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceWorkspaceSet",
-				},
-			],
-		},
-		// Should disallow context.secrets.get
-		{
-			code: `const secret = await context.secrets.get("apiKey");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceSecretsGet",
-				},
-			],
-		},
-		// Should disallow context.secrets.store
-		{
-			code: `await context.secrets.store("apiKey", "secret-value");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceSecretsSet",
-				},
-			],
-		},
-		// Should disallow context.secrets.delete
-		{
-			code: `await context.secrets.delete("apiKey");`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceSecretsSet",
-				},
-			],
-		},
-		// Should disallow chained state API calls
-		{
-			code: `const value = await context.globalState.get("key") || "default";`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceGlobalGet",
-				},
-			],
-		},
-		// Should disallow state API calls in Promise.all
-		{
-			code: `await Promise.all([context.secrets.get("key1"), context.secrets.get("key2")]);`,
-			filename: "some-file.ts",
-			errors: [
-				{
-					messageId: "useCacheServiceSecretsGet",
-				},
-				{
-					messageId: "useCacheServiceSecretsGet",
-				},
-			],
-		},
-	],
-})

eslint-rules/index.js

@@ -1,18 +1,15 @@
 // eslint-rules/index.js
 const noDirectVscodeApi = require("./no-direct-vscode-api")
-const noDirectVscodeStateApi = require("./no-direct-vscode-state-api")
 
 module.exports = {
 	rules: {
 		"no-direct-vscode-api": noDirectVscodeApi,
-		"no-direct-vscode-state-api": noDirectVscodeStateApi,
 	},
 	configs: {
 		recommended: {
 			plugins: ["local"],
 			rules: {
 				"local/no-direct-vscode-api": "warn",
-				"local/no-direct-vscode-state-api": "error",
 			},
 		},
 	},

eslint-rules/no-direct-vscode-api.js

@@ -29,30 +29,23 @@ const disallowedApis = {
 	"vscode.workspace.applyEdit": {
 		messageId: "useHostBridge",
 	},
-	"vscode.window.onDidChangeActiveTextEditor": {
-		messageId: "useHostBridge",
-	},
-	"vscode.env.openExternal": {
-		messageId: "useUtils",
-	},
-	"vscode.window.showWarningMessage": {
-		messageId: "useHostBridgeShowMessage",
-	},
+	// "vscode.env.openExternal": {
+	// 	messageId: "useUtils",
+	// },
+	// "vscode.window.showWarningMessage": {
+	// 	messageId: "useHostBridgeShowMessage",
+	// },
 	"vscode.window.showOpenDialog": {
 		messageId: "useHostBridgeShowMessage",
 	},
-	"vscode.window.showErrorMessage": {
-		messageId: "useHostBridgeShowMessage",
-	},
-	"vscode.window.showInformationMessage": {
-		messageId: "useHostBridgeShowMessage",
-	},
-	"vscode.window.showInputBox": {
-		messageId: "useHostBridge",
-	},
-	"vscode.workspace.findFiles": {
-		messageId: "useNative",
-	},
+	// There are too many warnings for these calls, uncomment the following
+	// when the migration is finished.
+	// "vscode.window.showErrorMessage": {
+	// 	messageId: "useHostBridgeShowMessage",
+	// },
+	// "vscode.window.showInformationMessage": {
+	// 	messageId: "useHostBridgeShowMessage",
+	// },
 }
 
 module.exports = createRule({
@@ -93,10 +86,6 @@ module.exports = createRule({
 				"Use utilities in @/utils instead of calling vscode APIs directly.\n" +
 				"This provides a consistent abstraction across VSCode and standalone environments.\n" +
 				"Found: {{code}}",
-			useNative:
-				"Use a native Javascript API instead of calling the vscode API.\n" +
-				"This provides a consistent abstraction across VSCode and standalone environments.\n" +
-				"Found: {{code}}",
 		},
 		schema: [],
 	},
@@ -197,10 +186,6 @@ module.exports = createRule({
 			if (filename.includes("/standalone/runtime-files/")) {
 				return true
 			}
-			// Skip checking test files
-			if (filename.endsWith(".test.ts")) {
-				return true
-			}
 		}
 
 		return {

eslint-rules/no-direct-vscode-state-api.js

@@ -1,144 +0,0 @@
-const { ESLintUtils } = require("@typescript-eslint/utils")
-const path = require("path")
-
-const createRule = ESLintUtils.RuleCreator((name) => `https://cline.bot/eslint-rules/${name}`)
-
-// Configuration for context-based state APIs
-const disallowedContextApis = {
-	"globalState.get": {
-		messageId: "useCacheServiceGlobalGet",
-	},
-	"globalState.update": {
-		messageId: "useCacheServiceGlobalSet",
-	},
-	"workspaceState.get": {
-		messageId: "useCacheServiceWorkspaceGet",
-	},
-	"workspaceState.update": {
-		messageId: "useCacheServiceWorkspaceSet",
-	},
-	"secrets.get": {
-		messageId: "useCacheServiceSecretsGet",
-	},
-	"secrets.store": {
-		messageId: "useCacheServiceSecretsSet",
-	},
-	"secrets.delete": {
-		messageId: "useCacheServiceSecretsSet",
-	},
-}
-
-module.exports = createRule({
-	name: "no-direct-vscode-state-api",
-	meta: {
-		type: "problem",
-		docs: {
-			description:
-				"Disallow direct VSCode state API usage (context.globalState, context.workspaceState, context.secrets) in favor of CacheService",
-			recommended: "error",
-		},
-		messages: {
-			useCacheServiceGlobalGet:
-				"Use CacheService.getGlobalStateKey() instead of context.globalState.get().\n" +
-				"The CacheService provides fast in-memory access with automatic persistence.\n" +
-				"Example: cacheService.getGlobalStateKey('myKey') instead of context.globalState.get('myKey').\n" +
-				"Found: {{code}}",
-			useCacheServiceGlobalSet:
-				"Use CacheService.setGlobalState() instead of context.globalState.update().\n" +
-				"The CacheService provides immediate updates with debounced persistence.\n" +
-				"Example: cacheService.setGlobalState('myKey', value) instead of context.globalState.update('myKey', value).\n" +
-				"Found: {{code}}",
-			useCacheServiceWorkspaceGet:
-				"Use CacheService.getWorkspaceStateKey() instead of context.workspaceState.get().\n" +
-				"The CacheService provides fast in-memory access with automatic persistence.\n" +
-				"Example: cacheService.getWorkspaceStateKey('myKey') instead of context.workspaceState.get('myKey').\n" +
-				"Found: {{code}}",
-			useCacheServiceWorkspaceSet:
-				"Use CacheService.setWorkspaceState() instead of context.workspaceState.update().\n" +
-				"The CacheService provides immediate updates with debounced persistence.\n" +
-				"Example: cacheService.setWorkspaceState('myKey', value) instead of context.workspaceState.update('myKey', value).\n" +
-				"Found: {{code}}",
-			useCacheServiceSecretsGet:
-				"Use CacheService.getSecretKey() instead of context.secrets.get().\n" +
-				"The CacheService provides fast in-memory access with automatic persistence.\n" +
-				"Example: cacheService.getSecretKey('mySecret') instead of context.secrets.get('mySecret').\n" +
-				"Found: {{code}}",
-			useCacheServiceSecretsSet:
-				"Use CacheService.setSecret() instead of context.secrets.store() or context.secrets.delete().\n" +
-				"The CacheService provides immediate updates with debounced persistence.\n" +
-				"Example: cacheService.setSecret('mySecret', value) instead of context.secrets.store('mySecret', value).\n" +
-				"For deletion, use: cacheService.setSecret('mySecret', undefined).\n" +
-				"Found: {{code}}",
-		},
-		schema: [],
-	},
-	defaultOptions: [],
-
-	create(context) {
-		function isExcluded(filename) {
-			// Skip checking test files
-			if (filename.endsWith(".test.ts")) {
-				return true
-			}
-			// Skip checking specific state-related files that need direct access
-			const basename = path.basename(filename)
-			if (
-				basename === "CacheService.ts" ||
-				basename === "state-helpers.ts" ||
-				basename === "state-migrations.ts" ||
-				basename === "extension.ts" ||
-				basename === "common.ts" // CI might report errors from this virtual file
-			) {
-				return true
-			}
-			return false
-		}
-
-		// Check for context-based state API calls
-		function checkContextStateApi(node) {
-			if (isExcluded(context.filename)) {
-				return
-			}
-
-			// Check if this is a member expression like context.globalState.get
-			if (
-				node.type === "MemberExpression" &&
-				node.object &&
-				node.object.type === "MemberExpression" &&
-				node.object.object &&
-				node.object.object.type === "Identifier" &&
-				node.object.object.name === "context"
-			) {
-				const stateType = node.object.property.name // e.g., "globalState", "workspaceState", "secrets"
-				const method = node.property.name // e.g., "get", "update", "store", "delete"
-				const apiPath = `${stateType}.${method}`
-
-				if (disallowedContextApis[apiPath]) {
-					// For method calls, get the whole call expression
-					let reportNode = node
-					let parentNode = context.sourceCode.getAncestors(node).pop()
-					if (parentNode && parentNode.type === "CallExpression" && parentNode.callee === node) {
-						reportNode = parentNode
-					}
-
-					const callText = context.sourceCode.getText(reportNode).trim()
-
-					context.report({
-						node: reportNode,
-						messageId: disallowedContextApis[apiPath].messageId,
-						data: {
-							code: callText,
-						},
-					})
-				}
-			}
-		}
-
-		return {
-			// Detect member expressions (e.g., context.globalState.get)
-			MemberExpression(node) {
-				checkContextStateApi(node)
-			},
-		}
-	},
-})

evals/cli/src/commands/runDiffEval.ts

@@ -10,7 +10,6 @@ interface RunDiffEvalOptions {
 	parsingFunction: string
 	diffEditFunction: string
 	thinkingBudget: number
-	provider: string
 	parallel: boolean
 	verbose: boolean
 	testPath: string
@@ -40,8 +39,6 @@ export async function runDiffEvalHandler(options: RunDiffEvalOptions) {
 		options.parsingFunction,
 		"--diff-edit-function",
 		options.diffEditFunction,
-		"--provider",
-		options.provider,
 	]
 
 	// Conditionally add the optional arguments

evals/cli/src/index.ts

@@ -92,7 +92,6 @@ program
 	.option("--parsing-function <name>", "The parsing function to use", "parseAssistantMessageV2")
 	.option("--diff-edit-function <name>", "The diff editing function to use", "constructNewFileContentV2")
 	.option("--thinking-budget <tokens>", "Set the thinking tokens budget", "0")
-	.option("--provider <provider>", "API provider to use (openrouter, openai)", "openrouter")
 	.option("--parallel", "Run tests in parallel", false)
 	.option("--replay", "Run evaluation from a pre-recorded LLM output, skipping the API call", false)
 	.option("--replay-run-id <run_id>", "The ID of the run to replay from the database")

evals/diff-edits/ClineWrapper.ts

@@ -1,9 +1,11 @@
 import { OpenRouterHandler } from "../../src/api/providers/openrouter"
-import { OpenAiNativeHandler } from "../../src/api/providers/openai-native"
+import { ApiHandlerOptions } from "../../src/shared/api"
 import { Anthropic } from "@anthropic-ai/sdk"
 
 import {
+	parseAssistantMessageV1,
 	parseAssistantMessageV2,
+	parseAssistantMessageV3,
 	AssistantMessageContent,
 } from "./parsing/parse-assistant-message-06-06-25" // "../../src/core/assistant-message"
 import { constructNewFileContent as constructNewFileContent_06_06_25 } from "./diff-apply/diff-06-06-25"
@@ -15,7 +17,9 @@ type ParseAssistantMessageFn = (message: string) => AssistantMessageContent[]
 type ConstructNewFileContentFn = (diff: string, original: string, strict: boolean) => Promise<string | any>
 
 const parsingFunctions: Record<string, ParseAssistantMessageFn> = {
+	parseAssistantMessageV1: parseAssistantMessageV1,
 	parseAssistantMessageV2: parseAssistantMessageV2,
+	parseAssistantMessageV3: parseAssistantMessageV3,
 }
 
 const diffEditingFunctions: Record<string, ConstructNewFileContentFn> = {
@@ -50,7 +54,7 @@ interface StreamResult {
  * Process the stream and return full response with timing data
  */
 async function processStream(
-	handler: OpenRouterHandler | OpenAiNativeHandler,
+	handler: OpenRouterHandler,
 	systemPrompt: string,
 	messages: Anthropic.Messages.MessageParam[],
 ): Promise<StreamResult> {
@@ -186,7 +190,19 @@ export async function runSingleEvaluation(input: TestInput): Promise<TestResult>
 			}
 		}
 
-		const provider = input.provider || "openrouter"
+		const options: ApiHandlerOptions = {
+			openRouterApiKey: apiKey,
+			openRouterModelId: modelId,
+			thinkingBudgetTokens: thinkingBudgetTokens,
+			openRouterModelInfo: {
+				maxTokens: 10_000,
+				contextWindow: 1_000_000,
+				supportsImages: true,
+				supportsPromptCache: true, // may need to turn this on
+				inputPrice: 0,
+				outputPrice: 0,
+			},
+		}
 
 		// Get the output of streaming output of this llm call
 		let streamResult: StreamResult
@@ -198,34 +214,10 @@ export async function runSingleEvaluation(input: TestInput): Promise<TestResult>
 				usage: { inputTokens: 0, outputTokens: 0, cacheWriteTokens: 0, cacheReadTokens: 0, totalCost: 0 },
 			}
 		} else {
-			// Live mode: provider-specific API call logic
+			// Live mode: existing API call logic
 			try {
-				let handler: OpenRouterHandler | OpenAiNativeHandler
-				
-				if (provider === "openai") {
-					const openAiOptions = {
-						openAiNativeApiKey: apiKey,
-						apiModelId: modelId,
-					}
-					handler = new OpenAiNativeHandler(openAiOptions)
-				} else {
-					const openRouterOptions = {
-						openRouterApiKey: apiKey,
-						openRouterModelId: modelId,
-						thinkingBudgetTokens: thinkingBudgetTokens,
-						openRouterModelInfo: {
-							maxTokens: 10_000,
-							contextWindow: 1_000_000,
-							supportsImages: true,
-							supportsPromptCache: true,
-							inputPrice: 0,
-							outputPrice: 0,
-						},
-					}
-					handler = new OpenRouterHandler(openRouterOptions)
-				}
-				
-				streamResult = await processStream(handler, systemPrompt, messages)
+				const openRouterHandler = new OpenRouterHandler(options)
+				streamResult = await processStream(openRouterHandler, systemPrompt, messages)
 			} catch (error: any) {
 				return {
 					success: false,

evals/diff-edits/TestRunner.ts

@@ -49,25 +49,16 @@ type TestResultSet = { [test_id: string]: (TestResult & { test_id?: string })[]
 
 class NodeTestRunner {
 	private apiKey: string | undefined
-	private provider: string
 	private currentRunId: string | null = null
 	private systemPromptHash: string | null = null
 	private processingFunctionsHash: string | null = null
 	private caseIdMap: Map<string, string> = new Map() // test_id -> case_id mapping
 
-	constructor(isReplay: boolean, provider: string = "openrouter") {
-		this.provider = provider
+	constructor(isReplay: boolean) {
 		if (!isReplay) {
-			if (provider === "openai") {
-				this.apiKey = process.env.OPENAI_API_KEY
-				if (!this.apiKey) {
-					throw new Error("OPENAI_API_KEY environment variable not set for a non-replay run with OpenAI provider.")
-				}
-			} else {
-				this.apiKey = process.env.OPENROUTER_API_KEY
-				if (!this.apiKey) {
-					throw new Error("OPENROUTER_API_KEY environment variable not set for a non-replay run with OpenRouter provider.")
-				}
+			this.apiKey = process.env.OPENROUTER_API_KEY
+			if (!this.apiKey) {
+				throw new Error("OPENROUTER_API_KEY environment variable not set for a non-replay run.")
 			}
 		}
 	}
@@ -644,7 +635,6 @@ class NodeTestRunner {
 			thinkingBudgetTokens: testConfig.thinking_tokens_budget,
 			originalDiffEditToolCallMessage: testConfig.replay ? testCase.original_diff_edit_tool_call_message : undefined,
 			diffApplyFile: testConfig.diff_apply_file,
-			provider: this.provider,
 			isVerbose: isVerbose,
 		}
 
@@ -937,7 +927,6 @@ async function main() {
 		.option("--parsing-function <name>", "The parsing function to use", "parseAssistantMessageV2")
 		.option("--diff-edit-function <name>", "The diff editing function to use", "diff-06-26-25")
 		.option("--thinking-budget <tokens>", "Set the thinking tokens budget", "0")
-		.option("--provider <provider>", "API provider to use (openrouter, openai)", "openrouter")
 		.option("--parallel", "Run tests in parallel", false)
 		.option("--replay", "Run evaluation from a pre-recorded LLM output, skipping the API call", false)
 		.option("--replay-run-id <run_id>", "The ID of the run to replay from the database")
@@ -970,7 +959,7 @@ async function main() {
 		? parseInt(options.maxAttemptsPerCase, 10)
 		: validAttemptsPerCase * 10;
 
-	const runner = new NodeTestRunner(options.replay || !!options.replayRunId, options.provider)
+	const runner = new NodeTestRunner(options.replay || !!options.replayRunId)
 
 	if (options.replayRunId) {
 		if (!options.diffApplyFile) {
@@ -990,7 +979,7 @@ async function main() {
 			log(isVerbose, "Warning: Could not load OpenRouter model data. Context window filtering might be affected for OpenRouter models.");
 		}
 
-		const runner = new NodeTestRunner(options.replay, options.provider)
+		const runner = new NodeTestRunner(options.replay)
 		let allLoadedTestCases = runner.loadTestCases(testPath, isVerbose) // Pass isVerbose
 		
 		const allProcessedTestCasesGlobal: ProcessedTestCase[] = allLoadedTestCases.map((tc) => ({

evals/diff-edits/dashboard/app.py

@@ -331,42 +331,6 @@ def get_performance_grade(success_rate):
     else:
         return "C", "poor"
 
-def get_error_description(error_enum, error_string=None):
-    """Map error enum values to user-friendly descriptions"""
-    error_map = {
-        1: "No tool calls - Model didn't use the replace_in_file tool",
-        2: "Multiple tool calls - Model called multiple tools instead of one", 
-        3: "Wrong tool call - Model used wrong tool (not replace_in_file)",
-        4: "Missing parameters - Tool call missing required path or diff",
-        5: "Wrong file edited - Model edited different file than expected",
-        6: "Wrong tool call - Model used wrong tool type",
-        7: "Wrong file edited - Model targeted incorrect file path",
-        8: "API/Stream error - Problem with model API connection",
-        9: "Configuration error - Invalid evaluation parameters",
-        10: "Function error - Invalid parsing/diff functions",
-        11: "Other error - Unexpected failure"
-    }
-    
-    base_description = error_map.get(error_enum, f"Unknown error (code: {error_enum})")
-    
-    if error_string:
-        return f"{base_description}: {error_string}"
-    return base_description
-
-def get_error_guidance(error_enum):
-    """Provide specific guidance based on error type"""
-    guidance_map = {
-        1: "💡 The model provided a response but didn't use the replace_in_file tool. Check the raw output to see what the model actually said.",
-        2: "💡 The model called multiple tools when it should only call replace_in_file once. Check the parsed tool call section.",
-        3: "💡 The model used a different tool instead of replace_in_file. This might indicate confusion about the task.",
-        4: "💡 The model called replace_in_file but didn't provide the required 'path' or 'diff' parameters.",
-        5: "💡 The model tried to edit a different file than expected. Check the parsed tool call to see which file it targeted.",
-        6: "💡 The model used the wrong tool type. Check the raw output to see what tool it attempted to use.",
-        7: "💡 The model tried to edit a different file path than expected. This could indicate path confusion or hallucination.",
-    }
-    
-    return guidance_map.get(error_enum, "")
-
 def render_hero_section(current_run, model_performance):
     """Render the hero section with key metrics"""
     run_title = current_run['description'] if current_run['description'] else f"Run {current_run['run_id'][:8]}..."
@@ -606,16 +570,12 @@ def render_result_detail(result):
     """Render detailed view of a single result"""
     st.markdown("### 🔬 Result Deep Dive")
     
-    # Check if this is a valid result (only invalid if no tool calls or wrong file)
-    is_valid = True
-    if not pd.isna(result['error_enum']):
-        # Only these specific errors make a result "invalid" for the benchmark:
-        # 1 = no_tool_calls, 5 = wrong_file_edited, 7 = wrong_file_edited
-        is_valid = result['error_enum'] not in [1, 5, 7]
+    # Check if this is a valid result
+    is_valid = (result['error_enum'] not in [1, 6, 7]) if not pd.isna(result['error_enum']) else True
     
     # Show validity warning if needed
     if not is_valid:
-        st.warning("⚠️ **This is an invalid result** - The model didn't call the replace_in_file tool or edited the wrong file. This result is excluded from success rate calculations.")
+        st.warning("⚠️ **This is an invalid result** - The model didn't properly call the diff edit tool or edited the wrong file. This result is excluded from success rate calculations.")
     
     # Result metadata
     col1, col2, col3, col4 = st.columns(4)
@@ -631,10 +591,7 @@ def render_result_detail(result):
         st.markdown(f"**Round Trip:** {result['time_round_trip_ms']:.0f}ms")
     
     with col4:
-        if pd.notna(result['cost_usd']) and result['cost_usd'] is not None:
-            st.markdown(f"**Cost:** ${result['cost_usd']:.4f}")
-        else:
-            st.markdown(f"**Cost:** Free")
+        st.markdown(f"**Cost:** ${result['cost_usd']:.4f}")
     
     # Tabbed interface for different views
     tab1, tab2, tab3, tab4 = st.tabs(["📄 File & Edits", "🤖 Raw Output", "🔧 Parsed Tool Call", "📊 Metrics"])
@@ -736,46 +693,8 @@ def render_file_and_edits_view(result):
             # Show error information
             st.error("❌ **Edit Failed**")
             
-            # Show detailed error reason
             if not pd.isna(result['error_enum']):
-                error_description = get_error_description(
-                    result['error_enum'], 
-                    result.get('error_string')
-                )
-                st.markdown(f"**Reason:** {error_description}")
-                
-                # Show specific guidance based on error type
-                guidance = get_error_guidance(result['error_enum'])
-                if guidance:
-                    st.info(guidance)
-            
-            # For valid results that failed, check for diff application failures
-            elif not result['succeeded']:
-                # This is a valid result that failed - likely due to diff application issues
-                raw_output = result.get('raw_model_output', '')
-                
-                # Check if we have specific error information in the raw output
-                if 'does not match anything in the file' in str(raw_output).lower():
-                    st.warning("⚠️ **Diff Application Failed**")
-                    st.info("💡 The SEARCH block in the diff didn't match any content in the original file. This usually means the model hallucinated code that doesn't exist.")
-                elif 'malformatted' in str(raw_output).lower() or 'malformed' in str(raw_output).lower():
-                    st.warning("⚠️ **Diff Format Error**")
-                    st.info("💡 The diff format was incorrect. Check the raw tool call to see the formatting issues.")
-                elif 'error:' in str(raw_output).lower():
-                    # Try to extract the specific error message
-                    lines = str(raw_output).split('\n')
-                    error_lines = [line for line in lines if 'error:' in line.lower()]
-                    if error_lines:
-                        error_msg = error_lines[0].strip()
-                        st.warning("⚠️ **Diff Application Failed**")
-                        st.info(f"💡 {error_msg}")
-                    else:
-                        st.warning("⚠️ **Diff Application Failed**")
-                        st.info("💡 The diff couldn't be applied to the original file. Check the raw output and parsed tool call for more details.")
-                else:
-                    # Generic diff application failure
-                    st.warning("⚠️ **Diff Application Failed**")
-                    st.info("💡 The model made a valid tool call but the diff couldn't be applied to the original file. This usually indicates a mismatch between the expected and actual file content.")
+                st.markdown(f"**Error Code:** {result['error_enum']}")
         else:
             # Show successful edit information
             st.success("✅ **Edit Successful**")
@@ -806,25 +725,8 @@ def render_file_and_edits_view(result):
                     if len(edited_lines) > 50:
                         st.text(f"... ({len(edited_lines) - 50} more lines)")
         
-        # Show raw and parsed tool calls if available
+        # Show parsed tool call if available
         if not pd.isna(result['parsed_tool_call_json']):
-            with st.expander("View Raw Tool Call"):
-                # Extract the raw tool call text from the model output
-                raw_output = result['raw_model_output'] if not pd.isna(result['raw_model_output']) else ""
-                
-                # Try to extract just the tool call portion
-                if raw_output and '<replace_in_file>' in raw_output:
-                    # Find the tool call block
-                    start_idx = raw_output.find('<replace_in_file>')
-                    end_idx = raw_output.find('</replace_in_file>') + len('</replace_in_file>')
-                    if start_idx != -1 and end_idx != -1:
-                        raw_tool_call = raw_output[start_idx:end_idx]
-                        st.code(raw_tool_call, language='xml')
-                    else:
-                        st.text("Tool call not found in raw output")
-                else:
-                    st.text("No raw tool call available")
-            
             with st.expander("View Parsed Tool Call"):
                 try:
                     parsed_call = json.loads(result['parsed_tool_call_json'])
@@ -893,10 +795,8 @@ def render_metrics_view(result):
         if not pd.isna(result['completion_tokens']):
             st.metric("Completion Tokens", int(result['completion_tokens']))
         
-        if pd.notna(result['cost_usd']) and result['cost_usd'] is not None:
+        if not pd.isna(result['cost_usd']):
             st.metric("Cost", f"${result['cost_usd']:.4f}")
-        else:
-            st.metric("Cost", "Free")
         
         if not pd.isna(result['tokens_in_context']):
             st.metric("Context Tokens", int(result['tokens_in_context']))

evals/diff-edits/parsing/parse-assistant-message-06-06-25.ts

@@ -70,7 +70,246 @@ export interface ToolUse {
 	partial: boolean
 }
 
-// parseAssistantmessageV1 removed in https://github.com/cline/cline/pull/5425
+/**
+ * @description **Version 1**
+ * Parses an assistant message string potentially containing mixed text and tool usage blocks
+ * marked with XML-like tags into an array of structured content objects.
+ *
+ * This version iterates through the message character by character, building an accumulator string.
+ * It maintains state to track whether it's currently parsing text, a tool use block, or a specific tool parameter.
+ * It detects the start and end of tool uses and parameters by checking if the accumulator ends with
+ * the corresponding opening or closing tags.
+ * Special handling is included for `write_to_file` and `new_rule` tool uses to correctly parse
+ * the `content` parameter, which might contain the closing tag itself, by looking for the *last*
+ * occurrence of the closing tag.
+ * If the input string ends mid-tag or mid-content, the last block (text or tool use) is marked as partial.
+ *
+ * @param assistantMessage The raw string output from the assistant.
+ * @returns An array of `AssistantMessageContent` objects, which can be `TextContent` or `ToolUse`.
+ *          Blocks that were not fully closed by the end of the input string will have their `partial` flag set to `true`.
+ */
+export function parseAssistantMessageV1(assistantMessage: string): AssistantMessageContent[] {
+	const contentBlocks: AssistantMessageContent[] = []
+	let currentTextContent: TextContent | undefined = undefined
+	let currentTextContentStartIndex = 0
+	let currentToolUse: ToolUse | undefined = undefined
+	let currentToolUseStartIndex = 0
+	let currentParamName: ToolParamName | undefined = undefined
+	let currentParamValueStartIndex = 0
+	let accumulator = ""
+
+	for (let i = 0; i < assistantMessage.length; i++) {
+		const char = assistantMessage[i]
+		accumulator += char
+
+		// --- State: Parsing a Tool Parameter ---
+		// there should not be a param without a tool use
+		if (currentToolUse && currentParamName) {
+			const currentParamValue = accumulator.slice(currentParamValueStartIndex)
+			const paramClosingTag = `</${currentParamName}>`
+			if (currentParamValue.endsWith(paramClosingTag)) {
+				// End of param value found
+				currentToolUse.params[currentParamName] = currentParamValue.slice(0, -paramClosingTag.length).trim()
+				currentParamName = undefined // Go back to parsing tool content or looking for next param
+				continue // Move to next character
+			} else {
+				// Partial param value is accumulating
+				continue // Move to next character
+			}
+		}
+
+		// --- State: Parsing a Tool Use (but not a specific parameter) ---
+		// no currentParamName
+		if (currentToolUse) {
+			const currentToolValue = accumulator.slice(currentToolUseStartIndex)
+			const toolUseClosingTag = `</${currentToolUse.name}>`
+
+			if (currentToolValue.endsWith(toolUseClosingTag)) {
+				// End of a tool use found
+				currentToolUse.partial = false
+				contentBlocks.push(currentToolUse)
+				currentToolUse = undefined // Go back to parsing text or looking for next tool
+				// Reset text start index in case text follows immediately
+				currentTextContentStartIndex = i + 1
+				continue // Move to next character
+			} else {
+				// Check if starting a new parameter within the current tool use
+				const possibleParamOpeningTags = toolParamNames.map((name) => `<${name}>`)
+				let foundParamStart = false
+				for (const paramOpeningTag of possibleParamOpeningTags) {
+					if (accumulator.endsWith(paramOpeningTag)) {
+						// Start of a new parameter found
+						currentParamName = paramOpeningTag.slice(1, -1) as ToolParamName
+						currentParamValueStartIndex = accumulator.length
+						foundParamStart = true
+						break
+					}
+				}
+				if (foundParamStart) {
+					continue // Move to next character
+				}
+
+				// Special case for write_to_file/new_rule content param allowing nested tags
+				// Check if a </content> tag appears, potentially indicating the end of the content param
+				// even if the main tool closing tag hasn't been seen yet.
+				const contentParamName: ToolParamName = "content"
+				if (
+					(currentToolUse.name === "write_to_file" || currentToolUse.name === "new_rule") &&
+					accumulator.endsWith(`</${contentParamName}>`)
+				) {
+					const toolContent = accumulator.slice(currentToolUseStartIndex)
+					const contentStartTag = `<${contentParamName}>`
+					const contentEndTag = `</${contentParamName}>`
+					const contentStartIndex = toolContent.indexOf(contentStartTag) + contentStartTag.length
+					// Use lastIndexOf to handle cases where </content> might appear within the content itself
+					const contentEndIndex = toolContent.lastIndexOf(contentEndTag)
+
+					// Ensure we found valid start/end tags and end is after start
+					if (
+						contentStartIndex !== -1 &&
+						contentEndIndex !== -1 &&
+						contentEndIndex > contentStartIndex - contentStartTag.length // Ensure end tag is after start tag begins
+					) {
+						// Check if this content param was already being parsed. If so, update it.
+						// If not, and we just found the closing tag, assign it.
+						// This handles cases where the </content> detection might fire before
+						// the <content> tag detection logic, or if the content is very short.
+						if (currentParamName === contentParamName) {
+							// Already parsing content, now we found the end tag
+							currentToolUse.params[contentParamName] = toolContent.slice(contentStartIndex, contentEndIndex).trim()
+							currentParamName = undefined // Finished with this param
+						} else if (currentParamName === undefined) {
+							// Not parsing a param, but found </content>. Assume it closes the content block.
+							currentToolUse.params[contentParamName] = toolContent.slice(contentStartIndex, contentEndIndex).trim()
+							// We stay in the "parsing tool use" state, looking for more params or the tool end tag.
+						}
+					}
+				}
+
+				// If none of the above, partial tool value is accumulating
+				continue // Move to next character
+			}
+		}
+
+		// --- State: Parsing Text (or looking for start of a tool use) ---
+		// no currentToolUse
+		let didStartToolUse = false
+		const possibleToolUseOpeningTags = toolUseNames.map((name) => `<${name}>`)
+		for (const toolUseOpeningTag of possibleToolUseOpeningTags) {
+			if (accumulator.endsWith(toolUseOpeningTag)) {
+				// Start of a new tool use found
+				const toolName = toolUseOpeningTag.slice(1, -1) as ToolUseName
+				currentToolUse = {
+					type: "tool_use",
+					name: toolName,
+					params: {},
+					partial: true,
+				}
+				currentToolUseStartIndex = accumulator.length
+
+				// This also indicates the end of the current text content block (if any)
+				if (currentTextContent) {
+					currentTextContent.partial = false
+					// Extract text content, removing the part that formed the tool opening tag
+					const textEndIndex = accumulator.length - toolUseOpeningTag.length
+					currentTextContent.content = accumulator.slice(currentTextContentStartIndex, textEndIndex).trim()
+					// Only add if there's actual content
+					if (currentTextContent.content.length > 0) {
+						contentBlocks.push(currentTextContent)
+					}
+					currentTextContent = undefined
+				} else {
+					// Check if there was text before this tool use started
+					const textEndIndex = accumulator.length - toolUseOpeningTag.length
+					const potentialText = accumulator.slice(currentTextContentStartIndex, textEndIndex).trim()
+					if (potentialText.length > 0) {
+						contentBlocks.push({
+							type: "text",
+							content: potentialText,
+							partial: false, // Ended because tool use started
+						})
+					}
+				}
+
+				didStartToolUse = true
+				break // Found tool start, stop checking for others
+			}
+		}
+
+		if (!didStartToolUse) {
+			// No tool use started, so it must be text content accumulating
+			// (or continuing after a closed tool use)
+			if (currentTextContent === undefined) {
+				// Start of a new text block
+				currentTextContentStartIndex = i - (accumulator.length - currentTextContentStartIndex - 1) // Adjust start index based on how much we've accumulated since the last block ended or the beginning
+				// If accumulator starts from 0, start index is i
+				if (contentBlocks.length === 0 && currentToolUse === undefined) {
+					currentTextContentStartIndex = accumulator.length - 1 // i
+				} else {
+					// Re-calculate based on the actual start of the current text segment
+					// Find the end of the last block
+					let lastBlockEndIndex = 0
+					if (contentBlocks.length > 0) {
+						const lastBlock = contentBlocks[contentBlocks.length - 1]
+						// Approximation: find where the accumulator matches the end of the message string representation of the last block. This is complex.
+						// Simpler: Assume text starts right after the last block ended implicitly at index i.
+						lastBlockEndIndex = i // Where the loop *was* when the last block finished processing
+						// Need a more robust way to track the end index of the *raw string* corresponding to the last block.
+						// Let's stick to the accumulator slice approach for simplicity in this version.
+						// The start index should be where the current *unmatched* text began.
+						let lastProcessedIndex = -1
+						if (contentBlocks.length > 0) {
+							// This requires knowing the raw string length of the previous block, which V1 doesn't explicitly track easily.
+							// We'll approximate based on the current accumulator and start index logic.
+							// The issue arises if a tool tag was just closed. accumulator contains everything up to i.
+							// lastBlockEndIndex should point to the character *after* the closing tag of the last block.
+						}
+						// Reset start index to the beginning of the *current* potential text block
+						currentTextContentStartIndex = accumulator.length - 1 // Start accumulating from the current character `i`
+					}
+
+					// If we just closed a tool, text starts *after* its closing tag
+					// The logic needs refinement here for accurate start index after a tool closure.
+					// Let's assume for now the start index logic inside the loop handles it via slicing.
+				}
+
+				currentTextContent = {
+					type: "text",
+					content: "", // Content will be filled by slicing accumulator
+					partial: true,
+				}
+			}
+			// Update text content based on the accumulator from its start index
+			currentTextContent.content = accumulator.slice(currentTextContentStartIndex).trimStart() // Trim start to avoid leading space if text follows tool
+		}
+	} // End of loop
+
+	// --- Finalization after loop ---
+
+	// If a tool use was open at the end
+	if (currentToolUse) {
+		// If a parameter was open within that tool use
+		if (currentParamName) {
+			// The remaining accumulator content belongs to this partial parameter
+			currentToolUse.params[currentParamName] = accumulator.slice(currentParamValueStartIndex).trim()
+		}
+		// Add the potentially partial tool use block
+		contentBlocks.push(currentToolUse)
+	}
+	// If text content was being accumulated at the end
+	// Note: Only one of currentToolUse or currentTextContent can be defined here,
+	// as starting a tool use finalizes the preceding text block.
+	else if (currentTextContent) {
+		// Update content one last time
+		currentTextContent.content = accumulator.slice(currentTextContentStartIndex).trim()
+		// Add the potentially partial text block only if it contains content
+		if (currentTextContent.content.length > 0) {
+			contentBlocks.push(currentTextContent)
+		}
+	}
+
+	return contentBlocks
+}
 
 /**
  * @description **Version 2**
@@ -304,3 +543,621 @@ export function parseAssistantMessageV2(assistantMessage: string): AssistantMess
 
 	return contentBlocks
 }
+
+export function parseAssistantMessageV3(assistantMessage: string): AssistantMessageContent[] {
+	const contentBlocks: AssistantMessageContent[] = []
+	let currentTextContentStart = 0 // Index where the current text block started
+	let currentTextContent: TextContent | undefined = undefined
+	let currentToolUseStart = 0 // Index *after* the opening tag of the current tool use
+	let currentToolUse: ToolUse | undefined = undefined
+	let currentParamValueStart = 0 // Index *after* the opening tag of the current param
+	let currentParamName: ToolParamName | undefined = undefined
+
+	// Precompute tags for faster lookups
+	const toolUseOpenTags = new Map<string, ToolUseName>()
+	const toolParamOpenTags = new Map<string, ToolParamName>()
+	for (const name of toolUseNames) {
+		toolUseOpenTags.set(`<${name}>`, name)
+	}
+	for (const name of toolParamNames) {
+		toolParamOpenTags.set(`<${name}>`, name)
+	}
+
+	// Function calls format detection
+	const isFunctionCallsOpen = "<function_calls>"
+	const isFunctionCallsClose = "</function_calls>"
+	const isInvokeStart = '<invoke name="'
+	const isInvokeEnd = '">'
+	const isInvokeClose = "</invoke>"
+	const isParameterStart = '<parameter name="'
+	const isParameterNameEnd = '">'
+	const isParameterClose = "</parameter>"
+
+	// Variables for function calls parsing
+	let inFunctionCalls = false
+	let currentInvokeName = ""
+	let currentParameterName = ""
+
+	const len = assistantMessage.length
+	for (let i = 0; i < len; i++) {
+		const currentCharIndex = i
+
+		// --- State: Parsing Function Calls ---
+		// Check for opening function_calls tag
+		if (
+			!inFunctionCalls &&
+			currentCharIndex >= isFunctionCallsOpen.length - 1 &&
+			assistantMessage.startsWith(isFunctionCallsOpen, currentCharIndex - isFunctionCallsOpen.length + 1)
+		) {
+			// End current text block if one was active
+			if (currentTextContent) {
+				currentTextContent.content = assistantMessage
+					.slice(currentTextContentStart, currentCharIndex - isFunctionCallsOpen.length + 1)
+					.trim()
+				currentTextContent.partial = false
+				if (currentTextContent.content.length > 0) {
+					contentBlocks.push(currentTextContent)
+				}
+				currentTextContent = undefined
+			}
+
+			inFunctionCalls = true
+			continue
+		}
+
+		// Check for invoke start within function_calls
+		if (
+			inFunctionCalls &&
+			currentInvokeName === "" &&
+			!currentToolUse && // Don't create a new tool if we already have one
+			currentCharIndex >= isInvokeStart.length - 1 &&
+			assistantMessage.startsWith(isInvokeStart, currentCharIndex - isInvokeStart.length + 1)
+		) {
+			// Find the end of the invoke name
+			const nameEndPos = assistantMessage.indexOf(isInvokeEnd, currentCharIndex + 1)
+			if (nameEndPos !== -1) {
+				// Extract the invoke name
+				currentInvokeName = assistantMessage.slice(currentCharIndex + 1, nameEndPos)
+				i = nameEndPos + isInvokeEnd.length - 1 // Skip to after the '">
+
+				// If this is an LS invoke, create a list_files tool
+				if (currentInvokeName === "LS") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "list_files",
+						params: {},
+						partial: true,
+					}
+				}
+
+				// If this is a Grep invoke, create a search_files tool
+				if (currentInvokeName === "Grep") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "search_files",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "Bash") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "execute_command",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "Read") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "read_file",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "Write") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "write_to_file",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "WebFetch") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "web_fetch",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "AskQuestion") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "ask_followup_question",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "UseMCPTool") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "use_mcp_tool",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "AccessMCPResource") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "access_mcp_resource",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "ListCodeDefinitionNames") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "list_code_definition_names",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "PlanModeRespond") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "plan_mode_respond",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "LoadMcpDocumentation") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "load_mcp_documentation",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "AttemptCompletion") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "attempt_completion",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "BrowserAction") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "browser_action",
+						params: {},
+						partial: true,
+					}
+				}
+
+				if (currentInvokeName === "NewTask") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "new_task",
+						params: {},
+						partial: true,
+					}
+				}
+
+				// If this is a MultiEdit invoke, create a replace_in_file tool
+				if (currentInvokeName === "MultiEdit") {
+					currentToolUse = {
+						type: "tool_use",
+						name: "replace_in_file",
+						params: {},
+						partial: true,
+					}
+				}
+
+				continue
+			}
+		}
+
+		// Check for parameter start within invoke
+		if (
+			inFunctionCalls &&
+			currentInvokeName !== "" &&
+			currentParameterName === "" &&
+			currentCharIndex >= isParameterStart.length - 1 &&
+			assistantMessage.startsWith(isParameterStart, currentCharIndex - isParameterStart.length + 1)
+		) {
+			// Find the end of the parameter name
+			const nameEndPos = assistantMessage.indexOf(isParameterNameEnd, currentCharIndex + 1)
+			if (nameEndPos !== -1) {
+				// Extract the parameter name
+				currentParameterName = assistantMessage.slice(currentCharIndex + 1, nameEndPos)
+				currentParamValueStart = nameEndPos + isParameterNameEnd.length
+				i = nameEndPos + isParameterNameEnd.length - 1 // Skip to after the '">'
+				continue
+			}
+		}
+
+		// Check for parameter end
+		if (
+			inFunctionCalls &&
+			currentInvokeName !== "" &&
+			currentParameterName !== "" &&
+			currentCharIndex >= isParameterClose.length - 1 &&
+			assistantMessage.startsWith(isParameterClose, currentCharIndex - isParameterClose.length + 1)
+		) {
+			// Extract parameter value
+			const value = assistantMessage.slice(currentParamValueStart, currentCharIndex - isParameterClose.length + 1).trim()
+
+			// Map parameter to tool params
+			if (currentToolUse && currentInvokeName === "LS" && currentParameterName === "path") {
+				currentToolUse.params["path"] = value
+				// Default recursive to false - only show top level
+				currentToolUse.params["recursive"] = "false"
+			}
+
+			if (currentToolUse && currentInvokeName === "Read" && currentParameterName === "file_path") {
+				currentToolUse.params["path"] = value
+			}
+
+			if (currentToolUse && currentInvokeName === "PlanModeRespond" && currentParameterName === "response") {
+				currentToolUse.params["response"] = value
+			}
+
+			if (currentToolUse && currentInvokeName === "WebFetch" && currentParameterName === "url") {
+				currentToolUse.params["url"] = value
+			}
+
+			if (currentToolUse && currentInvokeName === "ListCodeDefinitionNames" && currentParameterName === "path") {
+				currentToolUse.params["path"] = value
+			}
+
+			if (currentToolUse && currentInvokeName === "NewTask" && currentParameterName === "context") {
+				currentToolUse.params["context"] = value
+			}
+
+			// Map parameter to tool params for Grep
+			if (currentToolUse && currentInvokeName === "Grep") {
+				if (currentParameterName === "pattern") {
+					currentToolUse.params["regex"] = value
+				} else if (currentParameterName === "path") {
+					currentToolUse.params["path"] = value
+				} else if (currentParameterName === "include") {
+					currentToolUse.params["file_pattern"] = value
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "Bash") {
+				if (currentParameterName === "command") {
+					currentToolUse.params["command"] = value
+				} else if (currentParameterName === "requires_approval") {
+					currentToolUse.params["requires_approval"] = value === "true" ? "true" : "false"
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "Write") {
+				if (currentParameterName === "file_path") {
+					currentToolUse.params["path"] = value
+				} else if (currentParameterName === "content") {
+					currentToolUse.params["content"] = value
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "AskQuestion") {
+				if (currentParameterName === "question") {
+					currentToolUse.params["question"] = value
+				} else if (currentParameterName === "options") {
+					currentToolUse.params["options"] = value
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "UseMCPTool") {
+				if (currentParameterName === "server_name") {
+					currentToolUse.params["server_name"] = value
+				} else if (currentParameterName === "tool_name") {
+					currentToolUse.params["tool_name"] = value
+				} else if (currentParameterName === "arguments") {
+					currentToolUse.params["arguments"] = value
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "AccessMCPResource") {
+				if (currentParameterName === "server_name") {
+					currentToolUse.params["server_name"] = value
+				} else if (currentParameterName === "uri") {
+					currentToolUse.params["uri"] = value
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "AttemptCompletion") {
+				if (currentParameterName === "result") {
+					currentToolUse.params["result"] = value
+				}
+				if (currentParameterName === "command") {
+					currentToolUse.params["command"] = value
+				}
+			}
+
+			if (currentToolUse && currentInvokeName === "BrowserAction") {
+				if (currentParameterName === "action") {
+					currentToolUse.params["action"] = value
+				} else if (currentParameterName === "url") {
+					currentToolUse.params["url"] = value
+				} else if (currentParameterName === "coordinate") {
+					currentToolUse.params["coordinate"] = value
+				} else if (currentParameterName === "text") {
+					currentToolUse.params["text"] = value
+				}
+			}
+
+			// Map parameter to tool params for MultiEdit
+			if (currentToolUse && currentInvokeName === "MultiEdit") {
+				if (currentParameterName === "file_path") {
+					currentToolUse.params["path"] = value
+				} else if (currentParameterName === "edits") {
+					// Save the value to the diff parameter for replace_in_file
+					currentToolUse.params["diff"] = value
+				}
+			}
+
+			currentParameterName = ""
+			continue
+		}
+
+		// Check for invoke end
+		if (
+			inFunctionCalls &&
+			currentInvokeName !== "" &&
+			currentCharIndex >= isInvokeClose.length - 1 &&
+			assistantMessage.startsWith(isInvokeClose, currentCharIndex - isInvokeClose.length + 1)
+		) {
+			// If we have a tool use from this invoke, finalize it
+			if (
+				currentToolUse &&
+				(currentInvokeName === "LS" ||
+					currentInvokeName === "Grep" ||
+					currentInvokeName === "Bash" ||
+					currentInvokeName === "Read" ||
+					currentInvokeName === "Write" ||
+					currentInvokeName === "WebFetch" ||
+					currentInvokeName === "AskQuestion" ||
+					currentInvokeName === "UseMCPTool" ||
+					currentInvokeName === "AccessMCPResource" ||
+					currentInvokeName === "ListCodeDefinitionNames" ||
+					currentInvokeName === "PlanModeRespond" ||
+					currentInvokeName === "LoadMcpDocumentation" ||
+					currentInvokeName === "AttemptCompletion" ||
+					currentInvokeName === "BrowserAction" ||
+					currentInvokeName === "NewTask" ||
+					currentInvokeName === "MultiEdit")
+			) {
+				currentToolUse.partial = false
+				contentBlocks.push(currentToolUse)
+				currentToolUse = undefined
+			}
+			currentInvokeName = ""
+			continue
+		}
+
+		// Check for function_calls end
+		if (
+			inFunctionCalls &&
+			currentCharIndex >= isFunctionCallsClose.length - 1 &&
+			assistantMessage.startsWith(isFunctionCallsClose, currentCharIndex - isFunctionCallsClose.length + 1)
+		) {
+			inFunctionCalls = false
+			currentTextContentStart = currentCharIndex + 1
+			// Start a new text content block for any text after function_calls
+			currentTextContent = {
+				type: "text",
+				content: "",
+				partial: true,
+			}
+			continue
+		}
+
+		// Skip normal parsing when inside function_calls
+		if (inFunctionCalls) {
+			continue
+		}
+
+		// --- State: Parsing a Tool Parameter ---
+		if (currentToolUse && currentParamName) {
+			const closeTag = `</${currentParamName}>`
+			// Check if the string *ending* at index `i` matches the closing tag
+			if (
+				currentCharIndex >= closeTag.length - 1 &&
+				assistantMessage.startsWith(
+					closeTag,
+					currentCharIndex - closeTag.length + 1, // Start checking from potential start of tag
+				)
+			) {
+				// Found the closing tag for the parameter
+				const value = assistantMessage
+					.slice(
+						currentParamValueStart, // Start after the opening tag
+						currentCharIndex - closeTag.length + 1, // End before the closing tag
+					)
+					.trim()
+				currentToolUse.params[currentParamName] = value
+				currentParamName = undefined // Go back to parsing tool content
+				// We don't continue loop here, need to check for tool close or other params at index i
+			} else {
+				continue // Still inside param value, move to next char
+			}
+		}
+
+		// --- State: Parsing a Tool Use (but not a specific parameter) ---
+		if (currentToolUse && !currentParamName) {
+			// Ensure we are not inside a parameter already
+			// Check if starting a new parameter
+			let startedNewParam = false
+			for (const [tag, paramName] of toolParamOpenTags.entries()) {
+				if (currentCharIndex >= tag.length - 1 && assistantMessage.startsWith(tag, currentCharIndex - tag.length + 1)) {
+					currentParamName = paramName
+					currentParamValueStart = currentCharIndex + 1 // Value starts after the tag
+					startedNewParam = true
+					break
+				}
+			}
+			if (startedNewParam) {
+				continue // Handled start of param, move to next char
+			}
+
+			// Check if closing the current tool use
+			const toolCloseTag = `</${currentToolUse.name}>`
+			if (
+				currentCharIndex >= toolCloseTag.length - 1 &&
+				assistantMessage.startsWith(toolCloseTag, currentCharIndex - toolCloseTag.length + 1)
+			) {
+				// End of the tool use found
+				// Special handling for content params *before* finalizing the tool
+				const toolContentSlice = assistantMessage.slice(
+					currentToolUseStart, // From after the tool opening tag
+					currentCharIndex - toolCloseTag.length + 1, // To before the tool closing tag
+				)
+
+				// Check if content parameter needs special handling (write_to_file/new_rule)
+				// This check is important if the closing </content> tag was missed by the parameter parsing logic
+				// (e.g., if content is empty or parsing logic prioritizes tool close)
+				const contentParamName: ToolParamName = "content"
+				if (
+					currentToolUse.name === "write_to_file" /* || currentToolUse.name === "new_rule" */ &&
+					toolContentSlice.includes(`<${contentParamName}>`)
+				) {
+					const contentStartTag = `<${contentParamName}>`
+					const contentEndTag = `</${contentParamName}>`
+					const contentStart = toolContentSlice.indexOf(contentStartTag)
+					// Use lastIndexOf for robustness against nested tags
+					const contentEnd = toolContentSlice.lastIndexOf(contentEndTag)
+
+					if (contentStart !== -1 && contentEnd !== -1 && contentEnd > contentStart) {
+						const contentValue = toolContentSlice.slice(contentStart + contentStartTag.length, contentEnd).trim()
+						currentToolUse.params[contentParamName] = contentValue
+					}
+				}
+
+				currentToolUse.partial = false // Mark as complete
+				contentBlocks.push(currentToolUse)
+				currentToolUse = undefined // Reset state
+				currentTextContentStart = currentCharIndex + 1 // Potential text starts after this tag
+				continue // Move to next char
+			}
+			// If not starting a param and not closing the tool, continue accumulating tool content implicitly
+			continue
+		}
+
+		// --- State: Parsing Text / Looking for Tool Start ---
+		if (!currentToolUse) {
+			// Check if starting a new tool use
+			let startedNewTool = false
+			for (const [tag, toolName] of toolUseOpenTags.entries()) {
+				if (currentCharIndex >= tag.length - 1 && assistantMessage.startsWith(tag, currentCharIndex - tag.length + 1)) {
+					// End current text block if one was active
+					if (currentTextContent) {
+						currentTextContent.content = assistantMessage
+							.slice(
+								currentTextContentStart, // From where text started
+								currentCharIndex - tag.length + 1, // To before the tool tag starts
+							)
+							.trim()
+						currentTextContent.partial = false // Ended because tool started
+						if (currentTextContent.content.length > 0) {
+							contentBlocks.push(currentTextContent)
+						}
+						currentTextContent = undefined
+					} else {
+						// Check for any text between the last block and this tag
+						const potentialText = assistantMessage
+							.slice(
+								currentTextContentStart, // From where text *might* have started
+								currentCharIndex - tag.length + 1, // To before the tool tag starts
+							)
+							.trim()
+						if (potentialText.length > 0) {
+							contentBlocks.push({
+								type: "text",
+								content: potentialText,
+								partial: false,
+							})
+						}
+					}
+
+					// Start the new tool use
+					currentToolUse = {
+						type: "tool_use",
+						name: toolName,
+						params: {},
+						partial: true, // Assume partial until closing tag is found
+					}
+					currentToolUseStart = currentCharIndex + 1 // Tool content starts after the opening tag
+					startedNewTool = true
+					break
+				}
+			}
+
+			if (startedNewTool) {
+				continue // Handled start of tool, move to next char
+			}
+
+			// If not starting a tool, it must be text content
+			if (!currentTextContent) {
+				// Start a new text block if we aren't already in one
+				currentTextContentStart = currentCharIndex // Text starts at the current character
+				// Check if the current char is the start of potential text *immediately* after a tag
+				// This needs the previous state - simpler to let slicing handle it later.
+				// Resetting start index accurately is key.
+				// It should be the index *after* the last processed tag.
+				// The logic managing currentTextContentStart after closing tags handles this.
+
+				currentTextContent = {
+					type: "text",
+					content: "", // Will be determined by slicing at the end or when a tool starts
+					partial: true,
+				}
+			}
+			// Continue accumulating text implicitly; content is extracted later.
+		}
+	} // End of loop
+
+	// --- Finalization after loop ---
+
+	// Finalize any open parameter within an open tool use
+	if (currentToolUse && currentParamName) {
+		currentToolUse.params[currentParamName] = assistantMessage
+			.slice(currentParamValueStart) // From param start to end of string
+			.trim()
+		// Tool use remains partial
+	}
+
+	// Finalize any open tool use (which might contain the finalized partial param)
+	if (currentToolUse) {
+		// Tool use is partial because the loop finished before its closing tag
+		contentBlocks.push(currentToolUse)
+	}
+	// Finalize any trailing text content
+	// Only possible if a tool use wasn't open at the very end
+	else if (currentTextContent) {
+		currentTextContent.content = assistantMessage
+			.slice(currentTextContentStart) // From text start to end of string
+			.trim()
+		// Text is partial because the loop finished
+		if (currentTextContent.content.length > 0) {
+			contentBlocks.push(currentTextContent)
+		}
+	}
+
+	return contentBlocks
+}

evals/diff-edits/types.ts

@@ -104,6 +104,5 @@ export interface TestInput {
 	thinkingBudgetTokens: number
 	originalDiffEditToolCallMessage?: string
 	diffApplyFile?: string
-	provider?: string
 	isVerbose: boolean
 }

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.25.2",
+	"version": "3.20.1",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -119,8 +119,7 @@
 				{
 					"type": "webview",
 					"id": "claude-dev.SidebarProvider",
-					"name": "",
-					"icon": "assets/icons/icon.svg"
+					"name": ""
 				}
 			]
 		},
@@ -339,14 +338,14 @@
 	},
 	"scripts": {
 		"vscode:prepublish": "npm run package",
-		"compile": "npm run check-types && npm run lint && node esbuild.mjs",
-		"compile-standalone": "npm run check-types && npm run lint && node esbuild.mjs --standalone",
+		"compile": "npm run check-types && npm run lint && node esbuild.js",
+		"compile-standalone": "npm run check-types && npm run lint && node esbuild.js --standalone",
 		"postcompile-standalone": "node scripts/package-standalone.mjs",
 		"watch": "npm-run-all -p watch:*",
-		"watch:esbuild": "node esbuild.mjs --watch",
+		"watch:esbuild": "node esbuild.js --watch",
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
-		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.mjs --production",
-		"protos": "node scripts/build-proto.mjs",
+		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.js --production",
+		"protos": "node scripts/build-proto.mjs && node scripts/generate-protobus-setup.mjs && node scripts/generate-host-bridge-client.mjs",
 		"postprotos": "prettier src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --log-level warn",
 		"clean": "rimraf dist dist-standalone webview-ui/build src/generated out/",
 		"compile-tests": "node ./scripts/build-tests.js",
@@ -362,8 +361,8 @@
 		"test:unit": "TS_NODE_PROJECT='./tsconfig.unit-test.json' mocha",
 		"test:coverage": "vscode-test --coverage",
 		"e2e": "playwright test -c playwright.config.ts",
-		"test:e2e": "playwright install && vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
-		"test:e2e:optimal": "vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e": "playwright install && vsce package --no-dependencies --out dist/e2e.vsix && node src/test/e2e/utils/build.js && playwright test",
+		"test:e2e:optimal": "vsce package --no-dependencies --out dist/e2e.vsix && node src/test/e2e/utils/build.js && playwright test",
 		"install:all": "npm install && cd webview-ui && npm install",
 		"dev:webview": "cd webview-ui && npm run dev",
 		"build:webview": "cd webview-ui && npm run build",
@@ -447,7 +446,6 @@
 		"@playwright/test": "^1.53.2",
 		"@sentry/browser": "^9.12.0",
 		"@streamparser/json": "^0.0.22",
-		"@types/uuid": "^10.0.0",
 		"@vscode/codicons": "^0.0.36",
 		"archiver": "^7.0.1",
 		"axios": "^1.8.2",
@@ -492,8 +490,6 @@
 		"tree-sitter-wasms": "^0.1.11",
 		"ts-morph": "^25.0.1",
 		"turndown": "^7.2.0",
-		"ulid": "^2.4.0",
-		"uuid": "^11.1.0",
 		"vscode-uri": "^3.1.0",
 		"web-tree-sitter": "^0.22.6",
 		"zod": "^3.24.2"

playwright.config.ts

@@ -1,31 +1,17 @@
 import { defineConfig } from "@playwright/test"
 
-const isCI = !!process?.env?.CI
-const isWindow = process?.platform?.startsWith("win")
+const isGitHubAction = !!process.env.CI
 
 export default defineConfig({
 	workers: 1,
 	retries: 1,
-	forbidOnly: isCI,
 	testDir: "src/test/e2e",
-	testMatch: /.*\.test\.ts/,
-	timeout: isCI || isWindow ? 40000 : 20000,
+	timeout: 20000,
 	expect: {
-		timeout: isCI || isWindow ? 5000 : 2000,
+		timeout: 20000,
 	},
 	fullyParallel: true,
-	reporter: isCI ? [["github"], ["list"]] : [["list"]],
-	use: {
-		video: "retain-on-failure",
-	},
-	projects: [
-		{
-			name: "setup test environment",
-			testMatch: /global\.setup\.ts/,
-		},
-		{
-			name: "e2e tests",
-			dependencies: ["setup test environment"],
-		},
-	],
+	reporter: isGitHubAction ? [["github"], ["list"]] : [["list"]],
+	globalSetup: require.resolve("./src/test/e2e/utils/setup"),
+	globalTeardown: require.resolve("./src/test/e2e/utils/teardown"),
 })

proto/account.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -36,8 +36,6 @@ service AccountService {
   rpc getUserOrganizations(EmptyRequest) returns (UserOrganizationsResponse);
 
   rpc setUserOrganization(UserOrganizationUpdateRequest) returns (Empty);
-
-  rpc openrouterAuthClicked(EmptyRequest) returns (Empty);
 }
 
 message AuthStateChangedRequest {
@@ -129,4 +127,4 @@ message OrganizationUsageTransaction {
   int32 prompt_tokens = 10;
   int32 total_tokens = 11;
   string user_id = 12;
-}
+}

proto/browser.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -42,7 +42,6 @@ message BrowserSettings {
   optional bool remote_browser_enabled = 3;
   optional string chrome_executable_path = 4;
   optional bool disable_tool_use = 5;
-  optional string custom_args = 6;
 }
 
 message UpdateBrowserSettingsRequest {
@@ -52,5 +51,4 @@ message UpdateBrowserSettingsRequest {
   optional bool remote_browser_enabled = 4;
   optional string chrome_executable_path = 5;
   optional bool disable_tool_use = 6;
-  optional string custom_args = 7;
 }

proto/checkpoints.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/cline/commands.proto

@@ -1,29 +0,0 @@
-syntax = "proto3";
-
-package cline;
-import "cline/common.proto";
-option java_package = "bot.cline.proto";
-option java_multiple_files = true;
-
-// Service for running IDE commands, for example context menu actions, 
-// commands, etc.
-// In contrast to the rest of the ProtoBus services, these are
-// intended to be called by the IDE directly instead of through the webview,
-// because they are triggered by interactions in the IDE.
-service CommandsService {
-  rpc addToCline(CommandContext) returns (Empty);
-  rpc fixWithCline(CommandContext) returns (Empty);
-  rpc explainWithCline(CommandContext) returns (Empty);
-  rpc improveWithCline(CommandContext) returns (Empty);
-}
-
-message CommandContext {
-  // The absolute path of the current file.
-  optional string file_path = 1;
-  // The selected source text.
-  optional string selected_text = 2;
-  // The language identifier for the current file.
-  optional string language = 3;
-  // Any diagnostic problems for the current file.
-  repeated cline.Diagnostic diagnostics = 4;
-}

proto/common.proto

@@ -55,11 +55,6 @@ message Boolean {
   bool value = 1;
 }
 
-// the same as Boolean, but avoiding name conflicts
-message BooleanResponse {
-  bool value = 1;
-}
-
 message StringArray {
   repeated string values = 1;
 }
@@ -73,32 +68,3 @@ message KeyValuePair {
   string key = 1;
   string value = 2;
 }
-
-message FileDiagnostics {
-  string file_path = 1;
-  repeated Diagnostic diagnostics = 2;
-}
-
-message Diagnostic {
-  string message = 1;
-  DiagnosticRange range = 2;
-  DiagnosticSeverity severity = 3;
-  optional string source = 4;
-}
-
-message DiagnosticRange {
-  DiagnosticPosition start = 1;
-  DiagnosticPosition end = 2;
-}
-
-message DiagnosticPosition {
-  int32 line = 1;
-  int32 character = 2;
-}
-
-enum DiagnosticSeverity {
-  DIAGNOSTIC_ERROR = 0;
-  DIAGNOSTIC_WARNING = 1;
-  DIAGNOSTIC_INFORMATION = 2;
-  DIAGNOSTIC_HINT = 3;
-}

proto/file.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -55,14 +55,8 @@ service FileService {
   // Toggles a workflow on or off
   rpc toggleWorkflow(ToggleWorkflowRequest) returns (ClineRulesToggles);
 
-  // Check if file exists in the project
-  rpc ifFileExistsRelativePath(StringRequest) returns (BooleanResponse);
-
-  // Open a file in editor by a relative path
-  rpc openFileRelativePath(StringRequest) returns (Empty);
-  
-  // Opens or creates a focus chain checklist markdown file for editing
-  rpc openFocusChainFile(StringRequest) returns (Empty);
+  // Subscribe to workspace file updates
+  rpc subscribeToWorkspaceUpdates(EmptyRequest) returns (stream StringArray);
 }
 
 // Response for refreshRules operation
@@ -93,19 +87,12 @@ message RelativePaths {
   repeated string paths = 1;
 }
 
-// Enum for file search type filtering
-enum FileSearchType {
-  FILE = 0;
-  FOLDER = 1;
-}
-
 // Request for file search operations
 message FileSearchRequest {
   Metadata metadata = 1;
   string query = 2;                  // Search query string
   optional string mentions_request_id = 3;  // Optional request ID for tracking requests
   optional int32 limit = 4;          // Optional limit for results (default: 20)
-  optional FileSearchType selected_type = 5;  // Optional selected type filter
 }
 
 // Result for file search operations

proto/host/diff.proto

@@ -4,34 +4,23 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "cline/common.proto";
+import "common.proto";
 
 // Provides methods for diff views.
 service DiffService {
   // Open the diff view/editor.
   rpc openDiff(OpenDiffRequest) returns (OpenDiffResponse);
-
   // Get the contents of the diff view.
   rpc getDocumentText(GetDocumentTextRequest) returns (GetDocumentTextResponse);
-
   // Replace a text selection in the diff.
   rpc replaceText(ReplaceTextRequest) returns (ReplaceTextResponse);
-
   rpc scrollDiff(ScrollDiffRequest) returns (ScrollDiffResponse);
-
   // Truncate the diff document.
   rpc truncateDocument(TruncateDocumentRequest) returns (TruncateDocumentResponse);
-
   // Save the diff document.
   rpc saveDocument(SaveDocumentRequest) returns (SaveDocumentResponse);
-
-  // Close all the diff editor windows/tabs.
-  // Any diff editors with unsaved content should not be closed.
-  rpc closeAllDiffs(CloseAllDiffsRequest) returns (CloseAllDiffsResponse);
-
-  // Display a diff view comparing before/after states for multiple files.
-  // Content is passed as in-memory data, not read from the file system.
-  rpc openMultiFileDiff(OpenMultiFileDiffRequest) returns (OpenMultiFileDiffResponse);
+  // Close the diff editor UI.
+  rpc closeDiff(CloseDiffRequest) returns (CloseDiffResponse);
 }
 
 message OpenDiffRequest {
@@ -81,9 +70,12 @@ message TruncateDocumentRequest {
 
 message TruncateDocumentResponse {}
 
-message CloseAllDiffsRequest {}
+message CloseDiffRequest {
+  optional cline.Metadata metadata = 1;
+  optional string diff_id = 2;
+}
 
-message CloseAllDiffsResponse {}
+message CloseDiffResponse {}
 
 message SaveDocumentRequest {
   optional cline.Metadata metadata = 1;
@@ -91,17 +83,3 @@ message SaveDocumentRequest {
 }
 
 message SaveDocumentResponse {}
-
-message OpenMultiFileDiffRequest {
-  optional string title = 1;
-  repeated ContentDiff diffs = 2;
-}
-
-message ContentDiff {
-  // The absolute file path.
-  optional string file_path = 1;
-  optional string left_content = 2;
-  optional string right_content = 3;
-}
-
-message OpenMultiFileDiffResponse {}

proto/host/env.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "cline/common.proto";
+import "common.proto";
 
 // Provides methods for working with the user's environment.
 service EnvService {
@@ -14,6 +14,6 @@ service EnvService {
   // Reads text from the system clipboard.
   rpc clipboardReadText(cline.EmptyRequest) returns (cline.String);
 
-  // Returns a stable machine identifier for telemetry distinctId purposes.
-  rpc getMachineId(cline.EmptyRequest) returns (cline.String);
+  // Opens a URL in the user's default browser or application.
+  rpc openExternal(cline.StringRequest) returns (cline.Empty);
 }

proto/host/testing.proto

@@ -1,17 +0,0 @@
-syntax = "proto3";
-
-package host;
-option java_package = "bot.cline.host.proto";
-option java_multiple_files = true;
-
-// This is for use in integration tests to get the contents of the webview.
-service TestingService {
-  rpc getWebviewHtml(GetWebviewHtmlRequest) returns (GetWebviewHtmlResponse);
-}
-
-message GetWebviewHtmlRequest {
-}
-
-message GetWebviewHtmlResponse {
-  optional string html = 1;
-}

proto/host/watch.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "cline/common.proto";
+import "common.proto";
 
 /** 
  * The watch service is only here as example of a streaming rpc in the host bridge. 

proto/host/window.proto

@@ -4,7 +4,7 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "cline/common.proto";
+import "common.proto";
 
 // Provides methods for working with IDE windows and editors.
 service WindowService {
@@ -14,7 +14,6 @@ service WindowService {
   rpc showMessage(ShowMessageRequest) returns (SelectedResponse);
   rpc showInputBox(ShowInputBoxRequest) returns (ShowInputBoxResponse);
   rpc showSaveDialog(ShowSaveDialogRequest) returns (ShowSaveDialogResponse);
-  rpc openFile(OpenFileRequest) returns (OpenFileResponse);
   rpc getOpenTabs(GetOpenTabsRequest) returns (GetOpenTabsResponse);
   rpc getVisibleTabs(GetVisibleTabsRequest) returns (GetVisibleTabsResponse);
 }
@@ -84,8 +83,6 @@ message ShowSaveDialogRequest {
 
 message ShowSaveDialogOptions {
   optional string default_path = 1;
-  // A map of file types to extensions, e.g
-  // "Text Files": { "extensions": ["txt", "md"] }
   map<string, FileExtensionList> filters = 2;
 }
 
@@ -94,7 +91,6 @@ message FileExtensionList {
 }
 
 message ShowSaveDialogResponse {
-  // If the user cancelled the dialog, this will be empty.
   optional string selected_path = 1;
 }
 
@@ -109,15 +105,6 @@ message ShowInputBoxResponse {
   optional string response = 1;
 }
 
-message OpenFileRequest {
-  cline.Metadata metadata = 1;
-  string file_path = 2;
-}
-
-message OpenFileResponse {
-  // empty
-}
-
 message GetOpenTabsRequest {
   // empty
 }
@@ -132,4 +119,4 @@ message GetVisibleTabsRequest {
 
 message GetVisibleTabsResponse {
   repeated string paths = 1;
-}
+}

proto/host/workspace.proto

@@ -4,18 +4,14 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;
 
-import "cline/common.proto";
+import "common.proto";
 
 // Provides methods for working with workspaces/projects.
 service WorkspaceService {
   // Returns a list of the top level directories of the workspace.
   rpc getWorkspacePaths(GetWorkspacePathsRequest) returns (GetWorkspacePathsResponse);
-  // Saves an open document if it's open in the editor and has unsaved changes. 
-  // Returns true if the document was saved, returns false if the document was not found, or did not
-  // need to be saved.
-  rpc saveOpenDocumentIfDirty(SaveOpenDocumentIfDirtyRequest) returns (SaveOpenDocumentIfDirtyResponse);
-  // Get diagnostics from the workspace.
-  rpc getDiagnostics(GetDiagnosticsRequest) returns (GetDiagnosticsResponse);
+  // Saves an open document if it's dirty
+  rpc saveOpenDocumentIfDirty(SaveOpenDocumentIfDirtyRequest) returns (cline.Empty);
 }
 
 message GetWorkspacePathsRequest {
@@ -32,17 +28,6 @@ message GetWorkspacePathsResponse {
 }
 
 message SaveOpenDocumentIfDirtyRequest {
-  optional string file_path = 2;
-}
-message SaveOpenDocumentIfDirtyResponse {
-  // Returns true if the document was saved. 
-  optional bool was_saved = 1;
-}
-
-message GetDiagnosticsRequest {
-  optional cline.Metadata metadata = 1;
-}
-
-message GetDiagnosticsResponse {
-  repeated cline.FileDiagnostics file_diagnostics = 1;
+  cline.Metadata metadata = 1;
+  string file_path = 2;
 }

proto/mcp.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/models.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -25,10 +25,8 @@ service ModelsService {
   rpc subscribeToOpenRouterModels(EmptyRequest) returns (stream OpenRouterCompatibleModelInfo);
   // Updates API configuration
   rpc updateApiConfigurationProto(UpdateApiConfigurationRequest) returns (Empty);
-  // Refreshes and returns Groq models
+   // Refreshes and returns Groq models
   rpc refreshGroqModels(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
-  // Refreshes and returns Baseten models
-  rpc refreshBasetenModels(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
 }
 
 // List of VS Code LM models
@@ -131,8 +129,6 @@ enum ApiProvider {
   CLAUDE_CODE = 26;
   MOONSHOT = 27;
   HUGGINGFACE = 28;
-  HUAWEI_CLOUD_MAAS = 29;
-  BASETEN = 30;
 }
 
 // Model info for OpenAI-compatible models
@@ -175,7 +171,7 @@ message ModelsApiConfiguration {
   // Global configuration fields (not mode-specific)
   optional string api_key = 1;
   optional string cline_api_key = 2;
-  optional string ulid = 3;
+  optional string task_id = 3;
   optional string lite_llm_base_url = 4;
   optional string lite_llm_api_key = 5;
   optional bool lite_llm_use_prompt_cache = 6;
@@ -205,38 +201,34 @@ message ModelsApiConfiguration {
   optional string open_ai_native_api_key = 30;
   optional string deep_seek_api_key = 31;
   optional string requesty_api_key = 32;
-  optional string requesty_base_url = 33;
-  optional string together_api_key = 34;
-  optional string fireworks_api_key = 35;
-  optional int32 fireworks_model_max_completion_tokens = 36;
-  optional int32 fireworks_model_max_tokens = 37;
-  optional string qwen_api_key = 38;
-  optional string doubao_api_key = 39;
-  optional string mistral_api_key = 40;
-  optional string azure_api_version = 41;
-  optional string qwen_api_line = 42;
-  optional string nebius_api_key = 43;
-  optional string asksage_api_url = 44;
-  optional string asksage_api_key = 45;
-  optional string xai_api_key = 46;
-  optional string sambanova_api_key = 47;
-  optional string cerebras_api_key = 48;
-  optional int32 request_timeout_ms = 49;
-  optional string sap_ai_core_client_id = 50;
-  optional string sap_ai_core_client_secret = 51;
-  optional string sap_ai_resource_group = 52;
-  optional string sap_ai_core_token_url = 53;
-  optional string sap_ai_core_base_url = 54;
-  optional string moonshot_api_key = 55;
-  optional string moonshot_api_line = 56;
-  optional string aws_authentication = 57;
-  optional string aws_bedrock_api_key = 58;
-  optional string cline_account_id = 59;
-  optional string groq_api_key = 60;
-  optional string hugging_face_api_key = 61;
-  optional string huawei_cloud_maas_api_key = 62;
-  optional string baseten_api_key = 63;
-  optional string ollama_api_key = 64;
+  optional string together_api_key = 33;
+  optional string fireworks_api_key = 34;
+  optional int32 fireworks_model_max_completion_tokens = 35;
+  optional int32 fireworks_model_max_tokens = 36;
+  optional string qwen_api_key = 37;
+  optional string doubao_api_key = 38;
+  optional string mistral_api_key = 39;
+  optional string azure_api_version = 40;
+  optional string qwen_api_line = 41;
+  optional string nebius_api_key = 42;
+  optional string asksage_api_url = 43;
+  optional string asksage_api_key = 44;
+  optional string xai_api_key = 45;
+  optional string sambanova_api_key = 46;
+  optional string cerebras_api_key = 47;
+  optional int32 request_timeout_ms = 48;
+  optional string sap_ai_core_client_id = 49;
+  optional string sap_ai_core_client_secret = 50;
+  optional string sap_ai_resource_group = 51;
+  optional string sap_ai_core_token_url = 52;
+  optional string sap_ai_core_base_url = 53;
+  optional string moonshot_api_key = 54;
+  optional string moonshot_api_line = 55;
+  optional string aws_authentication = 56;
+  optional string aws_bedrock_api_key = 57;
+  optional string cline_account_id = 58;
+  optional string groq_api_key = 59;
+  optional string hugging_face_api_key = 60;
 
   // Plan mode configurations
   optional ApiProvider plan_mode_api_provider = 100;
@@ -263,10 +255,6 @@ message ModelsApiConfiguration {
   optional OpenRouterModelInfo plan_mode_groq_model_info = 121;
   optional string plan_mode_hugging_face_model_id = 122;
   optional OpenRouterModelInfo plan_mode_hugging_face_model_info = 123;
-  optional string plan_mode_huawei_cloud_maas_model_id = 124;
-  optional OpenRouterModelInfo plan_mode_huawei_cloud_maas_model_info = 125; 
-  optional string plan_mode_baseten_model_id = 126;
-  optional OpenRouterModelInfo plan_mode_baseten_model_info = 127;
 
   // Act mode configurations
   optional ApiProvider act_mode_api_provider = 200;
@@ -293,10 +281,6 @@ message ModelsApiConfiguration {
   optional OpenRouterModelInfo act_mode_groq_model_info = 221;
   optional string act_mode_hugging_face_model_id = 222;
   optional OpenRouterModelInfo act_mode_hugging_face_model_info = 223;
-  optional string act_mode_huawei_cloud_maas_model_id = 224;
-  optional OpenRouterModelInfo act_mode_huawei_cloud_maas_model_info = 225;
-  optional string act_mode_baseten_model_id = 226;
-  optional OpenRouterModelInfo act_mode_baseten_model_info = 227;
 
   repeated string favorited_model_ids = 300;
 }

proto/slash.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/state.proto

@@ -1,19 +1,19 @@
 syntax = "proto3";
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
 service StateService {
   rpc getLatestState(EmptyRequest) returns (State);
-  rpc updateTerminalConnectionTimeout(UpdateTerminalConnectionTimeoutRequest) returns (UpdateTerminalConnectionTimeoutResponse);
+  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(ResetStateRequest) returns (Empty);
-  rpc togglePlanActModeProto(TogglePlanActModeRequest) returns (Boolean);
+  rpc togglePlanActMode(TogglePlanActModeRequest) returns (Boolean);
   rpc updateAutoApprovalSettings(AutoApprovalSettingsRequest) returns (Empty);
   rpc updateSettings(UpdateSettingsRequest) returns (Empty);
   rpc updateTelemetrySetting(TelemetrySettingRequest) returns (Empty);
@@ -43,7 +43,7 @@ message TerminalProfileUpdateResponse {
 
 message TogglePlanActModeRequest {
   Metadata metadata = 1;
-  PlanActMode mode = 2;
+  ChatSettings chat_settings = 2;
   optional ChatContent chat_content = 3;
 }
 
@@ -52,16 +52,10 @@ enum PlanActMode {
   ACT = 1;
 }
 
-enum OpenaiReasoningEffort {
-  LOW = 0;
-  MEDIUM = 1;
-  HIGH = 2;
-}
-
-enum McpDisplayMode {
-  RICH = 0;
-  PLAIN = 1;
-  MARKDOWN = 2;
+message ChatSettings {
+  PlanActMode mode = 1;
+  optional string preferred_language = 2;
+  optional string open_ai_reasoning_effort = 3;
 }
 
 message ChatContent {
@@ -114,16 +108,12 @@ message UpdateSettingsRequest {
   optional bool plan_act_separate_models_setting = 4;
   optional bool enable_checkpoints_setting = 5;
   optional bool mcp_marketplace_enabled = 6;
-  optional int32 shell_integration_timeout = 8;
+  optional ChatSettings chat_settings = 7;
+  optional int64 shell_integration_timeout = 8;
   optional bool terminal_reuse_enabled = 9;
   optional bool mcp_responses_collapsed = 10;
-  optional McpDisplayMode mcp_display_mode = 11;
-  optional int32 terminal_output_line_limit = 12;
-  optional PlanActMode mode = 13;
-  optional string preferred_language = 14;
-  optional OpenaiReasoningEffort openai_reasoning_effort = 15;
-  optional bool strict_plan_mode_enabled = 16;
-  optional FocusChainSettings focus_chain_settings = 17;
+  optional string mcp_display_mode = 11;
+  optional int64 terminal_output_line_limit = 12;
 }
 
 // Complete API Configuration message
@@ -131,7 +121,7 @@ message ApiConfiguration {
   // Global configuration fields (not mode-specific)
   optional string api_key = 1; // anthropic
   optional string cline_api_key = 2;
-  optional string ulid = 3;
+  optional string task_id = 3;
   optional string lite_llm_base_url = 4;
   optional string lite_llm_api_key = 5;
   optional bool lite_llm_use_prompt_cache = 6;
@@ -161,37 +151,34 @@ message ApiConfiguration {
   optional string openai_native_api_key = 30;
   optional string deep_seek_api_key = 31;
   optional string requesty_api_key = 32;
-  optional string requesty_base_url = 33;
-  optional string together_api_key = 34;
-  optional string fireworks_api_key = 35;
-  optional int32 fireworks_model_max_completion_tokens = 36;
-  optional int32 fireworks_model_max_tokens = 37;
-  optional string qwen_api_key = 38;
-  optional string doubao_api_key = 39;
-  optional string mistral_api_key = 40;
-  optional string azure_api_version = 41;
-  optional string qwen_api_line = 42;
-  optional string nebius_api_key = 43;
-  optional string asksage_api_url = 44;
-  optional string asksage_api_key = 45;
-  optional string xai_api_key = 46;
-  optional string sambanova_api_key = 47;
-  optional string cerebras_api_key = 48;
-  optional int32 request_timeout_ms = 49;
-  optional string sap_ai_core_client_id = 50;
-  optional string sap_ai_core_client_secret = 51;
-  optional string sap_ai_resource_group = 52;
-  optional string sap_ai_core_token_url = 53;
-  optional string sap_ai_core_base_url = 54;
-  optional string moonshot_api_key = 55;
-  optional string moonshot_api_line = 56;
-  optional string huawei_cloud_maas_api_key = 57;
-  optional string ollama_api_key = 58;
+  optional string together_api_key = 33;
+  optional string fireworks_api_key = 34;
+  optional int64 fireworks_model_max_completion_tokens = 35;
+  optional int64 fireworks_model_max_tokens = 36;
+  optional string qwen_api_key = 37;
+  optional string doubao_api_key = 38;
+  optional string mistral_api_key = 39;
+  optional string azure_api_version = 40;
+  optional string qwen_api_line = 41;
+  optional string nebius_api_key = 42;
+  optional string asksage_api_url = 43;
+  optional string asksage_api_key = 44;
+  optional string xai_api_key = 45;
+  optional string sambanova_api_key = 46;
+  optional string cerebras_api_key = 47;
+  optional int64 request_timeout_ms = 48;
+  optional string sap_ai_core_client_id = 49;
+  optional string sap_ai_core_client_secret = 50;
+  optional string sap_ai_resource_group = 51;
+  optional string sap_ai_core_token_url = 52;
+  optional string sap_ai_core_base_url = 53;
+  optional string moonshot_api_key = 54;
+  optional string moonshot_api_line = 55;
   
   // Plan mode configurations
   optional string plan_mode_api_provider = 100;
   optional string plan_mode_api_model_id = 101;
-  optional int32 plan_mode_thinking_budget_tokens = 102;
+  optional int64 plan_mode_thinking_budget_tokens = 102;
   optional string plan_mode_reasoning_effort = 103;
   optional string plan_mode_vscode_lm_model_selector = 104; // JSON string
   optional bool plan_mode_aws_bedrock_custom_selected = 105;
@@ -209,13 +196,11 @@ message ApiConfiguration {
   optional string plan_mode_together_model_id = 117;
   optional string plan_mode_fireworks_model_id = 118;
   optional string plan_mode_sap_ai_core_model_id = 119;
-  optional string plan_mode_huawei_cloud_maas_model_id = 120;
-  optional string plan_mode_huawei_cloud_maas_model_info = 121;
   
   // Act mode configurations
   optional string act_mode_api_provider = 200;
   optional string act_mode_api_model_id = 201;
-  optional int32 act_mode_thinking_budget_tokens = 202;
+  optional int64 act_mode_thinking_budget_tokens = 202;
   optional string act_mode_reasoning_effort = 203;
   optional string act_mode_vscode_lm_model_selector = 204; // JSON string
   optional bool act_mode_aws_bedrock_custom_selected = 205;
@@ -233,8 +218,6 @@ message ApiConfiguration {
   optional string act_mode_together_model_id = 217;
   optional string act_mode_fireworks_model_id = 218;
   optional string act_mode_sap_ai_core_model_id = 219;
-  optional string act_mode_huawei_cloud_maas_model_id = 220;
-  optional string act_mode_huawei_cloud_maas_model_info = 221;
   
   // Favorited model IDs
   repeated string favorited_model_ids = 300;
@@ -245,16 +228,3 @@ message ApiConfiguration {
 
   optional string cline_account_id = 303;
 }
-
-message UpdateTerminalConnectionTimeoutRequest {
-  optional int32 timeout_ms = 1;
-}
-
-message FocusChainSettings {
-  bool enabled = 1;
-  int32 remind_cline_interval = 2;
-}
-
-message UpdateTerminalConnectionTimeoutResponse {
-  optional int32 timeout_ms = 1;
-}

proto/task.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

proto/ui.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -41,7 +41,6 @@ enum ClineAsk {
   NEW_TASK = 13;
   CONDENSE = 14;
   REPORT_BUG = 15;
-  SUMMARIZE_TASK = 16;
 }
 
 // Enum for ClineSay types
@@ -73,7 +72,6 @@ enum ClineSay {
   CHECKPOINT_CREATED = 24;
   LOAD_MCP_DOCUMENTATION = 25;
   INFO = 26;
-  TASK_PROGRESS = 27;
 }
 
 // Enum for ClineSayTool tool types
@@ -229,7 +227,7 @@ service UiService {
   rpc onDidShowAnnouncement(EmptyRequest) returns (Boolean);
   
   // Subscribe to addToInput events (when user adds content via context menu)
-  rpc subscribeToAddToInput(StringRequest) returns (stream String);
+  rpc subscribeToAddToInput(EmptyRequest) returns (stream String);
   
   // Subscribe to MCP button clicked events
   rpc subscribeToMcpButtonClicked(WebviewProviderTypeRequest) returns (stream Empty);
@@ -269,7 +267,4 @@ service UiService {
   
   // Opens a URL in the default browser
   rpc openUrl(StringRequest) returns (Empty);
-  
-  // Opens the Cline walkthrough
-  rpc openWalkthrough(EmptyRequest) returns (Empty);
 }

proto/web.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 
 package cline;
-import "cline/common.proto";
+import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 

scripts/build-proto.mjs

@@ -7,10 +7,8 @@ import { globby } from "globby"
 import { createRequire } from "module"
 import os from "os"
 import * as path from "path"
+import { fileURLToPath } from "url"
 import { rmrf } from "./file-utils.mjs"
-import { main as generateProtoBusSetup } from "./generate-protobus-setup.mjs"
-import { main as generateHostBridgeClient } from "./generate-host-bridge-client.mjs"
-import { loadProtoDescriptorSet } from "./proto-utils.mjs"
 
 const require = createRequire(import.meta.url)
 const PROTOC = path.join(require.resolve("grpc-tools"), "../bin/protoc")
@@ -36,15 +34,10 @@ const TS_PROTO_OPTIONS = [
 ]
 
 async function main() {
-	await cleanup()
-	await compileProtos()
-	await checkProtos()
-	await generateProtoBusSetup()
-	await generateHostBridgeClient()
-}
-async function compileProtos() {
 	console.log(chalk.bold.blue("Compiling Protocol Buffers..."))
 
+	await cleanup()
+
 	// Check for Apple Silicon compatibility before proceeding
 	checkAppleSiliconCompatibility()
 
@@ -187,51 +180,6 @@ function checkAppleSiliconCompatibility() {
 	}
 }
 
-const int64TypeNames = ["TYPE_INT64", "TYPE_UINT64", "TYPE_SINT64", "TYPE_FIXED64", "TYPE_SFIXED64"]
-
-async function checkProtos() {
-	const proto = await loadProtoDescriptorSet()
-	const int64Fields = []
-
-	for (const [packageName, packageDef] of Object.entries(proto)) {
-		for (const [messageName, def] of Object.entries(packageDef)) {
-			// Skip service definitions
-			if (def && typeof def === "object" && "service" in def) {
-				continue
-			}
-			// Check message fields
-			if (def && def.type && def.type.field) {
-				for (const field of def.type.field) {
-					if (int64TypeNames.includes(field.type)) {
-						const name = `${packageName}.${messageName}.${field.name}`
-						int64Fields.push({
-							name: name,
-							type: field.type,
-						})
-					}
-				}
-			}
-		}
-	}
-
-	if (int64Fields.length > 0) {
-		console.log(chalk.yellow(`\nWarning: Found ${int64Fields.length} fields using 64-bit integer types`))
-		for (const field of int64Fields) {
-			const typeNames = {
-				TYPE_INT64: "int64",
-				TYPE_UINT64: "uint64",
-				TYPE_SINT64: "sint64",
-				TYPE_FIXED64: "fixed64",
-				TYPE_SFIXED64: "sfixed64",
-			}
-			log_verbose(chalk.yellow(`  - ${field.name} (${typeNames[field.type]})`))
-		}
-		log_verbose(chalk.yellow("\nWARNING: 64-bit integer fields detected in proto definitions"))
-		log_verbose(chalk.yellow("JavaScript cannot safely represent integers larger than 2^53-1 (Number.MAX_SAFE_INTEGER)."))
-		log_verbose(chalk.yellow("Consider using string representation for large numbers or implementing BigInt support.\n"))
-	}
-}
-
 function log_verbose(s) {
 	if (process.argv.includes("-v") || process.argv.includes("--verbose")) {
 		console.log(s)

scripts/build-tests.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 const { execSync } = require("child_process")
 const esbuild = require("esbuild")
 

scripts/generate-host-bridge-client.mjs

@@ -15,7 +15,7 @@ const VSCODE_CLIENT_FILE = path.resolve("src/generated/hosts/vscode/hostbridge-g
 /**
  * Main function to generate the host bridge client
  */
-export async function main() {
+async function main() {
 	const { hostServices } = await loadServicesFromProtoDescriptor()
 
 	await generateTypesFile(hostServices)
@@ -234,10 +234,8 @@ const ${name}ServiceRegistry = createServiceRegistry("${name}")
 ${methods}`
 }
 
-// Only run main if this script is executed directly
-if (import.meta.url === `file://${process.argv[1]}`) {
-	main().catch((error) => {
-		console.error(chalk.red("Error:"), error)
-		process.exit(1)
-	})
-}
+// Run the main function
+main().catch((error) => {
+	console.error(chalk.red("Error:"), error)
+	process.exit(1)
+})

scripts/generate-protobus-setup.mjs

@@ -12,7 +12,7 @@ const STANDALONE_SERVER_SETUP_FILE = path.resolve("src/generated/hosts/standalon
 
 const SCRIPT_NAME = path.relative(process.cwd(), fileURLToPath(import.meta.url))
 
-export async function main() {
+async function main() {
 	const { protobusServices } = await loadServicesFromProtoDescriptor()
 	await generateWebviewProtobusClients(protobusServices)
 	await generateVscodeServiceTypes(protobusServices)
@@ -40,11 +40,11 @@ async function generateWebviewProtobusClients(protobusServices) {
 			}
 			if (!rpc.responseStream) {
 				rpcs.push(`    static async ${rpcName}(request: ${requestType}): Promise<${responseType}> {
-		return this.makeUnaryRequest("${rpcName}", request, ${requestType}.toJSON, ${responseType}.fromJSON)
+		return this.makeRequest("${rpcName}", request)
 	}`)
 			} else {
 				rpcs.push(`    static ${rpcName}(request: ${requestType}, callbacks: Callbacks<${responseType}>): ()=>void {
-		return this.makeStreamingRequest("${rpcName}", request, ${requestType}.toJSON, ${responseType}.fromJSON, callbacks)
+		return this.makeStreamingRequest("${rpcName}", request, callbacks)
 	}`)
 			}
 		}
@@ -205,10 +205,4 @@ function getDirName(serviceName) {
 	return domain.charAt(0).toLowerCase() + domain.slice(1)
 }
 
-// Only run main if this script is executed directly
-if (import.meta.url === `file://${process.argv[1]}`) {
-	main().catch((error) => {
-		console.error(chalk.red("Error:"), error)
-		process.exit(1)
-	})
-}
+main()

scripts/proto-utils.mjs

@@ -10,7 +10,7 @@ const DESCRIPTOR_SET = path.resolve("dist-standalone/proto/descriptor_set.pb")
 const typeNameToFQN = new Map()
 
 function addTypeNameToFqn(name, fqn) {
-	if (typeNameToFQN.has(name) && typeNameToFQN.get(name) !== fqn) {
+	if (typeNameToFQN.has(name)) {
 		throw new Error(`Proto type ${name} redefined (${fqn}).`)
 	}
 	typeNameToFQN.set(name, fqn)
@@ -23,20 +23,11 @@ export function getFqn(name) {
 	return typeNameToFQN.get(name)
 }
 
-export async function getPackageDefinition() {
-	const descriptorBuffer = await fs.readFile(DESCRIPTOR_SET)
-	const options = { longs: Number } // Encode int64 fields as numbers
-	return protoLoader.loadFileDescriptorSetFromBuffer(descriptorBuffer, options)
-}
-
-export async function loadProtoDescriptorSet() {
-	const packageDefinition = await getPackageDefinition()
-	return grpc.loadPackageDefinition(packageDefinition)
-}
-
 export async function loadServicesFromProtoDescriptor() {
 	// Load service definitions from descriptor set
-	const proto = await loadProtoDescriptorSet()
+	const descriptorBuffer = await fs.readFile(DESCRIPTOR_SET)
+	const packageDefinition = protoLoader.loadFileDescriptorSetFromBuffer(descriptorBuffer)
+	const proto = grpc.loadPackageDefinition(packageDefinition)
 
 	// Extract host services and proto messages from the proto definition
 	const hostServices = {}

scripts/runclinecore.sh

@@ -1,16 +1,10 @@
 #!/usr/bin/env bash
 set -eu #x
-
 # This installs the cline-core app to the user's home directory,
 # and starts the service.
 
-if [[ "${1:-}" == "-h" ]]; then
-    ./scripts/test-hostbridge-server.ts &
-fi
-
 CORE_DIR=~/.cline/core
 INSTALL_DIR=$CORE_DIR/0.0.1
-LOG_FILE=~/.cline/cline-core-service.log
 
 ZIP_FILE=standalone.zip
 ZIP=dist-standalone/${ZIP_FILE}
@@ -24,5 +18,4 @@ cd $INSTALL_DIR
 unp $ZIP_FILE > /dev/null
 
 pkill -f cline-core.js || true
-
-NODE_PATH=./node_modules DEV_WORKSPACE_FOLDER=/tmp/ node cline-core.js 2>&1 | tee $LOG_FILE
+NODE_PATH=./node_modules DEV_WORKSPACE_FOLDER=/tmp/ node cline-core.js

scripts/test-hostbridge-server.ts

@@ -1,139 +0,0 @@
-#!/usr/bin/env npx tsx
-import * as grpc from "@grpc/grpc-js"
-import * as health from "grpc-health-check"
-import { ReflectionService } from "@grpc/reflection"
-import * as os from "os"
-import { host } from "src/generated/grpc-js/index"
-import { getPackageDefinition } from "./proto-utils.mjs"
-
-export async function startTestHostBridgeServer() {
-	const server = new grpc.Server()
-
-	// Set up health check
-	const healthImpl = new health.HealthImplementation({ "": "SERVING" })
-	healthImpl.addToServer(server)
-
-	// Add host bridge services using the mock implementations
-	server.addService(host.WorkspaceServiceService, createMockService<host.WorkspaceServiceServer>("WorkspaceService"))
-	server.addService(host.WindowServiceService, createMockService<host.WindowServiceServer>("WindowService"))
-	server.addService(host.EnvServiceService, createMockService<host.EnvServiceServer>("EnvService"))
-	server.addService(host.DiffServiceService, createMockService<host.DiffServiceServer>("DiffService"))
-	server.addService(host.WatchServiceService, createMockService<host.WatchServiceServer>("WatchService"))
-
-	// Load package definition for reflection service
-	const packageDefinition = await getPackageDefinition()
-	// Filter service names to only include host services
-	const hostBridgeServiceNames = Object.keys(packageDefinition).filter(
-		(name) => name.startsWith("host.") || name.startsWith("grpc.health"),
-	)
-	const reflection = new ReflectionService(packageDefinition, {
-		services: hostBridgeServiceNames,
-	})
-	reflection.addToServer(server)
-
-	const bindAddress = process.env.HOST_BRIDGE_ADDRESS || `127.0.0.1:26041`
-
-	server.bindAsync(bindAddress, grpc.ServerCredentials.createInsecure(), (err) => {
-		if (err) {
-			console.error(`Failed to bind test host bridge server to ${bindAddress}:`, err)
-			process.exit(1)
-		}
-		server.start()
-		console.log(`Test HostBridge gRPC server listening on ${bindAddress}`)
-	})
-}
-
-/**
- * Creates a mock gRPC service implementation using Proxy
- * @param serviceName Name of the service for logging
- * @returns A proxy that implements the service interface
- */
-function createMockService<T extends grpc.UntypedServiceImplementation>(serviceName: string): T {
-	const handler: ProxyHandler<T> = {
-		get(_target, prop) {
-			// Return a function that handles the gRPC call
-			return (call: any, callback: any) => {
-				console.log(`Hostbridge: ${serviceName}.${String(prop)} called with:`, call.request)
-
-				// Special cases that need specific return values
-				switch (prop) {
-					case "getWorkspacePaths":
-						callback(null, {
-							paths: ["/test-workspace"],
-						})
-						return
-
-					case "getMachineId":
-						callback(null, {
-							value: "fake-machine-id-" + os.hostname(),
-						})
-						return
-
-					case "clipboardReadText":
-						callback(null, {
-							value: "",
-						})
-						return
-
-					case "getWebviewHtml":
-						callback(null, {
-							html: "<html><body>Fake Webview</body></html>",
-						})
-						return
-
-					case "showTextDocument":
-						callback(null, {
-							document_path: call.request?.path || "",
-							view_column: 1,
-							is_active: true,
-						})
-						return
-
-					case "openDiff":
-						callback(null, {
-							diff_id: "fake-diff-" + Date.now(),
-						})
-						return
-
-					case "getDocumentText":
-						callback(null, {
-							content: "",
-						})
-						return
-
-					case "getOpenTabs":
-					case "getVisibleTabs":
-					case "showOpenDialogue":
-						callback(null, {
-							paths: [],
-						})
-						return
-
-					case "getDiagnostics":
-						callback(null, {
-							file_diagnostics: [],
-						})
-						return
-
-					// For streaming methods (like subscribeToFile)
-					case "subscribeToFile":
-						// Just end the stream immediately
-						call.end()
-						return
-				}
-
-				// Default: return empty object for all other methods
-				callback(null, {})
-			}
-		},
-	}
-
-	return new Proxy({} as T, handler)
-}
-
-if (require.main === module) {
-	startTestHostBridgeServer().catch((err) => {
-		console.error("Failed to start test host bridge server:", err)
-		process.exit(1)
-	})
-}

src/api/index.ts

@@ -1,5 +1,5 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiConfiguration, ModelInfo, QwenApiRegions } from "../shared/api"
+import { ApiConfiguration, ModelInfo } from "../shared/api"
 import { AnthropicHandler } from "./providers/anthropic"
 import { AwsBedrockHandler } from "./providers/bedrock"
 import { OpenRouterHandler } from "./providers/openrouter"
@@ -29,10 +29,8 @@ import { SapAiCoreHandler } from "./providers/sapaicore"
 import { ClaudeCodeHandler } from "./providers/claude-code"
 import { MoonshotHandler } from "./providers/moonshot"
 import { GroqHandler } from "./providers/groq"
-import { Mode } from "@shared/storage/types"
+import { Mode } from "../shared/ChatSettings"
 import { HuggingFaceHandler } from "./providers/huggingface"
-import { HuaweiCloudMaaSHandler } from "./providers/huawei-cloud-maas"
-import { BasetenHandler } from "./providers/baseten"
 
 export interface ApiHandler {
 	createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream
@@ -98,7 +96,7 @@ function createHandlerForProvider(
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
 				geminiApiKey: options.geminiApiKey,
 				geminiBaseUrl: options.geminiBaseUrl,
-				ulid: options.ulid,
+				taskId: options.taskId,
 			})
 		case "openai":
 			return new OpenAiHandler({
@@ -113,7 +111,6 @@ function createHandlerForProvider(
 		case "ollama":
 			return new OllamaHandler({
 				ollamaBaseUrl: options.ollamaBaseUrl,
-				ollamaApiKey: options.ollamaApiKey,
 				ollamaModelId: mode === "plan" ? options.planModeOllamaModelId : options.actModeOllamaModelId,
 				ollamaApiOptionsCtxNum: options.ollamaApiOptionsCtxNum,
 				requestTimeoutMs: options.requestTimeoutMs,
@@ -132,7 +129,7 @@ function createHandlerForProvider(
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
-				ulid: options.ulid,
+				taskId: options.taskId,
 			})
 		case "openai-native":
 			return new OpenAiNativeHandler({
@@ -147,7 +144,6 @@ function createHandlerForProvider(
 			})
 		case "requesty":
 			return new RequestyHandler({
-				requestyBaseUrl: options.requestyBaseUrl,
 				requestyApiKey: options.requestyApiKey,
 				reasoningEffort: mode === "plan" ? options.planModeReasoningEffort : options.actModeReasoningEffort,
 				thinkingBudgetTokens:
@@ -170,8 +166,7 @@ function createHandlerForProvider(
 		case "qwen":
 			return new QwenHandler({
 				qwenApiKey: options.qwenApiKey,
-				qwenApiLine:
-					options.qwenApiLine === QwenApiRegions.INTERNATIONAL ? QwenApiRegions.INTERNATIONAL : QwenApiRegions.CHINA,
+				qwenApiLine: options.qwenApiLine,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
@@ -194,7 +189,7 @@ function createHandlerForProvider(
 		case "cline":
 			return new ClineHandler({
 				clineAccountId: options.clineAccountId,
-				ulid: options.ulid,
+				taskId: options.taskId,
 				reasoningEffort: mode === "plan" ? options.planModeReasoningEffort : options.actModeReasoningEffort,
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
@@ -211,7 +206,7 @@ function createHandlerForProvider(
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
 				liteLlmUsePromptCache: options.liteLlmUsePromptCache,
-				ulid: options.ulid,
+				taskId: options.taskId,
 			})
 		case "moonshot":
 			return new MoonshotHandler({
@@ -260,13 +255,6 @@ function createHandlerForProvider(
 				groqModelInfo: mode === "plan" ? options.planModeGroqModelInfo : options.actModeGroqModelInfo,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
 			})
-		case "baseten":
-			return new BasetenHandler({
-				basetenApiKey: options.basetenApiKey,
-				basetenModelId: mode === "plan" ? options.planModeBasetenModelId : options.actModeBasetenModelId,
-				basetenModelInfo: mode === "plan" ? options.planModeBasetenModelInfo : options.actModeBasetenModelInfo,
-				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
-			})
 		case "sapaicore":
 			return new SapAiCoreHandler({
 				sapAiCoreClientId: options.sapAiCoreClientId,
@@ -275,8 +263,6 @@ function createHandlerForProvider(
 				sapAiResourceGroup: options.sapAiResourceGroup,
 				sapAiCoreBaseUrl: options.sapAiCoreBaseUrl,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
-				thinkingBudgetTokens:
-					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
 			})
 		case "claude-code":
 			return new ClaudeCodeHandler({
@@ -285,14 +271,6 @@ function createHandlerForProvider(
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
 			})
-		case "huawei-cloud-maas":
-			return new HuaweiCloudMaaSHandler({
-				huaweiCloudMaasApiKey: options.huaweiCloudMaasApiKey,
-				huaweiCloudMaasModelId:
-					mode === "plan" ? options.planModeHuaweiCloudMaasModelId : options.actModeHuaweiCloudMaasModelId,
-				huaweiCloudMaasModelInfo:
-					mode === "plan" ? options.planModeHuaweiCloudMaasModelInfo : options.actModeHuaweiCloudMaasModelInfo,
-			})
 		default:
 			return new AnthropicHandler({
 				apiKey: options.apiKey,

src/api/providers/__tests__/bedrock.test.ts

@@ -612,102 +612,101 @@ describe("AwsBedrockHandler", () => {
 		})
 	})
 
-	// TODO: Re-enable or remove these tests.
-	// describe("getModelId", () => {
-	// 	it("should return raw model ID for custom models", async () => {
-	// 		const customOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			actModeAwsBedrockCustomSelected: true,
-	// 			actModeApiModelId:
-	// 				"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
-	// 		}
-	// 		const customHandler = new AwsBedrockHandler(customOptions)
+	describe("getModelId", () => {
+		it("should return raw model ID for custom models", async () => {
+			const customOptions: ApiHandlerOptions = {
+				...mockOptions,
+				actModeAwsBedrockCustomSelected: true,
+				actModeApiModelId:
+					"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
+			}
+			const customHandler = new AwsBedrockHandler(customOptions)
 
-	// 		const modelId = await customHandler.getModelId()
-	// 		modelId.should.equal(
-	// 			"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
-	// 		)
-	// 	})
+			const modelId = await customHandler.getModelId()
+			modelId.should.equal(
+				"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
+			)
+		})
 
-	// 	it("should not encode custom model IDs with slashes", async () => {
-	// 		const customOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			actModeAwsBedrockCustomSelected: true,
-	// 			actModeApiModelId: "my-namespace/my-custom-model",
-	// 		}
-	// 		const customHandler = new AwsBedrockHandler(customOptions)
+		it("should not encode custom model IDs with slashes", async () => {
+			const customOptions: ApiHandlerOptions = {
+				...mockOptions,
+				actModeAwsBedrockCustomSelected: true,
+				actModeApiModelId: "my-namespace/my-custom-model",
+			}
+			const customHandler = new AwsBedrockHandler(customOptions)
 
-	// 		const modelId = await customHandler.getModelId()
-	// 		modelId.should.equal("my-namespace/my-custom-model")
-	// 		modelId.should.not.match(/%2F/)
-	// 	})
+			const modelId = await customHandler.getModelId()
+			modelId.should.equal("my-namespace/my-custom-model")
+			modelId.should.not.match(/%2F/)
+		})
 
-	// 	it("should apply cross-region prefix for non-custom models when enabled", async () => {
-	// 		const crossRegionOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			awsUseCrossRegionInference: true,
-	// 			awsRegion: "us-west-2",
-	// 		}
-	// 		const crossRegionHandler = new AwsBedrockHandler(crossRegionOptions)
+		it("should apply cross-region prefix for non-custom models when enabled", async () => {
+			const crossRegionOptions: ApiHandlerOptions = {
+				...mockOptions,
+				awsUseCrossRegionInference: true,
+				awsRegion: "us-west-2",
+			}
+			const crossRegionHandler = new AwsBedrockHandler(crossRegionOptions)
 
-	// 		const modelId = await crossRegionHandler.getModelId()
-	// 		modelId.should.equal("us.anthropic.claude-3-7-sonnet-20250219-v1:0")
-	// 	})
+			const modelId = await crossRegionHandler.getModelId()
+			modelId.should.equal("us.anthropic.claude-3-7-sonnet-20250219-v1:0")
+		})
 
-	// 	it("should apply EU cross-region prefix", async () => {
-	// 		const euOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			awsUseCrossRegionInference: true,
-	// 			awsRegion: "eu-central-1",
-	// 		}
-	// 		const euHandler = new AwsBedrockHandler(euOptions)
+		it("should apply EU cross-region prefix", async () => {
+			const euOptions: ApiHandlerOptions = {
+				...mockOptions,
+				awsUseCrossRegionInference: true,
+				awsRegion: "eu-central-1",
+			}
+			const euHandler = new AwsBedrockHandler(euOptions)
 
-	// 		const modelId = await euHandler.getModelId()
-	// 		modelId.should.equal("eu.anthropic.claude-3-7-sonnet-20250219-v1:0")
-	// 	})
+			const modelId = await euHandler.getModelId()
+			modelId.should.equal("eu.anthropic.claude-3-7-sonnet-20250219-v1:0")
+		})
 
-	// 	it("should apply APAC cross-region prefix", async () => {
-	// 		const apacOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			awsUseCrossRegionInference: true,
-	// 			awsRegion: "ap-northeast-1",
-	// 		}
-	// 		const apacHandler = new AwsBedrockHandler(apacOptions)
+		it("should apply APAC cross-region prefix", async () => {
+			const apacOptions: ApiHandlerOptions = {
+				...mockOptions,
+				awsUseCrossRegionInference: true,
+				awsRegion: "ap-northeast-1",
+			}
+			const apacHandler = new AwsBedrockHandler(apacOptions)
 
-	// 		const modelId = await apacHandler.getModelId()
-	// 		modelId.should.equal("apac.anthropic.claude-3-7-sonnet-20250219-v1:0")
-	// 	})
+			const modelId = await apacHandler.getModelId()
+			modelId.should.equal("apac.anthropic.claude-3-7-sonnet-20250219-v1:0")
+		})
 
-	// 	it("should not apply cross-region prefix for custom models even when enabled", async () => {
-	// 		const customCrossRegionOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			actModeAwsBedrockCustomSelected: true,
-	// 			actModeApiModelId: "arn:aws:bedrock:us-west-2:123456789012:custom-model/my-model",
-	// 			awsUseCrossRegionInference: true,
-	// 		}
-	// 		const customCrossRegionHandler = new AwsBedrockHandler(customCrossRegionOptions)
+		it("should not apply cross-region prefix for custom models even when enabled", async () => {
+			const customCrossRegionOptions: ApiHandlerOptions = {
+				...mockOptions,
+				actModeAwsBedrockCustomSelected: true,
+				actModeApiModelId: "arn:aws:bedrock:us-west-2:123456789012:custom-model/my-model",
+				awsUseCrossRegionInference: true,
+			}
+			const customCrossRegionHandler = new AwsBedrockHandler(customCrossRegionOptions)
 
-	// 		const modelId = await customCrossRegionHandler.getModelId()
-	// 		modelId.should.equal("arn:aws:bedrock:us-west-2:123456789012:custom-model/my-model")
-	// 	})
+			const modelId = await customCrossRegionHandler.getModelId()
+			modelId.should.equal("arn:aws:bedrock:us-west-2:123456789012:custom-model/my-model")
+		})
 
-	// 	it("should handle UltraThink model ARN correctly", async () => {
-	// 		const ultraThinkOptions: ApiHandlerOptions = {
-	// 			...mockOptions,
-	// 			actModeAwsBedrockCustomSelected: true,
-	// 			actModeApiModelId:
-	// 				"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
-	// 			actModeAwsBedrockCustomModelBaseId: "anthropic.claude-3-5-sonnet-20241022-v2:0",
-	// 		}
-	// 		const ultraThinkHandler = new AwsBedrockHandler(ultraThinkOptions)
+		it("should handle UltraThink model ARN correctly", async () => {
+			const ultraThinkOptions: ApiHandlerOptions = {
+				...mockOptions,
+				actModeAwsBedrockCustomSelected: true,
+				actModeApiModelId:
+					"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
+				actModeAwsBedrockCustomModelBaseId: "anthropic.claude-3-5-sonnet-20241022-v2:0",
+			}
+			const ultraThinkHandler = new AwsBedrockHandler(ultraThinkOptions)
 
-	// 		const modelId = await ultraThinkHandler.getModelId()
-	// 		// Should return the raw ARN without any encoding
-	// 		modelId.should.equal(
-	// 			"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
-	// 		)
-	// 		modelId.should.not.match(/%2F/)
-	// 		modelId.should.not.match(/%3A/)
-	// 	})
-	// })
+			const modelId = await ultraThinkHandler.getModelId()
+			// Should return the raw ARN without any encoding
+			modelId.should.equal(
+				"arn:aws:bedrock:us-west-2:123456789012:custom-model/anthropic.claude-3-5-sonnet-20241022-v2:0/Qk8MMyLmRd",
+			)
+			modelId.should.not.match(/%2F/)
+			modelId.should.not.match(/%3A/)
+		})
+	})
 })

src/api/providers/anthropic.ts

@@ -1,8 +1,8 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { Stream as AnthropicStream } from "@anthropic-ai/sdk/streaming"
-import { anthropicDefaultModelId, AnthropicModelId, anthropicModels, CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo } from "@shared/api"
-import { ApiHandler } from "../index"
 import { withRetry } from "../retry"
+import { anthropicDefaultModelId, AnthropicModelId, anthropicModels, ApiHandlerOptions, ModelInfo } from "@shared/api"
+import { ApiHandler } from "../index"
 import { ApiStream } from "../transform/stream"
 
 interface AnthropicHandlerOptions {
@@ -43,11 +43,7 @@ export class AnthropicHandler implements ApiHandler {
 
 		const model = this.getModel()
 		let stream: AnthropicStream<Anthropic.RawMessageStreamEvent>
-
-		const modelId = model.id.endsWith(CLAUDE_SONNET_4_1M_SUFFIX)
-			? model.id.slice(0, -CLAUDE_SONNET_4_1M_SUFFIX.length)
-			: model.id
-		const enable1mContextWindow = model.id.endsWith(CLAUDE_SONNET_4_1M_SUFFIX)
+		const modelId = model.id
 
 		const budget_tokens = this.options.thinkingBudgetTokens || 0
 		const reasoningOn = (modelId.includes("3-7") || modelId.includes("4-")) && budget_tokens !== 0 ? true : false
@@ -59,7 +55,6 @@ export class AnthropicHandler implements ApiHandler {
 			case "claude-3-5-sonnet-20241022":
 			case "claude-3-5-haiku-20241022":
 			case "claude-opus-4-20250514":
-			case "claude-opus-4-1-20250805":
 			case "claude-3-opus-20240229":
 			case "claude-3-haiku-20240307": {
 				/*
@@ -121,15 +116,24 @@ export class AnthropicHandler implements ApiHandler {
 						stream: true,
 					},
 					(() => {
-						// 1m context window beta header
-						if (enable1mContextWindow) {
-							return {
-								headers: {
-									"anthropic-beta": "context-1m-2025-08-07",
-								},
-							}
-						} else {
-							return undefined
+						// prompt caching: https://x.com/alexalbert__/status/1823751995901272068
+						// https://github.com/anthropics/anthropic-sdk-typescript?tab=readme-ov-file#default-headers
+						// https://github.com/anthropics/anthropic-sdk-typescript/commit/c920b77fc67bd839bfeb6716ceab9d7c9bbe7393
+						switch (modelId) {
+							case "claude-sonnet-4-20250514":
+							case "claude-opus-4-20250514":
+							case "claude-3-7-sonnet-20250219":
+							case "claude-3-5-sonnet-20241022":
+							case "claude-3-5-haiku-20241022":
+							case "claude-3-opus-20240229":
+							case "claude-3-haiku-20240307":
+								return {
+									headers: {
+										"anthropic-beta": "prompt-caching-2024-07-31",
+									},
+								}
+							default:
+								return undefined
 						}
 					})(),
 				)

src/api/providers/baseten.ts

@@ -1,165 +0,0 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import OpenAI from "openai"
-import { withRetry } from "../retry"
-import { ApiHandler } from "../"
-import { BasetenModelId, ModelInfo, basetenDefaultModelId, basetenModels } from "@shared/api"
-import { calculateApiCostOpenAI } from "../../utils/cost"
-import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
-
-interface BasetenHandlerOptions {
-	basetenApiKey?: string
-	basetenModelId?: string
-	basetenModelInfo?: ModelInfo
-	apiModelId?: string // For backward compatibility
-}
-
-export class BasetenHandler implements ApiHandler {
-	private options: BasetenHandlerOptions
-	private client: OpenAI | undefined
-
-	constructor(options: BasetenHandlerOptions) {
-		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.basetenApiKey) {
-				throw new Error("Baseten API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://inference.baseten.co/v1",
-					apiKey: this.options.basetenApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Baseten client: ${error.message}`)
-			}
-		}
-		return this.client
-	}
-
-	/**
-	 * Gets the optimal max_tokens based on model capabilities
-	 */
-	private getOptimalMaxTokens(model: { id: BasetenModelId; info: ModelInfo }): number {
-		// Use model-specific max tokens if available
-		if (model.info.maxTokens && model.info.maxTokens > 0) {
-			return model.info.maxTokens
-		}
-
-		// Default fallback
-		return 8192
-	}
-
-	getModel(): { id: BasetenModelId; info: ModelInfo } {
-		// First priority: basetenModelId and basetenModelInfo
-		const basetenModelId = this.options.basetenModelId
-		const basetenModelInfo = this.options.basetenModelInfo
-		if (basetenModelId && basetenModelInfo) {
-			return { id: basetenModelId as BasetenModelId, info: basetenModelInfo }
-		}
-
-		// Second priority: basetenModelId with static model info
-		if (basetenModelId && basetenModelId in basetenModels) {
-			const id = basetenModelId as BasetenModelId
-			return { id, info: basetenModels[id] }
-		}
-
-		// Third priority: apiModelId (for backward compatibility)
-		const apiModelId = this.options.apiModelId
-		if (apiModelId && apiModelId in basetenModels) {
-			const id = apiModelId as BasetenModelId
-			return { id, info: basetenModels[id] }
-		}
-
-		// Default fallback
-		return {
-			id: basetenDefaultModelId,
-			info: basetenModels[basetenDefaultModelId],
-		}
-	}
-
-	private async *yieldUsage(modelInfo: ModelInfo, usage: any): ApiStream {
-		if (usage.prompt_tokens || usage.completion_tokens) {
-			const cost = calculateApiCostOpenAI(modelInfo, usage.prompt_tokens || 0, usage.completion_tokens || 0)
-
-			yield {
-				type: "usage",
-				inputTokens: usage.prompt_tokens || 0,
-				outputTokens: usage.completion_tokens || 0,
-				cacheWriteTokens: 0,
-				cacheReadTokens: 0,
-				totalCost: cost,
-			}
-		}
-	}
-
-	@withRetry()
-	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
-		const model = this.getModel()
-		const maxTokens = this.getOptimalMaxTokens(model)
-
-		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
-			{ role: "system", content: systemPrompt },
-			...convertToOpenAiMessages(messages),
-		]
-
-		const stream = await client.chat.completions.create({
-			model: model.id,
-			max_tokens: maxTokens,
-			messages: openAiMessages,
-			stream: true,
-			stream_options: { include_usage: true },
-			temperature: 0,
-		})
-
-		let didOutputUsage = false
-
-		for await (const chunk of stream) {
-			const delta = chunk.choices[0]?.delta
-
-			// Handle reasoning field if present (for reasoning models with parsed output)
-			if ((delta as any)?.reasoning) {
-				const reasoningContent = (delta as any).reasoning as string
-				yield {
-					type: "reasoning",
-					reasoning: reasoningContent,
-				}
-				continue
-			}
-
-			// Handle content field
-			if (delta?.content) {
-				yield {
-					type: "text",
-					text: delta.content,
-				}
-			}
-
-			// Handle usage information - only output once
-			if (!didOutputUsage && chunk.usage) {
-				yield* this.yieldUsage(model.info, chunk.usage)
-				didOutputUsage = true
-			}
-		}
-	}
-
-	/**
-	 * Checks if the current model supports vision/images
-	 */
-	supportsImages(): boolean {
-		const model = this.getModel()
-		return model.info.supportsImages === true
-	}
-
-	/**
-	 * Checks if the current model supports tools
-	 */
-	supportsTools(): boolean {
-		const model = this.getModel()
-		// Baseten models support tools via OpenAI-compatible API
-		return true
-	}
-}

src/api/providers/bedrock.ts

@@ -2,14 +2,13 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { withRetry } from "../retry"
 import { ApiHandler } from "../"
 import { convertToR1Format } from "../transform/r1-format"
-import { bedrockDefaultModelId, BedrockModelId, bedrockModels, CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo } from "@shared/api"
+import { bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "../../utils/cost"
 import { ApiStream } from "../transform/stream"
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
 import {
 	BedrockRuntimeClient,
 	ConversationRole,
-	ConverseCommand,
 	ConverseStreamCommand,
 	InvokeModelWithResponseStreamCommand,
 } from "@aws-sdk/client-bedrock-runtime"
@@ -118,14 +117,7 @@ export class AwsBedrockHandler implements ApiHandler {
 	@withRetry({ maxRetries: 4 })
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		// cross region inference requires prefixing the model id with the region
-		const rawModelId = await this.getModelId()
-
-		const modelId = rawModelId.endsWith(CLAUDE_SONNET_4_1M_SUFFIX)
-			? rawModelId.slice(0, -CLAUDE_SONNET_4_1M_SUFFIX.length)
-			: rawModelId
-
-		const enable1mContextWindow = rawModelId.endsWith(CLAUDE_SONNET_4_1M_SUFFIX)
-
+		const modelId = await this.getModelId()
 		const model = this.getModel()
 
 		// This baseModelId is used to indicate the capabilities of the model.
@@ -140,11 +132,6 @@ export class AwsBedrockHandler implements ApiHandler {
 			return
 		}
 
-		if (baseModelId.includes("openai")) {
-			yield* this.createOpenAIMessage(systemPrompt, messages, modelId, model)
-			return
-		}
-
 		// Check if this is a Deepseek model
 		if (baseModelId.includes("deepseek")) {
 			yield* this.createDeepseekMessage(systemPrompt, messages, modelId, model)
@@ -152,7 +139,7 @@ export class AwsBedrockHandler implements ApiHandler {
 		}
 
 		// Default: Use Anthropic Converse API for all Anthropic models
-		yield* this.createAnthropicMessage(systemPrompt, messages, modelId, model, enable1mContextWindow)
+		yield* this.createAnthropicMessage(systemPrompt, messages, modelId, model)
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
@@ -756,7 +743,6 @@ export class AwsBedrockHandler implements ApiHandler {
 		messages: Anthropic.Messages.MessageParam[],
 		modelId: string,
 		model: { id: string; info: ModelInfo },
-		enable1mContextWindow: boolean,
 	): ApiStream {
 		// Format messages for Anthropic model using unified formatter
 		const formattedMessages = this.formatMessagesForConverseAPI(messages)
@@ -787,18 +773,15 @@ export class AwsBedrockHandler implements ApiHandler {
 			messages: messagesWithCache,
 			system: systemMessages,
 			inferenceConfig: this.getInferenceConfig(model.info, "anthropic"),
-			additionalModelRequestFields: {
-				// Add thinking configuration as per LangChain documentation
-				...(reasoningOn && {
-					thinking: {
-						type: "enabled",
-						budget_tokens: budget_tokens,
-					},
-				}),
-				...(enable1mContextWindow && {
-					anthropic_beta: ["context-1m-2025-08-07"],
-				}),
-			},
+			// Add thinking configuration as per LangChain documentation
+			additionalModelRequestFields: reasoningOn
+				? {
+						thinking: {
+							type: "enabled",
+							budget_tokens: budget_tokens,
+						},
+					}
+				: undefined,
 		})
 
 		// Execute the streaming request using unified handler
@@ -975,139 +958,4 @@ export class AwsBedrockHandler implements ApiHandler {
 		// Execute the streaming request using unified handler
 		yield* this.executeConverseStream(command, model.info)
 	}
-
-	/**
-	 * Creates a message using OpenAI models through AWS Bedrock
-	 * Uses non-streaming Converse API and simulates streaming for models that don't support it
-	 */
-	private async *createOpenAIMessage(
-		systemPrompt: string,
-		messages: Anthropic.Messages.MessageParam[],
-		modelId: string,
-		model: { id: string; info: ModelInfo },
-	): ApiStream {
-		// Get Bedrock client with proper credentials
-		const client = await this.getBedrockClient()
-
-		// Format messages for Converse API
-		const formattedMessages = this.formatMessagesForConverseAPI(messages)
-
-		// Prepare system message
-		const systemMessages = systemPrompt ? [{ text: systemPrompt }] : undefined
-
-		// Prepare the non-streaming Converse command
-		const command = new ConverseCommand({
-			modelId: modelId,
-			messages: formattedMessages,
-			system: systemMessages,
-			inferenceConfig: {
-				maxTokens: model.info.maxTokens || 8192,
-				temperature: 0,
-			},
-		})
-
-		try {
-			// Track token usage
-			const inputTokenEstimate = this.estimateInputTokens(systemPrompt, messages)
-			let outputTokens = 0
-
-			// Execute the non-streaming request
-			const response = await client.send(command)
-
-			// Extract the complete response text and reasoning content
-			let fullText = ""
-			let reasoningText = ""
-
-			if (response.output?.message?.content) {
-				for (const contentBlock of response.output.message.content) {
-					// Check for reasoning content first
-					if ("reasoningContent" in contentBlock && contentBlock.reasoningContent) {
-						// Handle nested reasoning structure
-						const reasoning = contentBlock.reasoningContent
-						if ("reasoningText" in reasoning && reasoning.reasoningText && "text" in reasoning.reasoningText) {
-							reasoningText += reasoning.reasoningText.text
-						}
-					}
-					// Handle regular text content
-					else if ("text" in contentBlock && contentBlock.text) {
-						fullText += contentBlock.text
-					}
-				}
-			}
-
-			// If we have actual usage data from the response, use it
-			if (response.usage) {
-				const actualInputTokens = response.usage.inputTokens || inputTokenEstimate
-				const actualOutputTokens = response.usage.outputTokens || this.estimateTokenCount(fullText + reasoningText)
-				outputTokens = actualOutputTokens
-
-				// Report actual usage after processing content
-				const actualCost = calculateApiCostOpenAI(model.info, actualInputTokens, actualOutputTokens, 0, 0)
-				yield {
-					type: "usage",
-					inputTokens: actualInputTokens,
-					outputTokens: actualOutputTokens,
-					totalCost: actualCost,
-				}
-			} else {
-				// Estimate output tokens if not provided (includes both regular text and reasoning)
-				outputTokens = this.estimateTokenCount(fullText + reasoningText)
-			}
-
-			// Yield reasoning content first if present
-			if (reasoningText) {
-				const reasoningChunkSize = 1000 // Characters per chunk
-				for (let i = 0; i < reasoningText.length; i += reasoningChunkSize) {
-					const chunk = reasoningText.slice(i, Math.min(i + reasoningChunkSize, reasoningText.length))
-
-					yield {
-						type: "reasoning",
-						reasoning: chunk,
-					}
-				}
-			}
-
-			// Simulate streaming by chunking the response text
-			if (fullText) {
-				const chunkSize = 1000 // Characters per chunk
-
-				for (let i = 0; i < fullText.length; i += chunkSize) {
-					const chunk = fullText.slice(i, Math.min(i + chunkSize, fullText.length))
-
-					yield {
-						type: "text",
-						text: chunk,
-					}
-				}
-			}
-
-			// Report final usage if we didn't have actual usage data earlier
-			if (!response.usage) {
-				const finalCost = calculateApiCostOpenAI(model.info, inputTokenEstimate, outputTokens, 0, 0)
-				yield {
-					type: "usage",
-					inputTokens: inputTokenEstimate,
-					outputTokens: outputTokens,
-					totalCost: finalCost,
-				}
-			}
-		} catch (error) {
-			console.error("Error with OpenAI model via Converse API:", error)
-
-			// Try to extract more detailed error information
-			let errorMessage = "Failed to process OpenAI model request"
-			if (error instanceof Error) {
-				errorMessage = error.message
-				// Check for specific AWS SDK errors
-				if ("name" in error) {
-					errorMessage = `${error.name}: ${error.message}`
-				}
-			}
-
-			yield {
-				type: "text",
-				text: `[ERROR] ${errorMessage}`,
-			}
-		}
-	}
 }

src/api/providers/cerebras.ts

@@ -39,11 +39,7 @@ export class CerebrasHandler implements ApiHandler {
 		return this.client
 	}
 
-	@withRetry({
-		maxRetries: 6, // More retries to be patient with rate limits
-		baseDelay: 5000, // Start with 5 second delay
-		maxDelay: 60000, // Allow up to 60 second delays to respect rate limits
-	})
+	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		const client = this.ensureClient()
 
@@ -106,7 +102,6 @@ export class CerebrasHandler implements ApiHandler {
 				messages: cerebrasMessages,
 				temperature: 0,
 				stream: true,
-				max_tokens: this.getModel().info.maxTokens,
 			})
 
 			// Handle streaming response
@@ -174,39 +169,15 @@ export class CerebrasHandler implements ApiHandler {
 					}
 				}
 			}
-		} catch (error: any) {
-			// Enhanced error handling for Cerebras API
-			if (error?.status === 429 || error?.code === "rate_limit_exceeded") {
-				// Rate limit error - will be handled by retry decorator with patient backoff
-				const limits = this.getRateLimits()
-				throw new Error(`Cerebras API rate limit exceeded.`)
-			} else if (error?.status === 401) {
-				throw new Error("Cerebras API authentication failed. Please check your API key.")
-			} else if (error?.status === 403) {
-				throw new Error("Cerebras API access denied. Please check your API key permissions.")
-			} else if (error?.status >= 500) {
-				// Server errors - retryable
-				throw new Error(`Cerebras API server error (${error.status}): ${error.message || "Unknown server error"}`)
-			} else if (error?.status === 400) {
-				// Client errors - not retryable
-				throw new Error(`Cerebras API bad request: ${error.message || "Invalid request parameters"}`)
-			}
-
-			// Re-throw original error for other cases
+		} catch (error) {
 			throw error
 		}
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
-		const originalModelId = this.options.apiModelId
-		let apiModelId = originalModelId
-		if (originalModelId === "qwen-3-coder-480b-free") {
-			apiModelId = "qwen-3-coder-480b"
-			return { id: apiModelId, info: cerebrasModels[originalModelId as CerebrasModelId] }
-		}
-
-		if (originalModelId && originalModelId in cerebrasModels) {
-			const id = originalModelId as CerebrasModelId
+		const modelId = this.options.apiModelId
+		if (modelId && modelId in cerebrasModels) {
+			const id = modelId as CerebrasModelId
 			return { id, info: cerebrasModels[id] }
 		}
 		return {
@@ -215,35 +186,6 @@ export class CerebrasHandler implements ApiHandler {
 		}
 	}
 
-	/**
-	 * Get rate limit information for the current model
-	 *
-	 * These limits are used for informational purposes and to calculate appropriate
-	 * retry delays. Since Cerebras inference is extremely fast, users hit these limits
-	 * quickly, so we need to be patient with retries to maximize usage efficiency.
-	 *
-	 * @returns Rate limit configuration for the model
-	 */
-	private getRateLimits(): { requestsPerMinute: number; tokensPerMinute: number } {
-		const modelId = this.getModel().id
-
-		switch (modelId) {
-			case "qwen-3-coder-480b":
-			case "qwen-3-coder-480b-free":
-				return { requestsPerMinute: 10, tokensPerMinute: 150_000 }
-			case "qwen-3-235b-a22b-instruct-2507":
-			case "qwen-3-235b-a22b-thinking-2507":
-				return { requestsPerMinute: 30, tokensPerMinute: 60_000 }
-			case "llama-3.3-70b":
-			case "gpt-oss-120b":
-			case "qwen-3-32b":
-				return { requestsPerMinute: 30, tokensPerMinute: 64_000 }
-			default:
-				// Default rate limits for unknown models
-				return { requestsPerMinute: 30, tokensPerMinute: 60_000 }
-		}
-	}
-
 	private calculateCost({ inputTokens, outputTokens }: { inputTokens: number; outputTokens: number }): number {
 		const model = this.getModel()
 		const inputPrice = model.info.inputPrice || 0

src/api/providers/cline.ts

@@ -15,7 +15,7 @@ import { CLINE_ACCOUNT_AUTH_ERROR_MESSAGE } from "@/shared/ClineAccount"
 import { clineEnvConfig } from "@/config"
 
 interface ClineHandlerOptions {
-	ulid?: string
+	taskId?: string
 	reasoningEffort?: string
 	thinkingBudgetTokens?: number
 	openRouterProviderSorting?: string
@@ -51,7 +51,7 @@ export class ClineHandler implements ApiHandler {
 					defaultHeaders: {
 						"HTTP-Referer": "https://cline.bot",
 						"X-Title": "Cline",
-						"X-Task-ID": this.options.ulid || "",
+						"X-Task-ID": this.options.taskId || "",
 						"X-Cline-Version": extensionVersion,
 					},
 				})
@@ -133,6 +133,7 @@ export class ClineHandler implements ApiHandler {
 				if (!didOutputUsage && chunk.usage) {
 					// @ts-ignore-next-line
 					let totalCost = (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0)
+					const modelId = this.getModel().id
 
 					// const provider = modelId.split("/")[0]
 					// // If provider is x-ai, set totalCost to 0 (we're doing a promo)
@@ -140,14 +141,27 @@ export class ClineHandler implements ApiHandler {
 					// 	totalCost = 0
 					// }
 
-					yield {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
-						inputTokens: (chunk.usage.prompt_tokens || 0) - (chunk.usage.prompt_tokens_details?.cached_tokens || 0),
-						outputTokens: chunk.usage.completion_tokens || 0,
-						// @ts-ignore-next-line
-						totalCost: totalCost,
+					if (modelId.includes("gemini")) {
+						yield {
+							type: "usage",
+							cacheWriteTokens: 0,
+							cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
+							inputTokens:
+								(chunk.usage.prompt_tokens || 0) - (chunk.usage.prompt_tokens_details?.cached_tokens || 0),
+							outputTokens: chunk.usage.completion_tokens || 0,
+							// @ts-ignore-next-line
+							totalCost,
+						}
+					} else {
+						yield {
+							type: "usage",
+							cacheWriteTokens: 0,
+							cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
+							inputTokens: chunk.usage.prompt_tokens || 0,
+							outputTokens: chunk.usage.completion_tokens || 0,
+							// @ts-ignore-next-line
+							totalCost,
+						}
 					}
 					didOutputUsage = true
 				}
@@ -172,26 +186,36 @@ export class ClineHandler implements ApiHandler {
 			try {
 				// TODO: replace this with firebase auth
 				// TODO: use global API Host
-				const clineAccountAuthToken = await this._authService.getAuthToken()
-				if (!clineAccountAuthToken) {
-					throw new Error(CLINE_ACCOUNT_AUTH_ERROR_MESSAGE)
-				}
+
 				const response = await axios.get(`${this.clineAccountService.baseUrl}/generation?id=${this.lastGenerationId}`, {
 					headers: {
-						Authorization: `Bearer ${clineAccountAuthToken}`,
+						Authorization: `Bearer ${this.options.clineAccountId}`,
 					},
 					timeout: 15_000, // this request hangs sometimes
 				})
 
 				const generation = response.data
-				return {
-					type: "usage",
-					cacheWriteTokens: 0,
-					cacheReadTokens: generation?.native_tokens_cached || 0,
-					// openrouter generation endpoint fails often
-					inputTokens: (generation?.native_tokens_prompt || 0) - (generation?.native_tokens_cached || 0),
-					outputTokens: generation?.native_tokens_completion || 0,
-					totalCost: generation?.total_cost || 0,
+				let modelId = this.options.openRouterModelId
+				if (modelId && modelId.includes("gemini")) {
+					return {
+						type: "usage",
+						cacheWriteTokens: 0,
+						cacheReadTokens: generation?.native_tokens_cached || 0,
+						// openrouter generation endpoint fails often
+						inputTokens: (generation?.native_tokens_prompt || 0) - (generation?.native_tokens_cached || 0),
+						outputTokens: generation?.native_tokens_completion || 0,
+						totalCost: generation?.total_cost || 0,
+					}
+				} else {
+					return {
+						type: "usage",
+						cacheWriteTokens: 0,
+						cacheReadTokens: generation?.native_tokens_cached || 0,
+						// openrouter generation endpoint fails often
+						inputTokens: generation?.native_tokens_prompt || 0,
+						outputTokens: generation?.native_tokens_completion || 0,
+						totalCost: generation?.total_cost || 0,
+					}
 				}
 			} catch (error) {
 				// ignore if fails

src/api/providers/gemini-mock.test.ts

@@ -1,53 +0,0 @@
-// Mock for @google/genai module to avoid ESM compatibility issues in tests
-
-export class GoogleGenAI {
-	constructor(options: any) {
-		// Mock constructor
-	}
-
-	models = {
-		generateContentStream: async (params: any) => {
-			// Mock implementation that returns an async iterator
-			return {
-				async *[Symbol.asyncIterator]() {
-					yield {
-						text: "Mock response",
-						candidates: [],
-						usageMetadata: {
-							promptTokenCount: 100,
-							candidatesTokenCount: 50,
-							thoughtsTokenCount: 0,
-							cachedContentTokenCount: 0,
-						},
-					}
-				},
-			}
-		},
-		countTokens: async (params: any) => {
-			// Mock token counting
-			return {
-				totalTokens: 100,
-			}
-		},
-	}
-}
-
-// Export mock types
-export interface GenerateContentConfig {
-	httpOptions?: any
-	systemInstruction?: string
-	temperature?: number
-	thinkingConfig?: any
-}
-
-export interface GenerateContentResponseUsageMetadata {
-	promptTokenCount?: number
-	candidatesTokenCount?: number
-	thoughtsTokenCount?: number
-	cachedContentTokenCount?: number
-}
-
-export interface Part {
-	thought?: boolean
-	text?: string
-}

src/api/providers/gemini.ts

@@ -7,7 +7,7 @@ import { ApiHandler } from "../"
 import { ApiHandlerOptions, geminiDefaultModelId, GeminiModelId, geminiModels, ModelInfo } from "@shared/api"
 import { convertAnthropicMessageToGemini } from "../transform/gemini-format"
 import { ApiStream } from "../transform/stream"
-import { telemetryService } from "@services/posthog/PostHogClientProvider"
+import { telemetryService } from "@services/posthog/telemetry/TelemetryService"
 
 // Define a default TTL for the cache (e.g., 15 minutes in seconds)
 const DEFAULT_CACHE_TTL_SECONDS = 900
@@ -20,7 +20,7 @@ interface GeminiHandlerOptions {
 	geminiBaseUrl?: string
 	thinkingBudgetTokens?: number
 	apiModelId?: string
-	ulid?: string
+	taskId?: string
 }
 
 /**
@@ -28,7 +28,7 @@ interface GeminiHandlerOptions {
  *
  * Key features:
  * - One cache per task: Creates a single cache per task and reuses it for subsequent turns
- * - Stable cache keys: Uses ulid as a stable identifier for caches
+ * - Stable cache keys: Uses taskId as a stable identifier for caches
  * - Efficient cache updates: Only updates caches when there's new content to add
  * - Split cost accounting: Separates immediate costs from ongoing cache storage costs
  *
@@ -255,8 +255,8 @@ export class GeminiHandler implements ApiHandler {
 			const throughputTokensPerSecSdk =
 				totalDurationSdkMs > 0 && outputTokens > 0 ? outputTokens / (totalDurationSdkMs / 1000) : undefined
 
-			if (this.options.ulid) {
-				telemetryService.captureGeminiApiPerformance(this.options.ulid, modelId, {
+			if (this.options.taskId) {
+				telemetryService.captureGeminiApiPerformance(this.options.taskId, modelId, {
 					ttftSec: ttftSdkMs !== undefined ? ttftSdkMs / 1000 : undefined,
 					totalDurationSec: totalDurationSdkMs / 1000,
 					promptTokens,
@@ -269,7 +269,7 @@ export class GeminiHandler implements ApiHandler {
 					throughputTokensPerSec: throughputTokensPerSecSdk,
 				})
 			} else {
-				console.warn("GeminiHandler: ulid not available for telemetry in createMessage.")
+				console.warn("GeminiHandler: taskId not available for telemetry in createMessage.")
 			}
 		}
 	}

src/api/providers/huawei-cloud-maas.ts

@@ -1,132 +0,0 @@
-import { ApiHandler } from ".."
-import { huaweiCloudMaasDefaultModelId, HuaweiCloudMaasModelId, huaweiCloudMaasModels, ModelInfo } from "@shared/api"
-import { Anthropic } from "@anthropic-ai/sdk"
-import OpenAI from "openai"
-import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
-import { withRetry } from "../retry"
-
-interface HuaweiCloudMaaSHandlerOptions {
-	huaweiCloudMaasApiKey?: string
-	huaweiCloudMaasModelId?: string
-	huaweiCloudMaasModelInfo?: ModelInfo
-}
-
-export class HuaweiCloudMaaSHandler implements ApiHandler {
-	private options: HuaweiCloudMaaSHandlerOptions
-	private client: OpenAI | undefined
-	constructor(options: HuaweiCloudMaaSHandlerOptions) {
-		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.huaweiCloudMaasApiKey) {
-				throw new Error("Huawei Cloud MaaS API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.modelarts-maas.com/v1/",
-					apiKey: this.options.huaweiCloudMaasApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Huawei Cloud MaaS client: ${error.message}`)
-			}
-		}
-		return this.client
-	}
-
-	getModel(): { id: HuaweiCloudMaasModelId; info: ModelInfo } {
-		// First priority: huaweiCloudMaasModelId and huaweiCloudMaasModelInfo (like Groq does)
-		const huaweiCloudMaasModelId = this.options.huaweiCloudMaasModelId
-		const huaweiCloudMaasModelInfo = this.options.huaweiCloudMaasModelInfo
-		if (huaweiCloudMaasModelId && huaweiCloudMaasModelInfo) {
-			return { id: huaweiCloudMaasModelId as HuaweiCloudMaasModelId, info: huaweiCloudMaasModelInfo }
-		}
-
-		// Second priority: huaweiCloudMaasModelId with static model info
-		if (huaweiCloudMaasModelId && huaweiCloudMaasModelId in huaweiCloudMaasModels) {
-			const id = huaweiCloudMaasModelId as HuaweiCloudMaasModelId
-			return { id, info: huaweiCloudMaasModels[id] }
-		}
-
-		// Default fallback
-		return {
-			id: huaweiCloudMaasDefaultModelId,
-			info: huaweiCloudMaasModels[huaweiCloudMaasDefaultModelId],
-		}
-	}
-
-	@withRetry()
-	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
-		const model = this.getModel()
-		let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
-			{ role: "system", content: systemPrompt },
-			...convertToOpenAiMessages(messages),
-		]
-		const stream = await client.chat.completions.create({
-			model: model.id,
-			max_completion_tokens: model.info.maxTokens,
-			messages: openAiMessages,
-			stream: true,
-			stream_options: { include_usage: true },
-			temperature: 0,
-		})
-
-		let reasoning: string | null = null
-		let didOutputUsage: boolean = false
-		let finalUsage: any = null
-
-		for await (const chunk of stream) {
-			const delta = chunk.choices[0]?.delta
-
-			// Handle reasoning content detection
-			if (delta?.content) {
-				if (reasoning || delta.content.includes("<think>")) {
-					reasoning = (reasoning || "") + delta.content
-				} else if (!reasoning) {
-					yield {
-						type: "text",
-						text: delta.content,
-					}
-				}
-			}
-
-			// Handle reasoning output
-			if (reasoning || (delta && "reasoning_content" in delta && delta.reasoning_content)) {
-				const reasoningContent = delta?.content || ((delta as any)?.reasoning_content as string | undefined) || ""
-				if (reasoningContent.trim()) {
-					yield {
-						type: "reasoning",
-						reasoning: reasoningContent,
-					}
-				}
-
-				// Check if reasoning is complete
-				if (reasoning?.includes("</think>")) {
-					reasoning = null
-				}
-			}
-
-			// Store usage information for later output
-			if (chunk.usage) {
-				finalUsage = chunk.usage
-			}
-
-			// Output usage when stream is finished
-			if (!didOutputUsage && chunk.choices?.[0]?.finish_reason) {
-				if (finalUsage) {
-					yield {
-						type: "usage",
-						inputTokens: finalUsage.prompt_tokens || 0,
-						outputTokens: finalUsage.completion_tokens || 0,
-						cacheWriteTokens: 0,
-						cacheReadTokens: 0,
-					}
-				}
-				didOutputUsage = true
-			}
-		}
-	}
-}

src/api/providers/litellm.ts

@@ -13,32 +13,12 @@ interface LiteLlmHandlerOptions {
 	liteLlmModelInfo?: LiteLLMModelInfo
 	thinkingBudgetTokens?: number
 	liteLlmUsePromptCache?: boolean
-	ulid?: string
-}
-
-interface LiteLlmModelInfoResponse {
-	data: Array<{
-		model_name: string
-		litellm_params: {
-			model: string
-			[key: string]: any
-		}
-		model_info: {
-			input_cost_per_token: number
-			output_cost_per_token: number
-			cache_creation_input_token_cost?: number
-			cache_read_input_token_cost?: number
-			[key: string]: any
-		}
-	}>
+	taskId?: string
 }
 
 export class LiteLlmHandler implements ApiHandler {
 	private options: LiteLlmHandlerOptions
 	private client: OpenAI | undefined
-	private modelInfoCache: LiteLlmModelInfoResponse | undefined
-	private modelInfoCacheTimestamp: number = 0
-	private readonly modelInfoCacheTTL = 5 * 60 * 1000 // 5 minutes
 
 	constructor(options: LiteLlmHandlerOptions) {
 		this.options = options
@@ -61,112 +41,35 @@ export class LiteLlmHandler implements ApiHandler {
 		return this.client
 	}
 
-	private async fetchModelInfo(): Promise<LiteLlmModelInfoResponse | undefined> {
-		// Check if cache is still valid
-		const now = Date.now()
-		if (this.modelInfoCache && now - this.modelInfoCacheTimestamp < this.modelInfoCacheTTL) {
-			return this.modelInfoCache
-		}
-
+	async calculateCost(prompt_tokens: number, completion_tokens: number): Promise<number | undefined> {
+		// Reference: https://github.com/BerriAI/litellm/blob/122ee634f434014267af104814022af1d9a0882f/litellm/proxy/spend_tracking/spend_management_endpoints.py#L1473
 		const client = this.ensureClient()
-		// Handle base URLs that already include /v1 to avoid double /v1/v1/
-		const baseUrl = client.baseURL.endsWith("/v1") ? client.baseURL : `${client.baseURL}/v1`
-		const url = `${baseUrl}/model/info`
-
+		const modelId = this.options.liteLlmModelId || liteLlmDefaultModelId
 		try {
-			const response = await fetch(url, {
-				method: "GET",
+			const response = await fetch(`${client.baseURL}/spend/calculate`, {
+				method: "POST",
 				headers: {
-					accept: "application/json",
-					"x-litellm-api-key": this.options.liteLlmApiKey || "",
+					"Content-Type": "application/json",
+					Authorization: `Bearer ${this.options.liteLlmApiKey}`,
 				},
+				body: JSON.stringify({
+					completion_response: {
+						model: modelId,
+						usage: {
+							prompt_tokens,
+							completion_tokens,
+						},
+					},
+				}),
 			})
 
 			if (response.ok) {
-				const data: LiteLlmModelInfoResponse = await response.json()
-				this.modelInfoCache = data
-				this.modelInfoCacheTimestamp = now
-				return data
+				const data: { cost: number } = await response.json()
+				return data.cost
 			} else {
-				console.warn("Failed to fetch LiteLLM model info:", response.statusText)
-				// Try with Authorization header instead
-				const retryResponse = await fetch(url, {
-					method: "GET",
-					headers: {
-						accept: "application/json",
-						Authorization: `Bearer ${this.options.liteLlmApiKey || ""}`,
-					},
-				})
-
-				if (retryResponse.ok) {
-					const data: LiteLlmModelInfoResponse = await retryResponse.json()
-					this.modelInfoCache = data
-					this.modelInfoCacheTimestamp = now
-					return data
-				} else {
-					console.warn("Failed to fetch LiteLLM model info with Authorization header:", retryResponse.statusText)
-					return undefined
-				}
+				console.error("Error calculating spend:", response.statusText)
+				return undefined
 			}
-		} catch (error) {
-			console.warn("Error fetching LiteLLM model info:", error)
-			return undefined
-		}
-	}
-
-	private async getModelCostInfo(publicModelName: string): Promise<{
-		inputCostPerToken: number
-		outputCostPerToken: number
-		cacheCreationCostPerToken?: number
-		cacheReadCostPerToken?: number
-	}> {
-		try {
-			const modelInfo = await this.fetchModelInfo()
-
-			if (modelInfo?.data) {
-				// Find the model by public name
-				const matchingModel = modelInfo.data.find((model) => model.model_name === publicModelName)
-
-				if (matchingModel?.model_info) {
-					return {
-						inputCostPerToken: matchingModel.model_info.input_cost_per_token || 0,
-						outputCostPerToken: matchingModel.model_info.output_cost_per_token || 0,
-						cacheCreationCostPerToken: matchingModel.model_info.cache_creation_input_token_cost,
-						cacheReadCostPerToken: matchingModel.model_info.cache_read_input_token_cost,
-					}
-				}
-			}
-		} catch (error) {
-			console.warn("Error getting LiteLLM model cost info:", error)
-		}
-
-		// Fallback to zero costs if we can't get the information
-		return {
-			inputCostPerToken: 0,
-			outputCostPerToken: 0,
-		}
-	}
-
-	async calculateCost(
-		prompt_tokens: number,
-		completion_tokens: number,
-		cache_creation_tokens?: number,
-		cache_read_tokens?: number,
-	): Promise<number | undefined> {
-		const publicModelId = this.options.liteLlmModelId || liteLlmDefaultModelId
-
-		try {
-			const costInfo = await this.getModelCostInfo(publicModelId)
-
-			// Calculate costs for different token types
-			const inputCost = Math.max(0, prompt_tokens - (cache_read_tokens || 0)) * costInfo.inputCostPerToken
-			const outputCost = completion_tokens * costInfo.outputCostPerToken
-			const cacheCreationCost = (cache_creation_tokens || 0) * (costInfo.cacheCreationCostPerToken || 0)
-			const cacheReadCost = (cache_read_tokens || 0) * (costInfo.cacheReadCostPerToken || 0)
-
-			const totalCost = inputCost + outputCost + cacheCreationCost + cacheReadCost
-
-			return totalCost
 		} catch (error) {
 			console.error("Error calculating spend:", error)
 			return undefined
@@ -230,9 +133,12 @@ export class LiteLlmHandler implements ApiHandler {
 			stream: true,
 			stream_options: { include_usage: true },
 			...(thinkingConfig && { thinking: thinkingConfig }), // Add thinking configuration when applicable
-			...(this.options.ulid && { litellm_session_id: `cline-${this.options.ulid}` }), // Add session ID for LiteLLM tracking
+			...(this.options.taskId && { litellm_session_id: `cline-${this.options.taskId}` }), // Add session ID for LiteLLM tracking
 		})
 
+		const inputCost = (await this.calculateCost(1e6, 0)) || 0
+		const outputCost = (await this.calculateCost(0, 1e6)) || 0
+
 		for await (const chunk of stream) {
 			const delta = chunk.choices[0]?.delta
 
@@ -259,6 +165,9 @@ export class LiteLlmHandler implements ApiHandler {
 
 			// Handle token usage information
 			if (chunk.usage) {
+				const totalCost =
+					(inputCost * chunk.usage.prompt_tokens) / 1e6 + (outputCost * chunk.usage.completion_tokens) / 1e6
+
 				// Extract cache-related information if available
 				// Need to use type assertion since these properties are not in the standard OpenAI types
 				const usage = chunk.usage as {
@@ -273,15 +182,6 @@ export class LiteLlmHandler implements ApiHandler {
 				const cacheWriteTokens = usage.cache_creation_input_tokens || usage.prompt_cache_miss_tokens || 0
 				const cacheReadTokens = usage.cache_read_input_tokens || usage.prompt_cache_hit_tokens || 0
 
-				// Calculate cost using the actual token usage including cache tokens
-				const totalCost =
-					(await this.calculateCost(
-						usage.prompt_tokens || 0,
-						usage.completion_tokens || 0,
-						cacheWriteTokens > 0 ? cacheWriteTokens : undefined,
-						cacheReadTokens > 0 ? cacheReadTokens : undefined,
-					)) || 0
-
 				yield {
 					type: "usage",
 					inputTokens: usage.prompt_tokens || 0,

src/api/providers/ollama.ts

@@ -1,5 +1,5 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { Message, Ollama, Config } from "ollama"
+import { Message, Ollama } from "ollama"
 import { ApiHandler } from "../"
 import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
 import { convertToOllamaMessages } from "../transform/ollama-format"
@@ -8,7 +8,6 @@ import { withRetry } from "../retry"
 
 interface OllamaHandlerOptions {
 	ollamaBaseUrl?: string
-	ollamaApiKey?: string
 	ollamaModelId?: string
 	ollamaApiOptionsCtxNum?: string
 	requestTimeoutMs?: number
@@ -25,18 +24,7 @@ export class OllamaHandler implements ApiHandler {
 	private ensureClient(): Ollama {
 		if (!this.client) {
 			try {
-				const clientOptions: Partial<Config> = {
-					host: this.options.ollamaBaseUrl || "http://localhost:11434",
-				}
-
-				// Add API key if provided (for Ollama cloud or authenticated instances)
-				if (this.options.ollamaApiKey) {
-					clientOptions.headers = {
-						Authorization: `Bearer ${this.options.ollamaApiKey}`,
-					}
-				}
-
-				this.client = new Ollama(clientOptions)
+				this.client = new Ollama({ host: this.options.ollamaBaseUrl || "http://localhost:11434" })
 			} catch (error) {
 				throw new Error(`Error creating Ollama client: ${error.message}`)
 			}

src/api/providers/openai-native.ts

@@ -104,33 +104,6 @@ export class OpenAiNativeHandler implements ApiHandler {
 				}
 				break
 			}
-			case "nectarine-alpha-new-reasoning-effort-2025-07-25":
-			case "gpt-5-2025-08-07":
-			case "gpt-5-mini-2025-08-07":
-			case "gpt-5-nano-2025-08-07":
-				const stream = await client.chat.completions.create({
-					model: model.id,
-					temperature: 1,
-					messages: [{ role: "developer", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
-					stream: true,
-					stream_options: { include_usage: true },
-					reasoning_effort: (this.options.reasoningEffort as ChatCompletionReasoningEffort) || "medium",
-				})
-
-				for await (const chunk of stream) {
-					const delta = chunk.choices[0]?.delta
-					if (delta?.content) {
-						yield {
-							type: "text",
-							text: delta.content,
-						}
-					}
-					if (chunk.usage) {
-						// Only last chunk contains usage
-						yield* this.yieldUsage(model.info, chunk.usage)
-					}
-				}
-				break
 			default: {
 				const stream = await client.chat.completions.create({
 					model: model.id,

src/api/providers/openrouter.ts

@@ -132,14 +132,27 @@ export class OpenRouterHandler implements ApiHandler {
 			}
 
 			if (!didOutputUsage && chunk.usage) {
-				yield {
-					type: "usage",
-					cacheWriteTokens: 0,
-					cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
-					inputTokens: (chunk.usage.prompt_tokens || 0) - (chunk.usage.prompt_tokens_details?.cached_tokens || 0),
-					outputTokens: chunk.usage.completion_tokens || 0,
-					// @ts-ignore-next-line
-					totalCost: (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0),
+				let modelId = this.options.openRouterModelId
+				if (modelId && modelId.includes("gemini")) {
+					yield {
+						type: "usage",
+						cacheWriteTokens: 0,
+						cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
+						inputTokens: (chunk.usage.prompt_tokens || 0) - (chunk.usage.prompt_tokens_details?.cached_tokens || 0),
+						outputTokens: chunk.usage.completion_tokens || 0,
+						// @ts-ignore-next-line
+						totalCost: (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0),
+					}
+				} else {
+					yield {
+						type: "usage",
+						cacheWriteTokens: 0,
+						cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
+						inputTokens: chunk.usage.prompt_tokens || 0,
+						outputTokens: chunk.usage.completion_tokens || 0,
+						// @ts-ignore-next-line
+						totalCost: (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0),
+					}
 				}
 				didOutputUsage = true
 			}
@@ -161,14 +174,27 @@ export class OpenRouterHandler implements ApiHandler {
 				const generationIterator = this.fetchGenerationDetails(this.lastGenerationId)
 				const generation = (await generationIterator.next()).value
 				// console.log("OpenRouter generation details:", generation)
-				return {
-					type: "usage",
-					cacheWriteTokens: 0,
-					cacheReadTokens: generation?.native_tokens_cached || 0,
-					// openrouter generation endpoint fails often
-					inputTokens: (generation?.native_tokens_prompt || 0) - (generation?.native_tokens_cached || 0),
-					outputTokens: generation?.native_tokens_completion || 0,
-					totalCost: generation?.total_cost || 0,
+				let modelId = this.options.openRouterModelId
+				if (modelId && modelId.includes("gemini")) {
+					return {
+						type: "usage",
+						cacheWriteTokens: 0,
+						cacheReadTokens: generation?.native_tokens_cached || 0,
+						// openrouter generation endpoint fails often
+						inputTokens: (generation?.native_tokens_prompt || 0) - (generation?.native_tokens_cached || 0),
+						outputTokens: generation?.native_tokens_completion || 0,
+						totalCost: generation?.total_cost || 0,
+					}
+				} else {
+					return {
+						type: "usage",
+						cacheWriteTokens: 0,
+						cacheReadTokens: generation?.native_tokens_cached || 0,
+						// openrouter generation endpoint fails often
+						inputTokens: generation?.native_tokens_prompt || 0,
+						outputTokens: generation?.native_tokens_completion || 0,
+						totalCost: generation?.total_cost || 0,
+					}
 				}
 			} catch (error) {
 				// ignore if fails

src/api/providers/qwen.ts

@@ -9,7 +9,6 @@ import {
 	internationalQwenDefaultModelId,
 	MainlandQwenModelId,
 	InternationalQwenModelId,
-	QwenApiRegions,
 } from "@shared/api"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
@@ -18,7 +17,7 @@ import { withRetry } from "../retry"
 
 interface QwenHandlerOptions {
 	qwenApiKey?: string
-	qwenApiLine?: QwenApiRegions
+	qwenApiLine?: string
 	apiModelId?: string
 	thinkingBudgetTokens?: number
 }
@@ -28,15 +27,7 @@ export class QwenHandler implements ApiHandler {
 	private client: OpenAI | undefined
 
 	constructor(options: QwenHandlerOptions) {
-		// Ensure options start with defaults but allow overrides
-		this.options = {
-			qwenApiLine: QwenApiRegions.CHINA,
-			...options,
-		}
-	}
-
-	private useChinaApi(): boolean {
-		return this.options.qwenApiLine === QwenApiRegions.CHINA
+		this.options = options
 	}
 
 	private ensureClient(): OpenAI {
@@ -46,9 +37,10 @@ export class QwenHandler implements ApiHandler {
 			}
 			try {
 				this.client = new OpenAI({
-					baseURL: this.useChinaApi()
-						? "https://dashscope.aliyuncs.com/compatible-mode/v1"
-						: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
+					baseURL:
+						this.options.qwenApiLine === "china"
+							? "https://dashscope.aliyuncs.com/compatible-mode/v1"
+							: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
 					apiKey: this.options.qwenApiKey,
 				})
 			} catch (error: any) {
@@ -61,7 +53,7 @@ export class QwenHandler implements ApiHandler {
 	getModel(): { id: MainlandQwenModelId | InternationalQwenModelId; info: ModelInfo } {
 		const modelId = this.options.apiModelId
 		// Branch based on API line to let poor typescript know what to do
-		if (this.useChinaApi()) {
+		if (this.options.qwenApiLine === "china") {
 			return {
 				id: (modelId as MainlandQwenModelId) ?? mainlandQwenDefaultModelId,
 				info: mainlandQwenModels[modelId as MainlandQwenModelId] ?? mainlandQwenModels[mainlandQwenDefaultModelId],

src/api/providers/requesty.ts

@@ -8,7 +8,6 @@ import { calculateApiCostOpenAI } from "@utils/cost"
 import { ApiStream } from "@api/transform/stream"
 
 interface RequestyHandlerOptions {
-	requestyBaseUrl?: string
 	requestyApiKey?: string
 	reasoningEffort?: string
 	thinkingBudgetTokens?: number
@@ -41,7 +40,7 @@ export class RequestyHandler implements ApiHandler {
 			}
 			try {
 				this.client = new OpenAI({
-					baseURL: this.options.requestyBaseUrl || "https://router.requesty.ai/v1",
+					baseURL: "https://router.requesty.ai/v1",
 					apiKey: this.options.requestyApiKey,
 					defaultHeaders: {
 						"HTTP-Referer": "https://cline.bot",
@@ -75,10 +74,7 @@ export class RequestyHandler implements ApiHandler {
 				? { thinking: { type: "enabled", budget_tokens: thinkingBudget } }
 				: { thinking: { type: "disabled" } }
 		const thinkingArgs =
-			model.id.includes("claude-3-7-sonnet") ||
-			model.id.includes("claude-sonnet-4") ||
-			model.id.includes("claude-opus-4") ||
-			model.id.includes("claude-opus-4-1")
+			model.id.includes("claude-3-7-sonnet") || model.id.includes("claude-sonnet-4") || model.id.includes("claude-opus-4")
 				? thinking
 				: {}
 

src/api/providers/sapaicore.ts

@@ -5,11 +5,6 @@ import { ApiHandler } from "../"
 import { ModelInfo, sapAiCoreDefaultModelId, SapAiCoreModelId, sapAiCoreModels } from "../../shared/api"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
-import {
-	type Message as BedrockMessage,
-	type ContentBlock as BedrockContentBlock,
-	ConversationRole as BedrockConversationRole,
-} from "@aws-sdk/client-bedrock-runtime"
 
 interface SapAiCoreHandlerOptions {
 	sapAiCoreClientId?: string
@@ -18,7 +13,6 @@ interface SapAiCoreHandlerOptions {
 	sapAiResourceGroup?: string
 	sapAiCoreBaseUrl?: string
 	apiModelId?: string
-	thinkingBudgetTokens?: number
 }
 
 interface Deployment {
@@ -33,307 +27,6 @@ interface Token {
 	token_type: string
 	expires_at: number
 }
-
-// Bedrock namespace containing caching-related functions
-namespace Bedrock {
-	// Define cache point type for AWS Bedrock
-	interface CachePointContentBlock {
-		cachePoint: {
-			type: "default"
-		}
-	}
-
-	// 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
-		}
-	}
-
-	/**
-	 * Prepares system messages with optional caching support
-	 */
-	export function prepareSystemMessages(systemPrompt: string, enableCaching: boolean): any[] | undefined {
-		if (!systemPrompt) {
-			return undefined
-		}
-
-		if (enableCaching) {
-			return [{ text: systemPrompt }, { cachePoint: { type: "default" } }]
-		}
-
-		return [{ text: systemPrompt }]
-	}
-
-	/**
-	 * Applies cache control to messages for prompt caching using AWS Bedrock's cachePoint system
-	 * AWS Bedrock uses cachePoint objects instead of Anthropic's cache_control approach
-	 */
-	export function applyCacheControlToMessages(
-		messages: BedrockMessage[],
-		lastUserMsgIndex: number,
-		secondLastMsgUserIndex: number,
-	): BedrockMessage[] {
-		return messages.map((message, index) => {
-			// Add cachePoint to the last user message and second-to-last user message
-			if (index === lastUserMsgIndex || index === secondLastMsgUserIndex) {
-				// Clone the message to avoid modifying the original
-				const messageWithCache = { ...message }
-
-				if (messageWithCache.content && Array.isArray(messageWithCache.content)) {
-					// Add cachePoint to the end of the content array
-					messageWithCache.content = [
-						...messageWithCache.content,
-						{
-							cachePoint: {
-								type: "default",
-							},
-						} as CachePointContentBlock, // Properly typed cache point for AWS SDK
-					]
-				}
-
-				return messageWithCache
-			}
-
-			return message
-		})
-	}
-
-	/**
-	 * Formats messages for models using the Converse API specification
-	 * Used by both Anthropic and Nova models to avoid code duplication
-	 */
-	export function formatMessagesForConverseAPI(messages: Anthropic.Messages.MessageParam[]): BedrockMessage[] {
-		return messages.map((message) => {
-			// Determine role (user or assistant)
-			const role = message.role === "user" ? BedrockConversationRole.USER : BedrockConversationRole.ASSISTANT
-
-			// Process content based on type
-			let content: BedrockContentBlock[] = []
-
-			if (typeof message.content === "string") {
-				// Simple text content
-				content = [{ text: message.content }]
-			} else if (Array.isArray(message.content)) {
-				// Convert Anthropic content format to Converse API content format
-				const processedContent = message.content
-					.map((item) => {
-						// Text content
-						if (item.type === "text") {
-							return { text: item.text }
-						}
-
-						// Image content
-						if (item.type === "image") {
-							return processImageContent(item)
-						}
-
-						// Log unsupported content types for debugging
-						console.warn(`Unsupported content type: ${(item as ContentItem).type}`)
-						return null
-					})
-					.filter((item): item is BedrockContentBlock => item !== null)
-
-				content = processedContent
-			}
-
-			// Return formatted message
-			return {
-				role,
-				content,
-			}
-		})
-	}
-
-	/**
-	 * Processes image content with proper error handling and user notification
-	 */
-	function processImageContent(item: any): BedrockContentBlock | null {
-		let imageData: Uint8Array
-		let format: "png" | "jpeg" | "gif" | "webp" = "jpeg" // default format
-
-		// Extract format from media_type if available
-		if (item.source.media_type) {
-			// Extract format from media_type (e.g., "image/jpeg" -> "jpeg")
-			const formatMatch = item.source.media_type.match(/image\/(\w+)/)
-			if (formatMatch && formatMatch[1]) {
-				const extractedFormat = formatMatch[1]
-				// Ensure format is one of the allowed values
-				if (["png", "jpeg", "gif", "webp"].includes(extractedFormat)) {
-					format = extractedFormat as "png" | "jpeg" | "gif" | "webp"
-				}
-			}
-		}
-
-		// Get image data with improved error handling
-		try {
-			if (typeof item.source.data === "string") {
-				// Handle base64 encoded data
-				const base64Data = item.source.data.replace(/^data:image\/\w+;base64,/, "")
-				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 Buffer | Uint8Array))
-			} else {
-				throw new Error("Unsupported image data format")
-			}
-
-			return {
-				image: {
-					format,
-					source: {
-						bytes: imageData,
-					},
-				},
-			}
-		} catch (error) {
-			console.error("Failed to process image content:", error)
-			// Return a text content indicating the error instead of null
-			// This ensures users are aware of the issue
-			return {
-				text: `[ERROR: Failed to process image - ${error instanceof Error ? error.message : "Unknown error"}]`,
-			}
-		}
-	}
-}
-
-// Gemini namespace containing caching-related functions and types
-namespace Gemini {
-	/**
-	 * Process Gemini streaming response with enhanced thinking content support and caching awareness
-	 */
-	export function processStreamChunk(data: any): {
-		text?: string
-		reasoning?: string
-		usageMetadata?: {
-			promptTokenCount?: number
-			candidatesTokenCount?: number
-			thoughtsTokenCount?: number
-			cachedContentTokenCount?: number
-		}
-	} {
-		const result: ReturnType<typeof processStreamChunk> = {}
-
-		// Handle thinking content from Gemini's response
-		const candidateForThoughts = data?.candidates?.[0]
-		const partsForThoughts = candidateForThoughts?.content?.parts
-		let thoughts = ""
-
-		if (partsForThoughts) {
-			for (const part of partsForThoughts) {
-				const { thought, text } = part
-				if (thought && text) {
-					thoughts += text + "\n"
-				}
-			}
-		}
-
-		if (thoughts.trim() !== "") {
-			result.reasoning = thoughts.trim()
-		}
-
-		// Handle regular text content
-		if (data.text) {
-			result.text = data.text
-		}
-
-		// Handle content parts for non-thought text
-		if (data.candidates && data.candidates[0]?.content?.parts) {
-			let nonThoughtText = ""
-			for (const part of data.candidates[0].content.parts) {
-				if (part.text && !part.thought) {
-					nonThoughtText += part.text
-				}
-			}
-			if (nonThoughtText && !result.text) {
-				result.text = nonThoughtText
-			}
-		}
-
-		// Handle usage metadata with caching support
-		if (data.usageMetadata) {
-			result.usageMetadata = {
-				promptTokenCount: data.usageMetadata.promptTokenCount,
-				candidatesTokenCount: data.usageMetadata.candidatesTokenCount,
-				thoughtsTokenCount: data.usageMetadata.thoughtsTokenCount,
-				cachedContentTokenCount: data.usageMetadata.cachedContentTokenCount,
-			}
-		}
-
-		return result
-	}
-
-	function convertAnthropicMessageToGemini(message: Anthropic.Messages.MessageParam) {
-		const role = message.role === "assistant" ? "model" : "user"
-		const parts = []
-
-		if (typeof message.content === "string") {
-			parts.push({ text: message.content })
-		} else if (Array.isArray(message.content)) {
-			for (const block of message.content) {
-				if (block.type === "text") {
-					parts.push({ text: block.text })
-				} else if (block.type === "image") {
-					parts.push({
-						inlineData: {
-							mimeType: block.source.media_type,
-							data: block.source.data,
-						},
-					})
-				}
-			}
-		}
-
-		return { role, parts }
-	}
-
-	/**
-	 * Prepare Gemini request payload with thinking configuration and implicit caching support
-	 */
-	export function prepareRequestPayload(
-		systemPrompt: string,
-		messages: Anthropic.Messages.MessageParam[],
-		model: { id: SapAiCoreModelId; info: ModelInfo },
-		thinkingBudgetTokens?: number,
-	): any {
-		const contents = messages.map(convertAnthropicMessageToGemini)
-
-		const payload = {
-			contents,
-			systemInstruction: {
-				parts: [
-					{
-						text: systemPrompt,
-					},
-				],
-			},
-			generationConfig: {
-				maxOutputTokens: model.info.maxTokens,
-				temperature: 0.0,
-			},
-		}
-
-		// Add thinking config if the model supports it and budget is provided
-		const thinkingBudget = thinkingBudgetTokens ?? 0
-		const maxBudget = model.info.thinkingConfig?.maxBudget ?? 0
-
-		if (thinkingBudget > 0 && model.info.thinkingConfig) {
-			// Add thinking configuration to the payload
-			;(payload as any).thinkingConfig = {
-				thinkingBudget: thinkingBudget,
-				includeThoughts: true,
-			}
-		}
-
-		return payload
-	}
-}
-
 export class SapAiCoreHandler implements ApiHandler {
 	private options: SapAiCoreHandlerOptions
 	private token?: Token
@@ -449,20 +142,7 @@ export class SapAiCoreHandler implements ApiHandler {
 			"anthropic--claude-3-opus",
 		]
 
-		const openAIModels = [
-			"gpt-4o",
-			"gpt-4",
-			"gpt-4o-mini",
-			"o1",
-			"gpt-4.1",
-			"gpt-4.1-nano",
-			"gpt-5",
-			"gpt-5-nano",
-			"gpt-5-mini",
-			"o3-mini",
-			"o3",
-			"o4-mini",
-		]
+		const openAIModels = ["gpt-4o", "gpt-4", "gpt-4o-mini", "o1", "gpt-4.1", "gpt-4.1-nano", "o3-mini", "o3", "o4-mini"]
 
 		const geminiModels = ["gemini-2.5-flash", "gemini-2.5-pro"]
 
@@ -471,47 +151,21 @@ export class SapAiCoreHandler implements ApiHandler {
 		if (anthropicModels.includes(model.id)) {
 			url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/invoke-with-response-stream`
 
-			// Format messages for Converse API. Note that the Invoke API has
-			// the same format for messages as the Converse API.
-			const formattedMessages = Bedrock.formatMessagesForConverseAPI(messages)
-
-			// Get message indices for caching
-			const userMsgIndices = messages.reduce(
-				(acc, msg, index) => (msg.role === "user" ? [...acc, index] : acc),
-				[] as number[],
-			)
-			const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1
-			const secondLastMsgUserIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1
-
 			if (
 				model.id === "anthropic--claude-4-sonnet" ||
 				model.id === "anthropic--claude-4-opus" ||
 				model.id === "anthropic--claude-3.7-sonnet"
 			) {
-				// Use converse-stream endpoint with caching support
 				url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/converse-stream`
-
-				// Apply caching controls to messages (enabled by default)
-				const messagesWithCache = Bedrock.applyCacheControlToMessages(
-					formattedMessages,
-					lastUserMsgIndex,
-					secondLastMsgUserIndex,
-				)
-
-				// Prepare system message with caching support (enabled by default)
-				const systemMessages = Bedrock.prepareSystemMessages(systemPrompt, true)
-
 				payload = {
 					inferenceConfig: {
 						maxTokens: model.info.maxTokens,
 						temperature: 0.0,
 					},
-					system: systemMessages,
-					messages: messagesWithCache,
+					system: systemPrompt ? [{ text: systemPrompt }] : undefined,
+					messages: this.formatAnthropicMessages(messages),
 				}
 			} else {
-				// Use invoke-with-response-stream endpoint
-				// TODO: add caching support using Anthropic-native cache_control blocks
 				payload = {
 					max_tokens: model.info.maxTokens,
 					system: systemPrompt,
@@ -537,7 +191,7 @@ export class SapAiCoreHandler implements ApiHandler {
 				stream_options: { include_usage: true },
 			}
 
-			if (["o1", "o3-mini", "o3", "o4-mini", "gpt-5", "gpt-5-nano", "gpt-5-mini"].includes(model.id)) {
+			if (["o1", "o3-mini", "o3", "o4-mini"].includes(model.id)) {
 				delete payload.max_tokens
 				delete payload.temperature
 			}
@@ -548,7 +202,7 @@ export class SapAiCoreHandler implements ApiHandler {
 			}
 		} else if (geminiModels.includes(model.id)) {
 			url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/models/${model.id}:streamGenerateContent`
-			payload = Gemini.prepareRequestPayload(systemPrompt, messages, model, this.options.thinkingBudgetTokens)
+			payload = this.convertToGeminiFormat(systemPrompt, messages)
 		} else {
 			throw new Error(`Unsupported model: ${model.id}`)
 		}
@@ -705,17 +359,9 @@ export class SapAiCoreHandler implements ApiHandler {
 
 							// Handle metadata (token usage)
 							if (data.metadata?.usage) {
-								let inputTokens = data.metadata.usage.inputTokens || 0
+								const inputTokens = data.metadata.usage.inputTokens || 0
 								const outputTokens = data.metadata.usage.outputTokens || 0
 
-								// calibrate input token
-								const totalTokens = data.metadata.usage.totalTokens || 0
-								const cacheReadInputTokens = data.metadata.usage.cacheReadInputTokens || 0
-								const cacheWriteOutputTokens = data.metadata.usage.cacheWriteOutputTokens || 0
-								if (inputTokens + outputTokens + cacheReadInputTokens + cacheWriteOutputTokens !== totalTokens) {
-									inputTokens = totalTokens - outputTokens - cacheReadInputTokens - cacheWriteOutputTokens
-								}
-
 								yield {
 									type: "usage",
 									inputTokens,
@@ -847,31 +493,50 @@ export class SapAiCoreHandler implements ApiHandler {
 						const jsonData = line.slice(6)
 						try {
 							const data = JSON.parse(jsonData)
+							const candidateForThoughts = data?.candidates?.[0]
+							const partsForThoughts = candidateForThoughts?.content?.parts
+							let thoughts = ""
 
-							// Use Gemini namespace to process the chunk
-							const processed = Gemini.processStreamChunk(data)
+							if (partsForThoughts) {
+								for (const part of partsForThoughts) {
+									const { thought, text } = part
+									if (thought && text) {
+										thoughts += text + "\n"
+									}
+								}
+							}
 
-							// Yield reasoning if present
-							if (processed.reasoning) {
+							if (thoughts.trim() !== "") {
 								yield {
 									type: "reasoning",
-									reasoning: processed.reasoning,
+									reasoning: thoughts.trim(),
 								}
 							}
 
-							// Yield text if present
-							if (processed.text) {
+							if (data.text) {
 								yield {
 									type: "text",
-									text: processed.text,
+									text: data.text,
 								}
 							}
 
-							if (processed.usageMetadata) {
-								promptTokens = processed.usageMetadata.promptTokenCount ?? promptTokens
-								outputTokens = processed.usageMetadata.candidatesTokenCount ?? outputTokens
-								thoughtsTokenCount = processed.usageMetadata.thoughtsTokenCount ?? thoughtsTokenCount
-								cacheReadTokens = processed.usageMetadata.cachedContentTokenCount ?? cacheReadTokens
+							if (data.candidates && data.candidates[0]?.content?.parts) {
+								for (const part of data.candidates[0].content.parts) {
+									if (part.text && !part.thought) {
+										// Only non-thought text
+										yield {
+											type: "text",
+											text: part.text,
+										}
+									}
+								}
+							}
+
+							if (data.usageMetadata) {
+								promptTokens = data.usageMetadata.promptTokenCount ?? promptTokens
+								outputTokens = data.usageMetadata.candidatesTokenCount ?? outputTokens
+								thoughtsTokenCount = data.usageMetadata.thoughtsTokenCount ?? thoughtsTokenCount
+								cacheReadTokens = data.usageMetadata.cachedContentTokenCount ?? cacheReadTokens
 
 								yield {
 									type: "usage",
@@ -879,7 +544,6 @@ export class SapAiCoreHandler implements ApiHandler {
 									outputTokens,
 									thoughtsTokenCount,
 									cacheReadTokens,
-									cacheWriteTokens: 0,
 								}
 							}
 						} catch (error) {
@@ -917,4 +581,111 @@ export class SapAiCoreHandler implements ApiHandler {
 		}
 		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 convertToGeminiFormat(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]) {
+		const contents = messages.map(this.convertAnthropicMessageToGemini)
+
+		const payload = {
+			contents,
+			systemInstruction: {
+				parts: [
+					{
+						text: systemPrompt,
+					},
+				],
+			},
+			generationConfig: {
+				maxOutputTokens: this.getModel().info.maxTokens,
+				temperature: 0.0,
+			},
+		}
+
+		return payload
+	}
+
+	private convertAnthropicMessageToGemini(message: Anthropic.Messages.MessageParam) {
+		const role = message.role === "assistant" ? "model" : "user"
+		const parts = []
+
+		if (typeof message.content === "string") {
+			parts.push({ text: message.content })
+		} else if (Array.isArray(message.content)) {
+			for (const block of message.content) {
+				if (block.type === "text") {
+					parts.push({ text: block.text })
+				} else if (block.type === "image") {
+					parts.push({
+						inlineData: {
+							mimeType: block.source.media_type,
+							data: block.source.data,
+						},
+					})
+				}
+			}
+		}
+
+		return { role, parts }
+	}
+	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/providers/vertex.ts

@@ -13,7 +13,7 @@ interface VertexHandlerOptions {
 	thinkingBudgetTokens?: number
 	geminiApiKey?: string
 	geminiBaseUrl?: string
-	ulid?: string
+	taskId?: string
 }
 
 export class VertexHandler implements ApiHandler {
@@ -86,7 +86,6 @@ export class VertexHandler implements ApiHandler {
 
 		switch (modelId) {
 			case "claude-sonnet-4@20250514":
-			case "claude-opus-4-1@20250805":
 			case "claude-opus-4@20250514":
 			case "claude-3-7-sonnet@20250219":
 			case "claude-3-5-sonnet-v2@20241022":

src/api/providers/vscode-lm.ts

@@ -1,13 +1,13 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiStream } from "@api/transform/stream"
-import { convertToVsCodeLmMessages } from "@api/transform/vscode-lm-format"
-import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
-import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "@shared/vsCodeSelectorUtils"
-import { calculateApiCostAnthropic } from "@utils/cost"
 import * as vscode from "vscode"
 import { ApiHandler, SingleCompletionHandler } from "../"
-import { withRetry } from "../retry"
+import { calculateApiCostAnthropic } from "@utils/cost"
+import { ApiStream } from "@api/transform/stream"
+import { convertToVsCodeLmMessages } from "@api/transform/vscode-lm-format"
+import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "@shared/vsCodeSelectorUtils"
+import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
 import type { LanguageModelChatSelector as LanguageModelChatSelectorFromTypes } from "./types"
+import { withRetry } from "../retry"
 
 interface VsCodeLmHandlerOptions {
 	vsCodeLmModelSelector?: any
@@ -237,40 +237,82 @@ export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
 		}
 	}
 
-	private extractTextFromMessage(message: vscode.LanguageModelChatMessage): string {
-		if (Array.isArray(message.content)) {
-			return message.content
-				.filter((part) => part instanceof vscode.LanguageModelTextPart)
-				.map((part) => (part as vscode.LanguageModelTextPart).value)
-				.join("")
-		}
-		return ""
-	}
-
-	private isClaudeModel(): boolean {
-		return this.client?.family?.startsWith("claude") || false
-	}
-
 	private async countTokens(text: string | vscode.LanguageModelChatMessage): Promise<number> {
-		/**
-		 * NOTE (intentional trade-off):
-		 * We use a coarse chars/4 heuristic here instead of a real tokenizer (e.g., js-tiktoken with o200k_base).
-		 * Rationale:
-		 *  - Avoid pulling multi‑MB rank files and increasing the extension install/download size.
-		 *  - Eliminate encoder lifecycle/memory concerns in long-running sessions.
-		 * Consequences:
-		 *  - This is not model-accurate and can under/over-estimate tokens, especially with tool/function calls.
-		 *  - It is “good enough” for budgeting/context checks, and we accept the inaccuracy by design.
-		 * If precise accounting becomes a requirement, reintroduce a tokenizer behind a feature flag or backend-only path.
-		 */
-		const textContent = typeof text === "string" ? text : this.extractTextFromMessage(text)
-		return Math.ceil((textContent || "").length / 4)
+		// Check for required dependencies
+		if (!this.client) {
+			console.warn("Cline <Language Model API>: No client available for token counting")
+			return 0
+		}
+
+		if (!this.currentRequestCancellation) {
+			console.warn("Cline <Language Model API>: No cancellation token available for token counting")
+			return 0
+		}
+
+		// Validate input
+		if (!text) {
+			console.debug("Cline <Language Model API>: Empty text provided for token counting")
+			return 0
+		}
+
+		try {
+			// Handle different input types
+			let tokenCount: number
+
+			if (typeof text === "string") {
+				tokenCount = await this.client.countTokens(text, this.currentRequestCancellation.token)
+			} else if (text instanceof vscode.LanguageModelChatMessage) {
+				// For chat messages, ensure we have content
+				if (!text.content || (Array.isArray(text.content) && text.content.length === 0)) {
+					console.debug("Cline <Language Model API>: Empty chat message content")
+					return 0
+				}
+				tokenCount = await this.client.countTokens(text, this.currentRequestCancellation.token)
+			} else {
+				console.warn("Cline <Language Model API>: Invalid input type for token counting")
+				return 0
+			}
+
+			// Validate the result
+			if (typeof tokenCount !== "number") {
+				console.warn("Cline <Language Model API>: Non-numeric token count received:", tokenCount)
+				return 0
+			}
+
+			if (tokenCount < 0) {
+				console.warn("Cline <Language Model API>: Negative token count received:", tokenCount)
+				return 0
+			}
+
+			return tokenCount
+		} catch (error) {
+			// Handle specific error types
+			if (error instanceof vscode.CancellationError) {
+				console.debug("Cline <Language Model API>: Token counting cancelled by user")
+				return 0
+			}
+
+			const errorMessage = error instanceof Error ? error.message : "Unknown error"
+			console.warn("Cline <Language Model API>: Token counting failed:", errorMessage)
+
+			// Log additional error details if available
+			if (error instanceof Error && error.stack) {
+				console.debug("Token counting error stack:", error.stack)
+			}
+
+			return 0 // Fallback to prevent stream interruption
+		}
 	}
 
-	private async calculateTotalInputTokens(vsCodeLmMessages: vscode.LanguageModelChatMessage[]): Promise<number> {
+	private async calculateTotalInputTokens(
+		systemPrompt: string,
+		vsCodeLmMessages: vscode.LanguageModelChatMessage[],
+	): Promise<number> {
+		const systemTokens: number = await this.countTokens(systemPrompt)
+
 		const messageTokens: number[] = await Promise.all(vsCodeLmMessages.map((msg) => this.countTokens(msg)))
 
-		return messageTokens.reduce((sum: number, tokens: number): number => sum + tokens, 0)
+		return systemTokens + messageTokens.reduce((sum: number, tokens: number): number => sum + tokens, 0)
 	}
 
 	private ensureCleanState(): void {
@@ -392,7 +434,7 @@ export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
 		this.currentRequestCancellation = new vscode.CancellationTokenSource()
 
 		// Calculate input tokens before starting the stream
-		const totalInputTokens: number = await this.calculateTotalInputTokens(vsCodeLmMessages)
+		const totalInputTokens: number = await this.calculateTotalInputTokens(systemPrompt, vsCodeLmMessages)
 
 		// Accumulate the text and count at the end of the stream to reduce token counting overhead.
 		let accumulatedText: string = ""

src/api/transform/openrouter-stream.ts

@@ -1,4 +1,4 @@
-import { CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo, openRouterClaudeSonnet41mModelId } from "@shared/api"
+import { ModelInfo } from "@shared/api"
 import { convertToOpenAiMessages } from "@api/transform/openai-format"
 import { convertToR1Format } from "@api/transform/r1-format"
 import { Anthropic } from "@anthropic-ai/sdk"
@@ -19,18 +19,11 @@ export async function createOpenRouterStream(
 		...convertToOpenAiMessages(messages),
 	]
 
-	const isClaudeSonnet41m = model.id === openRouterClaudeSonnet41mModelId
-	if (isClaudeSonnet41m) {
-		// remove the custom :1m suffix, to create the model id openrouter API expects
-		model.id = model.id.slice(0, -CLAUDE_SONNET_4_1M_SUFFIX.length)
-	}
-
 	// prompt caching: https://openrouter.ai/docs/prompt-caching
 	// this was initially specifically for claude models (some models may 'support prompt caching' automatically without this)
 	// handles direct model.id match logic
 	switch (model.id) {
 		case "anthropic/claude-sonnet-4":
-		case "anthropic/claude-opus-4.1":
 		case "anthropic/claude-opus-4":
 		case "anthropic/claude-3.7-sonnet":
 		case "anthropic/claude-3.7-sonnet:beta":
@@ -89,7 +82,6 @@ export async function createOpenRouterStream(
 	let maxTokens: number | undefined
 	switch (model.id) {
 		case "anthropic/claude-sonnet-4":
-		case "anthropic/claude-opus-4.1":
 		case "anthropic/claude-opus-4":
 		case "anthropic/claude-3.7-sonnet":
 		case "anthropic/claude-3.7-sonnet:beta":
@@ -125,7 +117,6 @@ export async function createOpenRouterStream(
 	let reasoning: { max_tokens: number } | undefined = undefined
 	switch (model.id) {
 		case "anthropic/claude-sonnet-4":
-		case "anthropic/claude-opus-4.1":
 		case "anthropic/claude-opus-4":
 		case "anthropic/claude-3.7-sonnet":
 		case "anthropic/claude-3.7-sonnet:beta":
@@ -170,8 +161,6 @@ export async function createOpenRouterStream(
 		...(isKimiK2
 			? { provider: { order: ["groq", "together", "baseten", "parasail", "novita", "deepinfra"], allow_fallbacks: false } }
 			: {}),
-		// limit providers to only those that support the 1m context window
-		...(isClaudeSonnet41m ? { provider: { order: ["anthropic", "amazon-bedrock"], allow_fallbacks: false } } : {}),
 	})
 
 	return stream