merge conflicts

.changeset/beige-turtles-jump.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Fix list_files tool to return files if the targeted directory is a hidden directory

.changeset/blue-cobras-allow.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Migrated updateSettings to protos, removed didUpdateSettings, altered Plan/Act toggling in settings menu

.changeset/clean-beers-clean.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-add ability to constrain size of terminal output

.changeset/eight-otters-grow.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixed issue where telemetry warning popup was created for every new Cline window

.changeset/eleven-monkeys-watch.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Prioritize active files in file context menu

.changeset/fast-ducks-raise.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Exclude clinerules from checkpoints

.changeset/fuzzy-queens-double.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-chore(bedrock): remove @anthropic-ai/bedrock-sdk

.changeset/giant-cycles-divide.md

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

.changeset/grumpy-cars-report.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Update developer reset to allow for resetting workspace settings.

.changeset/heavy-bananas-shave.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Added promise to task init to prevent race condition with checkpoints

.changeset/honest-boats-fix.md

@@ -2,4 +2,4 @@
 "claude-dev": patch
 ---
 
-Integrate Claude Code
+Spring cleaning

.changeset/hot-vans-hang.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Added file context warnings to reduce diff edit errors when resuming a task after it has been restored

.changeset/mighty-pillows-pretend.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Clear the chat input when the user changes mode within a task

.changeset/nice-trees-ring.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Added a configurable default terminal profile setting

.changeset/quick-rocks-guess.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix bug where replace_in_file would not be able to handle for out-of-order SEARCH/REPLACE blocks

.changeset/rare-ducks-give.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Context menu is default to File option on start up

.changeset/shiny-snakes-compete.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fixed race condition where clineAsk was undefined, leading to task restoration and other downstream issues

.changeset/shiny-taxis-suffer.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-update the copy button functionality

.changeset/six-rice-end.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Migrate fetchLatestServersFromHub to protobus

.changeset/smart-ladybugs-give.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+the response of the mcps is displayed with a collapsible which allows to focus on the model responses.

.changeset/sour-peaches-float.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix where clineMessages were not saving checkpoint commitHash on some messages

.changeset/tiny-olives-tease.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Better debounce on checkmark control menu

.changeset/wet-emus-breathe.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add SAP AI Core as a provider for Cline

.changeset/wild-cycles-cough.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Adding MCP Rich Display settings in cline's settings page, to enable users to change it in a persistent manner

.github/ISSUE_TEMPLATE/config.yml

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

.github/ISSUE_TEMPLATE/feature_proposal.yml

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

.github/pull_request_template.md

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

.github/workflows/publish.yml

@@ -11,10 +11,6 @@ on:
                 options:
                     - pre-release
                     - release
-            tag:
-                description: "Enter existing tag to publish (e.g., v3.1.2)"
-                required: true
-                type: string
 
 permissions:
     contents: write
@@ -34,8 +30,6 @@ jobs:
 
         steps:
             - uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.inputs.tag }}
 
             - name: Setup Node.js
               uses: actions/setup-node@v4
@@ -75,20 +69,14 @@ jobs:
                   VERSION=$(node -p "require('./package.json').version")
                   echo "version=$VERSION" >> $GITHUB_OUTPUT
 
-            - name: Validate Tag
-              id: validate_tag
+            - name: Create Git Tag
+              id: create_tag
               run: |
-                  TAG="${{ github.event.inputs.tag }}"
-                  echo "tag=$TAG" >> $GITHUB_OUTPUT
-                  echo "Using existing tag: $TAG"
-
-                  # Verify the tag exists
-                  if ! git rev-parse "$TAG" >/dev/null 2>&1; then
-                    echo "Error: Tag '$TAG' does not exist in the repository"
-                    exit 1
-                  fi
-
-                  echo "Tag '$TAG' validated successfully"
+                  VERSION=v${{ steps.get_version.outputs.version }}
+                  echo "tag=$VERSION" >> $GITHUB_OUTPUT
+                  echo "Tagging with $VERSION"
+                  git tag "$VERSION"
+                  git push origin "$VERSION"
 
             - name: Package and Publish Extension
               env:
@@ -118,7 +106,7 @@ jobs:
             - name: Create GitHub Release
               uses: softprops/action-gh-release@v1
               with:
-                  tag_name: ${{ steps.validate_tag.outputs.tag }}
+                  tag_name: ${{ steps.create_tag.outputs.tag }}
                   files: "*.vsix"
                   # body: ${{ steps.changelog.outputs.content }}
                   generate_release_notes: true

.github/workflows/test.yml

@@ -68,12 +68,6 @@ jobs:
               if: steps.webview-cache.outputs.cache-hit != 'true'
               run: cd webview-ui && npm ci
 
-            - name: Install local modules on windows
-              if: runner.os == 'Windows' && steps.root-cache.outputs.cache-hit == 'true'
-              run: |
-                  npm install eslint-plugin-eslint-rules 
-                  cd webview-ui/ && npm install eslint-plugin-eslint-rules
-
             - name: Set up NPM on Windows
               if: runner.os == 'Windows'
               run: |

.gitignore

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

.husky/pre-commit

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

.vscode/launch.json

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

.vscode/tasks.json

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

CHANGELOG.md

@@ -1,26 +1,5 @@
 # Changelog
 
-## [3.17.13]
-
--   Add Thinking UX for Gemini models, providing visual feedback during model reasoning
--   Add support for Notifications MCP integration with Cline
--   Add prompt caching indicator for Grok 3 models
--   Sort MCP marketplace by newest listings by default for easier discovery of recent servers
--   Update O3 model family pricing to reflect latest OpenAI rates
--   Remove '-beta' suffix from Grok model identifiers
--   Fix AWS Bedrock provider by removing deprecated Anthropic-Bedrock SDK (Thanks @watany-dev!)
--   Fix menu display issue for terminal timeout settings
--   Improve chat input field styling and behavior
-
-## [3.17.12]
-
--   **Free Grok Model Available!** Access Grok 3 completely free through the Cline provider
--   Add collapsible MCP response panels to keep conversations focused on the main AI responses while still allowing access to detailed MCP output (Thanks @valinha!)
--   Prioritize active files (open tabs) at the top of the file context menu when using @ mentions (Thanks @abeatrix!)
--   Fix context menu to properly default to "File" option instead of incorrectly selecting "Git Commits"
--   Fix diff editing to handle out-of-order SEARCH/REPLACE blocks, improving reliability with models that don't follow strict ordering
--   Fix telemetry warning popup appearing repeatedly for users who have telemetry disabled
-
 ## [3.17.11]
 
 -   Add support for Gemini 2.5 Pro Preview 06-05 model to Vertex AI and Google Gemini providers

CONTRIBUTING.md

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

buf.yaml

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

evals/.gitignore

@@ -1,6 +1,3 @@
 repositories
 
-results/evals.db
-
-diff_editing/test_cases/
-diff_editing/test_outputs/
+results/evals.db

evals/cli/package-lock.json

@@ -9,7 +9,7 @@
 			"version": "0.1.0",
 			"license": "MIT",
 			"dependencies": {
-				"better-sqlite3": "^11.10.0",
+				"better-sqlite3": "^8.0.0",
 				"chalk": "^4.1.2",
 				"commander": "^9.4.1",
 				"execa": "^5.1.1",
@@ -217,11 +217,10 @@
 			]
 		},
 		"node_modules/better-sqlite3": {
-			"version": "11.10.0",
-			"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.10.0.tgz",
-			"integrity": "sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==",
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.7.0.tgz",
+			"integrity": "sha512-99jZU4le+f3G6aIl6PmmV0cxUIWqKieHxsiF7G34CVFiE+/UabpYqkU0NJIkY/96mQKikHeBjtR27vFfs5JpEw==",
 			"hasInstallScript": true,
-			"license": "MIT",
 			"dependencies": {
 				"bindings": "^1.5.0",
 				"prebuild-install": "^7.1.1"
@@ -1608,9 +1607,9 @@
 			"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
 		},
 		"better-sqlite3": {
-			"version": "11.10.0",
-			"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-11.10.0.tgz",
-			"integrity": "sha512-EwhOpyXiOEL/lKzHz9AW1msWFNzGc/z+LzeB3/jnFJpxu+th2yqvzsSWas1v9jgs9+xiXJcD5A8CJxAG2TaghQ==",
+			"version": "8.7.0",
+			"resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-8.7.0.tgz",
+			"integrity": "sha512-99jZU4le+f3G6aIl6PmmV0cxUIWqKieHxsiF7G34CVFiE+/UabpYqkU0NJIkY/96mQKikHeBjtR27vFfs5JpEw==",
 			"requires": {
 				"bindings": "^1.5.0",
 				"prebuild-install": "^7.1.1"

evals/cli/package.json

@@ -17,7 +17,7 @@
 	"author": "",
 	"license": "MIT",
 	"dependencies": {
-		"better-sqlite3": "^11.10.0",
+		"better-sqlite3": "^8.0.0",
 		"chalk": "^4.1.2",
 		"commander": "^9.4.1",
 		"execa": "^5.1.1",

evals/cli/src/commands/runDiffEval.ts

@@ -1,79 +0,0 @@
-import execa from "execa"
-import chalk from "chalk"
-import path from "path"
-
-interface RunDiffEvalOptions {
-	modelId: string
-	systemPromptName: string
-	numberOfRuns: number
-	parsingFunction: string
-	diffEditFunction: string
-	thinkingBudget: number
-	parallel: boolean
-	verbose: boolean
-	testPath: string
-	outputPath: string
-	replay: boolean
-}
-
-export async function runDiffEvalHandler(options: RunDiffEvalOptions) {
-	console.log(chalk.blue("Starting diff editing evaluation..."))
-
-	// Resolve the path to the TestRunner.ts script relative to the current file
-	const scriptPath = path.resolve(__dirname, "../../../diff_editing/TestRunner.ts")
-
-	// Construct the arguments array for the execa call
-	const args = [
-		"--model-id",
-		options.modelId,
-		"--system-prompt-name",
-		options.systemPromptName,
-		"--number-of-runs",
-		String(options.numberOfRuns),
-		"--parsing-function",
-		options.parsingFunction,
-		"--diff-edit-function",
-		options.diffEditFunction,
-	]
-
-	// Conditionally add the optional arguments
-	if (options.testPath) {
-		args.push("--test-path", options.testPath)
-	}
-	if (options.outputPath) {
-		args.push("--output-path", options.outputPath)
-	}
-	if (options.thinkingBudget > 0) {
-		args.push("--thinking-budget", String(options.thinkingBudget))
-	}
-
-	if (options.parallel) {
-		args.push("--parallel")
-	}
-
-	if (options.replay) {
-		args.push("--replay")
-	}
-
-	if (options.verbose) {
-		args.push("--verbose")
-	}
-
-	try {
-		console.log(chalk.gray(`Executing: npx tsx ${scriptPath} ${args.join(" ")}`))
-
-		// Execute the script as a child process
-		// We use 'inherit' to stream the stdout/stderr directly to the user's terminal
-		const subprocess = execa("npx", ["tsx", scriptPath, ...args], {
-			stdio: "inherit",
-		})
-
-		await subprocess
-
-		console.log(chalk.green("Diff editing evaluation completed successfully."))
-	} catch (error) {
-		console.error(chalk.red("An error occurred during the diff editing evaluation."))
-		// The 'inherit' stdio will have already printed the error details from the script
-		process.exit(1)
-	}
-}

evals/cli/src/index.ts

@@ -5,7 +5,6 @@ import { setupHandler } from "./commands/setup"
 import { runHandler } from "./commands/run"
 import { reportHandler } from "./commands/report"
 import { evalsEnvHandler } from "./commands/evals-env"
-import { runDiffEvalHandler } from "./commands/runDiffEval"
 
 // Create the CLI program
 const program = new Command()
@@ -78,36 +77,6 @@ program
 		}
 	})
 
-// Run-diff-eval command
-program
-	.command("run-diff-eval")
-	.description("Run the diff editing evaluation suite")
-	.option("--test-path <path>", "Path to the directory containing test case JSON files")
-	.option("--output-path <path>", "Path to the directory to save the test output JSON files")
-	.option("--model-id <model_id>", "The model ID to use for the test")
-	.option("--system-prompt-name <name>", "The name of the system prompt to use", "basicSystemPrompt")
-	.option("-n, --number-of-runs <number>", "Number of times to run each test case", "1")
-	.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("--parallel", "Run tests in parallel", false)
-	.option("--replay", "Run evaluation from a pre-recorded LLM output, skipping the API call", false)
-	.option("-v, --verbose", "Enable verbose logging", false)
-	.action(async (options) => {
-		try {
-			// The logic here simplifies slightly
-			const fullOptions = {
-				...options,
-				numberOfRuns: parseInt(options.numberOfRuns, 10),
-				thinkingBudget: parseInt(options.thinkingBudget, 10),
-			}
-			await runDiffEvalHandler(fullOptions)
-		} catch (error) {
-			console.error(chalk.red(`Error during diff eval run: ${error instanceof Error ? error.message : String(error)}`))
-			process.exit(1)
-		}
-	})
-
 // Parse command line arguments
 program.parse(process.argv)
 

evals/diff_editing/ClineWrapper.ts

@@ -1,279 +0,0 @@
-import { OpenRouterHandler } from "../../src/api/providers/openrouter"
-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 constructNewFileContentV1, constructNewFileContentV2 } from "./diff-apply/diff-06-06-25"
-import { constructNewFileContent as constructNewFileContentV3 } from "../../src/core/assistant-message/diff" // this defaults to the new v1 when called
-
-type ParseAssistantMessageFn = (message: string) => AssistantMessageContent[]
-type ConstructNewFileContentFn = (diff: string, original: string, strict: boolean) => Promise<string>
-
-const parsingFunctions: Record<string, ParseAssistantMessageFn> = {
-	parseAssistantMessageV1: parseAssistantMessageV1,
-	parseAssistantMessageV2: parseAssistantMessageV2,
-	parseAssistantMessageV3: parseAssistantMessageV3,
-}
-
-const diffEditingFunctions: Record<string, ConstructNewFileContentFn> = {
-	constructNewFileContentV1: constructNewFileContentV1,
-	constructNewFileContentV2: constructNewFileContentV2,
-	constructNewFileContentV3: constructNewFileContentV3, // position invariant diff
-}
-
-import { TestInput, TestResult, ExtractedToolCall } from "./types"
-export { TestInput, TestResult, ExtractedToolCall }
-
-interface StreamResult {
-	assistantMessage: string
-	reasoningMessage: string
-	usage: {
-		inputTokens: number
-		outputTokens: number
-		cacheWriteTokens: number
-		cacheReadTokens: number
-		totalCost: number
-	}
-}
-
-/**
- * Process the stream and return full response
- */
-async function processStream(
-	handler: OpenRouterHandler,
-	systemPrompt: string,
-	messages: Anthropic.Messages.MessageParam[],
-): Promise<StreamResult> {
-	const stream = handler.createMessage(systemPrompt, messages)
-
-	let assistantMessage = ""
-	let reasoningMessage = ""
-	let inputTokens = 0
-	let outputTokens = 0
-	let cacheWriteTokens = 0
-	let cacheReadTokens = 0
-	let totalCost = 0
-
-	for await (const chunk of stream) {
-		if (!chunk) {
-			continue
-		}
-
-		switch (chunk.type) {
-			case "usage":
-				inputTokens += chunk.inputTokens
-				outputTokens += chunk.outputTokens
-				cacheWriteTokens += chunk.cacheWriteTokens ?? 0
-				cacheReadTokens += chunk.cacheReadTokens ?? 0
-				if (chunk.totalCost) {
-					totalCost = chunk.totalCost
-				}
-				break
-			case "reasoning":
-				reasoningMessage += chunk.reasoning
-				break
-			case "text":
-				assistantMessage += chunk.text
-				break
-		}
-	}
-
-	return {
-		assistantMessage,
-		reasoningMessage,
-		usage: {
-			inputTokens,
-			outputTokens,
-			cacheWriteTokens,
-			cacheReadTokens,
-			totalCost,
-		},
-	}
-}
-
-/**
- * Main evaluation function:
- * 1. create and process stream
- * 2. extract any tool calls from the stream
- * 3. if no diff edit, considered a failure (or rerun) - otherwise attempt to apply the diff edit
- */
-export async function runSingleEvaluation(input: TestInput): Promise<TestResult> {
-	try {
-		// Extract parameters
-		const {
-			apiKey,
-			systemPrompt,
-			messages,
-			modelId,
-			originalFile,
-			originalFilePath,
-			parsingFunction,
-			diffEditFunction,
-			thinkingBudgetTokens,
-			originalDiffEditToolCallMessage,
-		} = input
-
-		const requiredParams = {
-			systemPrompt,
-			messages,
-			modelId,
-			originalFile,
-			originalFilePath,
-			parsingFunction,
-			diffEditFunction,
-		}
-
-		const missingParams = Object.entries(requiredParams)
-			.filter(([, value]) => !value)
-			.map(([key]) => key)
-
-		if (missingParams.length > 0) {
-			return {
-				success: false,
-				error: "missing_required_parameters",
-				errorString: `Missing required parameters: ${missingParams.join(", ")}`,
-			}
-		}
-
-		const parseAssistantMessage = parsingFunctions[parsingFunction]
-		const constructNewFileContent = diffEditingFunctions[diffEditFunction]
-
-		if (!parseAssistantMessage || !constructNewFileContent) {
-			return {
-				success: false,
-				error: "invalid_functions",
-			}
-		}
-
-		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
-		if (originalDiffEditToolCallMessage !== undefined) {
-			// Replay mode: mock the stream result
-			streamResult = {
-				assistantMessage: originalDiffEditToolCallMessage,
-				reasoningMessage: "",
-				usage: { inputTokens: 0, outputTokens: 0, cacheWriteTokens: 0, cacheReadTokens: 0, totalCost: 0 },
-			}
-		} else {
-			// Live mode: existing API call logic
-			try {
-				const openRouterHandler = new OpenRouterHandler(options)
-				streamResult = await processStream(openRouterHandler, systemPrompt, messages)
-			} catch (error: any) {
-				return {
-					success: false,
-					error: "llm_stream_error",
-					errorString: error.message || error.toString(),
-				}
-			}
-		}
-
-		// process the assistant message into its constituent tool calls & text blocks
-		const assistantContentBlocks: AssistantMessageContent[] = parseAssistantMessage(streamResult.assistantMessage)
-
-		const detectedToolCalls: ExtractedToolCall[] = []
-
-		for (const block of assistantContentBlocks) {
-			if (block.type === "tool_use") {
-				detectedToolCalls.push({
-					name: block.name,
-					input: block.params,
-				})
-			}
-		}
-
-		// check if there are any tool calls, if there are none then its a clear error
-		if (detectedToolCalls.length === 0) {
-			return {
-				success: false,
-				streamResult: streamResult,
-				toolCalls: detectedToolCalls,
-				error: "no_tool_calls",
-			}
-		}
-
-		// check that there is exactly one tool call, otherwise an error
-		if (detectedToolCalls.length > 1) {
-			return {
-				success: false,
-				streamResult: streamResult,
-				toolCalls: detectedToolCalls,
-				error: "multi_tool_calls",
-			}
-		}
-
-		// check that the tool call is diff edit tool call
-		if (detectedToolCalls[0].name !== "replace_in_file") {
-			return {
-				success: false,
-				streamResult: streamResult,
-				toolCalls: detectedToolCalls,
-				error: "wrong_tool_call",
-			}
-		}
-
-		const toolCall = detectedToolCalls[0]
-		const diffToolPath = toolCall.input.path
-		const diffToolContent = toolCall.input.diff
-
-		if (!diffToolPath || !diffToolContent) {
-			return {
-				success: false,
-				streamResult: streamResult,
-				toolCalls: detectedToolCalls,
-				error: "tool_call_params_undefined",
-			}
-		}
-
-		// check that we are editing the correct file path
-		if (diffToolPath !== originalFilePath) {
-			return {
-				success: false,
-				streamResult: streamResult,
-				toolCalls: detectedToolCalls,
-				error: "wrong_file_edited",
-			}
-		}
-
-		// checking if the diff edit succeeds, if it failed it will throw an error
-		let diffSuccess = true
-		try {
-			await constructNewFileContent(diffToolContent, originalFile, true)
-		} catch (error: any) {
-			diffSuccess = false
-		}
-
-		return {
-			success: true,
-			streamResult: streamResult,
-			toolCalls: detectedToolCalls,
-			diffEdit: diffToolContent,
-			diffEditSuccess: diffSuccess,
-		}
-	} catch (error: any) {
-		return {
-			success: false,
-			error: "other_error",
-			errorString: error.message || error.toString(),
-		}
-	}
-}

evals/diff_editing/TestRunner.ts

@@ -1,391 +0,0 @@
-import { runSingleEvaluation, TestInput, TestResult } from "./ClineWrapper"
-import { basicSystemPrompt } from "./prompts/basicSystemPrompt-06-06-25"
-import { claude4SystemPrompt } from "./prompts/claude4SystemPrompt-06-06-25"
-import { formatResponse } from "./helpers"
-import { Anthropic } from "@anthropic-ai/sdk"
-import * as fs from "fs"
-import * as path from "path"
-import { Command } from "commander"
-import { InputMessage, ProcessedTestCase, TestCase, TestConfig, SystemPromptDetails, ConstructSystemPromptFn } from "./types"
-
-function log(isVerbose: boolean, message: string) {
-	if (isVerbose) {
-		console.log(message)
-	}
-}
-
-const systemPromptGeneratorLookup: Record<string, ConstructSystemPromptFn> = {
-	basicSystemPrompt: basicSystemPrompt,
-	claude4SystemPrompt: claude4SystemPrompt,
-}
-
-type TestResultSet = { [test_id: string]: (TestResult & { test_id?: string })[] }
-
-class NodeTestRunner {
-	private apiKey: string | undefined
-
-	constructor(isReplay: boolean) {
-		if (!isReplay) {
-			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.")
-			}
-		}
-	}
-
-	/**
-	 * convert our messages array into a properly formatted Anthropic messages array
-	 */
-	transformMessages(messages: InputMessage[]): Anthropic.Messages.MessageParam[] {
-		return messages.map((msg) => {
-			// Use TextBlockParam here for constructing the input message
-			const content: (Anthropic.TextBlockParam | Anthropic.ImageBlockParam)[] = []
-
-			if (msg.text) {
-				// This object now correctly matches the TextBlockParam type
-				content.push({ type: "text", text: msg.text })
-			}
-
-			if (msg.images && Array.isArray(msg.images)) {
-				const imageBlocks = formatResponse.imageBlocks(msg.images)
-				content.push(...imageBlocks)
-			}
-
-			return {
-				role: msg.role,
-				content: content,
-			}
-		})
-	}
-
-	/**
-	 * Generate the system prompt on the fly
-	 */
-	constructSystemPrompt(systemPromptDetails: SystemPromptDetails, systemPromptName: string) {
-		const systemPromptGenerator = systemPromptGeneratorLookup[systemPromptName]
-
-		const { cwd_value, browser_use, width, height, os_value, shell_value, home_value, mcp_string, user_custom_instructions } =
-			systemPromptDetails
-
-		const systemPrompt = systemPromptGenerator(
-			cwd_value,
-			browser_use,
-			width,
-			height,
-			os_value,
-			shell_value,
-			home_value,
-			mcp_string,
-			user_custom_instructions,
-		)
-
-		return systemPrompt
-	}
-
-	/**
-	 * Loads our test cases from a directory of json files
-	 */
-	loadTestCases(testDirectoryPath: string): TestCase[] {
-		const testCasesArray: TestCase[] = []
-		const dirents = fs.readdirSync(testDirectoryPath, { withFileTypes: true })
-
-		for (const dirent of dirents) {
-			if (dirent.isFile() && dirent.name.endsWith(".json")) {
-				const testFilePath = path.join(testDirectoryPath, dirent.name)
-				const fileContent = fs.readFileSync(testFilePath, "utf8")
-				const testCase: TestCase = JSON.parse(fileContent)
-
-				// Use the filename (without extension) as the test_id if not provided
-				if (!testCase.test_id) {
-					testCase.test_id = path.parse(dirent.name).name
-				}
-				testCasesArray.push(testCase)
-			}
-		}
-
-		return testCasesArray
-	}
-
-	/**
-	 * Saves the test results to the specified output directory.
-	 */
-	saveTestResults(results: TestResultSet, outputPath: string) {
-		// Ensure output directory exists
-		if (!fs.existsSync(outputPath)) {
-			fs.mkdirSync(outputPath, { recursive: true })
-		}
-
-		// Write each test result to its own file
-		for (const testId in results) {
-			const outputFilePath = path.join(outputPath, `${testId}.json`)
-			const testResult = results[testId]
-			fs.writeFileSync(outputFilePath, JSON.stringify(testResult, null, 2))
-		}
-	}
-
-	/**
-	 * Run a single test example
-	 */
-	async runSingleTest(testCase: ProcessedTestCase, testConfig: TestConfig): Promise<TestResult> {
-		if (testConfig.replay && !testCase.original_diff_edit_tool_call_message) {
-			return {
-				success: false,
-				error: "missing_original_diff_edit_tool_call_message",
-				errorString: `Test case ${testCase.test_id} is missing 'original_diff_edit_tool_call_message' for replay.`,
-			}
-		}
-
-		const customSystemPrompt = this.constructSystemPrompt(testCase.system_prompt_details, testConfig.system_prompt_name)
-
-		// messages don't include system prompt and are everything up to the first replace_in_file tool call which results in a diff edit error
-		const input: TestInput = {
-			apiKey: this.apiKey,
-			systemPrompt: customSystemPrompt,
-			messages: testCase.messages,
-			modelId: testConfig.model_id,
-			originalFile: testCase.file_contents,
-			originalFilePath: testCase.file_path,
-			parsingFunction: testConfig.parsing_function,
-			diffEditFunction: testConfig.diff_edit_function,
-			thinkingBudgetTokens: testConfig.thinking_tokens_budget,
-			originalDiffEditToolCallMessage: testConfig.replay ? testCase.original_diff_edit_tool_call_message : undefined,
-		}
-
-		return await runSingleEvaluation(input)
-	}
-
-	/**
-	 * Runs all the text examples synchonously
-	 */
-	async runAllTests(testCases: ProcessedTestCase[], testConfig: TestConfig, isVerbose: boolean): Promise<TestResultSet> {
-		const results: TestResultSet = {}
-
-		for (const testCase of testCases) {
-			results[testCase.test_id] = []
-
-			log(isVerbose, `-Running test: ${testCase.test_id}`)
-			for (let i = 0; i < testConfig.number_of_runs; i++) {
-				const result = await this.runSingleTest(testCase, testConfig)
-				results[testCase.test_id].push(result)
-			}
-		}
-		return results
-	}
-
-	/**
-	 * Runs all of the text examples asynchronously, with concurrency limit
-	 */
-	async runAllTestsParallel(
-		testCases: ProcessedTestCase[],
-		testConfig: TestConfig,
-		isVerbose: boolean,
-		maxConcurrency: number = 20,
-	): Promise<TestResultSet> {
-		const results: TestResultSet = {}
-		testCases.forEach((tc) => {
-			results[tc.test_id] = []
-		})
-
-		// Create a flat list of all individual runs we need to execute
-		const allRuns = testCases.flatMap((testCase) =>
-			Array(testConfig.number_of_runs)
-				.fill(null)
-				.map(() => testCase),
-		)
-
-		for (let i = 0; i < allRuns.length; i += maxConcurrency) {
-			const batch = allRuns.slice(i, i + maxConcurrency)
-
-			const batchPromises = batch.map((testCase) =>
-				this.runSingleTest(testCase, testConfig).then((result) => ({
-					...result,
-					test_id: testCase.test_id,
-				})),
-			)
-
-			const batchResults = await Promise.all(batchPromises)
-
-			// Calculate the total cost for this batch
-			const batchCost = batchResults.reduce((total, result) => {
-				return total + (result.streamResult?.usage?.totalCost || 0)
-			}, 0)
-
-			// Populate the results dictionary
-			for (const result of batchResults) {
-				if (result.test_id) {
-					results[result.test_id].push(result)
-				}
-			}
-
-			const batchNumber = i / maxConcurrency + 1
-			const totalBatches = Math.ceil(allRuns.length / maxConcurrency)
-			log(isVerbose, `-Completed batch ${batchNumber} of ${totalBatches}... (Batch Cost: $${batchCost.toFixed(6)})`)
-		}
-
-		return results
-	}
-
-	/**
-	 * Print output of the tests
-	 */
-	printSummary(results: TestResultSet, isVerbose: boolean) {
-		let totalRuns = 0
-		let totalPasses = 0
-		let totalInputTokens = 0
-		let totalOutputTokens = 0
-		let totalCost = 0
-		let runsWithUsageData = 0
-		let totalDiffEditSuccesses = 0
-		let totalRunsWithToolCalls = 0
-		const testCaseIds = Object.keys(results)
-
-		log(isVerbose, "\n=== TEST SUMMARY ===")
-
-		for (const testId of testCaseIds) {
-			const testResults = results[testId]
-			const passedCount = testResults.filter((r) => r.success && r.diffEditSuccess).length
-			const runCount = testResults.length
-
-			totalRuns += runCount
-			totalPasses += passedCount
-
-			const runsWithToolCalls = testResults.filter((r) => r.success === true).length
-			const diffEditSuccesses = passedCount
-			totalRunsWithToolCalls += runsWithToolCalls
-			totalDiffEditSuccesses += diffEditSuccesses
-
-			// Accumulate token and cost data
-			for (const result of testResults) {
-				if (result.streamResult?.usage) {
-					totalInputTokens += result.streamResult.usage.inputTokens
-					totalOutputTokens += result.streamResult.usage.outputTokens
-					totalCost += result.streamResult.usage.totalCost
-					runsWithUsageData++
-				}
-			}
-
-			log(isVerbose, `\n--- Test Case: ${testId} ---`)
-			log(isVerbose, `  Runs: ${runCount}`)
-			log(isVerbose, `  Passed: ${passedCount}`)
-			log(isVerbose, `  Success Rate: ${runCount > 0 ? ((passedCount / runCount) * 100).toFixed(1) : "N/A"}%`)
-		}
-
-		log(isVerbose, "\n\n=== OVERALL SUMMARY ===")
-		log(isVerbose, `Total Test Cases: ${testCaseIds.length}`)
-		log(isVerbose, `Total Runs Executed: ${totalRuns}`)
-		log(isVerbose, `Overall Passed: ${totalPasses}`)
-		log(isVerbose, `Overall Failed: ${totalRuns - totalPasses}`)
-		log(isVerbose, `Overall Success Rate: ${totalRuns > 0 ? ((totalPasses / totalRuns) * 100).toFixed(1) : "N/A"}%`)
-
-		log(isVerbose, "\n\n=== OVERALL DIFF EDIT SUCCESS RATE ===")
-		if (totalRunsWithToolCalls > 0) {
-			const diffSuccessRate = (totalDiffEditSuccesses / totalRunsWithToolCalls) * 100
-			log(isVerbose, `Total Runs with Successful Tool Calls: ${totalRunsWithToolCalls}`)
-			log(isVerbose, `Total Runs with Successful Diff Edits: ${totalDiffEditSuccesses}`)
-			log(isVerbose, `Diff Edit Success Rate: ${diffSuccessRate.toFixed(1)}%`)
-		} else {
-			log(isVerbose, "No successful tool calls to analyze for diff edit success.")
-		}
-
-		log(isVerbose, "\n\n=== TOKEN & COST ANALYSIS ===")
-		if (runsWithUsageData > 0) {
-			log(isVerbose, `Total Input Tokens: ${totalInputTokens.toLocaleString()}`)
-			log(isVerbose, `Total Output Tokens: ${totalOutputTokens.toLocaleString()}`)
-			log(isVerbose, `Total Cost: $${totalCost.toFixed(6)}`)
-			log(isVerbose, "---")
-			log(
-				isVerbose,
-				`Avg Input Tokens / Run: ${(totalInputTokens / runsWithUsageData).toLocaleString(undefined, {
-					maximumFractionDigits: 0,
-				})}`,
-			)
-			log(
-				isVerbose,
-				`Avg Output Tokens / Run: ${(totalOutputTokens / runsWithUsageData).toLocaleString(undefined, {
-					maximumFractionDigits: 0,
-				})}`,
-			)
-			log(isVerbose, `Avg Cost / Run: $${(totalCost / runsWithUsageData).toFixed(6)}`)
-		} else {
-			log(isVerbose, "No usage data available to analyze.")
-		}
-	}
-}
-
-async function main() {
-	const program = new Command()
-
-	const defaultTestPath = path.join(__dirname, "test_cases")
-	const defaultOutputPath = path.join(__dirname, "test_outputs")
-
-	program
-		.name("TestRunner")
-		.description("Run evaluation tests for diff editing")
-		.version("1.0.0")
-		.option("--test-path <path>", "Path to the directory containing test case JSON files", defaultTestPath)
-		.option("--output-path <path>", "Path to the directory to save the test output JSON files", defaultOutputPath)
-		.option("--model-id <model_id>", "The model ID to use for the test")
-		.option("--system-prompt-name <name>", "The name of the system prompt to use", "basicSystemPrompt")
-		.option("-n, --number-of-runs <number>", "Number of times to run each test case", "1")
-		.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("--parallel", "Run tests in parallel", false)
-		.option("--replay", "Run evaluation from a pre-recorded LLM output, skipping the API call", false)
-		.option("-v, --verbose", "Enable verbose logging", false)
-
-	program.parse(process.argv)
-
-	const options = program.opts()
-	const isVerbose = options.verbose
-	const testPath = options.testPath
-	const outputPath = options.outputPath
-
-	const testConfig: TestConfig = {
-		model_id: options.modelId,
-		system_prompt_name: options.systemPromptName,
-		number_of_runs: parseInt(options.numberOfRuns, 10),
-		parsing_function: options.parsingFunction,
-		diff_edit_function: options.diffEditFunction,
-		thinking_tokens_budget: parseInt(options.thinkingBudget, 10),
-		replay: options.replay,
-	}
-
-	try {
-		const startTime = Date.now()
-
-		const runner = new NodeTestRunner(testConfig.replay)
-		const testCases = runner.loadTestCases(testPath)
-
-		const processedTestCases: ProcessedTestCase[] = testCases.map((tc) => ({
-			...tc,
-			messages: runner.transformMessages(tc.messages),
-		}))
-
-		log(isVerbose, `-Loaded ${testCases.length} test cases.`)
-		log(isVerbose, `-Executing ${testConfig.number_of_runs} run(s) per test case.`)
-		if (testConfig.replay) {
-			log(isVerbose, `-Running in REPLAY mode. No API calls will be made.`)
-		}
-		log(isVerbose, "Starting tests...\n")
-
-		const results = options.parallel
-			? await runner.runAllTestsParallel(processedTestCases, testConfig, isVerbose)
-			: await runner.runAllTests(processedTestCases, testConfig, isVerbose)
-
-		runner.printSummary(results, isVerbose)
-
-		const endTime = Date.now()
-		const durationSeconds = ((endTime - startTime) / 1000).toFixed(2)
-		log(isVerbose, `\n-Total execution time: ${durationSeconds} seconds`)
-
-		runner.saveTestResults(results, outputPath)
-	} catch (error) {
-		console.error("\nError running tests:", error)
-		process.exit(1)
-	}
-}
-
-if (require.main === module) {
-	main()
-}

evals/diff_editing/diff-apply/diff-06-06-25.ts

@@ -1,729 +0,0 @@
-const SEARCH_BLOCK_START = "------- SEARCH"
-const SEARCH_BLOCK_END = "======="
-const REPLACE_BLOCK_END = "+++++++ REPLACE"
-
-const SEARCH_BLOCK_CHAR = "-"
-const REPLACE_BLOCK_CHAR = "+"
-
-/**
- * Attempts a line-trimmed fallback match for the given search content in the original content.
- * It tries to match `searchContent` lines against a block of lines in `originalContent` starting
- * from `lastProcessedIndex`. Lines are matched by trimming leading/trailing whitespace and ensuring
- * they are identical afterwards.
- *
- * Returns [matchIndexStart, matchIndexEnd] if found, or false if not found.
- */
-function lineTrimmedFallbackMatch(originalContent: string, searchContent: string, startIndex: number): [number, number] | false {
-	// Split both contents into lines
-	const originalLines = originalContent.split("\n")
-	const searchLines = searchContent.split("\n")
-
-	// Trim trailing empty line if exists (from the trailing \n in searchContent)
-	if (searchLines[searchLines.length - 1] === "") {
-		searchLines.pop()
-	}
-
-	// Find the line number where startIndex falls
-	let startLineNum = 0
-	let currentIndex = 0
-	while (currentIndex < startIndex && startLineNum < originalLines.length) {
-		currentIndex += originalLines[startLineNum].length + 1 // +1 for \n
-		startLineNum++
-	}
-
-	// For each possible starting position in original content
-	for (let i = startLineNum; i <= originalLines.length - searchLines.length; i++) {
-		let matches = true
-
-		// Try to match all search lines from this position
-		for (let j = 0; j < searchLines.length; j++) {
-			const originalTrimmed = originalLines[i + j].trim()
-			const searchTrimmed = searchLines[j].trim()
-
-			if (originalTrimmed !== searchTrimmed) {
-				matches = false
-				break
-			}
-		}
-
-		// If we found a match, calculate the exact character positions
-		if (matches) {
-			// Find start character index
-			let matchStartIndex = 0
-			for (let k = 0; k < i; k++) {
-				matchStartIndex += originalLines[k].length + 1 // +1 for \n
-			}
-
-			// Find end character index
-			let matchEndIndex = matchStartIndex
-			for (let k = 0; k < searchLines.length; k++) {
-				matchEndIndex += originalLines[i + k].length + 1 // +1 for \n
-			}
-
-			return [matchStartIndex, matchEndIndex]
-		}
-	}
-
-	return false
-}
-
-/**
- * Attempts to match blocks of code by using the first and last lines as anchors.
- * This is a third-tier fallback strategy that helps match blocks where we can identify
- * the correct location by matching the beginning and end, even if the exact content
- * differs slightly.
- *
- * The matching strategy:
- * 1. Only attempts to match blocks of 3 or more lines to avoid false positives
- * 2. Extracts from the search content:
- *    - First line as the "start anchor"
- *    - Last line as the "end anchor"
- * 3. For each position in the original content:
- *    - Checks if the next line matches the start anchor
- *    - If it does, jumps ahead by the search block size
- *    - Checks if that line matches the end anchor
- *    - All comparisons are done after trimming whitespace
- *
- * This approach is particularly useful for matching blocks of code where:
- * - The exact content might have minor differences
- * - The beginning and end of the block are distinctive enough to serve as anchors
- * - The overall structure (number of lines) remains the same
- *
- * @param originalContent - The full content of the original file
- * @param searchContent - The content we're trying to find in the original file
- * @param startIndex - The character index in originalContent where to start searching
- * @returns A tuple of [startIndex, endIndex] if a match is found, false otherwise
- */
-function blockAnchorFallbackMatch(originalContent: string, searchContent: string, startIndex: number): [number, number] | false {
-	const originalLines = originalContent.split("\n")
-	const searchLines = searchContent.split("\n")
-
-	// Only use this approach for blocks of 3+ lines
-	if (searchLines.length < 3) {
-		return false
-	}
-
-	// Trim trailing empty line if exists
-	if (searchLines[searchLines.length - 1] === "") {
-		searchLines.pop()
-	}
-
-	const firstLineSearch = searchLines[0].trim()
-	const lastLineSearch = searchLines[searchLines.length - 1].trim()
-	const searchBlockSize = searchLines.length
-
-	// Find the line number where startIndex falls
-	let startLineNum = 0
-	let currentIndex = 0
-	while (currentIndex < startIndex && startLineNum < originalLines.length) {
-		currentIndex += originalLines[startLineNum].length + 1
-		startLineNum++
-	}
-
-	// Look for matching start and end anchors
-	for (let i = startLineNum; i <= originalLines.length - searchBlockSize; i++) {
-		// Check if first line matches
-		if (originalLines[i].trim() !== firstLineSearch) {
-			continue
-		}
-
-		// Check if last line matches at the expected position
-		if (originalLines[i + searchBlockSize - 1].trim() !== lastLineSearch) {
-			continue
-		}
-
-		// Calculate exact character positions
-		let matchStartIndex = 0
-		for (let k = 0; k < i; k++) {
-			matchStartIndex += originalLines[k].length + 1
-		}
-
-		let matchEndIndex = matchStartIndex
-		for (let k = 0; k < searchBlockSize; k++) {
-			matchEndIndex += originalLines[i + k].length + 1
-		}
-
-		return [matchStartIndex, matchEndIndex]
-	}
-
-	return false
-}
-
-/**
- * This function reconstructs the file content by applying a streamed diff (in a
- * specialized SEARCH/REPLACE block format) to the original file content. It is designed
- * to handle both incremental updates and the final resulting file after all chunks have
- * been processed.
- *
- * The diff format is a custom structure that uses three markers to define changes:
- *
- *   ------- SEARCH
- *   [Exact content to find in the original file]
- *   =======
- *   [Content to replace with]
- *   +++++++ REPLACE
- *
- * Behavior and Assumptions:
- * 1. The file is processed chunk-by-chunk. Each chunk of `diffContent` may contain
- *    partial or complete SEARCH/REPLACE blocks. By calling this function with each
- *    incremental chunk (with `isFinal` indicating the last chunk), the final reconstructed
- *    file content is produced.
- *
- * 2. Matching Strategy (in order of attempt):
- *    a. Exact Match: First attempts to find the exact SEARCH block text in the original file
- *    b. Line-Trimmed Match: Falls back to line-by-line comparison ignoring leading/trailing whitespace
- *    c. Block Anchor Match: For blocks of 3+ lines, tries to match using first/last lines as anchors
- *    If all matching strategies fail, an error is thrown.
- *
- * 3. Empty SEARCH Section:
- *    - If SEARCH is empty and the original file is empty, this indicates creating a new file
- *      (pure insertion).
- *    - If SEARCH is empty and the original file is not empty, this indicates a complete
- *      file replacement (the entire original content is considered matched and replaced).
- *
- * 4. Applying Changes:
- *    - Before encountering the "=======" marker, lines are accumulated as search content.
- *    - After "=======" and before ">>>>>>> REPLACE", lines are accumulated as replacement content.
- *    - Once the block is complete (">>>>>>> REPLACE"), the matched section in the original
- *      file is replaced with the accumulated replacement lines, and the position in the original
- *      file is advanced.
- *
- * 5. Incremental Output:
- *    - As soon as the match location is found and we are in the REPLACE section, each new
- *      replacement line is appended to the result so that partial updates can be viewed
- *      incrementally.
- *
- * 6. Partial Markers:
- *    - If the final line of the chunk looks like it might be part of a marker but is not one
- *      of the known markers, it is removed. This prevents incomplete or partial markers
- *      from corrupting the output.
- *
- * 7. Finalization:
- *    - Once all chunks have been processed (when `isFinal` is true), any remaining original
- *      content after the last replaced section is appended to the result.
- *    - Trailing newlines are not forcibly added. The code tries to output exactly what is specified.
- *
- * Errors:
- * - If the search block cannot be matched using any of the available matching strategies,
- *   an error is thrown.
- */
-export async function constructNewFileContent(
-	diffContent: string,
-	originalContent: string,
-	isFinal: boolean,
-	version: "v1" | "v2" = "v1",
-): Promise<string> {
-	const constructor = constructNewFileContentVersionMapping[version]
-	if (!constructor) {
-		throw new Error(`Invalid version '${version}' for file content constructor`)
-	}
-	return constructor(diffContent, originalContent, isFinal)
-}
-
-const constructNewFileContentVersionMapping: Record<
-	string,
-	(diffContent: string, originalContent: string, isFinal: boolean) => Promise<string>
-> = {
-	v1: constructNewFileContentV1,
-	v2: constructNewFileContentV2,
-} as const
-
-/**
- * @deprecated
- */
-async function constructNewFileContentV1(diffContent: string, originalContent: string, isFinal: boolean): Promise<string> {
-	let result = ""
-	let lastProcessedIndex = 0
-
-	let currentSearchContent = ""
-	let currentReplaceContent = ""
-	let inSearch = false
-	let inReplace = false
-
-	let searchMatchIndex = -1
-	let searchEndIndex = -1
-
-	let lines = diffContent.split("\n")
-
-	// If the last line looks like a partial marker but isn't recognized,
-	// remove it because it might be incomplete.
-	const lastLine = lines[lines.length - 1]
-	if (
-		lines.length > 0 &&
-		(lastLine.startsWith(SEARCH_BLOCK_CHAR) || lastLine.startsWith("=") || lastLine.startsWith(REPLACE_BLOCK_CHAR)) &&
-		lastLine !== SEARCH_BLOCK_START &&
-		lastLine !== SEARCH_BLOCK_END &&
-		lastLine !== REPLACE_BLOCK_END
-	) {
-		lines.pop()
-	}
-
-	for (const line of lines) {
-		if (line === SEARCH_BLOCK_START) {
-			inSearch = true
-			currentSearchContent = ""
-			currentReplaceContent = ""
-			continue
-		}
-
-		if (line === SEARCH_BLOCK_END) {
-			inSearch = false
-			inReplace = true
-
-			// Remove trailing linebreak for adding the === marker
-			// if (currentSearchContent.endsWith("\r\n")) {
-			// 	currentSearchContent = currentSearchContent.slice(0, -2)
-			// } else if (currentSearchContent.endsWith("\n")) {
-			// 	currentSearchContent = currentSearchContent.slice(0, -1)
-			// }
-
-			if (!currentSearchContent) {
-				// Empty search block
-				if (originalContent.length === 0) {
-					// New file scenario: nothing to match, just start inserting
-					searchMatchIndex = 0
-					searchEndIndex = 0
-				} else {
-					// Complete file replacement scenario: treat the entire file as matched
-					searchMatchIndex = 0
-					searchEndIndex = originalContent.length
-				}
-			} else {
-				// Add check for inefficient full-file search
-				// if (currentSearchContent.trim() === originalContent.trim()) {
-				// 	throw new Error(
-				// 		"The SEARCH block contains the entire file content. Please either:\n" +
-				// 			"1. Use an empty SEARCH block to replace the entire file, or\n" +
-				// 			"2. Make focused changes to specific parts of the file that need modification.",
-				// 	)
-				// }
-
-				// Exact search match scenario
-				const exactIndex = originalContent.indexOf(currentSearchContent, lastProcessedIndex)
-				if (exactIndex !== -1) {
-					searchMatchIndex = exactIndex
-					searchEndIndex = exactIndex + currentSearchContent.length
-				} else {
-					// Attempt fallback line-trimmed matching
-					const lineMatch = lineTrimmedFallbackMatch(originalContent, currentSearchContent, lastProcessedIndex)
-					if (lineMatch) {
-						;[searchMatchIndex, searchEndIndex] = lineMatch
-					} else {
-						// Try block anchor fallback for larger blocks
-						const blockMatch = blockAnchorFallbackMatch(originalContent, currentSearchContent, lastProcessedIndex)
-						if (blockMatch) {
-							;[searchMatchIndex, searchEndIndex] = blockMatch
-						} else {
-							throw new Error(
-								`The SEARCH block:\n${currentSearchContent.trimEnd()}\n...does not match anything in the file or was searched out of order in the provided blocks.`,
-							)
-						}
-					}
-				}
-			}
-
-			// Output everything up to the match location
-			result += originalContent.slice(lastProcessedIndex, searchMatchIndex)
-			continue
-		}
-
-		if (line === REPLACE_BLOCK_END) {
-			// Finished one replace block
-
-			// // Remove the artificially added linebreak in the last line of the REPLACE block
-			// if (result.endsWith("\r\n")) {
-			// 	result = result.slice(0, -2)
-			// } else if (result.endsWith("\n")) {
-			// 	result = result.slice(0, -1)
-			// }
-
-			// Advance lastProcessedIndex to after the matched section
-			lastProcessedIndex = searchEndIndex
-
-			// Reset for next block
-			inSearch = false
-			inReplace = false
-			currentSearchContent = ""
-			currentReplaceContent = ""
-			searchMatchIndex = -1
-			searchEndIndex = -1
-			continue
-		}
-
-		// Accumulate content for search or replace
-		// (currentReplaceContent is not being used for anything right now since we directly append to result.)
-		// (We artificially add a linebreak since we split on \n at the beginning. In order to not include a trailing linebreak in the final search/result blocks we need to remove it before using them. This allows for partial line matches to be correctly identified.)
-		// NOTE: search/replace blocks must be arranged in the order they appear in the file due to how we build the content using lastProcessedIndex. We also cannot strip the trailing newline since for non-partial lines it would remove the linebreak from the original content. (If we remove end linebreak from search, then we'd also have to remove it from replace but we can't know if it's a partial line or not since the model may be using the line break to indicate the end of the block rather than as part of the search content.) We require the model to output full lines in order for our fallbacks to work as well.
-		if (inSearch) {
-			currentSearchContent += line + "\n"
-		} else if (inReplace) {
-			currentReplaceContent += line + "\n"
-			// Output replacement lines immediately if we know the insertion point
-			if (searchMatchIndex !== -1) {
-				result += line + "\n"
-			}
-		}
-	}
-
-	// If this is the final chunk, append any remaining original content
-	if (isFinal && lastProcessedIndex < originalContent.length) {
-		result += originalContent.slice(lastProcessedIndex)
-	}
-
-	return result
-}
-
-enum ProcessingState {
-	Idle = 0,
-	StateSearch = 1 << 0,
-	StateReplace = 1 << 1,
-}
-
-class NewFileContentConstructor {
-	private originalContent: string
-	private isFinal: boolean
-	private state: number
-	private pendingNonStandardLines: string[]
-	private result: string
-	private lastProcessedIndex: number
-	private currentSearchContent: string
-	private currentReplaceContent: string
-	private searchMatchIndex: number
-	private searchEndIndex: number
-
-	constructor(originalContent: string, isFinal: boolean) {
-		this.originalContent = originalContent
-		this.isFinal = isFinal
-		this.pendingNonStandardLines = []
-		this.result = ""
-		this.lastProcessedIndex = 0
-		this.state = ProcessingState.Idle
-		this.currentSearchContent = ""
-		this.currentReplaceContent = ""
-		this.searchMatchIndex = -1
-		this.searchEndIndex = -1
-	}
-
-	private resetForNextBlock() {
-		// Reset for next block
-		this.state = ProcessingState.Idle
-		this.currentSearchContent = ""
-		this.currentReplaceContent = ""
-		this.searchMatchIndex = -1
-		this.searchEndIndex = -1
-	}
-
-	private findLastMatchingLineIndex(regx: RegExp, lineLimit: number) {
-		for (let i = lineLimit; i > 0; ) {
-			i--
-			if (this.pendingNonStandardLines[i].match(regx)) {
-				return i
-			}
-		}
-		return -1
-	}
-
-	private updateProcessingState(newState: ProcessingState) {
-		const isValidTransition =
-			(this.state === ProcessingState.Idle && newState === ProcessingState.StateSearch) ||
-			(this.state === ProcessingState.StateSearch && newState === ProcessingState.StateReplace)
-
-		if (!isValidTransition) {
-			throw new Error(
-				`Invalid state transition.\n` +
-					"Valid transitions are:\n" +
-					"- Idle → StateSearch\n" +
-					"- StateSearch → StateReplace",
-			)
-		}
-
-		this.state |= newState
-	}
-
-	private isStateActive(state: ProcessingState): boolean {
-		return (this.state & state) === state
-	}
-
-	private activateReplaceState() {
-		this.updateProcessingState(ProcessingState.StateReplace)
-	}
-
-	private activateSearchState() {
-		this.updateProcessingState(ProcessingState.StateSearch)
-		this.currentSearchContent = ""
-		this.currentReplaceContent = ""
-	}
-
-	private isSearchingActive(): boolean {
-		return this.isStateActive(ProcessingState.StateSearch)
-	}
-
-	private isReplacingActive(): boolean {
-		return this.isStateActive(ProcessingState.StateReplace)
-	}
-
-	private hasPendingNonStandardLines(pendingNonStandardLineLimit: number): boolean {
-		return this.pendingNonStandardLines.length - pendingNonStandardLineLimit < this.pendingNonStandardLines.length
-	}
-
-	public processLine(line: string) {
-		this.internalProcessLine(line, true, this.pendingNonStandardLines.length)
-	}
-
-	public getResult() {
-		// If this is the final chunk, append any remaining original content
-		if (this.isFinal && this.lastProcessedIndex < this.originalContent.length) {
-			this.result += this.originalContent.slice(this.lastProcessedIndex)
-		}
-		if (this.isFinal && this.state !== ProcessingState.Idle) {
-			throw new Error("File processing incomplete - SEARCH/REPLACE operations still active during finalization")
-		}
-		return this.result
-	}
-
-	private internalProcessLine(
-		line: string,
-		canWritependingNonStandardLines: boolean,
-		pendingNonStandardLineLimit: number,
-	): number {
-		let removeLineCount = 0
-		if (line === SEARCH_BLOCK_START) {
-			removeLineCount = this.trimPendingNonStandardTrailingEmptyLines(pendingNonStandardLineLimit)
-			if (removeLineCount > 0) {
-				pendingNonStandardLineLimit = pendingNonStandardLineLimit - removeLineCount
-			}
-			if (this.hasPendingNonStandardLines(pendingNonStandardLineLimit)) {
-				this.tryFixSearchReplaceBlock(pendingNonStandardLineLimit)
-				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
-			}
-			this.activateSearchState()
-		} else if (line === SEARCH_BLOCK_END) {
-			// 校验非标内容
-			if (!this.isSearchingActive()) {
-				this.tryFixSearchBlock(pendingNonStandardLineLimit)
-				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
-			}
-			this.activateReplaceState()
-			this.beforeReplace()
-		} else if (line === REPLACE_BLOCK_END) {
-			if (!this.isReplacingActive()) {
-				this.tryFixReplaceBlock(pendingNonStandardLineLimit)
-				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
-			}
-			this.lastProcessedIndex = this.searchEndIndex
-			this.resetForNextBlock()
-		} else {
-			// Accumulate content for search or replace
-			// (currentReplaceContent is not being used for anything right now since we directly append to result.)
-			// (We artificially add a linebreak since we split on \n at the beginning. In order to not include a trailing linebreak in the final search/result blocks we need to remove it before using them. This allows for partial line matches to be correctly identified.)
-			// NOTE: search/replace blocks must be arranged in the order they appear in the file due to how we build the content using lastProcessedIndex. We also cannot strip the trailing newline since for non-partial lines it would remove the linebreak from the original content. (If we remove end linebreak from search, then we'd also have to remove it from replace but we can't know if it's a partial line or not since the model may be using the line break to indicate the end of the block rather than as part of the search content.) We require the model to output full lines in order for our fallbacks to work as well.
-			if (this.isReplacingActive()) {
-				this.currentReplaceContent += line + "\n"
-				// Output replacement lines immediately if we know the insertion point
-				if (this.searchMatchIndex !== -1) {
-					this.result += line + "\n"
-				}
-			} else if (this.isSearchingActive()) {
-				this.currentSearchContent += line + "\n"
-			} else {
-				let appendToPendingNonStandardLines = canWritependingNonStandardLines
-				if (appendToPendingNonStandardLines) {
-					// 处理非标内容
-					this.pendingNonStandardLines.push(line)
-				}
-			}
-		}
-		return removeLineCount
-	}
-
-	private beforeReplace() {
-		// Remove trailing linebreak for adding the === marker
-		// if (currentSearchContent.endsWith("\r\n")) {
-		// 	currentSearchContent = currentSearchContent.slice(0, -2)
-		// } else if (currentSearchContent.endsWith("\n")) {
-		// 	currentSearchContent = currentSearchContent.slice(0, -1)
-		// }
-
-		if (!this.currentSearchContent) {
-			// Empty search block
-			if (this.originalContent.length === 0) {
-				// New file scenario: nothing to match, just start inserting
-				this.searchMatchIndex = 0
-				this.searchEndIndex = 0
-			} else {
-				// Complete file replacement scenario: treat the entire file as matched
-				this.searchMatchIndex = 0
-				this.searchEndIndex = this.originalContent.length
-			}
-		} else {
-			// Add check for inefficient full-file search
-			// if (currentSearchContent.trim() === originalContent.trim()) {
-			// 	throw new Error(
-			// 		"The SEARCH block contains the entire file content. Please either:\n" +
-			// 			"1. Use an empty SEARCH block to replace the entire file, or\n" +
-			// 			"2. Make focused changes to specific parts of the file that need modification.",
-			// 	)
-			// }
-			// Exact search match scenario
-			const exactIndex = this.originalContent.indexOf(this.currentSearchContent, this.lastProcessedIndex)
-			if (exactIndex !== -1) {
-				this.searchMatchIndex = exactIndex
-				this.searchEndIndex = exactIndex + this.currentSearchContent.length
-			} else {
-				// Attempt fallback line-trimmed matching
-				const lineMatch = lineTrimmedFallbackMatch(
-					this.originalContent,
-					this.currentSearchContent,
-					this.lastProcessedIndex,
-				)
-				if (lineMatch) {
-					;[this.searchMatchIndex, this.searchEndIndex] = lineMatch
-				} else {
-					// Try block anchor fallback for larger blocks
-					const blockMatch = blockAnchorFallbackMatch(
-						this.originalContent,
-						this.currentSearchContent,
-						this.lastProcessedIndex,
-					)
-					if (blockMatch) {
-						;[this.searchMatchIndex, this.searchEndIndex] = blockMatch
-					} else {
-						throw new Error(
-							`The SEARCH block:\n${this.currentSearchContent.trimEnd()}\n...does not match anything in the file.`,
-						)
-					}
-				}
-			}
-		}
-		if (this.searchMatchIndex < this.lastProcessedIndex) {
-			throw new Error(
-				`The SEARCH block:\n${this.currentSearchContent.trimEnd()}\n...matched an incorrect content in the file.`,
-			)
-		}
-		// Output everything up to the match location
-		this.result += this.originalContent.slice(this.lastProcessedIndex, this.searchMatchIndex)
-	}
-
-	private tryFixSearchBlock(lineLimit: number): number {
-		let removeLineCount = 0
-		if (lineLimit < 0) {
-			lineLimit = this.pendingNonStandardLines.length
-		}
-		if (!lineLimit) {
-			throw new Error("Invalid SEARCH/REPLACE block structure - no lines available to process")
-		}
-		let searchTagRegexp = /^[-]{3,} SEARCH$/
-		const searchTagIndex = this.findLastMatchingLineIndex(searchTagRegexp, lineLimit)
-		if (searchTagIndex !== -1) {
-			let fixLines = this.pendingNonStandardLines.slice(searchTagIndex, lineLimit)
-			fixLines[0] = SEARCH_BLOCK_START
-			for (const line of fixLines) {
-				removeLineCount += this.internalProcessLine(line, false, searchTagIndex)
-			}
-		} else {
-			throw new Error(
-				`Invalid REPLACE marker detected - could not find matching SEARCH block starting from line ${searchTagIndex + 1}`,
-			)
-		}
-		return removeLineCount
-	}
-
-	private tryFixReplaceBlock(lineLimit: number): number {
-		let removeLineCount = 0
-		if (lineLimit < 0) {
-			lineLimit = this.pendingNonStandardLines.length
-		}
-		if (!lineLimit) {
-			throw new Error()
-		}
-		let replaceBeginTagRegexp = /^[=]{3,}$/
-		const replaceBeginTagIndex = this.findLastMatchingLineIndex(replaceBeginTagRegexp, lineLimit)
-		if (replaceBeginTagIndex !== -1) {
-			// // 校验非标内容
-			// if (!this.isSearchingActive()) {
-			// 	removeLineCount += this.tryFixSearchBlock(replaceBeginTagIndex)
-			// }
-			let fixLines = this.pendingNonStandardLines.slice(replaceBeginTagIndex - removeLineCount, lineLimit - removeLineCount)
-			fixLines[0] = SEARCH_BLOCK_END
-			for (const line of fixLines) {
-				removeLineCount += this.internalProcessLine(line, false, replaceBeginTagIndex - removeLineCount)
-			}
-		} else {
-			throw new Error(`Malformed REPLACE block - missing valid separator after line ${replaceBeginTagIndex + 1}`)
-		}
-		return removeLineCount
-	}
-
-	private tryFixSearchReplaceBlock(lineLimit: number): number {
-		let removeLineCount = 0
-		if (lineLimit < 0) {
-			lineLimit = this.pendingNonStandardLines.length
-		}
-		if (!lineLimit) {
-			throw new Error()
-		}
-
-		let replaceEndTagRegexp = /^[+]{3,} REPLACE$/
-		const replaceEndTagIndex = this.findLastMatchingLineIndex(replaceEndTagRegexp, lineLimit)
-		const likeReplaceEndTag = replaceEndTagIndex === lineLimit - 1
-		if (likeReplaceEndTag) {
-			// // 校验非标内容
-			// if (!this.isReplacingActive()) {
-			// 	removeLineCount += this.tryFixReplaceBlock(replaceEndTagIndex)
-			// }
-			let fixLines = this.pendingNonStandardLines.slice(replaceEndTagIndex - removeLineCount, lineLimit - removeLineCount)
-			fixLines[fixLines.length - 1] = REPLACE_BLOCK_END
-			for (const line of fixLines) {
-				removeLineCount += this.internalProcessLine(line, false, replaceEndTagIndex - removeLineCount)
-			}
-		} else {
-			throw new Error("Malformed SEARCH/REPLACE block structure: Missing valid closing REPLACE marker")
-		}
-		return removeLineCount
-	}
-
-	/**
-	 * Removes trailing empty lines from the pendingNonStandardLines array
-	 * @param lineLimit - The index to start checking from (exclusive).
-	 *                    Removes empty lines from lineLimit-1 backwards.
-	 * @returns The number of empty lines removed
-	 */
-	private trimPendingNonStandardTrailingEmptyLines(lineLimit: number): number {
-		let removedCount = 0
-		let i = Math.min(lineLimit, this.pendingNonStandardLines.length) - 1
-
-		while (i >= 0 && this.pendingNonStandardLines[i].trim() === "") {
-			this.pendingNonStandardLines.pop()
-			removedCount++
-			i--
-		}
-
-		return removedCount
-	}
-}
-
-export async function constructNewFileContentV2(diffContent: string, originalContent: string, isFinal: boolean): Promise<string> {
-	let newFileContentConstructor = new NewFileContentConstructor(originalContent, isFinal)
-
-	let lines = diffContent.split("\n")
-
-	// If the last line looks like a partial marker but isn't recognized,
-	// remove it because it might be incomplete.
-	const lastLine = lines[lines.length - 1]
-	if (
-		lines.length > 0 &&
-		(lastLine.startsWith(SEARCH_BLOCK_CHAR) || lastLine.startsWith("=") || lastLine.startsWith(REPLACE_BLOCK_CHAR)) &&
-		lastLine !== SEARCH_BLOCK_START &&
-		lastLine !== SEARCH_BLOCK_END &&
-		lastLine !== REPLACE_BLOCK_END
-	) {
-		lines.pop()
-	}
-
-	for (const line of lines) {
-		newFileContentConstructor.processLine(line)
-	}
-
-	let result = newFileContentConstructor.getResult()
-	return result
-}

evals/diff_editing/helpers.ts

@@ -1,25 +0,0 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-
-const formatImagesIntoBlocks = (images?: string[]): Anthropic.ImageBlockParam[] => {
-	return images
-		? images.map((dataUrl) => {
-				// data:image/png;base64,base64string
-				const [rest, base64] = dataUrl.split(",")
-				const mimeType = rest.split(":")[1].split(";")[0]
-				return {
-					type: "image",
-					source: {
-						type: "base64",
-						media_type: mimeType,
-						data: base64,
-					},
-				} as Anthropic.ImageBlockParam
-			})
-		: []
-}
-
-export const formatResponse = {
-	imageBlocks: (images?: string[]): Anthropic.ImageBlockParam[] => {
-		return formatImagesIntoBlocks(images)
-	},
-}

evals/diff_editing/prompts/basicSystemPrompt-06-06-25.ts

@@ -1,615 +0,0 @@
-/**
- * Use all standard prompt values to construct prompt
- */
-export const basicSystemPrompt = (
-	cwdFormatted: string,
-	supportsBrowserUse: boolean,
-	browserWidth: number,
-	browserHeight: number,
-	os: string,
-	shell: string,
-	homeFormatted: string,
-	mcpHubString: string,
-	userCustomInstructions: string,
-) => {
-	return `You are Cline, a highly skilled software engineer with extensive knowledge in many programming languages, frameworks, design patterns, and best practices.
-
-====
-
-TOOL USE
-
-You have access to a set of tools that are executed upon the user's approval. You can use one tool per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
-
-# Tool Use Formatting
-
-Tool use is formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. Here's the structure:
-
-<tool_name>
-<parameter1_name>value1</parameter1_name>
-<parameter2_name>value2</parameter2_name>
-...
-</tool_name>
-
-For example:
-
-<read_file>
-<path>src/main.js</path>
-</read_file>
-
-Always adhere to this format for the tool use to ensure proper parsing and execution.
-
-# Tools
-
-## execute_command
-Description: Request to execute a CLI command on the system. Use this when you need to perform system operations or run specific commands to accomplish any step in the user's task. You must tailor your command to the user's system and provide a clear explanation of what the command does. For command chaining, use the appropriate chaining syntax for the user's shell. Prefer to execute complex CLI commands over creating executable scripts, as they are more flexible and easier to run. Commands will be executed in the current working directory: ${cwdFormatted}
-Parameters:
-- command: (required) The CLI command to execute. This should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
-- requires_approval: (required) A boolean indicating whether this command requires explicit user approval before execution in case the user has auto-approve mode enabled. Set to 'true' for potentially impactful operations like installing/uninstalling packages, deleting/overwriting files, system configuration changes, network operations, or any commands that could have unintended side effects. Set to 'false' for safe operations like reading files/directories, running development servers, building projects, and other non-destructive operations.
-Usage:
-<execute_command>
-<command>Your command here</command>
-<requires_approval>true or false</requires_approval>
-</execute_command>
-
-## read_file
-Description: Request to read the contents of a file at the specified path. Use this when you need to examine the contents of an existing file you do not know the contents of, for example to analyze code, review text files, or extract information from configuration files. Automatically extracts raw text from PDF and DOCX files. May not be suitable for other types of binary files, as it returns the raw content as a string.
-Parameters:
-- path: (required) The path of the file to read (relative to the current working directory ${cwdFormatted})
-Usage:
-<read_file>
-<path>File path here</path>
-</read_file>
-
-## write_to_file
-Description: Request to write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
-Parameters:
-- path: (required) The path of the file to write to (relative to the current working directory ${cwdFormatted})
-- content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified.
-Usage:
-<write_to_file>
-<path>File path here</path>
-<content>
-Your file content here
-</content>
-</write_to_file>
-
-## replace_in_file
-Description: Request to replace sections of content in an existing file using SEARCH/REPLACE blocks that define exact changes to specific parts of the file. This tool should be used when you need to make targeted changes to specific parts of a file.
-Parameters:
-- path: (required) The path of the file to modify (relative to the current working directory ${cwdFormatted})
-- diff: (required) One or more SEARCH/REPLACE blocks following this exact format:
-  \`\`\`
-  ------- SEARCH
-  [exact content to find]
-  =======
-  [new content to replace with]
-  +++++++ REPLACE
-  \`\`\`
-  Critical rules:
-  1. SEARCH content must match the associated file section to find EXACTLY:
-     * Match character-for-character including whitespace, indentation, line endings
-     * Include all comments, docstrings, etc.
-  2. SEARCH/REPLACE blocks will ONLY replace the first match occurrence.
-     * Including multiple unique SEARCH/REPLACE blocks if you need to make multiple changes.
-     * Include *just* enough lines in each SEARCH section to uniquely match each set of lines that need to change.
-     * When using multiple SEARCH/REPLACE blocks, list them in the order they appear in the file.
-  3. Keep SEARCH/REPLACE blocks concise:
-     * Break large SEARCH/REPLACE blocks into a series of smaller blocks that each change a small portion of the file.
-     * Include just the changing lines, and a few surrounding lines if needed for uniqueness.
-     * Do not include long runs of unchanging lines in SEARCH/REPLACE blocks.
-     * Each line must be complete. Never truncate lines mid-way through as this can cause matching failures.
-  4. Special operations:
-     * To move code: Use two SEARCH/REPLACE blocks (one to delete from original + one to insert at new location)
-     * To delete code: Use empty REPLACE section
-Usage:
-<replace_in_file>
-<path>File path here</path>
-<diff>
-Search and replace blocks here
-</diff> 
-</replace_in_file>
-
-
-## search_files
-Description: Request to perform a regex search across files in a specified directory, providing context-rich results. This tool searches for patterns or specific content across multiple files, displaying each match with encapsulating context.
-Parameters:
-- path: (required) The path of the directory to search in (relative to the current working directory ${cwdFormatted}). This directory will be recursively searched.
-- regex: (required) The regular expression pattern to search for. Uses Rust regex syntax.
-- file_pattern: (optional) Glob pattern to filter files (e.g., '*.ts' for TypeScript files). If not provided, it will search all files (*).
-Usage:
-<search_files>
-<path>Directory path here</path>
-<regex>Your regex pattern here</regex>
-<file_pattern>file pattern here (optional)</file_pattern>
-</search_files>
-
-## list_files
-Description: Request to list files and directories within the specified directory. If recursive is true, it will list all files and directories recursively. If recursive is false or not provided, it will only list the top-level contents. Do not use this tool to confirm the existence of files you may have created, as the user will let you know if the files were created successfully or not.
-Parameters:
-- path: (required) The path of the directory to list contents for (relative to the current working directory ${cwdFormatted})
-- recursive: (optional) Whether to list files recursively. Use true for recursive listing, false or omit for top-level only.
-Usage:
-<list_files>
-<path>Directory path here</path>
-<recursive>true or false (optional)</recursive>
-</list_files>
-
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) used in source code files at the top level of the specified directory. This tool provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the directory (relative to the current working directory ${cwdFormatted}) to list top level source code definitions for.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>${
-		supportsBrowserUse
-			? `
-
-## browser_action
-Description: Request to interact with a Puppeteer-controlled browser. Every action, except \`close\`, will be responded to with a screenshot of the browser's current state, along with any new console logs. You may only perform one browser action per message, and wait for the user's response including a screenshot and logs to determine the next action.
-- The sequence of actions **must always start with** launching the browser at a URL, and **must always end with** closing the browser. If you need to visit a new URL that is not possible to navigate to from the current webpage, you must first close the browser, then launch again at the new URL.
-- While the browser is active, only the \`browser_action\` tool can be used. No other tools should be called during this time. You may proceed to use other tools only after closing the browser. For example if you run into an error and need to fix a file, you must close the browser, then use other tools to make the necessary changes, then re-launch the browser to verify the result.
-- The browser window has a resolution of **${browserWidth}x${browserHeight}** pixels. When performing any click actions, ensure the coordinates are within this resolution range.
-- Before clicking on any elements such as icons, links, or buttons, you must consult the provided screenshot of the page to determine the coordinates of the element. The click should be targeted at the **center of the element**, not on its edges.
-Parameters:
-- action: (required) The action to perform. The available actions are:
-    * launch: Launch a new Puppeteer-controlled browser instance at the specified URL. This **must always be the first action**.
-        - Use with the \`url\` parameter to provide the URL.
-        - Ensure the URL is valid and includes the appropriate protocol (e.g. http://localhost:3000/page, file:///path/to/file.html, etc.)
-    * click: Click at a specific x,y coordinate.
-        - Use with the \`coordinate\` parameter to specify the location.
-        - Always click in the center of an element (icon, button, link, etc.) based on coordinates derived from a screenshot.
-    * type: Type a string of text on the keyboard. You might use this after clicking on a text field to input text.
-        - Use with the \`text\` parameter to provide the string to type.
-    * scroll_down: Scroll down the page by one page height.
-    * scroll_up: Scroll up the page by one page height.
-    * close: Close the Puppeteer-controlled browser instance. This **must always be the final browser action**.
-        - Example: \`<action>close</action>\`
-- url: (optional) Use this for providing the URL for the \`launch\` action.
-    * Example: <url>https://example.com</url>
-- coordinate: (optional) The X and Y coordinates for the \`click\` action. Coordinates should be within the **${browserWidth}x${browserHeight}** resolution.
-    * Example: <coordinate>450,300</coordinate>
-- text: (optional) Use this for providing the text for the \`type\` action.
-    * Example: <text>Hello, world!</text>
-Usage:
-<browser_action>
-<action>Action to perform (e.g., launch, click, type, scroll_down, scroll_up, close)</action>
-<url>URL to launch the browser at (optional)</url>
-<coordinate>x,y coordinates (optional)</coordinate>
-<text>Text to type (optional)</text>
-</browser_action>`
-			: ""
-	}
-
-## use_mcp_tool
-Description: Request to use a tool provided by a connected MCP server. Each MCP server can provide multiple tools with different capabilities. Tools have defined input schemas that specify required and optional parameters.
-Parameters:
-- server_name: (required) The name of the MCP server providing the tool
-- tool_name: (required) The name of the tool to execute
-- arguments: (required) A JSON object containing the tool's input parameters, following the tool's input schema
-Usage:
-<use_mcp_tool>
-<server_name>server name here</server_name>
-<tool_name>tool name here</tool_name>
-<arguments>
-{
-  "param1": "value1",
-  "param2": "value2"
-}
-</arguments>
-</use_mcp_tool>
-
-## access_mcp_resource
-Description: Request to access a resource provided by a connected MCP server. Resources represent data sources that can be used as context, such as files, API responses, or system information.
-Parameters:
-- server_name: (required) The name of the MCP server providing the resource
-- uri: (required) The URI identifying the specific resource to access
-Usage:
-<access_mcp_resource>
-<server_name>server name here</server_name>
-<uri>resource URI here</uri>
-</access_mcp_resource>
-
-## ask_followup_question
-Description: Ask the user a question to gather additional information needed to complete the task. This tool should be used when you encounter ambiguities, need clarification, or require more details to proceed effectively. It allows for interactive problem-solving by enabling direct communication with the user. Use this tool judiciously to maintain a balance between gathering necessary information and avoiding excessive back-and-forth.
-Parameters:
-- question: (required) The question to ask the user. This should be a clear, specific question that addresses the information you need.
-- options: (optional) An array of 2-5 options for the user to choose from. Each option should be a string describing a possible answer. You may not always need to provide options, but it may be helpful in many cases where it can save the user from having to type out a response manually. IMPORTANT: NEVER include an option to toggle to Act mode, as this would be something you need to direct the user to do manually themselves if needed.
-Usage:
-<ask_followup_question>
-<question>Your question here</question>
-<options>
-Array of options here (optional), e.g. ["Option 1", "Option 2", "Option 3"]
-</options>
-</ask_followup_question>
-
-## attempt_completion
-Description: After each tool use, the user will respond with the result of that tool use, i.e. if it succeeded or failed, along with any reasons for failure. Once you've received the results of tool uses and can confirm that the task is complete, use this tool to present the result of your work to the user. Optionally you may provide a CLI command to showcase the result of your work. The user may respond with feedback if they are not satisfied with the result, which you can use to make improvements and try again.
-IMPORTANT NOTE: This tool CANNOT be used until you've confirmed from the user that any previous tool uses were successful. Failure to do so will result in code corruption and system failure. Before using this tool, you must ask yourself in <thinking></thinking> tags if you've confirmed from the user that any previous tool uses were successful. If not, then DO NOT use this tool.
-Parameters:
-- result: (required) The result of the task. Formulate this result in a way that is final and does not require further input from the user. Don't end your result with questions or offers for further assistance.
-- command: (optional) A CLI command to execute to show a live demo of the result to the user. For example, use \`open index.html\` to display a created html website, or \`open localhost:3000\` to display a locally running development server. But DO NOT use commands like \`echo\` or \`cat\` that merely print text. This command should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
-Usage:
-<attempt_completion>
-<result>
-Your final result description here
-</result>
-<command>Command to demonstrate result (optional)</command>
-</attempt_completion>
-
-## new_task
-Description: Request to create a new task with preloaded context covering the conversation with the user up to this point and key information for continuing with the new task. With this tool, you will create a detailed summary of the conversation so far, paying close attention to the user's explicit requests and your previous actions, with a focus on the most relevant information required for the new task.
-Among other important areas of focus, this summary should be thorough in capturing technical details, code patterns, and architectural decisions that would be essential for continuing with the new task. The user will be presented with a preview of your generated context and can choose to create a new task or keep chatting in the current conversation. The user may choose to start a new task at any point.
-Parameters:
-- Context: (required) The context to preload the new task with. If applicable based on the current task, this should include:
-  1. Current Work: Describe in detail what was being worked on prior to this request to create a new task. Pay special attention to the more recent messages / conversation.
-  2. Key Technical Concepts: List all important technical concepts, technologies, coding conventions, and frameworks discussed, which might be relevant for the new task.
-  3. Relevant Files and Code: If applicable, enumerate specific files and code sections examined, modified, or created for the task continuation. Pay special attention to the most recent messages and changes.
-  4. Problem Solving: Document problems solved thus far and any ongoing troubleshooting efforts.
-  5. Pending Tasks and Next Steps: Outline all pending tasks that you have explicitly been asked to work on, as well as list the next steps you will take for all outstanding work, if applicable. Include code snippets where they add clarity. For any next steps, include direct quotes from the most recent conversation showing exactly what task you were working on and where you left off. This should be verbatim to ensure there's no information loss in context between tasks. It's important to be detailed here.
-Usage:
-<new_task>
-<context>context to preload new task with</context>
-</new_task>
-
-## plan_mode_respond
-Description: Respond to the user's inquiry in an effort to plan a solution to the user's task. This tool should be used when you need to provide a response to a question or statement from the user about how you plan to accomplish the task. This tool is only available in PLAN MODE. The environment_details will specify the current mode, if it is not PLAN MODE then you should not use this tool. Depending on the user's message, you may ask questions to get clarification about the user's request, architect a solution to the task, and to brainstorm ideas with the user. For example, if the user's task is to create a website, you may start by asking some clarifying questions, then present a detailed plan for how you will accomplish the task given the context, and perhaps engage in a back and forth to finalize the details before the user switches you to ACT MODE to implement the solution.
-Parameters:
-- response: (required) The response to provide to the user. Do not try to use tools in this parameter, this is simply a chat response. (You MUST use the response parameter, do not simply place the response text directly within <plan_mode_respond> tags.)
-Usage:
-<plan_mode_respond>
-<response>Your response here</response>
-</plan_mode_respond>
-
-## load_mcp_documentation
-Description: Load documentation about creating MCP servers. This tool should be used when the user requests to create or install an MCP server (the user may ask you something along the lines of "add a tool" that does some function, in other words to create an MCP server that provides tools and resources that may connect to external APIs for example. You have the ability to create an MCP server and add it to a configuration file that will then expose the tools and resources for you to use with \`use_mcp_tool\` and \`access_mcp_resource\`). The documentation provides detailed information about the MCP server creation process, including setup instructions, best practices, and examples.
-Parameters: None
-Usage:
-<load_mcp_documentation>
-</load_mcp_documentation>
-
-# Tool Use Examples
-
-## Example 1: Requesting to execute a command
-
-<execute_command>
-<command>npm run dev</command>
-<requires_approval>false</requires_approval>
-</execute_command>
-
-## Example 2: Requesting to create a new file
-
-<write_to_file>
-<path>src/frontend-config.json</path>
-<content>
-{
-  "apiEndpoint": "https://api.example.com",
-  "theme": {
-    "primaryColor": "#007bff",
-    "secondaryColor": "#6c757d",
-    "fontFamily": "Arial, sans-serif"
-  },
-  "features": {
-    "darkMode": true,
-    "notifications": true,
-    "analytics": false
-  },
-  "version": "1.0.0"
-}
-</content>
-</write_to_file>
-
-## Example 3: Creating a new task
-
-<new_task>
-<context>
-1. Current Work:
-   [Detailed description]
-
-2. Key Technical Concepts:
-   - [Concept 1]
-   - [Concept 2]
-   - [...]
-
-3. Relevant Files and Code:
-   - [File Name 1]
-      - [Summary of why this file is important]
-      - [Summary of the changes made to this file, if any]
-      - [Important Code Snippet]
-   - [File Name 2]
-      - [Important Code Snippet]
-   - [...]
-
-4. Problem Solving:
-   [Detailed description]
-
-5. Pending Tasks and Next Steps:
-   - [Task 1 details & next steps]
-   - [Task 2 details & next steps]
-   - [...]
-</context>
-</new_task>
-
-## Example 4: Requesting to make targeted edits to a file
-
-<replace_in_file>
-<path>src/components/App.tsx</path>
-<diff>
-------- SEARCH
-import React from 'react';
-=======
-import React, { useState } from 'react';
-+++++++ REPLACE
-
-------- SEARCH
-function handleSubmit() {
-  saveData();
-  setLoading(false);
-}
-
-=======
-+++++++ REPLACE
-
-------- SEARCH
-return (
-  <div>
-=======
-function handleSubmit() {
-  saveData();
-  setLoading(false);
-}
-
-return (
-  <div>
-+++++++ REPLACE
-</diff>
-</replace_in_file>
-
-
-## Example 5: Requesting to use an MCP tool
-
-<use_mcp_tool>
-<server_name>weather-server</server_name>
-<tool_name>get_forecast</tool_name>
-<arguments>
-{
-  "city": "San Francisco",
-  "days": 5
-}
-</arguments>
-</use_mcp_tool>
-
-## Example 6: Another example of using an MCP tool (where the server name is a unique identifier such as a URL)
-
-<use_mcp_tool>
-<server_name>github.com/modelcontextprotocol/servers/tree/main/src/github</server_name>
-<tool_name>create_issue</tool_name>
-<arguments>
-{
-  "owner": "octocat",
-  "repo": "hello-world",
-  "title": "Found a bug",
-  "body": "I'm having a problem with this.",
-  "labels": ["bug", "help wanted"],
-  "assignees": ["octocat"]
-}
-</arguments>
-</use_mcp_tool>
-
-# Tool Use Guidelines
-
-1. In <thinking> tags, assess what information you already have and what information you need to proceed with the task.
-2. Choose the most appropriate tool based on the task and the tool descriptions provided. Assess if you need additional information to proceed, and which of the available tools would be most effective for gathering this information. For example using the list_files tool is more effective than running a command like \`ls\` in the terminal. It's critical that you think about each available tool and use the one that best fits the current step in the task.
-3. If multiple actions are needed, use one tool at a time per message to accomplish the task iteratively, with each tool use being informed by the result of the previous tool use. Do not assume the outcome of any tool use. Each step must be informed by the previous step's result.
-4. Formulate your tool use using the XML format specified for each tool.
-5. After each tool use, the user will respond with the result of that tool use. This result will provide you with the necessary information to continue your task or make further decisions. This response may include:
-  - Information about whether the tool succeeded or failed, along with any reasons for failure.
-  - Linter errors that may have arisen due to the changes you made, which you'll need to address.
-  - New terminal output in reaction to the changes, which you may need to consider or act upon.
-  - Any other relevant feedback or information related to the tool use.
-6. ALWAYS wait for user confirmation after each tool use before proceeding. Never assume the success of a tool use without explicit confirmation of the result from the user.
-
-It is crucial to proceed step-by-step, waiting for the user's message after each tool use before moving forward with the task. This approach allows you to:
-1. Confirm the success of each step before proceeding.
-2. Address any issues or errors that arise immediately.
-3. Adapt your approach based on new information or unexpected results.
-4. Ensure that each action builds correctly on the previous ones.
-
-By waiting for and carefully considering the user's response after each tool use, you can react accordingly and make informed decisions about how to proceed with the task. This iterative process helps ensure the overall success and accuracy of your work.
-
-====
-
-MCP SERVERS
-
-The Model Context Protocol (MCP) enables communication between the system and locally running MCP servers that provide additional tools and resources to extend your capabilities.
-
-# Connected MCP Servers
-
-When a server is connected, you can use the server's tools via the \`use_mcp_tool\` tool, and access the server's resources via the \`access_mcp_resource\` tool.
-
-${mcpHubString}
-
-====
-
-EDITING FILES
-
-You have access to two tools for working with files: **write_to_file** and **replace_in_file**. Understanding their roles and selecting the right one for the job will help ensure efficient and accurate modifications.
-
-# write_to_file
-
-## Purpose
-
-- Create a new file, or overwrite the entire contents of an existing file.
-
-## When to Use
-
-- Initial file creation, such as when scaffolding a new project.  
-- Overwriting large boilerplate files where you want to replace the entire content at once.
-- When the complexity or number of changes would make replace_in_file unwieldy or error-prone.
-- When you need to completely restructure a file's content or change its fundamental organization.
-
-## Important Considerations
-
-- Using write_to_file requires providing the file's complete final content.  
-- If you only need to make small changes to an existing file, consider using replace_in_file instead to avoid unnecessarily rewriting the entire file.
-- While write_to_file should not be your default choice, don't hesitate to use it when the situation truly calls for it.
-
-# replace_in_file
-
-## Purpose
-
-- Make targeted edits to specific parts of an existing file without overwriting the entire file.
-
-## When to Use
-
-- Small, localized changes like updating a few lines, function implementations, changing variable names, modifying a section of text, etc.
-- Targeted improvements where only specific portions of the file's content needs to be altered.
-- Especially useful for long files where much of the file will remain unchanged.
-
-## Advantages
-
-- More efficient for minor edits, since you don't need to supply the entire file content.  
-- Reduces the chance of errors that can occur when overwriting large files.
-
-# Choosing the Appropriate Tool
-
-- **Default to replace_in_file** for most changes. It's the safer, more precise option that minimizes potential issues.
-- **Use write_to_file** when:
-  - Creating new files
-  - The changes are so extensive that using replace_in_file would be more complex or risky
-  - You need to completely reorganize or restructure a file
-  - The file is relatively small and the changes affect most of its content
-  - You're generating boilerplate or template files
-
-# Auto-formatting Considerations
-
-- After using either write_to_file or replace_in_file, the user's editor may automatically format the file
-- This auto-formatting may modify the file contents, for example:
-  - Breaking single lines into multiple lines
-  - Adjusting indentation to match project style (e.g. 2 spaces vs 4 spaces vs tabs)
-  - Converting single quotes to double quotes (or vice versa based on project preferences)
-  - Organizing imports (e.g. sorting, grouping by type)
-  - Adding/removing trailing commas in objects and arrays
-  - Enforcing consistent brace style (e.g. same-line vs new-line)
-  - Standardizing semicolon usage (adding or removing based on style)
-- The write_to_file and replace_in_file tool responses will include the final state of the file after any auto-formatting
-- Use this final state as your reference point for any subsequent edits. This is ESPECIALLY important when crafting SEARCH blocks for replace_in_file which require the content to match what's in the file exactly.
-
-# Workflow Tips
-
-1. Before editing, assess the scope of your changes and decide which tool to use.
-2. For targeted edits, apply replace_in_file with carefully crafted SEARCH/REPLACE blocks. If you need multiple changes, you can stack multiple SEARCH/REPLACE blocks within a single replace_in_file call.
-3. For major overhauls or initial file creation, rely on write_to_file.
-4. Once the file has been edited with either write_to_file or replace_in_file, the system will provide you with the final state of the modified file. Use this updated content as the reference point for any subsequent SEARCH/REPLACE operations, since it reflects any auto-formatting or user-applied changes.
-By thoughtfully selecting between write_to_file and replace_in_file, you can make your file editing process smoother, safer, and more efficient.
-
-====
- 
-ACT MODE V.S. PLAN MODE
-
-In each user message, the environment_details will specify the current mode. There are two modes:
-
-- ACT MODE: In this mode, you have access to all tools EXCEPT the plan_mode_respond tool.
- - In ACT MODE, you use tools to accomplish the user's task. Once you've completed the user's task, you use the attempt_completion tool to present the result of the task to the user.
-- PLAN MODE: In this special mode, you have access to the plan_mode_respond tool.
- - In PLAN MODE, the goal is to gather information and get context to create a detailed plan for accomplishing the task, which the user will review and approve before they switch you to ACT MODE to implement the solution.
- - In PLAN MODE, when you need to converse with the user or present a plan, you should use the plan_mode_respond tool to deliver your response directly, rather than using <thinking> tags to analyze when to respond. Do not talk about using plan_mode_respond - just use it directly to share your thoughts and provide helpful answers.
-
-## What is PLAN MODE?
-
-- While you are usually in ACT MODE, the user may switch to PLAN MODE in order to have a back and forth with you to plan how to best accomplish the task. 
-- When starting in PLAN MODE, depending on the user's request, you may need to do some information gathering e.g. using read_file or search_files to get more context about the task. You may also ask the user clarifying questions to get a better understanding of the task. You may return mermaid diagrams to visually display your understanding.
-- Once you've gained more context about the user's request, you should architect a detailed plan for how you will accomplish the task. Returning mermaid diagrams may be helpful here as well.
-- Then you might ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and plan the best way to accomplish it.
-- If at any point a mermaid diagram would make your plan clearer to help the user quickly see the structure, you are encouraged to include a Mermaid code block in the response. (Note: if you use colors in your mermaid diagrams, be sure to use high contrast colors so the text is readable.)
-- Finally once it seems like you've reached a good plan, ask the user to switch you back to ACT MODE to implement the solution.
-
-====
- 
-CAPABILITIES
-
-- You have access to tools that let you execute CLI commands on the user's computer, list files, view source code definitions, regex search${
-		supportsBrowserUse ? ", use the browser" : ""
-	}, read and edit files, and ask follow-up questions. These tools help you effectively accomplish a wide range of tasks, such as writing code, making edits or improvements to existing files, understanding the current state of a project, performing system operations, and much more.
-- When the user initially gives you a task, a recursive list of all filepaths in the current working directory ('${cwdFormatted}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current working directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop.
-- You can use search_files to perform regex searches across files in a specified directory, outputting context-rich results that include surrounding lines. This is particularly useful for understanding code patterns, finding specific implementations, or identifying areas that need refactoring.
-- You can use the list_code_definition_names tool to get an overview of source code definitions for all files at the top level of a specified directory. This can be particularly useful when you need to understand the broader context and relationships between certain parts of the code. You may need to call this tool multiple times to understand various parts of the codebase related to the task.
-	- For example, when asked to make edits or improvements you might analyze the file structure in the initial environment_details to get an overview of the project, then use list_code_definition_names to get further insight using source code definitions for files located in relevant directories, then read_file to examine the contents of relevant files, analyze the code and suggest improvements or make necessary edits, then use the replace_in_file tool to implement changes. If you refactored code that could affect other parts of the codebase, you could use search_files to ensure you update other files as needed.
-- You can use the execute_command tool to run commands on the user's computer whenever you feel it can help accomplish the user's task. When you need to execute a CLI command, you must provide a clear explanation of what the command does. Prefer to execute complex CLI commands over creating executable scripts, since they are more flexible and easier to run. Interactive and long-running commands are allowed, since the commands are run in the user's VSCode terminal. The user may keep commands running in the background and you will be kept updated on their status along the way. Each command you execute is run in a new terminal instance.${
-		supportsBrowserUse
-			? "\n- You can use the browser_action tool to interact with websites (including html files and locally running development servers) through a Puppeteer-controlled browser when you feel it is necessary in accomplishing the user's task. This tool is particularly useful for web development tasks as it allows you to launch a browser, navigate to pages, interact with elements through clicks and keyboard input, and capture the results through screenshots and console logs. This tool may be useful at key stages of web development tasks-such as after implementing new features, making substantial changes, when troubleshooting issues, or to verify the result of your work. You can analyze the provided screenshots to ensure correct rendering or identify errors, and review console logs for runtime issues.\n	- For example, if asked to add a component to a react website, you might create the necessary files, use execute_command to run the site locally, then use browser_action to launch the browser, navigate to the local server, and verify the component renders & functions correctly before closing the browser."
-			: ""
-	}
-- You have access to MCP servers that may provide additional tools and resources. Each server may provide different capabilities that you can use to accomplish tasks more effectively.
-- You can use LaTeX syntax in your responses to render mathematical expressions
-
-====
-
-RULES
-
-- Your current working directory is: ${cwdFormatted}
-- You cannot \`cd\` into a different directory to complete a task. You are stuck operating from '${cwdFormatted}', so be sure to pass in the correct 'path' parameter when using tools that require a path.
-- Do not use the ~ character or $HOME to refer to the home directory.
-- Before using the execute_command tool, you must first think about the SYSTEM INFORMATION context provided to understand the user's environment and tailor your commands to ensure they are compatible with their system. You must also consider if the command you need to run should be executed in a specific directory outside of the current working directory '${cwdFormatted}', and if so prepend with \`cd\`'ing into that directory && then executing the command (as one command since you are stuck operating from '${cwdFormatted}'). For example, if you needed to run \`npm install\` in a project outside of '${cwdFormatted}', you would need to prepend with a \`cd\` i.e. pseudocode for this would be \`cd (path to project) && (command, in this case npm install)\`.
-- When using the search_files tool, craft your regex patterns carefully to balance specificity and flexibility. Based on the user's task you may use it to find code patterns, TODO comments, function definitions, or any text-based information across the project. The results include context, so analyze the surrounding code to better understand the matches. Leverage the search_files tool in combination with other tools for more comprehensive analysis. For example, use it to find specific code patterns, then use read_file to examine the full context of interesting matches before using replace_in_file to make informed changes.
-- When creating a new project (such as an app, website, or any software project), organize all new files within a dedicated project directory unless the user specifies otherwise. Use appropriate file paths when creating files, as the write_to_file tool will automatically create any necessary directories. Structure the project logically, adhering to best practices for the specific type of project being created. Unless otherwise specified, new projects should be easily run without additional setup, for example most projects can be built in HTML, CSS, and JavaScript - which you can open in a browser.
-- Be sure to consider the type of project (e.g. Python, JavaScript, web application) when determining the appropriate structure and files to include. Also consider what files may be most relevant to accomplishing the task, for example looking at a project's manifest file would help you understand the project's dependencies, which you could incorporate into any code you write.
-- When making changes to code, always consider the context in which the code is being used. Ensure that your changes are compatible with the existing codebase and that they follow the project's coding standards and best practices.
-- When you want to modify a file, use the replace_in_file or write_to_file tool directly with the desired changes. You do not need to display the changes before using the tool.
-- Do not ask for more information than necessary. Use the tools provided to accomplish the user's request efficiently and effectively. When you've completed your task, you must use the attempt_completion tool to present the result to the user. The user may provide feedback, which you can use to make improvements and try again.
-- You are only allowed to ask the user questions using the ask_followup_question tool. Use this tool only when you need additional details to complete a task, and be sure to use a clear and concise question that will help you move forward with the task. However if you can use the available tools to avoid having to ask the user questions, you should do so. For example, if the user mentions a file that may be in an outside directory like the Desktop, you should use the list_files tool to list the files in the Desktop and check if the file they are talking about is there, rather than asking the user to provide the file path themselves.
-- When executing commands, if you don't see the expected output, assume the terminal executed the command successfully and proceed with the task. The user's terminal may be unable to stream the output back properly. If you absolutely need to see the actual terminal output, use the ask_followup_question tool to request the user to copy and paste it back to you.
-- The user may provide a file's contents directly in their message, in which case you shouldn't use the read_file tool to get the file contents again since you already have it.
-- Your goal is to try to accomplish the user's task, NOT engage in a back and forth conversation.${
-		supportsBrowserUse
-			? `\n- The user may ask generic non-development tasks, such as "what\'s the latest news" or "look up the weather in San Diego", in which case you might use the browser_action tool to complete the task if it makes sense to do so, rather than trying to create a website or using curl to answer the question. However, if an available MCP server tool or resource can be used instead, you should prefer to use it over browser_action.`
-			: ""
-	}
-- NEVER end attempt_completion result with a question or request to engage in further conversation! Formulate the end of your result in a way that is final and does not require further input from the user.
-- You are STRICTLY FORBIDDEN from starting your messages with "Great", "Certainly", "Okay", "Sure". You should NOT be conversational in your responses, but rather direct and to the point. For example you should NOT say "Great, I've updated the CSS" but instead something like "I've updated the CSS". It is important you be clear and technical in your messages.
-- When presented with images, utilize your vision capabilities to thoroughly examine them and extract meaningful information. Incorporate these insights into your thought process as you accomplish the user's task.
-- At the end of each user message, you will automatically receive environment_details. This information is not written by the user themselves, but is auto-generated to provide potentially relevant context about the project structure and environment. While this information can be valuable for understanding the project context, do not treat it as a direct part of the user's request or response. Use it to inform your actions and decisions, but don't assume the user is explicitly asking about or referring to this information unless they clearly do so in their message. When using environment_details, explain your actions clearly to ensure the user understands, as they may not be aware of these details.
-- Before executing commands, check the "Actively Running Terminals" section in environment_details. If present, consider how these active processes might impact your task. For example, if a local development server is already running, you wouldn't need to start it again. If no active terminals are listed, proceed with command execution as normal.
-- When using the replace_in_file tool, you must include complete lines in your SEARCH blocks, not partial lines. The system requires exact line matches and cannot match partial lines. For example, if you want to match a line containing "const x = 5;", your SEARCH block must include the entire line, not just "x = 5" or other fragments.
-- When using the replace_in_file tool, if you use multiple SEARCH/REPLACE blocks, list them in the order they appear in the file. For example if you need to make changes to both line 10 and line 50, first include the SEARCH/REPLACE block for line 10, followed by the SEARCH/REPLACE block for line 50.
-- When using the replace_in_file tool, Do NOT add extra characters to the markers (e.g., ------- SEARCH> is INVALID). Do NOT forget to use the closing +++++++ REPLACE marker. Do NOT modify the marker format in any way. Malformed XML will cause complete tool failure and break the entire editing process.
-- It is critical you wait for the user's response after each tool use, in order to confirm the success of the tool use. For example, if asked to make a todo app, you would create a file, wait for the user's response it was created successfully, then create another file if needed, wait for the user's response it was created successfully, etc.${
-		supportsBrowserUse
-			? " Then if you want to test your work, you might use browser_action to launch the site, wait for the user's response confirming the site was launched along with a screenshot, then perhaps e.g., click a button to test functionality if needed, wait for the user's response confirming the button was clicked along with a screenshot of the new state, before finally closing the browser."
-			: ""
-	}
-- MCP operations should be used one at a time, similar to other tool usage. Wait for confirmation of success before proceeding with additional operations.
-
-====
-
-SYSTEM INFORMATION
-
-Operating System: ${os}
-Default Shell: ${shell}
-Home Directory: ${homeFormatted}
-Current Working Directory: ${cwdFormatted}
-
-====
-
-OBJECTIVE
-
-You accomplish a given task iteratively, breaking it down into clear steps and working through them methodically.
-
-1. Analyze the user's task and set clear, achievable goals to accomplish it. Prioritize these goals in a logical order.
-2. Work through these goals sequentially, utilizing available tools one at a time as necessary. Each goal should correspond to a distinct step in your problem-solving process. You will be informed on the work completed and what's remaining as you go.
-3. Remember, you have extensive capabilities with access to a wide range of tools that can be used in powerful and clever ways as necessary to accomplish each goal. Before calling a tool, do some analysis within <thinking></thinking> tags. First, analyze the file structure provided in environment_details to gain context and insights for proceeding effectively. Then, think about which of the provided tools is the most relevant tool to accomplish the user's task. Next, go through each of the required parameters of the relevant tool and determine if the user has directly provided or given enough information to infer a value. When deciding if the parameter can be inferred, carefully consider all the context to see if it supports a specific value. If all of the required parameters are present or can be reasonably inferred, close the thinking tag and proceed with the tool use. BUT, if one of the values for a required parameter is missing, DO NOT invoke the tool (not even with fillers for the missing params) and instead, ask the user to provide the missing parameters using the ask_followup_question tool. DO NOT ask for more information on optional parameters if it is not provided.
-4. Once you've completed the user's task, you must use the attempt_completion tool to present the result of the task to the user. You may also provide a CLI command to showcase the result of your task; this can be particularly useful for web development tasks, where you can run e.g. \`open index.html\` to show the website you've built.
-5. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.
-${
-	userCustomInstructions
-		? `\n
-====
-
-USER'S CUSTOM INSTRUCTIONS
-
-The following additional instructions are provided by the user, and should be followed to the best of your ability without interfering with the TOOL USE guidelines.
-
-${userCustomInstructions}`
-		: ""
-}`
-}

evals/diff_editing/prompts/claude4SystemPrompt-06-06-25.ts

@@ -1,640 +0,0 @@
-/**
- * Use all standard prompt values to construct prompt
- */
-export const claude4SystemPrompt = (
-	cwdFormatted: string,
-	supportsBrowserUse: boolean,
-	browserWidth: number,
-	browserHeight: number,
-	os: string,
-	shell: string,
-	homeFormatted: string,
-	mcpHubString: string,
-	userCustomInstructions: string,
-) => {
-	return `You are Cline, a highly skilled software engineer with extensive knowledge in many programming languages, frameworks, design patterns, and best practices.
-
-====
-
-TOOL USE
-
-You have access to a set of tools that are executed upon the user's approval. You can use one tool per message, and will receive the result of that tool use in the user's response. You use tools step-by-step to accomplish a given task, with each tool use informed by the result of the previous tool use.
-
-# Tool Use Formatting
-
-Tool use is formatted using XML-style tags. The tool name is enclosed in opening and closing tags, and each parameter is similarly enclosed within its own set of tags. Here's the structure:
-
-<tool_name>
-<parameter1_name>value1</parameter1_name>
-<parameter2_name>value2</parameter2_name>
-...
-</tool_name>
-
-For example:
-
-<read_file>
-<path>src/main.js</path>
-</read_file>
-
-Always adhere to this format for the tool use to ensure proper parsing and execution.
-
-# Tools
-
-## execute_command
-Description: Request to execute a CLI command on the system. Use this when you need to perform system operations or run specific commands to accomplish any step in the user's task. You must tailor your command to the user's system and provide a clear explanation of what the command does. For command chaining, use the appropriate chaining syntax for the user's shell. Prefer to execute complex CLI commands over creating executable scripts, as they are more flexible and easier to run. Commands will be executed in the current working directory: ${cwdFormatted}
-Parameters:
-- command: (required) The CLI command to execute. This should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
-- requires_approval: (required) A boolean indicating whether this command requires explicit user approval before execution in case the user has auto-approve mode enabled. Set to 'true' for potentially impactful operations like installing/uninstalling packages, deleting/overwriting files, system configuration changes, network operations, or any commands that could have unintended side effects. Set to 'false' for safe operations like reading files/directories, running development servers, building projects, and other non-destructive operations.
-Usage:
-<execute_command>
-<command>Your command here</command>
-<requires_approval>true or false</requires_approval>
-</execute_command>
-
-## read_file
-Description: Request to read the contents of a file at the specified path. Use this when you need to examine the contents of an existing file you do not know the contents of, for example to analyze code, review text files, or extract information from configuration files. Automatically extracts raw text from PDF and DOCX files. May not be suitable for other types of binary files, as it returns the raw content as a string.
-Parameters:
-- path: (required) The path of the file to read (relative to the current working directory ${cwdFormatted})
-Usage:
-<read_file>
-<path>File path here</path>
-</read_file>
-
-## write_to_file
-Description: Request to write content to a file at the specified path. If the file exists, it will be overwritten with the provided content. If the file doesn't exist, it will be created. This tool will automatically create any directories needed to write the file.
-Parameters:
-- path: (required) The path of the file to write to (relative to the current working directory ${cwdFormatted})
-- content: (required) The content to write to the file. ALWAYS provide the COMPLETE intended content of the file, without any truncation or omissions. You MUST include ALL parts of the file, even if they haven't been modified.
-Usage:
-<write_to_file>
-<path>File path here</path>
-<content>
-Your file content here
-</content>
-</write_to_file>
-
-## replace_in_file
-Description: Request to replace sections of content in an existing file using SEARCH/REPLACE blocks that define exact changes to specific parts of the file. This tool should be used when you need to make targeted changes to specific parts of a file.
-Parameters:
-- path: (required) The path of the file to modify (relative to the current working directory ${cwdFormatted})
-- diff: (required) One or more SEARCH/REPLACE blocks following this exact format:
-  \`\`\`
-  ------- SEARCH
-  [exact content to find]
-  =======
-  [new content to replace with]
-  +++++++ REPLACE
-  \`\`\`
-  Critical rules:
-  1. SEARCH content must match the associated file section to find EXACTLY:
-     * Match character-for-character including whitespace, indentation, line endings
-     * Include all comments, docstrings, etc.
-  2. SEARCH/REPLACE blocks will ONLY replace the first match occurrence.
-     * Including multiple unique SEARCH/REPLACE blocks if you need to make multiple changes.
-     * Include *just* enough lines in each SEARCH section to uniquely match each set of lines that need to change.
-     * When using multiple SEARCH/REPLACE blocks, list them in the order they appear in the file.
-  3. Keep SEARCH/REPLACE blocks concise:
-     * Break large SEARCH/REPLACE blocks into a series of smaller blocks that each change a small portion of the file.
-     * Include just the changing lines, and a few surrounding lines if needed for uniqueness.
-     * Do not include long runs of unchanging lines in SEARCH/REPLACE blocks.
-     * Each line must be complete. Never truncate lines mid-way through as this can cause matching failures.
-  4. Special operations:
-     * To move code: Use two SEARCH/REPLACE blocks (one to delete from original + one to insert at new location)
-     * To delete code: Use empty REPLACE section
-Usage:
-<replace_in_file>
-<path>File path here</path>
-<diff>
-Search and replace blocks here
-</diff> 
-</replace_in_file>
-
-## list_files
-Description: Request to list files and directories within the specified directory. If recursive is true, it will list all files and directories recursively. If recursive is false or not provided, it will only list the top-level contents. Do not use this tool to confirm the existence of files you may have created, as the user will let you know if the files were created successfully or not.
-Parameters:
-- path: (required) The path of the directory to list contents for (relative to the current working directory ${cwdFormatted})
-- recursive: (optional) Whether to list files recursively. Use true for recursive listing, false or omit for top-level only.
-Usage:
-<list_files>
-<path>Directory path here</path>
-<recursive>true or false (optional)</recursive>
-</list_files>
-
-## list_code_definition_names
-Description: Request to list definition names (classes, functions, methods, etc.) used in source code files at the top level of the specified directory. This tool provides insights into the codebase structure and important constructs, encapsulating high-level concepts and relationships that are crucial for understanding the overall architecture.
-Parameters:
-- path: (required) The path of the directory (relative to the current working directory ${cwdFormatted}) to list top level source code definitions for.
-Usage:
-<list_code_definition_names>
-<path>Directory path here</path>
-</list_code_definition_names>${
-		supportsBrowserUse
-			? `
-
-## browser_action
-Description: Request to interact with a Puppeteer-controlled browser. Every action, except \`close\`, will be responded to with a screenshot of the browser's current state, along with any new console logs. You may only perform one browser action per message, and wait for the user's response including a screenshot and logs to determine the next action.
-- The sequence of actions **must always start with** launching the browser at a URL, and **must always end with** closing the browser. If you need to visit a new URL that is not possible to navigate to from the current webpage, you must first close the browser, then launch again at the new URL.
-- While the browser is active, only the \`browser_action\` tool can be used. No other tools should be called during this time. You may proceed to use other tools only after closing the browser. For example if you run into an error and need to fix a file, you must close the browser, then use other tools to make the necessary changes, then re-launch the browser to verify the result.
-- The browser window has a resolution of **${browserWidth}x${browserHeight}** pixels. When performing any click actions, ensure the coordinates are within this resolution range.
-- Before clicking on any elements such as icons, links, or buttons, you must consult the provided screenshot of the page to determine the coordinates of the element. The click should be targeted at the **center of the element**, not on its edges.
-Parameters:
-- action: (required) The action to perform. The available actions are:
-    * launch: Launch a new Puppeteer-controlled browser instance at the specified URL. This **must always be the first action**.
-        - Use with the \`url\` parameter to provide the URL.
-        - Ensure the URL is valid and includes the appropriate protocol (e.g. http://localhost:3000/page, file:///path/to/file.html, etc.)
-    * click: Click at a specific x,y coordinate.
-        - Use with the \`coordinate\` parameter to specify the location.
-        - Always click in the center of an element (icon, button, link, etc.) based on coordinates derived from a screenshot.
-    * type: Type a string of text on the keyboard. You might use this after clicking on a text field to input text.
-        - Use with the \`text\` parameter to provide the string to type.
-    * scroll_down: Scroll down the page by one page height.
-    * scroll_up: Scroll up the page by one page height.
-    * close: Close the Puppeteer-controlled browser instance. This **must always be the final browser action**.
-        - Example: \`<action>close</action>\`
-- url: (optional) Use this for providing the URL for the \`launch\` action.
-    * Example: <url>https://example.com</url>
-- coordinate: (optional) The X and Y coordinates for the \`click\` action. Coordinates should be within the **${browserWidth}x${browserHeight}** resolution.
-    * Example: <coordinate>450,300</coordinate>
-- text: (optional) Use this for providing the text for the \`type\` action.
-    * Example: <text>Hello, world!</text>
-Usage:
-<browser_action>
-<action>Action to perform (e.g., launch, click, type, scroll_down, scroll_up, close)</action>
-<url>URL to launch the browser at (optional)</url>
-<coordinate>x,y coordinates (optional)</coordinate>
-<text>Text to type (optional)</text>
-</browser_action>`
-			: ""
-	}
-
-## web_fetch
-Description: Fetches content from a specified URL and processes into markdown
-- Takes a URL as input
-- Fetches the URL content, converts HTML to markdown
-- Use this tool when you need to retrieve and analyze web content
-- IMPORTANT: If an MCP-provided web fetch tool is available, prefer using that tool instead of this one, as it may have fewer restrictions.
-- The URL must be a fully-formed valid URL
-- HTTP URLs will be automatically upgraded to HTTPS
-- This tool is read-only and does not modify any files
-Parameters:
-- url: (required) The URL to fetch content from
-Usage:
-<web_fetch>
-<url>https://example.com/docs</url>
-</web_fetch>
-
-
-## use_mcp_tool
-Description: Request to use a tool provided by a connected MCP server. Each MCP server can provide multiple tools with different capabilities. Tools have defined input schemas that specify required and optional parameters.
-Parameters:
-- server_name: (required) The name of the MCP server providing the tool
-- tool_name: (required) The name of the tool to execute
-- arguments: (required) A JSON object containing the tool's input parameters, following the tool's input schema
-Usage:
-<use_mcp_tool>
-<server_name>server name here</server_name>
-<tool_name>tool name here</tool_name>
-<arguments>
-{
-  "param1": "value1",
-  "param2": "value2"
-}
-</arguments>
-</use_mcp_tool>
-
-## access_mcp_resource
-Description: Request to access a resource provided by a connected MCP server. Resources represent data sources that can be used as context, such as files, API responses, or system information.
-Parameters:
-- server_name: (required) The name of the MCP server providing the resource
-- uri: (required) The URI identifying the specific resource to access
-Usage:
-<access_mcp_resource>
-<server_name>server name here</server_name>
-<uri>resource URI here</uri>
-</access_mcp_resource>
-
-## search_files
-Description: Request to perform a regex search across files in a specified directory, providing context-rich results. This tool searches for patterns or specific content across multiple files, displaying each match with encapsulating context. IMPORTANT NOTE: Use this tool sparingly, and opt to explore the codebase using the \`list_files\` and \`read_file\` tools instead.
-Parameters:
-- path: (required) The path of the directory to search in (relative to the current working directory ${cwdFormatted}). This directory will be recursively searched.
-- regex: (required) The regular expression pattern to search for. Uses Rust regex syntax.
-- file_pattern: (optional) Glob pattern to filter files (e.g., '*.ts' for TypeScript files). If not provided, it will search all files (*).
-Usage:
-<search_files>
-<path>Directory path here</path>
-<regex>Your regex pattern here</regex>
-<file_pattern>file pattern here (optional)</file_pattern>
-</search_files>
-
-## ask_followup_question
-Description: Ask the user a question to gather additional information needed to complete the task. This tool should be used when you encounter ambiguities, need clarification, or require more details to proceed effectively. It allows for interactive problem-solving by enabling direct communication with the user. Use this tool judiciously to maintain a balance between gathering necessary information and avoiding excessive back-and-forth.
-Parameters:
-- question: (required) The question to ask the user. This should be a clear, specific question that addresses the information you need.
-- options: (optional) An array of 2-5 options for the user to choose from. Each option should be a string describing a possible answer. You may not always need to provide options, but it may be helpful in many cases where it can save the user from having to type out a response manually. IMPORTANT: NEVER include an option to toggle to Act mode, as this would be something you need to direct the user to do manually themselves if needed.
-Usage:
-<ask_followup_question>
-<question>Your question here</question>
-<options>
-Array of options here (optional), e.g. ["Option 1", "Option 2", "Option 3"]
-</options>
-</ask_followup_question>
-
-## attempt_completion
-Description: After each tool use, the user will respond with the result of that tool use, i.e. if it succeeded or failed, along with any reasons for failure. Once you've received the results of tool uses and can confirm that the task is complete, use this tool to present the result of your work to the user. Optionally you may provide a CLI command to showcase the result of your work. The user may respond with feedback if they are not satisfied with the result, which you can use to make improvements and try again.
-IMPORTANT NOTE: This tool CANNOT be used until you've confirmed from the user that any previous tool uses were successful. Failure to do so will result in code corruption and system failure. Before using this tool, you must ask yourself in <thinking></thinking> tags if you've confirmed from the user that any previous tool uses were successful. If not, then DO NOT use this tool.
-Parameters:
-- result: (required) The result of the task. Formulate this result in a way that is final and does not require further input from the user. Don't end your result with questions or offers for further assistance.
-- command: (optional) A CLI command to execute to show a live demo of the result to the user. For example, use \`open index.html\` to display a created html website, or \`open localhost:3000\` to display a locally running development server. But DO NOT use commands like \`echo\` or \`cat\` that merely print text. This command should be valid for the current operating system. Ensure the command is properly formatted and does not contain any harmful instructions.
-Usage:
-<attempt_completion>
-<result>
-Your final result description here
-</result>
-<command>Command to demonstrate result (optional)</command>
-</attempt_completion>
-
-## new_task
-Description: Request to create a new task with preloaded context covering the conversation with the user up to this point and key information for continuing with the new task. With this tool, you will create a detailed summary of the conversation so far, paying close attention to the user's explicit requests and your previous actions, with a focus on the most relevant information required for the new task.
-Among other important areas of focus, this summary should be thorough in capturing technical details, code patterns, and architectural decisions that would be essential for continuing with the new task. The user will be presented with a preview of your generated context and can choose to create a new task or keep chatting in the current conversation. The user may choose to start a new task at any point.
-Parameters:
-- Context: (required) The context to preload the new task with. If applicable based on the current task, this should include:
-  1. Current Work: Describe in detail what was being worked on prior to this request to create a new task. Pay special attention to the more recent messages / conversation.
-  2. Key Technical Concepts: List all important technical concepts, technologies, coding conventions, and frameworks discussed, which might be relevant for the new task.
-  3. Relevant Files and Code: If applicable, enumerate specific files and code sections examined, modified, or created for the task continuation. Pay special attention to the most recent messages and changes.
-  4. Problem Solving: Document problems solved thus far and any ongoing troubleshooting efforts.
-  5. Pending Tasks and Next Steps: Outline all pending tasks that you have explicitly been asked to work on, as well as list the next steps you will take for all outstanding work, if applicable. Include code snippets where they add clarity. For any next steps, include direct quotes from the most recent conversation showing exactly what task you were working on and where you left off. This should be verbatim to ensure there's no information loss in context between tasks. It's important to be detailed here.
-Usage:
-<new_task>
-<context>context to preload new task with</context>
-</new_task>
-
-## plan_mode_respond
-Description: Respond to the user's inquiry in an effort to plan a solution to the user's task. This tool should be used when you need to provide a response to a question or statement from the user about how you plan to accomplish the task. This tool is only available in PLAN MODE. The environment_details will specify the current mode, if it is not PLAN MODE then you should not use this tool. Depending on the user's message, you may ask questions to get clarification about the user's request, architect a solution to the task, and to brainstorm ideas with the user. For example, if the user's task is to create a website, you may start by asking some clarifying questions, then present a detailed plan for how you will accomplish the task given the context, and perhaps engage in a back and forth to finalize the details before the user switches you to ACT MODE to implement the solution. IMPORTANT NOTE: You should NOT ask for permission to read files or explore the repo. Just do that proactively. This tool should only be used when you've already gathered enough information to make a plan, or if you have a question for the user.
-Parameters:
-- response: (required) The response to provide to the user. Do not try to use tools in this parameter, this is simply a chat response. (You MUST use the response parameter, do not simply place the response text directly within <plan_mode_respond> tags.)
-Usage:
-<plan_mode_respond>
-<response>Your response here</response>
-</plan_mode_respond>
-
-## load_mcp_documentation
-Description: Load documentation about creating MCP servers. This tool should be used when the user requests to create or install an MCP server (the user may ask you something along the lines of "add a tool" that does some function, in other words to create an MCP server that provides tools and resources that may connect to external APIs for example. You have the ability to create an MCP server and add it to a configuration file that will then expose the tools and resources for you to use with \`use_mcp_tool\` and \`access_mcp_resource\`). The documentation provides detailed information about the MCP server creation process, including setup instructions, best practices, and examples.
-Parameters: None
-Usage:
-<load_mcp_documentation>
-</load_mcp_documentation>
-
-# Tool Use Examples
-
-## Example 1: Requesting to execute a command
-
-<execute_command>
-<command>npm run dev</command>
-<requires_approval>false</requires_approval>
-</execute_command>
-
-## Example 2: Requesting to create a new file
-
-<write_to_file>
-<path>src/frontend-config.json</path>
-<content>
-{
-  "apiEndpoint": "https://api.example.com",
-  "theme": {
-    "primaryColor": "#007bff",
-    "secondaryColor": "#6c757d",
-    "fontFamily": "Arial, sans-serif"
-  },
-  "features": {
-    "darkMode": true,
-    "notifications": true,
-    "analytics": false
-  },
-  "version": "1.0.0"
-}
-</content>
-</write_to_file>
-
-## Example 3: Creating a new task
-
-<new_task>
-<context>
-1. Current Work:
-   [Detailed description]
-
-2. Key Technical Concepts:
-   - [Concept 1]
-   - [Concept 2]
-   - [...]
-
-3. Relevant Files and Code:
-   - [File Name 1]
-      - [Summary of why this file is important]
-      - [Summary of the changes made to this file, if any]
-      - [Important Code Snippet]
-   - [File Name 2]
-      - [Important Code Snippet]
-   - [...]
-
-4. Problem Solving:
-   [Detailed description]
-
-5. Pending Tasks and Next Steps:
-   - [Task 1 details & next steps]
-   - [Task 2 details & next steps]
-   - [...]
-</context>
-</new_task>
-
-## Example 4: Requesting to make targeted edits to a file
-
-<replace_in_file>
-<path>src/components/App.tsx</path>
-<diff>
-------- SEARCH
-import React from 'react';
-=======
-import React, { useState } from 'react';
-+++++++ REPLACE
-
-------- SEARCH
-function handleSubmit() {
-  saveData();
-  setLoading(false);
-}
-
-=======
-+++++++ REPLACE
-
-------- SEARCH
-return (
-  <div>
-=======
-function handleSubmit() {
-  saveData();
-  setLoading(false);
-}
-
-return (
-  <div>
-+++++++ REPLACE
-</diff>
-</replace_in_file>
-
-
-## Example 5: Requesting to use an MCP tool
-
-<use_mcp_tool>
-<server_name>weather-server</server_name>
-<tool_name>get_forecast</tool_name>
-<arguments>
-{
-  "city": "San Francisco",
-  "days": 5
-}
-</arguments>
-</use_mcp_tool>
-
-## Example 6: Another example of using an MCP tool (where the server name is a unique identifier such as a URL)
-
-<use_mcp_tool>
-<server_name>github.com/modelcontextprotocol/servers/tree/main/src/github</server_name>
-<tool_name>create_issue</tool_name>
-<arguments>
-{
-  "owner": "octocat",
-  "repo": "hello-world",
-  "title": "Found a bug",
-  "body": "I'm having a problem with this.",
-  "labels": ["bug", "help wanted"],
-  "assignees": ["octocat"]
-}
-</arguments>
-</use_mcp_tool>
-
-# Tool Use Guidelines
-
-1. In <thinking> tags, assess what information you already have and what information you need to proceed with the task.
-2. Choose the most appropriate tool based on the task and the tool descriptions provided. Assess if you need additional information to proceed, and which of the available tools would be most effective for gathering this information. For example using the list_files tool is more effective than running a command like \`ls\` in the terminal. It's critical that you think about each available tool and use the one that best fits the current step in the task.
-3. If multiple actions are needed, use one tool at a time per message to accomplish the task iteratively, with each tool use being informed by the result of the previous tool use. Do not assume the outcome of any tool use. Each step must be informed by the previous step's result.
-4. Formulate your tool use using the XML format specified for each tool.
-5. After each tool use, the user will respond with the result of that tool use. This result will provide you with the necessary information to continue your task or make further decisions. This response may include:
-  - Information about whether the tool succeeded or failed, along with any reasons for failure.
-  - Linter errors that may have arisen due to the changes you made, which you'll need to address.
-  - New terminal output in reaction to the changes, which you may need to consider or act upon.
-  - Any other relevant feedback or information related to the tool use.
-6. ALWAYS wait for user confirmation after each tool use before proceeding. Never assume the success of a tool use without explicit confirmation of the result from the user.
-
-It is crucial to proceed step-by-step, waiting for the user's message after each tool use before moving forward with the task. This approach allows you to:
-1. Confirm the success of each step before proceeding.
-2. Address any issues or errors that arise immediately.
-3. Adapt your approach based on new information or unexpected results.
-4. Ensure that each action builds correctly on the previous ones.
-
-By waiting for and carefully considering the user's response after each tool use, you can react accordingly and make informed decisions about how to proceed with the task. This iterative process helps ensure the overall success and accuracy of your work.
-
-====
-
-MCP SERVERS
-
-The Model Context Protocol (MCP) enables communication between the system and locally running MCP servers that provide additional tools and resources to extend your capabilities.
-
-# Connected MCP Servers
-
-When a server is connected, you can use the server's tools via the \`use_mcp_tool\` tool, and access the server's resources via the \`access_mcp_resource\` tool.
-
-${mcpHubString}
-
-====
-
-EDITING FILES
-
-You have access to two tools for working with files: **write_to_file** and **replace_in_file**. Understanding their roles and selecting the right one for the job will help ensure efficient and accurate modifications.
-
-# write_to_file
-
-## Purpose
-
-- Create a new file, or overwrite the entire contents of an existing file.
-
-## When to Use
-
-- Initial file creation, such as when scaffolding a new project.  
-- Overwriting large boilerplate files where you want to replace the entire content at once.
-- When the complexity or number of changes would make replace_in_file unwieldy or error-prone.
-- When you need to completely restructure a file's content or change its fundamental organization.
-
-## Important Considerations
-
-- Using write_to_file requires providing the file's complete final content.  
-- If you only need to make small changes to an existing file, consider using replace_in_file instead to avoid unnecessarily rewriting the entire file.
-- While write_to_file should not be your default choice, don't hesitate to use it when the situation truly calls for it.
-
-# replace_in_file
-
-## Purpose
-
-- Make targeted edits to specific parts of an existing file without overwriting the entire file.
-
-## When to Use
-
-- Small, localized changes like updating a few lines, function implementations, changing variable names, modifying a section of text, etc.
-- Targeted improvements where only specific portions of the file's content needs to be altered.
-- Especially useful for long files where much of the file will remain unchanged.
-
-## Advantages
-
-- More efficient for minor edits, since you don't need to supply the entire file content.  
-- Reduces the chance of errors that can occur when overwriting large files.
-
-# Choosing the Appropriate Tool
-
-- **Default to replace_in_file** for most changes. It's the safer, more precise option that minimizes potential issues.
-- **Use write_to_file** when:
-  - Creating new files
-  - The changes are so extensive that using replace_in_file would be more complex or risky
-  - You need to completely reorganize or restructure a file
-  - The file is relatively small and the changes affect most of its content
-  - You're generating boilerplate or template files
-
-# Auto-formatting Considerations
-
-- After using either write_to_file or replace_in_file, the user's editor may automatically format the file
-- This auto-formatting may modify the file contents, for example:
-  - Breaking single lines into multiple lines
-  - Adjusting indentation to match project style (e.g. 2 spaces vs 4 spaces vs tabs)
-  - Converting single quotes to double quotes (or vice versa based on project preferences)
-  - Organizing imports (e.g. sorting, grouping by type)
-  - Adding/removing trailing commas in objects and arrays
-  - Enforcing consistent brace style (e.g. same-line vs new-line)
-  - Standardizing semicolon usage (adding or removing based on style)
-- The write_to_file and replace_in_file tool responses will include the final state of the file after any auto-formatting
-- Use this final state as your reference point for any subsequent edits. This is ESPECIALLY important when crafting SEARCH blocks for replace_in_file which require the content to match what's in the file exactly.
-
-# Workflow Tips
-
-1. Before editing, assess the scope of your changes and decide which tool to use.
-2. For targeted edits, apply replace_in_file with carefully crafted SEARCH/REPLACE blocks. If you need multiple changes, you can stack multiple SEARCH/REPLACE blocks within a single replace_in_file call.
-3. For major overhauls or initial file creation, rely on write_to_file.
-4. Once the file has been edited with either write_to_file or replace_in_file, the system will provide you with the final state of the modified file. Use this updated content as the reference point for any subsequent SEARCH/REPLACE operations, since it reflects any auto-formatting or user-applied changes.
-By thoughtfully selecting between write_to_file and replace_in_file, you can make your file editing process smoother, safer, and more efficient.
-
-====
- 
-ACT MODE V.S. PLAN MODE
-
-In each user message, the environment_details will specify the current mode. There are two modes:
-
-- ACT MODE: In this mode, you have access to all tools EXCEPT the plan_mode_respond tool.
- - In ACT MODE, you use tools to accomplish the user's task. Once you've completed the user's task, you use the attempt_completion tool to present the result of the task to the user.
-- PLAN MODE: In this special mode, you have access to the plan_mode_respond tool.
- - In PLAN MODE, the goal is to gather information and get context to create a detailed plan for accomplishing the task, which the user will review and approve before they switch you to ACT MODE to implement the solution.
- - In PLAN MODE, when you need to converse with the user or present a plan, you should use the plan_mode_respond tool to deliver your response directly, rather than using <thinking> tags to analyze when to respond. Do not talk about using plan_mode_respond - just use it directly to share your thoughts and provide helpful answers.
-
-## What is PLAN MODE?
-
-- While you are usually in ACT MODE, the user may switch to PLAN MODE in order to have a back and forth with you to plan how to best accomplish the task. 
-- When starting in PLAN MODE, depending on the user's request, you may need to do some information gathering e.g. using read_file or search_files to get more context about the task. You may also ask the user clarifying questions to get a better understanding of the task. You may return mermaid diagrams to visually display your understanding.
-- Once you've gained more context about the user's request, you should architect a detailed plan for how you will accomplish the task. Returning mermaid diagrams may be helpful here as well.
-- Then you might ask the user if they are pleased with this plan, or if they would like to make any changes. Think of this as a brainstorming session where you can discuss the task and plan the best way to accomplish it.
-- If at any point a mermaid diagram would make your plan clearer to help the user quickly see the structure, you are encouraged to include a Mermaid code block in the response. (Note: if you use colors in your mermaid diagrams, be sure to use high contrast colors so the text is readable.)
-- Finally once it seems like you've reached a good plan, ask the user to switch you back to ACT MODE to implement the solution.
-
-====
- 
-CAPABILITIES
-
-- You have access to tools that let you execute CLI commands on the user's computer, list files, view source code definitions, regex search${
-		supportsBrowserUse ? ", use the browser" : ""
-	}, read and edit files, and ask follow-up questions. These tools help you effectively accomplish a wide range of tasks, such as writing code, making edits or improvements to existing files, understanding the current state of a project, performing system operations, and much more.
-- When the user initially gives you a task, a recursive list of all filepaths in the current working directory ('${cwdFormatted}') will be included in environment_details. This provides an overview of the project's file structure, offering key insights into the project from directory/file names (how developers conceptualize and organize their code) and file extensions (the language used). This can also guide decision-making on which files to explore further. If you need to further explore directories such as outside the current working directory, you can use the list_files tool. If you pass 'true' for the recursive parameter, it will list files recursively. Otherwise, it will list files at the top level, which is better suited for generic directories where you don't necessarily need the nested structure, like the Desktop.
-- You can use search_files to perform regex searches across files in a specified directory, outputting context-rich results that include surrounding lines. This is particularly useful for understanding code patterns, finding specific implementations, or identifying areas that need refactoring.
-- You can use the list_code_definition_names tool to get an overview of source code definitions for all files at the top level of a specified directory. This can be particularly useful when you need to understand the broader context and relationships between certain parts of the code. You may need to call this tool multiple times to understand various parts of the codebase related to the task.
-    - For example, when asked to make edits or improvements you might analyze the file structure in the initial environment_details to get an overview of the project, then use list_code_definition_names to get further insight using source code definitions for files located in relevant directories, then read_file to examine the contents of relevant files, analyze the code and suggest improvements or make necessary edits, then use the replace_in_file tool to implement changes. If you refactored code that could affect other parts of the codebase, you could use search_files to ensure you update other files as needed.
-- You can use the execute_command tool to run commands on the user's computer whenever you feel it can help accomplish the user's task. When you need to execute a CLI command, you must provide a clear explanation of what the command does. Prefer to execute complex CLI commands over creating executable scripts, since they are more flexible and easier to run. Interactive and long-running commands are allowed, since the commands are run in the user's VSCode terminal. The user may keep commands running in the background and you will be kept updated on their status along the way. Each command you execute is run in a new terminal instance.${
-		supportsBrowserUse
-			? "\n- You can use the browser_action tool to interact with websites (including html files and locally running development servers) through a Puppeteer-controlled browser when you feel it is necessary in accomplishing the user's task. This tool is particularly useful for web development tasks as it allows you to launch a browser, navigate to pages, interact with elements through clicks and keyboard input, and capture the results through screenshots and console logs. This tool may be useful at key stages of web development tasks-such as after implementing new features, making substantial changes, when troubleshooting issues, or to verify the result of your work. You can analyze the provided screenshots to ensure correct rendering or identify errors, and review console logs for runtime issues.\n	- For example, if asked to add a component to a react website, you might create the necessary files, use execute_command to run the site locally, then use browser_action to launch the browser, navigate to the local server, and verify the component renders & functions correctly before closing the browser."
-			: ""
-	}
-- You have access to MCP servers that may provide additional tools and resources. Each server may provide different capabilities that you can use to accomplish tasks more effectively.
-- You can use LaTeX syntax in your responses to render mathematical expressions
-
-====
-
-If the user asks for help or wants to give feedback inform them of the following: 
-- To give feedback, users should report the issue using the /reportbug slash command in the chat. 
-
-When the user directly asks about Cline (eg 'can Cline do...', 'does Cline have...') or asks in second person (eg 'are you able...', 'can you do...'), first use the web_fetch tool to gather information to answer the question from Cline docs at https://docs.cline.bot.
-  - The available sub-pages are \`getting-started\` (Intro for new coders, installing Cline and dev essentials), \`model-selection\` (Model Selection Guide, Custom Model Configs, Bedrock, Vertex, Codestral, LM Studio, Ollama), \`features\` (Auto approve, Checkpoints, Cline rules, Drag & Drop, Plan & Act, Workflows, etc), \`task-management\` (Task and Context Management in Cline), \`prompt-engineering\` (Improving your prompting skills, Prompt Engineering Guide), \`cline-tools\` (Cline Tools Reference Guide, New Task Tool, Remote Browser Support, Slash Commands), \`mcp\` (MCP Overview, Adding/Configuring Servers, Transport Mechanisms, MCP Dev Protocol), \`enterprise\` (Cloud provider integration, Security concerns, Custom instructions), \`more-info\` (Telemetry and other reference content)
-  - Example: https://docs.cline.bot/features/auto-approve
-
-====
-
-RULES
-
-- Your current working directory is: ${cwdFormatted}
-- You cannot \`cd\` into a different directory to complete a task. You are stuck operating from '${cwdFormatted}', so be sure to pass in the correct 'path' parameter when using tools that require a path.
-- Do not use the ~ character or $HOME to refer to the home directory.
-- Before using the execute_command tool, you must first think about the SYSTEM INFORMATION context provided to understand the user's environment and tailor your commands to ensure they are compatible with their system. You must also consider if the command you need to run should be executed in a specific directory outside of the current working directory '${cwdFormatted}', and if so prepend with \`cd\`'ing into that directory && then executing the command (as one command since you are stuck operating from '${cwdFormatted}'). For example, if you needed to run \`npm install\` in a project outside of '${cwdFormatted}', you would need to prepend with a \`cd\` i.e. pseudocode for this would be \`cd (path to project) && (command, in this case npm install)\`.
-- When using the search_files tool, craft your regex patterns carefully to balance specificity and flexibility. Based on the user's task you may use it to find code patterns, TODO comments, function definitions, or any text-based information across the project. The results include context, so analyze the surrounding code to better understand the matches. Leverage the search_files tool in combination with other tools for more comprehensive analysis. For example, use it to find specific code patterns, then use read_file to examine the full context of interesting matches before using replace_in_file to make informed changes.
-- When creating a new project (such as an app, website, or any software project), organize all new files within a dedicated project directory unless the user specifies otherwise. Use appropriate file paths when creating files, as the write_to_file tool will automatically create any necessary directories. Structure the project logically, adhering to best practices for the specific type of project being created. Unless otherwise specified, new projects should be easily run without additional setup, for example most projects can be built in HTML, CSS, and JavaScript - which you can open in a browser.
-- Be sure to consider the type of project (e.g. Python, JavaScript, web application) when determining the appropriate structure and files to include. Also consider what files may be most relevant to accomplishing the task, for example looking at a project's manifest file would help you understand the project's dependencies, which you could incorporate into any code you write.
-- When making changes to code, always consider the context in which the code is being used. Ensure that your changes are compatible with the existing codebase and that they follow the project's coding standards and best practices.
-- When you want to modify a file, use the replace_in_file or write_to_file tool directly with the desired changes. You do not need to display the changes before using the tool.
-- Do not ask for more information than necessary. Use the tools provided to accomplish the user's request efficiently and effectively. When you've completed your task, you must use the attempt_completion tool to present the result to the user. The user may provide feedback, which you can use to make improvements and try again.
-- You are only allowed to ask the user questions using the ask_followup_question tool. Use this tool only when you need additional details to complete a task, and be sure to use a clear and concise question that will help you move forward with the task. However if you can use the available tools to avoid having to ask the user questions, you should do so. For example, if the user mentions a file that may be in an outside directory like the Desktop, you should use the list_files tool to list the files in the Desktop and check if the file they are talking about is there, rather than asking the user to provide the file path themselves.
-- When executing commands, if you don't see the expected output, assume the terminal executed the command successfully and proceed with the task. The user's terminal may be unable to stream the output back properly. If you absolutely need to see the actual terminal output, use the ask_followup_question tool to request the user to copy and paste it back to you.
-- The user may provide a file's contents directly in their message, in which case you shouldn't use the read_file tool to get the file contents again since you already have it.
-- Your goal is to try to accomplish the user's task, NOT engage in a back and forth conversation.${
-		supportsBrowserUse
-			? `\n- The user may ask generic non-development tasks, such as "what\'s the latest news" or "look up the weather in San Diego", in which case you might use the browser_action tool to complete the task if it makes sense to do so, rather than trying to create a website or using curl to answer the question. However, if an available MCP server tool or resource can be used instead, you should prefer to use it over browser_action.`
-			: ""
-	}
-- NEVER end attempt_completion result with a question or request to engage in further conversation! Formulate the end of your result in a way that is final and does not require further input from the user.
-- You are STRICTLY FORBIDDEN from starting your messages with "Great", "Certainly", "Okay", "Sure". You should NOT be conversational in your responses, but rather direct and to the point. For example you should NOT say "Great, I've updated the CSS" but instead something like "I've updated the CSS". It is important you be clear and technical in your messages.
-- When presented with images, utilize your vision capabilities to thoroughly examine them and extract meaningful information. Incorporate these insights into your thought process as you accomplish the user's task.
-- At the end of each user message, you will automatically receive environment_details. This information is not written by the user themselves, but is auto-generated to provide potentially relevant context about the project structure and environment. While this information can be valuable for understanding the project context, do not treat it as a direct part of the user's request or response. Use it to inform your actions and decisions, but don't assume the user is explicitly asking about or referring to this information unless they clearly do so in their message. When using environment_details, explain your actions clearly to ensure the user understands, as they may not be aware of these details.
-- Before executing commands, check the "Actively Running Terminals" section in environment_details. If present, consider how these active processes might impact your task. For example, if a local development server is already running, you wouldn't need to start it again. If no active terminals are listed, proceed with command execution as normal.
-- When using the replace_in_file tool, you must include complete lines in your SEARCH blocks, not partial lines. The system requires exact line matches and cannot match partial lines. For example, if you want to match a line containing "const x = 5;", your SEARCH block must include the entire line, not just "x = 5" or other fragments.
-- When using the replace_in_file tool, if you use multiple SEARCH/REPLACE blocks, list them in the order they appear in the file. For example if you need to make changes to both line 10 and line 50, first include the SEARCH/REPLACE block for line 10, followed by the SEARCH/REPLACE block for line 50.
-- When using the replace_in_file tool, Do NOT add extra characters to the markers (e.g., ------- SEARCH> is INVALID). Do NOT forget to use the closing +++++++ REPLACE marker. Do NOT modify the marker format in any way. Malformed XML will cause complete tool failure and break the entire editing process.
-- It is critical you wait for the user's response after each tool use, in order to confirm the success of the tool use. For example, if asked to make a todo app, you would create a file, wait for the user's response it was created successfully, then create another file if needed, wait for the user's response it was created successfully, etc.${
-		supportsBrowserUse
-			? " Then if you want to test your work, you might use browser_action to launch the site, wait for the user's response confirming the site was launched along with a screenshot, then perhaps e.g., click a button to test functionality if needed, wait for the user's response confirming the button was clicked along with a screenshot of the new state, before finally closing the browser."
-			: ""
-	}
-- MCP operations should be used one at a time, similar to other tool usage. Wait for confirmation of success before proceeding with additional operations.
-
-====
-
-SYSTEM INFORMATION
-
-Operating System: ${os}
-Default Shell: ${shell}
-Home Directory: ${homeFormatted}
-Current Working Directory: ${cwdFormatted}
-
-====
-
-OBJECTIVE
-
-You accomplish a given task iteratively, breaking it down into clear steps and working through them methodically.
-
-1. Analyze the user's task and set clear, achievable goals to accomplish it. Prioritize these goals in a logical order.
-2. Work through these goals sequentially, utilizing available tools one at a time as necessary. Each goal should correspond to a distinct step in your problem-solving process. You will be informed on the work completed and what's remaining as you go.
-3. Remember, you have extensive capabilities with access to a wide range of tools that can be used in powerful and clever ways as necessary to accomplish each goal. Before calling a tool, do some analysis within <thinking></thinking> tags. First, analyze the file structure provided in environment_details to gain context and insights for proceeding effectively. Then, think about which of the provided tools is the most relevant tool to accomplish the user's task. Next, go through each of the required parameters of the relevant tool and determine if the user has directly provided or given enough information to infer a value. When deciding if the parameter can be inferred, carefully consider all the context to see if it supports a specific value. If all of the required parameters are present or can be reasonably inferred, close the thinking tag and proceed with the tool use. BUT, if one of the values for a required parameter is missing, DO NOT invoke the tool (not even with fillers for the missing params) and instead, ask the user to provide the missing parameters using the ask_followup_question tool. DO NOT ask for more information on optional parameters if it is not provided.
-4. Once you've completed the user's task, you must use the attempt_completion tool to present the result of the task to the user. You may also provide a CLI command to showcase the result of your task; this can be particularly useful for web development tasks, where you can run e.g. \`open index.html\` to show the website you've built.
-5. The user may provide feedback, which you can use to make improvements and try again. But DO NOT continue in pointless back and forth conversations, i.e. don't end your responses with questions or offers for further assistance.
-${
-	userCustomInstructions
-		? `\n
-====
-
-USER'S CUSTOM INSTRUCTIONS
-
-The following additional instructions are provided by the user, and should be followed to the best of your ability without interfering with the TOOL USE guidelines.
-
-${userCustomInstructions}`
-		: ""
-}`
-}

evals/diff_editing/types.ts

@@ -1,88 +0,0 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ToolUseName, ToolParamName } from "../../src/core/assistant-message"
-
-export interface InputMessage {
-	role: "user" | "assistant"
-	text: string
-	images?: string[]
-}
-
-export interface ProcessedTestCase {
-	test_id: string
-	messages: Anthropic.Messages.MessageParam[]
-	file_contents: string
-	file_path: string
-	system_prompt_details: SystemPromptDetails
-	original_diff_edit_tool_call_message: string
-}
-
-export interface TestCase {
-	test_id: string
-	messages: InputMessage[]
-	file_contents: string
-	file_path: string
-	system_prompt_details: SystemPromptDetails
-	original_diff_edit_tool_call_message: string
-}
-
-export interface TestConfig {
-	model_id: string
-	system_prompt_name: string
-	number_of_runs: number
-	parsing_function: string
-	diff_edit_function: string
-	thinking_tokens_budget: number
-	replay: boolean
-}
-
-export interface SystemPromptDetails {
-	mcp_string: string
-	cwd_value: string
-	browser_use: boolean
-	width: number
-	height: number
-	os_value: string
-	shell_value: string
-	home_value: string
-	user_custom_instructions: string
-}
-
-export type ConstructSystemPromptFn = (
-	cwdFormatted: string,
-	supportsBrowserUse: boolean,
-	browserWidth: number,
-	browserHeight: number,
-	os: string,
-	shell: string,
-	homeFormatted: string,
-	mcpHubString: string,
-	userCustomInstructions: string,
-) => string
-
-export interface TestResult {
-	success: boolean
-	streamResult?: any
-	diffEdit?: string
-	toolCalls?: ExtractedToolCall[]
-	diffEditSuccess?: boolean
-	error?: string
-	errorString?: string
-}
-
-export interface ExtractedToolCall {
-	name: ToolUseName
-	input: Partial<Record<ToolParamName, string>>
-}
-
-export interface TestInput {
-	apiKey?: string
-	systemPrompt: string
-	messages: Anthropic.Messages.MessageParam[]
-	modelId: string
-	originalFile: string
-	originalFilePath: string
-	parsingFunction: string
-	diffEditFunction: string
-	thinkingBudgetTokens: number
-	originalDiffEditToolCallMessage?: string
-}

hosts/vscode/host-grpc-handler.ts

@@ -0,0 +1,197 @@
+import { v4 as uuidv4 } from "uuid"
+import { hostServiceHandlers } from "./host-grpc-service-config"
+import { GrpcRequestRegistry } from "../../src/core/controller/grpc-request-registry"
+
+/**
+ * Type definition for a streaming response handler
+ */
+export type StreamingResponseHandler = (response: any, isLast?: boolean, sequenceNumber?: number) => Promise<void>
+
+// Registry to track active gRPC requests and their cleanup functions
+const requestRegistry = new GrpcRequestRegistry()
+
+/**
+ * Callback interface for streaming requests
+ */
+export interface StreamingCallbacks<T = any> {
+	onResponse: (response: T) => void
+	onError?: (error: Error) => void
+	onComplete?: () => void
+}
+
+/**
+ * Handles gRPC requests from the webview
+ */
+export class GrpcHandler {
+	constructor() {}
+
+	/**
+	 * Handle a gRPC request from the webview
+	 * @param service The service name
+	 * @param method The method name
+	 * @param message The request message
+	 * @param requestId The request ID for response correlation
+	 * @param streamingCallbacks Optional callbacks for streaming responses
+	 * @returns For unary requests: the response message or error. For streaming requests: a cancel function.
+	 */
+	async handleRequest<T = any>(
+		service: string,
+		method: string,
+		message: any,
+		requestId: string,
+		streamingCallbacks?: StreamingCallbacks<T>,
+	): Promise<
+		| {
+				message?: any
+				error?: string
+				request_id: string
+		  }
+		| (() => void)
+	> {
+		// If streaming callbacks are provided, handle as a streaming request
+		if (streamingCallbacks) {
+			let completionCalled = false
+
+			// Create a response handler that will call the client's callbacks
+			const responseHandler: StreamingResponseHandler = async (response, isLast = false, sequenceNumber) => {
+				try {
+					// Call the client's onResponse callback with the response
+					streamingCallbacks.onResponse(response)
+
+					// If this is the last response, call the onComplete callback
+					if (isLast && streamingCallbacks.onComplete && !completionCalled) {
+						completionCalled = true
+						streamingCallbacks.onComplete()
+					}
+				} catch (error) {
+					// If there's an error in the callback, call the onError callback
+					if (streamingCallbacks.onError) {
+						streamingCallbacks.onError(error instanceof Error ? error : new Error(String(error)))
+					}
+				}
+			}
+
+			// Register the response handler with the registry
+			requestRegistry.registerRequest(
+				requestId,
+				() => {
+					console.log(`[DEBUG] Cleaning up streaming request: ${requestId}`)
+					if (streamingCallbacks.onComplete && !completionCalled) {
+						completionCalled = true
+						streamingCallbacks.onComplete()
+					}
+				},
+				{ type: "streaming_request", service, method },
+				responseHandler,
+			)
+
+			// Call the streaming handler directly
+			console.log(`[DEBUG] Streaming gRPC host call to ${service}.${method} req:${requestId}`)
+			try {
+				await this.handleStreamingRequest(service, method, message, requestId)
+			} catch (error) {
+				if (streamingCallbacks.onError) {
+					streamingCallbacks.onError(error instanceof Error ? error : new Error(String(error)))
+				}
+			}
+
+			// Return a function to cancel the stream
+			return () => {
+				console.log(`[DEBUG] Cancelling streaming request: ${requestId}`)
+				this.cancelRequest(requestId)
+			}
+		}
+
+		// Handle as a unary request
+		try {
+			// Get the service handler from the config
+			const serviceConfig = hostServiceHandlers[service]
+			if (!serviceConfig) {
+				throw new Error(`Unknown service: ${service}`)
+			}
+
+			// Handle unary request
+			return {
+				message: await serviceConfig.requestHandler(method, message),
+				request_id: requestId,
+			}
+		} catch (error) {
+			return {
+				error: error instanceof Error ? error.message : String(error),
+				request_id: requestId,
+			}
+		}
+	}
+
+	/**
+	 * Cancel a gRPC request
+	 * @param requestId The request ID to cancel
+	 * @returns True if the request was found and cancelled, false otherwise
+	 */
+	public async cancelRequest(requestId: string): Promise<boolean> {
+		const cancelled = requestRegistry.cancelRequest(requestId)
+
+		if (cancelled) {
+			// Get the registered response handler from the registry
+			const requestInfo = requestRegistry.getRequestInfo(requestId)
+			if (requestInfo && requestInfo.responseStream) {
+				try {
+					// Send cancellation confirmation using the registered response handler
+					await requestInfo.responseStream(
+						{ cancelled: true },
+						true, // Mark as last message
+					)
+				} catch (e) {
+					console.error(`Error sending cancellation response for ${requestId}:`, e)
+				}
+			}
+		} else {
+			console.log(`[DEBUG] Request not found for cancellation: ${requestId}`)
+		}
+
+		return cancelled
+	}
+
+	/**
+	 * Handle a streaming gRPC request
+	 * @param service The service name
+	 * @param method The method name
+	 * @param message The request message
+	 * @param requestId The request ID for response correlation
+	 */
+	private async handleStreamingRequest(service: string, method: string, message: any, requestId: string): Promise<void> {
+		// Get the service handler from the config
+		const serviceConfig = hostServiceHandlers[service]
+		if (!serviceConfig) {
+			throw new Error(`Unknown service: ${service}`)
+		}
+
+		// Check if the service supports streaming
+		if (!serviceConfig.streamingHandler) {
+			throw new Error(`Service ${service} does not support streaming`)
+		}
+
+		// Get the registered response handler from the registry
+		const requestInfo = requestRegistry.getRequestInfo(requestId)
+		if (!requestInfo || !requestInfo.responseStream) {
+			throw new Error(`No response handler registered for request: ${requestId}`)
+		}
+
+		// Use the registered response handler
+		const responseStream = requestInfo.responseStream
+
+		// Handle streaming request and pass the requestId to all streaming handlers
+		await serviceConfig.streamingHandler(method, message, responseStream, requestId)
+
+		// Don't send a final message here - the stream should stay open for future updates
+		// The stream will be closed when the client disconnects or when the service explicitly ends it
+	}
+}
+
+/**
+ * Get the request registry instance
+ * This allows other parts of the code to access the registry
+ */
+export function getRequestRegistry(): GrpcRequestRegistry {
+	return requestRegistry
+}

hosts/vscode/uri/file.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
-import { Uri } from "@shared/proto/host/uri"
-import { StringRequest } from "@shared/proto/common"
+import { Uri } from "../../../src/shared/proto/host/uri"
+import { StringRequest } from "../../../src/shared/proto/common"
 
 /**
  * Creates a file URI from a file path

hosts/vscode/uri/joinPath.ts

@@ -1,5 +1,5 @@
 import * as vscode from "vscode"
-import { JoinPathRequest, Uri } from "@shared/proto/host/uri"
+import { JoinPathRequest, Uri } from "../../../src/shared/proto/host/uri"
 
 /**
  * Joins a URI with additional path segments

hosts/vscode/uri/parse.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
-import { Uri } from "@shared/proto/host/uri"
-import { StringRequest } from "@shared/proto/common"
+import { Uri } from "../../../src/shared/proto/host/uri"
+import { StringRequest } from "../../../src/shared/proto/common"
 
 /**
  * Parses a string URI into a Uri object

hosts/vscode/watch/subscribeToFile.ts

@@ -1,6 +1,6 @@
 import * as fs from "fs/promises"
 import * as fsSync from "fs"
-import { SubscribeToFileRequest, FileChangeEvent, FileChangeEvent_ChangeType } from "@shared/proto/host/watch"
+import { SubscribeToFileRequest, FileChangeEvent, FileChangeEvent_ChangeType } from "../../../src/shared/proto/host/watch"
 import { StreamingResponseHandler, getRequestRegistry } from "../host-grpc-handler"
 
 // Debounce configuration

package.json

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

proto/build-proto.js

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

proto/host/uri.proto

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

proto/models.proto

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

proto/state.proto

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

proto/ui.proto

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

scripts/generate-server-setup.mjs

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

scripts/package-standalone.mjs

@@ -36,14 +36,12 @@ if (nativeModules.length > 0) {
 // Zip the build directory (excluding any pre-existing output zip).
 const zipPath = path.join(BUILD_DIR, "standalone.zip")
 const output = fs.createWriteStream(zipPath)
-const archive = archiver("zip", { zlib: { level: 3 } })
+const archive = archiver("zip", { zlib: { level: 9 } })
 
 output.on("close", () => {
 	console.log(`Created ${zipPath} (${(archive.pointer() / 1024 / 1024).toFixed(1)} MB)`)
 })
-archive.on("warning", (err) => {
-	console.warn(`Warning: ${err}`)
-})
+
 archive.on("error", (err) => {
 	throw err
 })
@@ -53,20 +51,4 @@ archive.glob("**/*", {
 	cwd: BUILD_DIR,
 	ignore: ["standalone.zip"],
 })
-
-// Add the whole cline directory under "extension"
-archive.directory(process.cwd(), "extension", (entry) => {
-	// Skip certain directories
-	if (
-		entry.name.startsWith(BUILD_DIR + "/") ||
-		entry.name.startsWith("node_modules/") || // node_modules nearly 1GB.
-		entry.name.startsWith("webview-ui/node_modules/") || // node_modules nearly 1GB.
-		entry.name.match(/(^|\/)\./) // exclude dot directories
-	) {
-		return false
-	}
-	return entry
-})
-
-console.log("Zipping package...")
 await archive.finalize()

src/api/index.ts

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

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

@@ -1,49 +1,8 @@
 import "should"
 import { AwsBedrockHandler } from "../bedrock"
 import { ApiHandlerOptions } from "@shared/api"
-import { ConverseStreamCommand } from "@aws-sdk/client-bedrock-runtime"
-import { Readable } from "stream"
 
 describe("AwsBedrockHandler", () => {
-	// Helper function to create a mock stream
-	function createMockStream(chunks: any[]): Readable {
-		const stream = new Readable({
-			objectMode: true,
-			read() {
-				if (chunks.length > 0) {
-					this.push(chunks.shift())
-				} else {
-					this.push(null)
-				}
-			},
-		})
-		return stream
-	}
-
-	// Helper function to collect generator results
-	async function collectGeneratorResults(generator: AsyncGenerator<any>): Promise<any[]> {
-		const results: any[] = []
-		for await (const item of generator) {
-			results.push(item)
-		}
-		return results
-	}
-
-	// Mock AWS Bedrock client
-	class MockBedrockClient {
-		private streamChunks: any[]
-
-		constructor(streamChunks: any[]) {
-			this.streamChunks = streamChunks
-		}
-
-		async send(_command: any): Promise<any> {
-			return {
-				stream: createMockStream(this.streamChunks),
-			}
-		}
-	}
-
 	describe("withTempEnv", () => {
 		// Store original env vars for cleanup
 		const originalEnv: Record<string, string | undefined> = {}
@@ -183,412 +142,4 @@ describe("AwsBedrockHandler", () => {
 			process.env["AWS_PROFILE"]!.should.equal(preAWSProfile)
 		})
 	})
-
-	describe("executeConverseStream", () => {
-		let handler: AwsBedrockHandler
-		const mockOptions: ApiHandlerOptions = {
-			apiModelId: "anthropic.claude-3-7-sonnet-20250219-v1:0",
-			awsRegion: "us-east-1",
-			awsAccessKey: "test-key",
-			awsSecretKey: "test-secret",
-			awsSessionToken: "",
-			awsUseProfile: false,
-			awsProfile: "",
-			awsBedrockUsePromptCache: false,
-			awsUseCrossRegionInference: false,
-			awsBedrockEndpoint: "",
-			awsBedrockCustomSelected: false,
-			awsBedrockCustomModelBaseId: undefined,
-			thinkingBudgetTokens: 1600,
-		}
-
-		const mockModelInfo = {
-			maxTokens: 8192,
-			contextWindow: 200000,
-			supportsPromptCache: true,
-			supportsImages: true,
-			inputPrice: 3.0,
-			outputPrice: 15.0,
-			cacheWritesPrice: 3.75,
-			cacheReadsPrice: 0.3,
-		}
-
-		beforeEach(() => {
-			handler = new AwsBedrockHandler(mockOptions)
-		})
-
-		describe("reasoning content handling (deprecated)", () => {
-			// These tests are for the old reasoningContent API that may be deprecated
-			// Keep them for backward compatibility but they may fail with new API
-		})
-
-		describe("thinking response handling (new API structure)", () => {
-			it("should handle thinking response in additionalModelResponseFields", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					{
-						metadata: {
-							additionalModelResponseFields: {
-								thinkingResponse: {
-									reasoning: [
-										{
-											type: "text",
-											text: "まず与えられた数値50.653の立方根を求める必要があります。",
-											signature: "sig1",
-										},
-										{
-											type: "text",
-											text: "立方根を近似するために数値を3乗したときの誤差を調整していきます。",
-											signature: "sig2",
-										},
-									],
-								},
-							},
-						},
-					},
-					{ contentBlockDelta: { delta: { text: "50.653の立方根は約3.707です。" }, contentBlockIndex: 0 } },
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-					{ metadata: { usage: { inputTokens: 100, outputTokens: 50 } } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify thinking steps are yielded before the final answer
-				results.should.have.length(4)
-				results[0].type.should.equal("reasoning")
-				results[0].reasoning.should.equal("まず与えられた数値50.653の立方根を求める必要があります。")
-				results[1].type.should.equal("reasoning")
-				results[1].reasoning.should.equal("立方根を近似するために数値を3乗したときの誤差を調整していきます。")
-				results[2].type.should.equal("text")
-				results[2].text.should.equal("50.653の立方根は約3.707です。")
-				results[3].type.should.equal("usage")
-			})
-
-			it("should not parse thinking tags in text content", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					// Regular text that contains thinking tags should NOT be parsed as thinking
-					{
-						contentBlockDelta: {
-							delta: { text: "Let me explain <thinking>this is not real thinking</thinking> in the text." },
-							contentBlockIndex: 0,
-						},
-					},
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify that thinking tags are treated as regular text
-				results.should.have.length(1)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("Let me explain <thinking>this is not real thinking</thinking> in the text.")
-			})
-
-			it("should handle thinking response with empty reasoning array", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					{
-						metadata: {
-							additionalModelResponseFields: {
-								thinkingResponse: {
-									reasoning: [],
-								},
-							},
-						},
-					},
-					{ contentBlockDelta: { delta: { text: "Direct response without thinking" }, contentBlockIndex: 0 } },
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify only text is returned when reasoning array is empty
-				results.should.have.length(1)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("Direct response without thinking")
-			})
-
-			it("should handle thinking response interleaved with text chunks", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					// First, some thinking
-					{
-						metadata: {
-							additionalModelResponseFields: {
-								thinkingResponse: {
-									reasoning: [{ type: "text", text: "Initial thought process", signature: "sig1" }],
-								},
-							},
-						},
-					},
-					// Then some text
-					{ contentBlockDelta: { delta: { text: "Based on my analysis" }, contentBlockIndex: 0 } },
-					// More thinking
-					{
-						metadata: {
-							additionalModelResponseFields: {
-								thinkingResponse: {
-									reasoning: [{ type: "text", text: "Additional consideration", signature: "sig2" }],
-								},
-							},
-						},
-					},
-					// Final text
-					{ contentBlockDelta: { delta: { text: ", here is the answer." }, contentBlockIndex: 0 } },
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify interleaved thinking and text
-				results.should.have.length(4)
-				results[0].type.should.equal("reasoning")
-				results[0].reasoning.should.equal("Initial thought process")
-				results[1].type.should.equal("text")
-				results[1].text.should.equal("Based on my analysis")
-				results[2].type.should.equal("reasoning")
-				results[2].reasoning.should.equal("Additional consideration")
-				results[3].type.should.equal("text")
-				results[3].text.should.equal(", here is the answer.")
-			})
-		})
-
-		describe("multiple content blocks", () => {
-			it("should handle multiple content blocks (reasoning + text)", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					// Text block only - reasoning is now in additionalModelResponseFields
-					{ contentBlockDelta: { delta: { text: "Here is " }, contentBlockIndex: 0 } },
-					{ contentBlockDelta: { delta: { text: "my response" }, contentBlockIndex: 0 } },
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify text chunks are yielded correctly
-				results.should.have.length(2)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("Here is ")
-				results[1].type.should.equal("text")
-				results[1].text.should.equal("my response")
-			})
-
-			it("should handle real-world Japanese content", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					// Text block with Japanese response
-					{ contentBlockDelta: { delta: { text: "# 生成AIの仕組み - 10歳の君にも分かる説明" }, contentBlockIndex: 0 } },
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify Japanese content is handled correctly
-				results.should.have.length(1)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("# 生成AIの仕組み - 10歳の君にも分かる説明")
-			})
-
-			it("should handle interleaved content blocks", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					// Interleaved text blocks
-					{ contentBlockDelta: { delta: { text: "Text 1" }, contentBlockIndex: 0 } },
-					{ contentBlockDelta: { delta: { text: " Text 2" }, contentBlockIndex: 0 } },
-					// Stop blocks
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify text chunks are yielded correctly
-				results.should.have.length(2)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("Text 1")
-				results[1].type.should.equal("text")
-				results[1].text.should.equal(" Text 2")
-			})
-		})
-
-		describe("error handling", () => {
-			it("should handle internalServerException", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					{ internalServerException: { message: "Internal server error occurred" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify error was handled
-				results.should.have.length(1)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("[ERROR] Internal server error: Internal server error occurred")
-			})
-
-			it("should handle throttlingException", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					{ throttlingException: { message: "Rate limit exceeded" } },
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify error was handled
-				results.should.have.length(1)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("[ERROR] Throttling error: Rate limit exceeded")
-			})
-		})
-
-		describe("usage tracking", () => {
-			it("should track usage with cache tokens", async () => {
-				const mockChunks = [
-					{ messageStart: { role: "assistant" } },
-					{ contentBlockDelta: { delta: { text: "Response" }, contentBlockIndex: 0 } },
-					{ contentBlockStop: { contentBlockIndex: 0 } },
-					{ messageStop: { stopReason: "end_turn" } },
-					{
-						metadata: {
-							usage: {
-								inputTokens: 100,
-								outputTokens: 50,
-								cacheReadInputTokens: 20,
-								cacheWriteInputTokens: 30,
-							},
-						},
-					},
-				]
-
-				const mockClient = new MockBedrockClient(mockChunks)
-				const command = new ConverseStreamCommand({ modelId: "test-model", messages: [] })
-
-				// Replace getBedrockClient with our mock
-				const originalGetBedrockClient = handler["getBedrockClient"]
-				handler["getBedrockClient"] = async () => mockClient as any
-
-				const generator = handler["executeConverseStream"](command, mockModelInfo)
-				const results = await collectGeneratorResults(generator)
-
-				// Restore original method
-				handler["getBedrockClient"] = originalGetBedrockClient
-
-				// Verify usage tracking
-				results.should.have.length(2)
-				results[0].type.should.equal("text")
-				results[0].text.should.equal("Response")
-				results[1].type.should.equal("usage")
-				results[1].inputTokens.should.equal(100)
-				results[1].outputTokens.should.equal(50)
-				results[1].cacheReadTokens.should.equal(20)
-				results[1].cacheWriteTokens.should.equal(30)
-			})
-		})
-	})
 })

src/api/providers/bedrock.ts

@@ -1,3 +1,4 @@
+import AnthropicBedrock from "@anthropic-ai/bedrock-sdk"
 import { Anthropic } from "@anthropic-ai/sdk"
 import { withRetry } from "../retry"
 import { ApiHandler } from "../"
@@ -13,81 +14,6 @@ import {
 	InvokeModelWithResponseStreamCommand,
 } from "@aws-sdk/client-bedrock-runtime"
 
-// Import proper AWS SDK types
-import type { Message, ContentBlock } from "@aws-sdk/client-bedrock-runtime"
-
-// Extend AWS SDK types to include additionalModelResponseFields
-interface ExtendedMetadata {
-	usage?: {
-		inputTokens?: number
-		outputTokens?: number
-		cacheReadInputTokens?: number
-		cacheWriteInputTokens?: number
-	}
-	additionalModelResponseFields?: {
-		thinkingResponse?: {
-			reasoning?: Array<{
-				type: string
-				text?: string
-				signature?: string
-			}>
-		}
-	}
-}
-
-// Define types for stream response content blocks
-interface ContentBlockStart {
-	contentBlockIndex?: number
-	start?: {
-		type?: string
-		thinking?: string
-	}
-	contentBlock?: {
-		type?: string
-		thinking?: string
-	}
-	type?: string
-	thinking?: string
-}
-
-// Define types for stream response deltas
-interface ContentBlockDelta {
-	contentBlockIndex?: number
-	delta?: {
-		type?: string
-		thinking?: string
-		text?: string
-		reasoningContent?: {
-			text?: string
-		}
-	}
-}
-
-// Define types for supported content types
-type SupportedContentType = "text" | "image" | "thinking"
-
-interface ContentItem {
-	type: SupportedContentType
-	text?: string
-	source?: {
-		data: string | Buffer | Uint8Array
-		media_type?: string
-	}
-}
-
-// Define cache point type for AWS Bedrock
-interface CachePointContentBlock {
-	cachePoint: {
-		type: "default"
-	}
-}
-
-// Define provider options type based on AWS SDK patterns
-interface ProviderChainOptions {
-	ignoreCache?: boolean
-	profile?: string
-}
-
 // https://docs.anthropic.com/en/api/claude-on-amazon-bedrock
 export class AwsBedrockHandler implements ApiHandler {
 	private options: ApiHandlerOptions
@@ -96,7 +22,7 @@ export class AwsBedrockHandler implements ApiHandler {
 		this.options = options
 	}
 
-	@withRetry({ maxRetries: 4 })
+	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		// cross region inference requires prefixing the model id with the region
 		const modelId = await this.getModelId()
@@ -120,8 +46,146 @@ export class AwsBedrockHandler implements ApiHandler {
 			return
 		}
 
-		// Default: Use Anthropic Converse API for all Anthropic models
-		yield* this.createAnthropicMessage(systemPrompt, messages, modelId, model)
+		const budget_tokens = this.options.thinkingBudgetTokens || 0
+		const reasoningOn =
+			(baseModelId.includes("3-7") || baseModelId.includes("sonnet-4") || baseModelId.includes("opus-4")) &&
+			budget_tokens !== 0
+				? true
+				: false
+
+		// Get model info and 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
+
+		// Create anthropic client, using sessions created or renewed after this handler's
+		// initialization, and allowing for session renewal if necessary as well
+		const client = await this.getAnthropicClient()
+
+		// Use withTempEnv to ensure environment variables are properly restored
+		const stream = await AwsBedrockHandler.withTempEnv(
+			() => {
+				// AWS SDK prioritizes AWS_PROFILE over AWS_ACCESS_KEY_ID/AWS_SECRET_ACCESS_KEY pair
+				// If this is set as an env variable already (ie. from ~/.zshrc) it will override credentials configured by Cline
+				// Temporarily remove AWS_PROFILE to ensure our credentials are used
+				delete process.env["AWS_PROFILE"]
+			},
+			async () => {
+				return await client.messages.create({
+					model: modelId,
+					max_tokens: model.info.maxTokens || 8192,
+					thinking: reasoningOn ? { type: "enabled", budget_tokens: budget_tokens } : undefined,
+					temperature: reasoningOn ? undefined : 0,
+					system: [
+						{
+							text: systemPrompt,
+							type: "text",
+							...(this.options.awsBedrockUsePromptCache === true && {
+								cache_control: { type: "ephemeral" },
+							}),
+						},
+					],
+					messages: messages.map((message, index) => {
+						if (index === lastUserMsgIndex || index === secondLastMsgUserIndex) {
+							return {
+								...message,
+								content:
+									typeof message.content === "string"
+										? [
+												{
+													type: "text",
+													text: message.content,
+													...(this.options.awsBedrockUsePromptCache === true && {
+														cache_control: { type: "ephemeral" },
+													}),
+												},
+											]
+										: message.content.map((content, contentIndex) =>
+												contentIndex === message.content.length - 1
+													? {
+															...content,
+															...(this.options.awsBedrockUsePromptCache === true && {
+																cache_control: { type: "ephemeral" },
+															}),
+														}
+													: content,
+											),
+							}
+						}
+						return message
+					}),
+					stream: true,
+				})
+			},
+		)
+
+		for await (const chunk of stream) {
+			switch (chunk?.type) {
+				case "message_start":
+					const usage = chunk.message.usage
+					yield {
+						type: "usage",
+						inputTokens: usage.input_tokens || 0,
+						outputTokens: usage.output_tokens || 0,
+						cacheWriteTokens: usage.cache_creation_input_tokens || undefined,
+						cacheReadTokens: usage.cache_read_input_tokens || undefined,
+					}
+					break
+				case "message_delta":
+					yield {
+						type: "usage",
+						inputTokens: 0,
+						outputTokens: chunk.usage.output_tokens || 0,
+					}
+					break
+				case "content_block_start":
+					switch (chunk.content_block.type) {
+						case "thinking":
+							yield {
+								type: "reasoning",
+								reasoning: chunk.content_block.thinking || "",
+							}
+							break
+						case "redacted_thinking":
+							// Handle redacted thinking blocks - we still mark it as reasoning
+							// but note that the content is encrypted
+							yield {
+								type: "reasoning",
+								reasoning: "[Redacted thinking block]",
+							}
+							break
+						case "text":
+							if (chunk.index > 0) {
+								yield {
+									type: "text",
+									text: "\n",
+								}
+							}
+							yield {
+								type: "text",
+								text: chunk.content_block.text,
+							}
+							break
+					}
+					break
+				case "content_block_delta":
+					switch (chunk.delta.type) {
+						case "thinking_delta":
+							yield {
+								type: "reasoning",
+								reasoning: chunk.delta.thinking,
+							}
+							break
+						case "text_delta":
+							yield {
+								type: "text",
+								text: chunk.delta.text,
+							}
+							break
+					}
+					break
+			}
+		}
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
@@ -160,7 +224,7 @@ export class AwsBedrockHandler implements ApiHandler {
 		sessionToken?: string
 	}> {
 		// Configure provider options
-		const providerOptions: ProviderChainOptions = {}
+		const providerOptions: any = {}
 		if (this.options.awsUseProfile) {
 			// For profile-based auth, always use ignoreCache to detect credential file changes
 			// This solves the AWS Identity Manager issue where credential files change externally
@@ -212,6 +276,22 @@ export class AwsBedrockHandler implements ApiHandler {
 		})
 	}
 
+	/**
+	 * Creates an AnthropicBedrock client with the appropriate credentials
+	 */
+	private async getAnthropicClient(): Promise<AnthropicBedrock> {
+		const credentials = await this.getAwsCredentials()
+
+		// Return an AnthropicBedrock client with the resolved/assumed credentials.
+		return new AnthropicBedrock({
+			awsAccessKey: credentials.accessKeyId,
+			awsSecretKey: credentials.secretAccessKey,
+			awsSessionToken: credentials.sessionToken,
+			awsRegion: this.getRegion(),
+			...(this.options.awsBedrockEndpoint && { baseURL: this.options.awsBedrockEndpoint }),
+		})
+	}
+
 	/**
 	 * Gets the appropriate model ID, accounting for cross-region inference if enabled.
 	 * If the model ID is an ARN that contains a slash, you will get the URL encoded ARN.
@@ -456,318 +536,126 @@ export class AwsBedrockHandler implements ApiHandler {
 	}
 
 	/**
-	 * Executes a Converse API stream command and handles the response
-	 * Common implementation for both Anthropic and Nova models
+	 * Creates a message using Amazon Nova models through AWS Bedrock
+	 * Implements support for Amazon Nova models
 	 */
-	private async *executeConverseStream(command: ConverseStreamCommand, modelInfo: ModelInfo): ApiStream {
-		try {
-			const client = await this.getBedrockClient()
-			const response = await client.send(command)
-
-			if (response.stream) {
-				// Buffer content by contentBlockIndex to handle multi-block responses correctly
-				const contentBuffers: Record<number, string> = {}
-				const blockTypes = new Map<number, "reasoning" | "text">()
-
-				for await (const chunk of response.stream) {
-					// Debug logging to see actual response structure
-					// console.log("Bedrock chunk:", JSON.stringify(chunk, null, 2))
-
-					// Handle thinking response in additionalModelResponseFields (LangChain format)
-					const metadata = chunk.metadata as ExtendedMetadata | undefined
-					if (metadata?.additionalModelResponseFields?.thinkingResponse) {
-						const thinkingResponse = metadata.additionalModelResponseFields.thinkingResponse
-						if (thinkingResponse.reasoning && Array.isArray(thinkingResponse.reasoning)) {
-							for (const reasoningBlock of thinkingResponse.reasoning) {
-								if (reasoningBlock.type === "text" && reasoningBlock.text) {
-									yield {
-										type: "reasoning",
-										reasoning: reasoningBlock.text,
-									}
-								}
-							}
-						}
-					}
-
-					// Handle metadata events with token usage information
-					if (chunk.metadata?.usage) {
-						const inputTokens = chunk.metadata.usage.inputTokens || 0
-						const outputTokens = chunk.metadata.usage.outputTokens || 0
-						const cacheReadInputTokens = chunk.metadata.usage.cacheReadInputTokens || 0
-						const cacheWriteInputTokens = chunk.metadata.usage.cacheWriteInputTokens || 0
-
-						yield {
-							type: "usage",
-							inputTokens,
-							outputTokens,
-							cacheReadTokens: cacheReadInputTokens,
-							cacheWriteTokens: cacheWriteInputTokens,
-							totalCost: calculateApiCostOpenAI(
-								modelInfo,
-								inputTokens,
-								outputTokens,
-								cacheWriteInputTokens,
-								cacheReadInputTokens,
-							),
-						}
-					}
-
-					// Handle content block start - check if Bedrock uses Anthropic SDK format
-					if (chunk.contentBlockStart) {
-						const blockStart = chunk.contentBlockStart as ContentBlockStart
-						const blockIndex = chunk.contentBlockStart.contentBlockIndex
-
-						// Check for thinking block in various possible formats
-						if (
-							blockStart.start?.type === "thinking" ||
-							blockStart.contentBlock?.type === "thinking" ||
-							blockStart.type === "thinking"
-						) {
-							if (blockIndex !== undefined) {
-								blockTypes.set(blockIndex, "reasoning")
-								// Initialize content if provided
-								const initialContent =
-									blockStart.start?.thinking || blockStart.contentBlock?.thinking || blockStart.thinking || ""
-								if (initialContent) {
-									yield {
-										type: "reasoning",
-										reasoning: initialContent,
-									}
-								}
-							}
-						}
-					}
-
-					// Handle content block delta - accumulate content by block index
-					if (chunk.contentBlockDelta) {
-						const blockIndex = chunk.contentBlockDelta.contentBlockIndex
-
-						if (blockIndex !== undefined) {
-							// Initialize buffer for this block if it doesn't exist
-							if (!(blockIndex in contentBuffers)) {
-								contentBuffers[blockIndex] = ""
-							}
-
-							// Check if this is a thinking block
-							const blockType = blockTypes.get(blockIndex)
-							const delta = chunk.contentBlockDelta.delta as ContentBlockDelta["delta"]
-
-							// Handle thinking delta (Anthropic SDK format)
-							if (delta?.type === "thinking_delta" || delta?.thinking) {
-								const thinkingContent = delta.thinking || delta.text || ""
-								if (thinkingContent) {
-									yield {
-										type: "reasoning",
-										reasoning: thinkingContent,
-									}
-								}
-							} else if (delta?.reasoningContent?.text) {
-								// Handle reasoning content (Bedrock format)
-								const reasoningText = delta.reasoningContent.text
-								if (reasoningText) {
-									yield {
-										type: "reasoning",
-										reasoning: reasoningText,
-									}
-								}
-							} else if (chunk.contentBlockDelta.delta?.text) {
-								// Handle regular text content
-								const textContent = chunk.contentBlockDelta.delta.text
-								contentBuffers[blockIndex] += textContent
-
-								// Stream based on block type
-								if (blockType === "reasoning") {
-									yield {
-										type: "reasoning",
-										reasoning: textContent,
-									}
-								} else {
-									yield {
-										type: "text",
-										text: textContent,
-									}
-								}
-							}
-						}
-					}
-
-					// Handle content block stop - clean up buffers
-					if (chunk.contentBlockStop) {
-						const blockIndex = chunk.contentBlockStop.contentBlockIndex
-
-						if (blockIndex !== undefined) {
-							// Clean up buffers and tracking for this block
-							delete contentBuffers[blockIndex]
-							blockTypes.delete(blockIndex)
-						}
-					}
-
-					// Handle errors with unified error handling
-					yield* this.handleBedrockStreamError(chunk)
-				}
-			}
-		} catch (error) {
-			console.error("Error processing Converse API response:", error)
-			yield {
-				type: "text",
-				text: `[ERROR] Failed to process response: ${error instanceof Error ? error.message : String(error)}`,
-			}
-		}
-	}
-
-	/**
-	 * Handles Bedrock stream errors in a unified way
-	 */
-	private *handleBedrockStreamError(chunk: any): Generator<{ type: "text"; text: string }> {
-		if (chunk.internalServerException) {
-			yield {
-				type: "text",
-				text: `[ERROR] Internal server error: ${chunk.internalServerException.message}`,
-			}
-		} else if (chunk.modelStreamErrorException) {
-			yield {
-				type: "text",
-				text: `[ERROR] Model stream error: ${chunk.modelStreamErrorException.message}`,
-			}
-		} else if (chunk.validationException) {
-			yield {
-				type: "text",
-				text: `[ERROR] Validation error: ${chunk.validationException.message}`,
-			}
-		} else if (chunk.throttlingException) {
-			yield {
-				type: "text",
-				text: `[ERROR] Throttling error: ${chunk.throttlingException.message}`,
-			}
-		} else if (chunk.serviceUnavailableException) {
-			yield {
-				type: "text",
-				text: `[ERROR] Service unavailable: ${chunk.serviceUnavailableException.message}`,
-			}
-		}
-	}
-
-	/**
-	 * Prepares system messages with optional caching support
-	 */
-	private prepareSystemMessages(systemPrompt: string, enableCaching: boolean): any[] | undefined {
-		if (!systemPrompt) {
-			return undefined
-		}
-
-		if (enableCaching) {
-			return [{ text: systemPrompt }, { cachePoint: { type: "default" } }]
-		}
-
-		return [{ text: systemPrompt }]
-	}
-
-	/**
-	 * Gets inference configuration for different model types
-	 */
-	private getInferenceConfig(modelInfo: ModelInfo, modelType: "anthropic" | "nova"): any {
-		// For Anthropic models with thinking enabled, temperature must be 1
-		if (modelType === "anthropic") {
-			const budget_tokens = this.options.thinkingBudgetTokens || 0
-			const baseModelId =
-				(this.options.awsBedrockCustomSelected ? this.options.awsBedrockCustomModelBaseId : this.getModel().id) ||
-				this.getModel().id
-			const reasoningOn = this.shouldEnableReasoning(baseModelId, budget_tokens)
-
-			return {
-				maxTokens: modelInfo.maxTokens || 8192,
-				temperature: reasoningOn ? 1 : 0,
-			}
-		}
-
-		return {
-			maxTokens: modelInfo.maxTokens || (modelType === "nova" ? 5000 : 8192),
-			temperature: 0,
-		}
-	}
-
-	/**
-	 * Determines if reasoning should be enabled for Claude models
-	 */
-	private shouldEnableReasoning(baseModelId: string, budgetTokens: number): boolean {
-		return (
-			(baseModelId.includes("3-7") || baseModelId.includes("sonnet-4") || baseModelId.includes("opus-4")) &&
-			budgetTokens !== 0
-		)
-	}
-
-	/**
-	 * Creates a message using Anthropic Claude models through AWS Bedrock Converse API
-	 * Implements support for Anthropic Claude models using the unified Converse API
-	 */
-	private async *createAnthropicMessage(
+	private async *createNovaMessage(
 		systemPrompt: string,
 		messages: Anthropic.Messages.MessageParam[],
 		modelId: string,
 		model: { id: string; info: ModelInfo },
 	): ApiStream {
-		// Format messages for Anthropic model using unified formatter
-		const formattedMessages = this.formatMessagesForConverseAPI(messages)
+		// Get Bedrock client with proper credentials
+		const client = await this.getBedrockClient()
 
-		// Get model info and 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
+		// Format messages for Nova model
+		const formattedMessages = this.formatNovaMessages(messages)
 
-		// Apply caching controls to messages if enabled
-		const messagesWithCache = this.options.awsBedrockUsePromptCache
-			? this.applyCacheControlToMessages(formattedMessages, lastUserMsgIndex, secondLastMsgUserIndex)
-			: formattedMessages
-
-		// Prepare system message with caching support
-		const systemMessages = this.prepareSystemMessages(systemPrompt, this.options.awsBedrockUsePromptCache || false)
-
-		// Get thinking configuration
-		const budget_tokens = this.options.thinkingBudgetTokens || 0
-		const baseModelId =
-			(this.options.awsBedrockCustomSelected ? this.options.awsBedrockCustomModelBaseId : this.getModel().id) ||
-			this.getModel().id
-		const reasoningOn = this.shouldEnableReasoning(baseModelId, budget_tokens)
-
-		// Prepare request for Anthropic model using Converse API
+		// Prepare request for Nova model
 		const command = new ConverseStreamCommand({
 			modelId: modelId,
-			messages: messagesWithCache,
-			system: systemMessages,
-			inferenceConfig: this.getInferenceConfig(model.info, "anthropic"),
-			// Add thinking configuration as per LangChain documentation
-			additionalModelRequestFields: reasoningOn
-				? {
-						thinking: {
-							type: "enabled",
-							budget_tokens: budget_tokens,
-						},
-					}
-				: undefined,
+			messages: formattedMessages,
+			system: systemPrompt ? [{ text: systemPrompt }] : undefined,
+			inferenceConfig: {
+				maxTokens: model.info.maxTokens || 5000,
+				temperature: 0,
+				// topP: 0.9, // Alternative: use topP instead of temperature
+			},
 		})
 
-		// Execute the streaming request using unified handler
-		yield* this.executeConverseStream(command, model.info)
+		// Execute the streaming request and handle response
+		try {
+			const response = await client.send(command)
+
+			if (response.stream) {
+				let hasReportedInputTokens = false
+
+				for await (const chunk of response.stream) {
+					// Handle metadata events with token usage information
+					if (chunk.metadata?.usage) {
+						// Report complete token usage from the model itself
+						const inputTokens = chunk.metadata.usage.inputTokens || 0
+						const outputTokens = chunk.metadata.usage.outputTokens || 0
+						yield {
+							type: "usage",
+							inputTokens,
+							outputTokens,
+							totalCost: calculateApiCostOpenAI(model.info, inputTokens, outputTokens, 0, 0),
+						}
+						hasReportedInputTokens = true
+					}
+
+					// Handle content delta (text generation)
+					if (chunk.contentBlockDelta?.delta?.text) {
+						yield {
+							type: "text",
+							text: chunk.contentBlockDelta.delta.text,
+						}
+					}
+
+					// Handle reasoning content if present
+					if (chunk.contentBlockDelta?.delta?.reasoningContent?.text) {
+						yield {
+							type: "reasoning",
+							reasoning: chunk.contentBlockDelta.delta.reasoningContent.text,
+						}
+					}
+
+					// Handle errors
+					if (chunk.internalServerException) {
+						yield {
+							type: "text",
+							text: `[ERROR] Internal server error: ${chunk.internalServerException.message}`,
+						}
+					} else if (chunk.modelStreamErrorException) {
+						yield {
+							type: "text",
+							text: `[ERROR] Model stream error: ${chunk.modelStreamErrorException.message}`,
+						}
+					} else if (chunk.validationException) {
+						yield {
+							type: "text",
+							text: `[ERROR] Validation error: ${chunk.validationException.message}`,
+						}
+					} else if (chunk.throttlingException) {
+						yield {
+							type: "text",
+							text: `[ERROR] Throttling error: ${chunk.throttlingException.message}`,
+						}
+					} else if (chunk.serviceUnavailableException) {
+						yield {
+							type: "text",
+							text: `[ERROR] Service unavailable: ${chunk.serviceUnavailableException.message}`,
+						}
+					}
+				}
+			}
+		} catch (error) {
+			console.error("Error processing Nova model response:", error)
+			yield {
+				type: "text",
+				text: `[ERROR] Failed to process Nova response: ${error instanceof Error ? error.message : String(error)}`,
+			}
+		}
 	}
 
 	/**
-	 * Formats messages for models using the Converse API specification
-	 * Used by both Anthropic and Nova models to avoid code duplication
+	 * Formats messages for Amazon Nova models according to the SDK specification
 	 */
-	private formatMessagesForConverseAPI(messages: Anthropic.Messages.MessageParam[]): Message[] {
+	private formatNovaMessages(messages: Anthropic.Messages.MessageParam[]): { role: ConversationRole; content: any[] }[] {
 		return messages.map((message) => {
 			// Determine role (user or assistant)
 			const role = message.role === "user" ? ConversationRole.USER : ConversationRole.ASSISTANT
 
 			// Process content based on type
-			let content: ContentBlock[] = []
+			let content: any[] = []
 
 			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
+				// Convert Anthropic content format to Nova content format
+				content = message.content
 					.map((item) => {
 						// Text content
 						if (item.type === "text") {
@@ -776,16 +664,55 @@ export class AwsBedrockHandler implements ApiHandler {
 
 						// Image content
 						if (item.type === "image") {
-							return this.processImageContent(item)
+							// Handle different image source formats
+							let imageData: Uint8Array
+							let format = "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]) {
+									format = formatMatch[1]
+									// Ensure format is one of the allowed values
+									if (!["png", "jpeg", "gif", "webp"].includes(format)) {
+										format = "jpeg" // Default to jpeg if not supported
+									}
+								}
+							}
+
+							// Get image data
+							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 any))
+								} else {
+									console.error("Unsupported image data format")
+									return null // Skip this item if format is not supported
+								}
+							} catch (error) {
+								console.error("Could not convert image data to Uint8Array:", error)
+								return null // Skip this item if conversion fails
+							}
+
+							return {
+								image: {
+									format,
+									source: {
+										bytes: imageData,
+									},
+								},
+							}
 						}
 
-						// Log unsupported content types for debugging
-						console.warn(`Unsupported content type: ${(item as ContentItem).type}`)
+						// Return null for unsupported content types
 						return null
 					})
-					.filter((item): item is ContentBlock => item !== null)
-
-				content = processedContent
+					.filter(Boolean) // Remove any null items
 			}
 
 			// Return formatted message
@@ -795,129 +722,4 @@ export class AwsBedrockHandler implements ApiHandler {
 			}
 		})
 	}
-
-	/**
-	 * Processes image content with proper error handling and user notification
-	 */
-	private processImageContent(item: any): ContentBlock | 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"}]`,
-			}
-		}
-	}
-
-	/**
-	 * 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
-	 */
-	private applyCacheControlToMessages(
-		messages: Message[],
-		lastUserMsgIndex: number,
-		secondLastMsgUserIndex: number,
-	): Message[] {
-		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
-		})
-	}
-
-	/**
-	 * Creates a message using Amazon Nova models through AWS Bedrock
-	 * Implements support for Amazon Nova models with caching support
-	 */
-	private async *createNovaMessage(
-		systemPrompt: string,
-		messages: Anthropic.Messages.MessageParam[],
-		modelId: string,
-		model: { id: string; info: ModelInfo },
-	): ApiStream {
-		// Format messages for Nova model using unified formatter
-		const formattedMessages = this.formatMessagesForConverseAPI(messages)
-
-		// Get model info and message indices for caching (for Nova models that support it)
-		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
-
-		// Apply caching controls to messages if model supports caching and option is enabled
-		const messagesWithCache =
-			this.options.awsBedrockUsePromptCache && model.info.supportsPromptCache
-				? this.applyCacheControlToMessages(formattedMessages, lastUserMsgIndex, secondLastMsgUserIndex)
-				: formattedMessages
-
-		// Prepare system message with caching support for Nova models that support it
-		const enableCaching = this.options.awsBedrockUsePromptCache && model.info.supportsPromptCache
-		const systemMessages = this.prepareSystemMessages(systemPrompt, enableCaching || false)
-
-		// Prepare request for Nova model
-		const command = new ConverseStreamCommand({
-			modelId: modelId,
-			messages: messagesWithCache,
-			system: systemMessages,
-			inferenceConfig: this.getInferenceConfig(model.info, "nova"),
-		})
-
-		// Execute the streaming request using unified handler
-		yield* this.executeConverseStream(command, model.info)
-	}
 }

src/api/providers/claude-code.ts

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

src/api/providers/cline.ts

@@ -74,16 +74,6 @@ export class ClineHandler implements ApiHandler {
 			}
 
 			if (!didOutputUsage && chunk.usage) {
-				// @ts-ignore-next-line
-				let totalCost = chunk.usage.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)
-				if (provider === "x-ai") {
-					totalCost = 0
-				}
-
 				yield {
 					type: "usage",
 					cacheWriteTokens: 0,
@@ -91,7 +81,7 @@ export class ClineHandler implements ApiHandler {
 					inputTokens: chunk.usage.prompt_tokens || 0,
 					outputTokens: chunk.usage.completion_tokens || 0,
 					// @ts-ignore-next-line
-					totalCost,
+					totalCost: chunk.usage.cost || 0,
 				}
 				didOutputUsage = true
 			}
@@ -134,10 +124,7 @@ export class ClineHandler implements ApiHandler {
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
-		let modelId = this.options.openRouterModelId
-		if (modelId === "x-ai/grok-3") {
-			modelId = "x-ai/grok-3-beta"
-		}
+		const modelId = this.options.openRouterModelId
 		const modelInfo = this.options.openRouterModelInfo
 		if (modelId && modelInfo) {
 			return { id: modelId, info: modelInfo }

src/api/providers/gemini.ts

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

src/api/providers/openrouter.ts

@@ -139,10 +139,7 @@ export class OpenRouterHandler implements ApiHandler {
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
-		let modelId = this.options.openRouterModelId
-		if (modelId === "x-ai/grok-3") {
-			modelId = "x-ai/grok-3-beta"
-		}
+		const modelId = this.options.openRouterModelId
 		const modelInfo = this.options.openRouterModelInfo
 		if (modelId && modelInfo) {
 			return { id: modelId, info: modelInfo }

src/api/providers/sapaicore.ts

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

src/api/transform/stream.ts

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

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

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

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

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

src/core/controller/file/getRelativePaths.ts

@@ -3,7 +3,7 @@ import { RelativePathsRequest, RelativePaths } from "@shared/proto/file"
 import { FileMethodHandler } from "./index"
 import * as vscode from "vscode"
 import * as path from "path"
-import { UriServiceClient } from "@hosts/host-bridge-client"
+import { UriServiceClient } from "../../../standalone/services/host-grpc-client"
 import { Metadata, StringRequest } from "@shared/proto/common"
 
 /**

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

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

src/core/controller/index.ts

@@ -114,7 +114,7 @@ export class Controller {
 		try {
 			await storeSecret(this.context, "clineApiKey", undefined)
 			await updateGlobalState(this.context, "userInfo", undefined)
-			await updateWorkspaceState(this.context, "apiProvider", "openrouter")
+			await updateGlobalState(this.context, "apiProvider", "openrouter")
 			await this.postStateToWebview()
 			vscode.window.showInformationMessage("Successfully logged out of Cline")
 		} catch (error) {
@@ -130,13 +130,12 @@ export class Controller {
 		await this.clearTask() // ensures that an existing task doesn't exist before starting a new one, although this shouldn't be possible since user must clear task before starting a new one
 		const {
 			apiConfiguration,
+			customInstructions,
 			autoApprovalSettings,
 			browserSettings,
 			chatSettings,
 			shellIntegrationTimeout,
 			terminalReuseEnabled,
-			terminalOutputLineLimit,
-			defaultTerminalProfile,
 			enableCheckpointsSetting,
 			isNewUser,
 			taskHistory,
@@ -172,9 +171,8 @@ export class Controller {
 			chatSettings,
 			shellIntegrationTimeout,
 			terminalReuseEnabled ?? true,
-			terminalOutputLineLimit ?? 500,
-			defaultTerminalProfile ?? "default",
 			enableCheckpointsSetting ?? true,
+			customInstructions,
 			task,
 			images,
 			files,
@@ -206,7 +204,15 @@ export class Controller {
 				await this.setUserInfo(message.user || undefined)
 				await this.postStateToWebview()
 				break
-
+			case "apiConfiguration":
+				if (message.apiConfiguration) {
+					await updateApiConfiguration(this.context, message.apiConfiguration)
+					if (this.task) {
+						this.task.api = buildApiHandler(message.apiConfiguration)
+					}
+				}
+				await this.postStateToWebview()
+				break
 			case "fetchUserCreditsData": {
 				await this.fetchUserCreditsData()
 				break
@@ -224,7 +230,6 @@ export class Controller {
 				await this.postStateToWebview()
 				break
 			}
-
 			case "clearAllTaskHistory": {
 				const answer = await vscode.window.showWarningMessage(
 					"What would you like to delete?",
@@ -285,12 +290,6 @@ export class Controller {
 			previousModeReasoningEffort: newReasoningEffort,
 			previousModeAwsBedrockCustomSelected: newAwsBedrockCustomSelected,
 			previousModeAwsBedrockCustomModelBaseId: newAwsBedrockCustomModelBaseId,
-			previousModeSapAiCoreClientId: newSapAiCoreClientId,
-			previousModeSapAiCoreClientSecret: newSapAiCoreClientSecret,
-			previousModeSapAiCoreBaseUrl: newSapAiCoreBaseUrl,
-			previousModeSapAiCoreTokenUrl: newSapAiCoreTokenUrl,
-			previousModeSapAiCoreResourceGroup: newSapAiResourceGroup,
-			previousModeSapAiCoreModelId: newSapAiCoreModelId,
 			planActSeparateModelsSetting,
 		} = await getAllExtensionState(this.context)
 
@@ -298,9 +297,9 @@ export class Controller {
 
 		if (shouldSwitchModel) {
 			// Save the last model used in this mode
-			await updateWorkspaceState(this.context, "previousModeApiProvider", apiConfiguration.apiProvider)
-			await updateWorkspaceState(this.context, "previousModeThinkingBudgetTokens", apiConfiguration.thinkingBudgetTokens)
-			await updateWorkspaceState(this.context, "previousModeReasoningEffort", apiConfiguration.reasoningEffort)
+			await updateGlobalState(this.context, "previousModeApiProvider", apiConfiguration.apiProvider)
+			await updateGlobalState(this.context, "previousModeThinkingBudgetTokens", apiConfiguration.thinkingBudgetTokens)
+			await updateGlobalState(this.context, "previousModeReasoningEffort", apiConfiguration.reasoningEffort)
 			switch (apiConfiguration.apiProvider) {
 				case "anthropic":
 				case "vertex":
@@ -310,16 +309,16 @@ export class Controller {
 				case "qwen":
 				case "deepseek":
 				case "xai":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
 					break
 				case "bedrock":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
-					await updateWorkspaceState(
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
+					await updateGlobalState(
 						this.context,
 						"previousModeAwsBedrockCustomSelected",
 						apiConfiguration.awsBedrockCustomSelected,
 					)
-					await updateWorkspaceState(
+					await updateGlobalState(
 						this.context,
 						"previousModeAwsBedrockCustomModelBaseId",
 						apiConfiguration.awsBedrockCustomModelBaseId,
@@ -327,51 +326,34 @@ export class Controller {
 					break
 				case "openrouter":
 				case "cline":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.openRouterModelId)
-					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.openRouterModelInfo)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.openRouterModelId)
+					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.openRouterModelInfo)
 					break
 				case "vscode-lm":
 					// Important we don't set modelId to this, as it's an object not string (webview expects model id to be a string)
-					await updateWorkspaceState(
+					await updateGlobalState(
 						this.context,
 						"previousModeVsCodeLmModelSelector",
 						apiConfiguration.vsCodeLmModelSelector,
 					)
 					break
 				case "openai":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.openAiModelId)
-					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.openAiModelInfo)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.openAiModelId)
+					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.openAiModelInfo)
 					break
 				case "ollama":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.ollamaModelId)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.ollamaModelId)
 					break
 				case "lmstudio":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.lmStudioModelId)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.lmStudioModelId)
 					break
 				case "litellm":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
-					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
+					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
 					break
 				case "requesty":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.requestyModelId)
-					await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.requestyModelInfo)
-					break
-				case "sapaicore":
-					await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.apiModelId)
-					await updateWorkspaceState(this.context, "previousModeSapAiCoreClientId", apiConfiguration.sapAiCoreClientId)
-					await updateWorkspaceState(
-						this.context,
-						"previousModeSapAiCoreClientSecret",
-						apiConfiguration.sapAiCoreClientSecret,
-					)
-					await updateWorkspaceState(this.context, "previousModeSapAiCoreBaseUrl", apiConfiguration.sapAiCoreBaseUrl)
-					await updateWorkspaceState(this.context, "previousModeSapAiCoreTokenUrl", apiConfiguration.sapAiCoreTokenUrl)
-					await updateWorkspaceState(
-						this.context,
-						"previousModeSapAiCoreResourceGroup",
-						apiConfiguration.sapAiResourceGroup,
-					)
-					await updateWorkspaceState(this.context, "previousModeSapAiCoreModelId", apiConfiguration.sapAiCoreModelId)
+					await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.requestyModelId)
+					await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.requestyModelInfo)
 					break
 			}
 
@@ -383,9 +365,9 @@ export class Controller {
 				newReasoningEffort ||
 				newVsCodeLmModelSelector
 			) {
-				await updateWorkspaceState(this.context, "apiProvider", newApiProvider)
-				await updateWorkspaceState(this.context, "thinkingBudgetTokens", newThinkingBudgetTokens)
-				await updateWorkspaceState(this.context, "reasoningEffort", newReasoningEffort)
+				await updateGlobalState(this.context, "apiProvider", newApiProvider)
+				await updateGlobalState(this.context, "thinkingBudgetTokens", newThinkingBudgetTokens)
+				await updateGlobalState(this.context, "reasoningEffort", newReasoningEffort)
 				switch (newApiProvider) {
 					case "anthropic":
 					case "vertex":
@@ -395,41 +377,38 @@ export class Controller {
 					case "qwen":
 					case "deepseek":
 					case "xai":
-						await updateWorkspaceState(this.context, "apiModelId", newModelId)
+						await updateGlobalState(this.context, "apiModelId", newModelId)
 						break
 					case "bedrock":
-						await updateWorkspaceState(this.context, "apiModelId", newModelId)
-						await updateWorkspaceState(this.context, "awsBedrockCustomSelected", newAwsBedrockCustomSelected)
-						await updateWorkspaceState(this.context, "awsBedrockCustomModelBaseId", newAwsBedrockCustomModelBaseId)
+						await updateGlobalState(this.context, "apiModelId", newModelId)
+						await updateGlobalState(this.context, "awsBedrockCustomSelected", newAwsBedrockCustomSelected)
+						await updateGlobalState(this.context, "awsBedrockCustomModelBaseId", newAwsBedrockCustomModelBaseId)
 						break
 					case "openrouter":
 					case "cline":
-						await updateWorkspaceState(this.context, "openRouterModelId", newModelId)
-						await updateWorkspaceState(this.context, "openRouterModelInfo", newModelInfo)
+						await updateGlobalState(this.context, "openRouterModelId", newModelId)
+						await updateGlobalState(this.context, "openRouterModelInfo", newModelInfo)
 						break
 					case "vscode-lm":
-						await updateWorkspaceState(this.context, "vsCodeLmModelSelector", newVsCodeLmModelSelector)
+						await updateGlobalState(this.context, "vsCodeLmModelSelector", newVsCodeLmModelSelector)
 						break
 					case "openai":
-						await updateWorkspaceState(this.context, "openAiModelId", newModelId)
-						await updateWorkspaceState(this.context, "openAiModelInfo", newModelInfo)
+						await updateGlobalState(this.context, "openAiModelId", newModelId)
+						await updateGlobalState(this.context, "openAiModelInfo", newModelInfo)
 						break
 					case "ollama":
-						await updateWorkspaceState(this.context, "ollamaModelId", newModelId)
+						await updateGlobalState(this.context, "ollamaModelId", newModelId)
 						break
 					case "lmstudio":
-						await updateWorkspaceState(this.context, "lmStudioModelId", newModelId)
+						await updateGlobalState(this.context, "lmStudioModelId", newModelId)
 						break
 					case "litellm":
-						await updateWorkspaceState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
-						await updateWorkspaceState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
+						await updateGlobalState(this.context, "previousModeModelId", apiConfiguration.liteLlmModelId)
+						await updateGlobalState(this.context, "previousModeModelInfo", apiConfiguration.liteLlmModelInfo)
 						break
 					case "requesty":
-						await updateWorkspaceState(this.context, "requestyModelId", newModelId)
-						await updateWorkspaceState(this.context, "requestyModelInfo", newModelInfo)
-						break
-					case "sapaicore":
-						await updateWorkspaceState(this.context, "apiModelId", newModelId)
+						await updateGlobalState(this.context, "requestyModelId", newModelId)
+						await updateGlobalState(this.context, "requestyModelInfo", newModelInfo)
 						break
 				}
 
@@ -440,7 +419,7 @@ export class Controller {
 			}
 		}
 
-		await updateWorkspaceState(this.context, "chatSettings", chatSettings)
+		await updateGlobalState(this.context, "chatSettings", chatSettings)
 		await this.postStateToWebview()
 
 		if (this.task) {
@@ -489,6 +468,14 @@ export class Controller {
 		}
 	}
 
+	async updateCustomInstructions(instructions?: string) {
+		// User may be clearing the field
+		await updateGlobalState(this.context, "customInstructions", instructions || undefined)
+		if (this.task) {
+			this.task.customInstructions = instructions || undefined
+		}
+	}
+
 	// Account
 
 	async fetchUserCreditsData() {
@@ -523,7 +510,7 @@ export class Controller {
 			await sendAuthCallbackEvent(customToken)
 
 			const clineProvider: ApiProvider = "cline"
-			await updateWorkspaceState(this.context, "apiProvider", clineProvider)
+			await updateGlobalState(this.context, "apiProvider", clineProvider)
 
 			// Update API configuration with the new provider and API key
 			const { apiConfiguration } = await getAllExtensionState(this.context)
@@ -682,7 +669,7 @@ export class Controller {
 		}
 
 		const openrouter: ApiProvider = "openrouter"
-		await updateWorkspaceState(this.context, "apiProvider", openrouter)
+		await updateGlobalState(this.context, "apiProvider", openrouter)
 		await storeSecret(this.context, "openRouterApiKey", apiKey)
 		await this.postStateToWebview()
 		if (this.task) {
@@ -970,13 +957,13 @@ export class Controller {
 		const {
 			apiConfiguration,
 			lastShownAnnouncementId,
+			customInstructions,
 			taskHistory,
 			autoApprovalSettings,
 			browserSettings,
 			chatSettings,
 			userInfo,
 			mcpMarketplaceEnabled,
-			mcpRichDisplayEnabled,
 			telemetrySetting,
 			planActSeparateModelsSetting,
 			enableCheckpointsSetting,
@@ -984,10 +971,8 @@ export class Controller {
 			globalWorkflowToggles,
 			shellIntegrationTimeout,
 			terminalReuseEnabled,
-			defaultTerminalProfile,
 			isNewUser,
 			mcpResponsesCollapsed,
-			terminalOutputLineLimit,
 		} = await getAllExtensionState(this.context)
 
 		const localClineRulesToggles =
@@ -1004,6 +989,7 @@ export class Controller {
 		return {
 			version: this.context.extension?.packageJSON?.version ?? "",
 			apiConfiguration,
+			customInstructions,
 			uriScheme: vscode.env.uriScheme,
 			currentTaskItem: this.task?.taskId ? (taskHistory || []).find((item) => item.id === this.task?.taskId) : undefined,
 			checkpointTrackerErrorMessage: this.task?.checkpointTrackerErrorMessage,
@@ -1019,7 +1005,6 @@ export class Controller {
 			chatSettings,
 			userInfo,
 			mcpMarketplaceEnabled,
-			mcpRichDisplayEnabled,
 			telemetrySetting,
 			planActSeparateModelsSetting,
 			enableCheckpointsSetting: enableCheckpointsSetting ?? true,
@@ -1032,10 +1017,8 @@ export class Controller {
 			globalWorkflowToggles: globalWorkflowToggles || {},
 			shellIntegrationTimeout,
 			terminalReuseEnabled,
-			defaultTerminalProfile,
 			isNewUser,
 			mcpResponsesCollapsed,
-			terminalOutputLineLimit,
 		}
 	}
 

src/core/controller/models/refreshOpenRouterModels.ts

@@ -99,11 +99,6 @@ export async function refreshOpenRouterModels(
 						modelInfo.cacheWritesPrice = 0.14
 						modelInfo.cacheReadsPrice = 0.014
 						break
-					case "x-ai/grok-3-beta":
-						modelInfo.supportsPromptCache = true
-						modelInfo.cacheWritesPrice = 0
-						modelInfo.cacheReadsPrice = 0
-						break
 					default:
 						if (rawModel.id.startsWith("openai/")) {
 							modelInfo.cacheReadsPrice = parsePrice(rawModel.pricing?.input_cache_read)
@@ -122,11 +117,6 @@ export async function refreshOpenRouterModels(
 						break
 				}
 
-				// add new model id
-				if (rawModel.id === "x-ai/grok-3-beta") {
-					models["x-ai/grok-3"] = modelInfo
-				}
-
 				models[rawModel.id] = modelInfo
 			}
 		} else {

src/core/controller/models/updateApiConfigurationProto.ts

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

src/core/controller/state/getAvailableTerminalProfiles.ts

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

src/core/controller/state/resetState.ts

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

src/core/controller/state/updateDefaultTerminalProfile.ts

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

src/core/controller/state/updateSettings.ts

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

src/core/controller/state/updateTerminalConnectionTimeout.ts

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

src/core/controller/state/updateTerminalReuseEnabled.ts

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

src/core/controller/ui/initializeWebview.ts

@@ -1,7 +1,7 @@
 import type { Controller } from "../index"
 import { EmptyRequest, Empty } from "@shared/proto/common"
 import { handleModelsServiceRequest } from "../models"
-import { getAllExtensionState, getGlobalState, updateWorkspaceState } from "../../storage/state"
+import { getAllExtensionState, getGlobalState, updateGlobalState } from "../../storage/state"
 import { sendOpenRouterModelsEvent } from "../models/subscribeToOpenRouterModels"
 import { sendMcpMarketplaceCatalogEvent } from "../mcp/subscribeToMcpMarketplaceCatalog"
 import { telemetryService } from "@/services/posthog/telemetry/TelemetryService"
@@ -32,7 +32,7 @@ export async function initializeWebview(controller: Controller, request: EmptyRe
 				// Update model info in state (this needs to be done here since we don't want to update state while settings is open, and we may refresh models there)
 				const { apiConfiguration } = await getAllExtensionState(controller.context)
 				if (apiConfiguration.openRouterModelId && response.models[apiConfiguration.openRouterModelId]) {
-					await updateWorkspaceState(
+					await updateGlobalState(
 						controller.context,
 						"openRouterModelInfo",
 						response.models[apiConfiguration.openRouterModelId],

src/core/controller/ui/subscribeToFocusChatInput.ts

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

src/core/prompts/model_prompts/claude4.ts

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

src/core/prompts/responses.ts

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

src/core/prompts/system.ts

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

src/core/storage/state-keys.ts

@@ -22,24 +22,28 @@ export type SecretKey =
 	| "nebiusApiKey"
 	| "sambanovaApiKey"
 	| "cerebrasApiKey"
-	| "sapAiCoreClientId"
-	| "sapAiCoreClientSecret"
 
 export type GlobalStateKey =
+	| "apiProvider"
+	| "apiModelId"
 	| "awsRegion"
 	| "awsUseCrossRegionInference"
 	| "awsBedrockUsePromptCache"
 	| "awsBedrockEndpoint"
 	| "awsProfile"
 	| "awsUseProfile"
+	| "awsBedrockCustomSelected"
+	| "awsBedrockCustomModelBaseId"
 	| "vertexProjectId"
 	| "vertexRegion"
 	| "lastShownAnnouncementId"
+	| "customInstructions"
 	| "taskHistory"
 	| "openAiBaseUrl"
 	| "openAiModelId"
 	| "openAiModelInfo"
 	| "openAiHeaders"
+	| "ollamaModelId"
 	| "ollamaBaseUrl"
 	| "ollamaApiOptionsCtxNum"
 	| "lmStudioModelId"
@@ -47,20 +51,40 @@ export type GlobalStateKey =
 	| "anthropicBaseUrl"
 	| "geminiBaseUrl"
 	| "azureApiVersion"
+	| "openRouterModelId"
+	| "openRouterModelInfo"
 	| "openRouterProviderSorting"
 	| "autoApprovalSettings"
 	| "globalClineRulesToggles"
 	| "globalWorkflowToggles"
 	| "browserSettings"
+	| "chatSettings"
+	| "vsCodeLmModelSelector"
 	| "userInfo"
+	| "previousModeApiProvider"
+	| "previousModeModelId"
+	| "previousModeThinkingBudgetTokens"
+	| "previousModeReasoningEffort"
+	| "previousModeVsCodeLmModelSelector"
+	| "previousModeAwsBedrockCustomSelected"
+	| "previousModeAwsBedrockCustomModelBaseId"
+	| "previousModeModelInfo"
 	| "liteLlmBaseUrl"
+	| "liteLlmModelId"
+	| "liteLlmModelInfo"
 	| "liteLlmUsePromptCache"
+	| "fireworksModelId"
 	| "fireworksModelMaxCompletionTokens"
 	| "fireworksModelMaxTokens"
 	| "qwenApiLine"
+	| "requestyModelId"
+	| "requestyModelInfo"
+	| "togetherModelId"
 	| "mcpMarketplaceCatalog"
 	| "telemetrySetting"
 	| "asksageApiUrl"
+	| "thinkingBudgetTokens"
+	| "reasoningEffort"
 	| "planActSeparateModelsSetting"
 	| "enableCheckpointsSetting"
 	| "mcpMarketplaceEnabled"
@@ -69,53 +93,6 @@ export type GlobalStateKey =
 	| "shellIntegrationTimeout"
 	| "mcpResponsesCollapsed"
 	| "terminalReuseEnabled"
-	| "defaultTerminalProfile"
 	| "isNewUser"
-	| "terminalOutputLineLimit"
-	| "mcpRichDisplayEnabled"
-	| "sapAiCoreTokenUrl"
-	| "sapAiCoreBaseUrl"
-	| "sapAiResourceGroup"
-	| "sapAiCoreClientId"
-	| "sapAiCoreClientSecret"
-	| "sapAiCoreModelId"
-	| "claudeCodePath"
 
-export type LocalStateKey =
-	| "localClineRulesToggles"
-	| "chatSettings"
-	// Current active model configuration (per workspace)
-	| "apiProvider"
-	| "apiModelId"
-	| "thinkingBudgetTokens"
-	| "reasoningEffort"
-	| "vsCodeLmModelSelector"
-	| "awsBedrockCustomSelected"
-	| "awsBedrockCustomModelBaseId"
-	| "openRouterModelId"
-	| "openRouterModelInfo"
-	| "openAiModelId"
-	| "openAiModelInfo"
-	| "ollamaModelId"
-	| "lmStudioModelId"
-	| "liteLlmModelId"
-	| "liteLlmModelInfo"
-	| "requestyModelId"
-	| "requestyModelInfo"
-	| "togetherModelId"
-	| "fireworksModelId"
-	// Previous mode saved configurations (per workspace)
-	| "previousModeApiProvider"
-	| "previousModeModelId"
-	| "previousModeModelInfo"
-	| "previousModeVsCodeLmModelSelector"
-	| "previousModeThinkingBudgetTokens"
-	| "previousModeReasoningEffort"
-	| "previousModeAwsBedrockCustomSelected"
-	| "previousModeAwsBedrockCustomModelBaseId"
-	| "previousModeSapAiCoreClientId"
-	| "previousModeSapAiCoreClientSecret"
-	| "previousModeSapAiCoreBaseUrl"
-	| "previousModeSapAiCoreTokenUrl"
-	| "previousModeSapAiCoreResourceGroup"
-	| "previousModeSapAiCoreModelId"
+export type LocalStateKey = "localClineRulesToggles"

src/core/storage/state.ts

@@ -11,9 +11,6 @@ import { ChatSettings } from "@shared/ChatSettings"
 import { TelemetrySetting } from "@shared/TelemetrySetting"
 import { UserInfo } from "@shared/UserInfo"
 import { ClineRulesToggles } from "@shared/cline-rules"
-import { ensureRulesDirectoryExists } from "./disk"
-import fs from "fs/promises"
-import path from "path"
 /*
 	Storage
 	https://dev.to/kompotkot/how-to-use-secretstorage-in-your-vscode-extensions-2hco
@@ -54,57 +51,6 @@ export async function getWorkspaceState(context: vscode.ExtensionContext, key: s
 	return await context.workspaceState.get(key)
 }
 
-export async function migratePlanActGlobalToWorkspaceStorage(context: vscode.ExtensionContext) {
-	// Keys that were migrated from global storage to workspace storage
-	const keysToMigrate = [
-		// Core settings
-		"apiProvider",
-		"apiModelId",
-		"thinkingBudgetTokens",
-		"reasoningEffort",
-		"chatSettings",
-		"vsCodeLmModelSelector",
-
-		// Provider-specific model keys
-		"awsBedrockCustomSelected",
-		"awsBedrockCustomModelBaseId",
-		"openRouterModelId",
-		"openRouterModelInfo",
-		"openAiModelId",
-		"openAiModelInfo",
-		"ollamaModelId",
-		"lmStudioModelId",
-		"liteLlmModelId",
-		"liteLlmModelInfo",
-		"requestyModelId",
-		"requestyModelInfo",
-		"togetherModelId",
-		"fireworksModelId",
-
-		// Previous mode settings
-		"previousModeApiProvider",
-		"previousModeModelId",
-		"previousModeModelInfo",
-		"previousModeVsCodeLmModelSelector",
-		"previousModeThinkingBudgetTokens",
-		"previousModeReasoningEffort",
-		"previousModeAwsBedrockCustomSelected",
-		"previousModeAwsBedrockCustomModelBaseId",
-	]
-
-	for (const key of keysToMigrate) {
-		const globalValue = await getGlobalState(context, key as GlobalStateKey)
-		if (globalValue !== undefined) {
-			const workspaceValue = await getWorkspaceState(context, key)
-			if (workspaceValue === undefined) {
-				await updateWorkspaceState(context, key, globalValue)
-			}
-			// Delete from global storage regardless of whether we copied it
-			await updateGlobalState(context, key as GlobalStateKey, undefined)
-		}
-	}
-}
-
 async function migrateMcpMarketplaceEnableSetting(mcpMarketplaceEnabledRaw: boolean | undefined): Promise<boolean> {
 	const config = vscode.workspace.getConfiguration("cline")
 	const mcpMarketplaceEnabled = config.get<boolean>("mcpMarketplace.enabled")
@@ -128,54 +74,11 @@ async function migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw: bool
 	return enableCheckpointsSettingRaw ?? true
 }
 
-export async function migrateCustomInstructionsToGlobalRules(context: vscode.ExtensionContext) {
-	try {
-		const customInstructions = (await context.globalState.get("customInstructions")) as string | undefined
-
-		if (customInstructions?.trim()) {
-			console.log("Migrating custom instructions to global Cline rules...")
-
-			// Create global .clinerules directory if it doesn't exist
-			const globalRulesDir = await ensureRulesDirectoryExists()
-
-			// Use a fixed filename for custom instructions
-			const migrationFileName = "custom_instructions.md"
-			const migrationFilePath = path.join(globalRulesDir, migrationFileName)
-
-			try {
-				// Check if file already exists to determine if we should append
-				let existingContent = ""
-				try {
-					existingContent = await fs.readFile(migrationFilePath, "utf8")
-				} catch (readError) {
-					// File doesn't exist, which is fine
-				}
-
-				// Append or create the file with custom instructions
-				const contentToWrite = existingContent
-					? `${existingContent}\n\n---\n\n${customInstructions.trim()}`
-					: customInstructions.trim()
-
-				await fs.writeFile(migrationFilePath, contentToWrite)
-				console.log(`Successfully ${existingContent ? "appended to" : "created"} migration file: ${migrationFilePath}`)
-			} catch (fileError) {
-				console.error("Failed to write migration file:", fileError)
-				return
-			}
-
-			// Remove customInstructions from global state only after successful file creation
-			await context.globalState.update("customInstructions", undefined)
-			console.log("Successfully migrated custom instructions to global Cline rules")
-		}
-	} catch (error) {
-		console.error("Failed to migrate custom instructions to global rules:", error)
-		// Continue execution - migration failure shouldn't break extension startup
-	}
-}
-
 export async function getAllExtensionState(context: vscode.ExtensionContext) {
 	const [
 		isNewUser,
+		storedApiProvider,
+		apiModelId,
 		apiKey,
 		openRouterApiKey,
 		clineApiKey,
@@ -188,13 +91,19 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		awsBedrockEndpoint,
 		awsProfile,
 		awsUseProfile,
+		awsBedrockCustomSelected,
+		awsBedrockCustomModelBaseId,
 		vertexProjectId,
 		vertexRegion,
 		openAiBaseUrl,
 		openAiApiKey,
+		openAiModelId,
+		openAiModelInfo,
 		openAiHeaders,
+		ollamaModelId,
 		ollamaBaseUrl,
 		ollamaApiOptionsCtxNum,
+		lmStudioModelId,
 		lmStudioBaseUrl,
 		anthropicBaseUrl,
 		geminiApiKey,
@@ -202,28 +111,49 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		openAiNativeApiKey,
 		deepSeekApiKey,
 		requestyApiKey,
+		requestyModelId,
+		requestyModelInfo,
 		togetherApiKey,
+		togetherModelId,
 		qwenApiKey,
 		doubaoApiKey,
 		mistralApiKey,
 		azureApiVersion,
+		openRouterModelId,
+		openRouterModelInfo,
 		openRouterProviderSorting,
 		lastShownAnnouncementId,
+		customInstructions,
 		taskHistory,
 		autoApprovalSettings,
 		browserSettings,
+		chatSettings,
+		vsCodeLmModelSelector,
 		liteLlmBaseUrl,
+		liteLlmModelId,
+		liteLlmModelInfo,
 		liteLlmUsePromptCache,
 		fireworksApiKey,
+		fireworksModelId,
 		fireworksModelMaxCompletionTokens,
 		fireworksModelMaxTokens,
 		userInfo,
+		previousModeApiProvider,
+		previousModeModelId,
+		previousModeModelInfo,
+		previousModeVsCodeLmModelSelector,
+		previousModeThinkingBudgetTokens,
+		previousModeReasoningEffort,
+		previousModeAwsBedrockCustomSelected,
+		previousModeAwsBedrockCustomModelBaseId,
 		qwenApiLine,
 		liteLlmApiKey,
 		telemetrySetting,
 		asksageApiKey,
 		asksageApiUrl,
 		xaiApiKey,
+		thinkingBudgetTokens,
+		reasoningEffort,
 		sambanovaApiKey,
 		cerebrasApiKey,
 		nebiusApiKey,
@@ -234,21 +164,13 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		shellIntegrationTimeout,
 		enableCheckpointsSettingRaw,
 		mcpMarketplaceEnabledRaw,
-		mcpRichDisplayEnabled,
 		mcpResponsesCollapsedRaw,
 		globalWorkflowToggles,
 		terminalReuseEnabled,
-		terminalOutputLineLimit,
-		defaultTerminalProfile,
-		sapAiCoreClientId,
-		sapAiCoreClientSecret,
-		sapAiCoreBaseUrl,
-		sapAiCoreTokenUrl,
-		sapAiResourceGroup,
-		sapAiCoreModelId,
-		claudeCodePath,
 	] = await Promise.all([
 		getGlobalState(context, "isNewUser") as Promise<boolean | undefined>,
+		getGlobalState(context, "apiProvider") as Promise<ApiProvider | undefined>,
+		getGlobalState(context, "apiModelId") as Promise<string | undefined>,
 		getSecret(context, "apiKey") as Promise<string | undefined>,
 		getSecret(context, "openRouterApiKey") as Promise<string | undefined>,
 		getSecret(context, "clineApiKey") as Promise<string | undefined>,
@@ -261,13 +183,19 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "awsBedrockEndpoint") as Promise<string | undefined>,
 		getGlobalState(context, "awsProfile") as Promise<string | undefined>,
 		getGlobalState(context, "awsUseProfile") as Promise<boolean | undefined>,
+		getGlobalState(context, "awsBedrockCustomSelected") as Promise<boolean | undefined>,
+		getGlobalState(context, "awsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
 		getGlobalState(context, "vertexProjectId") as Promise<string | undefined>,
 		getGlobalState(context, "vertexRegion") as Promise<string | undefined>,
 		getGlobalState(context, "openAiBaseUrl") as Promise<string | undefined>,
 		getSecret(context, "openAiApiKey") as Promise<string | undefined>,
+		getGlobalState(context, "openAiModelId") as Promise<string | undefined>,
+		getGlobalState(context, "openAiModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "openAiHeaders") as Promise<Record<string, string> | undefined>,
+		getGlobalState(context, "ollamaModelId") as Promise<string | undefined>,
 		getGlobalState(context, "ollamaBaseUrl") as Promise<string | undefined>,
 		getGlobalState(context, "ollamaApiOptionsCtxNum") as Promise<string | undefined>,
+		getGlobalState(context, "lmStudioModelId") as Promise<string | undefined>,
 		getGlobalState(context, "lmStudioBaseUrl") as Promise<string | undefined>,
 		getGlobalState(context, "anthropicBaseUrl") as Promise<string | undefined>,
 		getSecret(context, "geminiApiKey") as Promise<string | undefined>,
@@ -275,28 +203,49 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getSecret(context, "openAiNativeApiKey") as Promise<string | undefined>,
 		getSecret(context, "deepSeekApiKey") as Promise<string | undefined>,
 		getSecret(context, "requestyApiKey") as Promise<string | undefined>,
+		getGlobalState(context, "requestyModelId") as Promise<string | undefined>,
+		getGlobalState(context, "requestyModelInfo") as Promise<ModelInfo | undefined>,
 		getSecret(context, "togetherApiKey") as Promise<string | undefined>,
+		getGlobalState(context, "togetherModelId") as Promise<string | undefined>,
 		getSecret(context, "qwenApiKey") as Promise<string | undefined>,
 		getSecret(context, "doubaoApiKey") as Promise<string | undefined>,
 		getSecret(context, "mistralApiKey") as Promise<string | undefined>,
 		getGlobalState(context, "azureApiVersion") as Promise<string | undefined>,
+		getGlobalState(context, "openRouterModelId") as Promise<string | undefined>,
+		getGlobalState(context, "openRouterModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "openRouterProviderSorting") as Promise<string | undefined>,
 		getGlobalState(context, "lastShownAnnouncementId") as Promise<string | undefined>,
+		getGlobalState(context, "customInstructions") as Promise<string | undefined>,
 		getGlobalState(context, "taskHistory") as Promise<HistoryItem[] | undefined>,
 		getGlobalState(context, "autoApprovalSettings") as Promise<AutoApprovalSettings | undefined>,
 		getGlobalState(context, "browserSettings") as Promise<BrowserSettings | undefined>,
+		getGlobalState(context, "chatSettings") as Promise<ChatSettings | undefined>,
+		getGlobalState(context, "vsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
 		getGlobalState(context, "liteLlmBaseUrl") as Promise<string | undefined>,
+		getGlobalState(context, "liteLlmModelId") as Promise<string | undefined>,
+		getGlobalState(context, "liteLlmModelInfo") as Promise<ModelInfo | undefined>,
 		getGlobalState(context, "liteLlmUsePromptCache") as Promise<boolean | undefined>,
 		getSecret(context, "fireworksApiKey") as Promise<string | undefined>,
+		getGlobalState(context, "fireworksModelId") as Promise<string | undefined>,
 		getGlobalState(context, "fireworksModelMaxCompletionTokens") as Promise<number | undefined>,
 		getGlobalState(context, "fireworksModelMaxTokens") as Promise<number | undefined>,
 		getGlobalState(context, "userInfo") as Promise<UserInfo | undefined>,
+		getGlobalState(context, "previousModeApiProvider") as Promise<ApiProvider | undefined>,
+		getGlobalState(context, "previousModeModelId") as Promise<string | undefined>,
+		getGlobalState(context, "previousModeModelInfo") as Promise<ModelInfo | undefined>,
+		getGlobalState(context, "previousModeVsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
+		getGlobalState(context, "previousModeThinkingBudgetTokens") as Promise<number | undefined>,
+		getGlobalState(context, "previousModeReasoningEffort") as Promise<string | undefined>,
+		getGlobalState(context, "previousModeAwsBedrockCustomSelected") as Promise<boolean | undefined>,
+		getGlobalState(context, "previousModeAwsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
 		getGlobalState(context, "qwenApiLine") as Promise<string | undefined>,
 		getSecret(context, "liteLlmApiKey") as Promise<string | undefined>,
 		getGlobalState(context, "telemetrySetting") as Promise<TelemetrySetting | undefined>,
 		getSecret(context, "asksageApiKey") as Promise<string | undefined>,
 		getGlobalState(context, "asksageApiUrl") as Promise<string | undefined>,
 		getSecret(context, "xaiApiKey") as Promise<string | undefined>,
+		getGlobalState(context, "thinkingBudgetTokens") as Promise<number | undefined>,
+		getGlobalState(context, "reasoningEffort") as Promise<string | undefined>,
 		getSecret(context, "sambanovaApiKey") as Promise<string | undefined>,
 		getSecret(context, "cerebrasApiKey") as Promise<string | undefined>,
 		getSecret(context, "nebiusApiKey") as Promise<string | undefined>,
@@ -307,93 +256,9 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		getGlobalState(context, "shellIntegrationTimeout") as Promise<number | undefined>,
 		getGlobalState(context, "enableCheckpointsSetting") as Promise<boolean | undefined>,
 		getGlobalState(context, "mcpMarketplaceEnabled") as Promise<boolean | undefined>,
-		getGlobalState(context, "mcpRichDisplayEnabled") as Promise<boolean | undefined>,
 		getGlobalState(context, "mcpResponsesCollapsed") as Promise<boolean | undefined>,
 		getGlobalState(context, "globalWorkflowToggles") as Promise<ClineRulesToggles | undefined>,
 		getGlobalState(context, "terminalReuseEnabled") as Promise<boolean | undefined>,
-		getGlobalState(context, "terminalOutputLineLimit") as Promise<number | undefined>,
-		getGlobalState(context, "defaultTerminalProfile") as Promise<string | undefined>,
-		getSecret(context, "sapAiCoreClientId") as Promise<string | undefined>,
-		getSecret(context, "sapAiCoreClientSecret") as Promise<string | undefined>,
-		getGlobalState(context, "sapAiCoreBaseUrl") as Promise<string | undefined>,
-		getGlobalState(context, "sapAiCoreTokenUrl") as Promise<string | undefined>,
-		getGlobalState(context, "sapAiResourceGroup") as Promise<string | undefined>,
-		getGlobalState(context, "sapAiCoreModelId") as Promise<string | undefined>,
-		getGlobalState(context, "claudeCodePath") as Promise<string | undefined>,
-	])
-
-	const localClineRulesToggles = (await getWorkspaceState(context, "localClineRulesToggles")) as ClineRulesToggles
-
-	const [
-		chatSettings,
-		storedApiProvider,
-		apiModelId,
-		thinkingBudgetTokens,
-		reasoningEffort,
-		vsCodeLmModelSelector,
-		awsBedrockCustomSelected,
-		awsBedrockCustomModelBaseId,
-		openRouterModelId,
-		openRouterModelInfo,
-		openAiModelId,
-		openAiModelInfo,
-		ollamaModelId,
-		lmStudioModelId,
-		liteLlmModelId,
-		liteLlmModelInfo,
-		requestyModelId,
-		requestyModelInfo,
-		togetherModelId,
-		fireworksModelId,
-		previousModeApiProvider,
-		previousModeModelId,
-		previousModeModelInfo,
-		previousModeVsCodeLmModelSelector,
-		previousModeThinkingBudgetTokens,
-		previousModeReasoningEffort,
-		previousModeAwsBedrockCustomSelected,
-		previousModeAwsBedrockCustomModelBaseId,
-		previousModeSapAiCoreClientId,
-		previousModeSapAiCoreClientSecret,
-		previousModeSapAiCoreBaseUrl,
-		previousModeSapAiCoreTokenUrl,
-		previousModeSapAiCoreResourceGroup,
-		previousModeSapAiCoreModelId,
-	] = await Promise.all([
-		getWorkspaceState(context, "chatSettings") as Promise<ChatSettings | undefined>,
-		getWorkspaceState(context, "apiProvider") as Promise<ApiProvider | undefined>,
-		getWorkspaceState(context, "apiModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "thinkingBudgetTokens") as Promise<number | undefined>,
-		getWorkspaceState(context, "reasoningEffort") as Promise<string | undefined>,
-		getWorkspaceState(context, "vsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
-		getWorkspaceState(context, "awsBedrockCustomSelected") as Promise<boolean | undefined>,
-		getWorkspaceState(context, "awsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
-		getWorkspaceState(context, "openRouterModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "openRouterModelInfo") as Promise<ModelInfo | undefined>,
-		getWorkspaceState(context, "openAiModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "openAiModelInfo") as Promise<ModelInfo | undefined>,
-		getWorkspaceState(context, "ollamaModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "lmStudioModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "liteLlmModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "liteLlmModelInfo") as Promise<ModelInfo | undefined>,
-		getWorkspaceState(context, "requestyModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "requestyModelInfo") as Promise<ModelInfo | undefined>,
-		getWorkspaceState(context, "togetherModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "fireworksModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeApiProvider") as Promise<ApiProvider | undefined>,
-		getWorkspaceState(context, "previousModeModelId") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeModelInfo") as Promise<ModelInfo | undefined>,
-		getWorkspaceState(context, "previousModeVsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
-		getWorkspaceState(context, "previousModeThinkingBudgetTokens") as Promise<number | undefined>,
-		getWorkspaceState(context, "previousModeReasoningEffort") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeAwsBedrockCustomSelected") as Promise<boolean | undefined>,
-		getWorkspaceState(context, "previousModeAwsBedrockCustomModelBaseId") as Promise<BedrockModelId | undefined>,
-		getWorkspaceState(context, "previousModeSapAiCoreClientId") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeSapAiCoreClientSecret") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeSapAiCoreBaseUrl") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeSapAiCoreTokenUrl") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeSapAiCoreResourceGroup") as Promise<string | undefined>,
-		getWorkspaceState(context, "previousModeSapAiCoreModelId") as Promise<string | undefined>,
 	])
 
 	let apiProvider: ApiProvider
@@ -410,6 +275,8 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		}
 	}
 
+	const localClineRulesToggles = (await getWorkspaceState(context, "localClineRulesToggles")) as ClineRulesToggles
+
 	const mcpMarketplaceEnabled = await migrateMcpMarketplaceEnableSetting(mcpMarketplaceEnabledRaw)
 	const enableCheckpointsSetting = await migrateEnableCheckpointsSetting(enableCheckpointsSettingRaw)
 	const mcpResponsesCollapsed = mcpResponsesCollapsedRaw ?? false
@@ -439,7 +306,6 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 			apiKey,
 			openRouterApiKey,
 			clineApiKey,
-			claudeCodePath,
 			awsAccessKey,
 			awsSecretKey,
 			awsSessionToken,
@@ -501,15 +367,10 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 			nebiusApiKey,
 			favoritedModelIds,
 			requestTimeoutMs,
-			sapAiCoreClientId,
-			sapAiCoreClientSecret,
-			sapAiCoreBaseUrl,
-			sapAiCoreTokenUrl,
-			sapAiResourceGroup,
-			sapAiCoreModelId,
 		},
 		isNewUser: isNewUser ?? true,
 		lastShownAnnouncementId,
+		customInstructions,
 		taskHistory,
 		autoApprovalSettings: autoApprovalSettings || DEFAULT_AUTO_APPROVAL_SETTINGS, // default value can be 0 or empty string
 		globalClineRulesToggles: globalClineRulesToggles || {},
@@ -528,22 +389,13 @@ export async function getAllExtensionState(context: vscode.ExtensionContext) {
 		previousModeReasoningEffort,
 		previousModeAwsBedrockCustomSelected,
 		previousModeAwsBedrockCustomModelBaseId,
-		previousModeSapAiCoreClientId,
-		previousModeSapAiCoreClientSecret,
-		previousModeSapAiCoreBaseUrl,
-		previousModeSapAiCoreTokenUrl,
-		previousModeSapAiCoreResourceGroup,
-		previousModeSapAiCoreModelId,
 		mcpMarketplaceEnabled: mcpMarketplaceEnabled,
-		mcpRichDisplayEnabled: mcpRichDisplayEnabled ?? true,
 		mcpResponsesCollapsed: mcpResponsesCollapsed,
 		telemetrySetting: telemetrySetting || "unset",
 		planActSeparateModelsSetting,
 		enableCheckpointsSetting: enableCheckpointsSetting,
 		shellIntegrationTimeout: shellIntegrationTimeout || 4000,
 		terminalReuseEnabled: terminalReuseEnabled ?? true,
-		terminalOutputLineLimit: terminalOutputLineLimit ?? 500,
-		defaultTerminalProfile: defaultTerminalProfile ?? "default",
 		globalWorkflowToggles: globalWorkflowToggles || {},
 	}
 }
@@ -611,82 +463,37 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 		cerebrasApiKey,
 		nebiusApiKey,
 		favoritedModelIds,
-		fireworksApiKey,
-		fireworksModelId,
-		fireworksModelMaxCompletionTokens,
-		fireworksModelMaxTokens,
-		sapAiCoreClientId,
-		sapAiCoreClientSecret,
-		sapAiCoreBaseUrl,
-		sapAiCoreTokenUrl,
-		sapAiResourceGroup,
-		sapAiCoreModelId,
-		claudeCodePath,
 	} = apiConfiguration
-	// Workspace state updates
-	await updateWorkspaceState(context, "apiProvider", apiProvider)
-	await updateWorkspaceState(context, "apiModelId", apiModelId)
-	await updateWorkspaceState(context, "thinkingBudgetTokens", thinkingBudgetTokens)
-	await updateWorkspaceState(context, "reasoningEffort", reasoningEffort)
-	await updateWorkspaceState(context, "vsCodeLmModelSelector", vsCodeLmModelSelector)
-	await updateWorkspaceState(context, "awsBedrockCustomSelected", awsBedrockCustomSelected)
-	await updateWorkspaceState(context, "awsBedrockCustomModelBaseId", awsBedrockCustomModelBaseId)
-	await updateWorkspaceState(context, "openRouterModelId", openRouterModelId)
-	await updateWorkspaceState(context, "openRouterModelInfo", openRouterModelInfo)
-	await updateWorkspaceState(context, "openAiModelId", openAiModelId)
-	await updateWorkspaceState(context, "openAiModelInfo", openAiModelInfo)
-	await updateWorkspaceState(context, "ollamaModelId", ollamaModelId)
-	await updateWorkspaceState(context, "lmStudioModelId", lmStudioModelId)
-	await updateWorkspaceState(context, "liteLlmModelId", liteLlmModelId)
-	await updateWorkspaceState(context, "liteLlmModelInfo", liteLlmModelInfo)
-	await updateWorkspaceState(context, "requestyModelId", requestyModelId)
-	await updateWorkspaceState(context, "requestyModelInfo", requestyModelInfo)
-	await updateWorkspaceState(context, "togetherModelId", togetherModelId)
-	await updateWorkspaceState(context, "fireworksModelId", fireworksModelId)
-
-	// Global state updates
+	await updateGlobalState(context, "apiProvider", apiProvider)
+	await updateGlobalState(context, "apiModelId", apiModelId)
+	await storeSecret(context, "apiKey", apiKey)
+	await storeSecret(context, "openRouterApiKey", openRouterApiKey)
+	await storeSecret(context, "awsAccessKey", awsAccessKey)
+	await storeSecret(context, "awsSecretKey", awsSecretKey)
+	await storeSecret(context, "awsSessionToken", awsSessionToken)
 	await updateGlobalState(context, "awsRegion", awsRegion)
 	await updateGlobalState(context, "awsUseCrossRegionInference", awsUseCrossRegionInference)
 	await updateGlobalState(context, "awsBedrockUsePromptCache", awsBedrockUsePromptCache)
 	await updateGlobalState(context, "awsBedrockEndpoint", awsBedrockEndpoint)
 	await updateGlobalState(context, "awsProfile", awsProfile)
 	await updateGlobalState(context, "awsUseProfile", awsUseProfile)
+	await updateGlobalState(context, "awsBedrockCustomSelected", awsBedrockCustomSelected)
+	await updateGlobalState(context, "awsBedrockCustomModelBaseId", awsBedrockCustomModelBaseId)
 	await updateGlobalState(context, "vertexProjectId", vertexProjectId)
 	await updateGlobalState(context, "vertexRegion", vertexRegion)
 	await updateGlobalState(context, "openAiBaseUrl", openAiBaseUrl)
+	await storeSecret(context, "openAiApiKey", openAiApiKey)
+	await updateGlobalState(context, "openAiModelId", openAiModelId)
+	await updateGlobalState(context, "openAiModelInfo", openAiModelInfo)
 	await updateGlobalState(context, "openAiHeaders", openAiHeaders || {})
+	await updateGlobalState(context, "ollamaModelId", ollamaModelId)
 	await updateGlobalState(context, "ollamaBaseUrl", ollamaBaseUrl)
 	await updateGlobalState(context, "ollamaApiOptionsCtxNum", ollamaApiOptionsCtxNum)
+	await updateGlobalState(context, "lmStudioModelId", lmStudioModelId)
 	await updateGlobalState(context, "lmStudioBaseUrl", lmStudioBaseUrl)
 	await updateGlobalState(context, "anthropicBaseUrl", anthropicBaseUrl)
-	await updateGlobalState(context, "geminiBaseUrl", geminiBaseUrl)
-	await updateGlobalState(context, "azureApiVersion", azureApiVersion)
-	await updateGlobalState(context, "openRouterProviderSorting", openRouterProviderSorting)
-	await updateGlobalState(context, "liteLlmBaseUrl", liteLlmBaseUrl)
-	await updateGlobalState(context, "liteLlmUsePromptCache", liteLlmUsePromptCache)
-	await updateGlobalState(context, "qwenApiLine", qwenApiLine)
-	await updateGlobalState(context, "asksageApiUrl", asksageApiUrl)
-	await updateGlobalState(context, "favoritedModelIds", favoritedModelIds)
-	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
-	await updateGlobalState(context, "fireworksModelMaxCompletionTokens", fireworksModelMaxCompletionTokens)
-	await updateGlobalState(context, "fireworksModelMaxTokens", fireworksModelMaxTokens)
-	await updateGlobalState(context, "favoritedModelIds", favoritedModelIds)
-	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
-	await updateGlobalState(context, "sapAiCoreBaseUrl", sapAiCoreBaseUrl)
-	await updateGlobalState(context, "sapAiCoreTokenUrl", sapAiCoreTokenUrl)
-	await updateGlobalState(context, "sapAiResourceGroup", sapAiResourceGroup)
-	await updateGlobalState(context, "sapAiCoreModelId", sapAiCoreModelId)
-	await updateGlobalState(context, "claudeCodePath", claudeCodePath)
-
-	// Secret updates
-	await storeSecret(context, "apiKey", apiKey)
-	await storeSecret(context, "openRouterApiKey", openRouterApiKey)
-	await storeSecret(context, "clineApiKey", clineApiKey)
-	await storeSecret(context, "awsAccessKey", awsAccessKey)
-	await storeSecret(context, "awsSecretKey", awsSecretKey)
-	await storeSecret(context, "awsSessionToken", awsSessionToken)
-	await storeSecret(context, "openAiApiKey", openAiApiKey)
 	await storeSecret(context, "geminiApiKey", geminiApiKey)
+	await updateGlobalState(context, "geminiBaseUrl", geminiBaseUrl)
 	await storeSecret(context, "openAiNativeApiKey", openAiNativeApiKey)
 	await storeSecret(context, "deepSeekApiKey", deepSeekApiKey)
 	await storeSecret(context, "requestyApiKey", requestyApiKey)
@@ -695,24 +502,33 @@ export async function updateApiConfiguration(context: vscode.ExtensionContext, a
 	await storeSecret(context, "doubaoApiKey", doubaoApiKey)
 	await storeSecret(context, "mistralApiKey", mistralApiKey)
 	await storeSecret(context, "liteLlmApiKey", liteLlmApiKey)
-	await storeSecret(context, "fireworksApiKey", fireworksApiKey)
-	await storeSecret(context, "asksageApiKey", asksageApiKey)
 	await storeSecret(context, "xaiApiKey", xaiApiKey)
+	await updateGlobalState(context, "azureApiVersion", azureApiVersion)
+	await updateGlobalState(context, "openRouterModelId", openRouterModelId)
+	await updateGlobalState(context, "openRouterModelInfo", openRouterModelInfo)
+	await updateGlobalState(context, "openRouterProviderSorting", openRouterProviderSorting)
+	await updateGlobalState(context, "vsCodeLmModelSelector", vsCodeLmModelSelector)
+	await updateGlobalState(context, "liteLlmBaseUrl", liteLlmBaseUrl)
+	await updateGlobalState(context, "liteLlmModelId", liteLlmModelId)
+	await updateGlobalState(context, "liteLlmModelInfo", liteLlmModelInfo)
+	await updateGlobalState(context, "liteLlmUsePromptCache", liteLlmUsePromptCache)
+	await updateGlobalState(context, "qwenApiLine", qwenApiLine)
+	await updateGlobalState(context, "requestyModelId", requestyModelId)
+	await updateGlobalState(context, "requestyModelInfo", requestyModelInfo)
+	await updateGlobalState(context, "togetherModelId", togetherModelId)
+	await storeSecret(context, "asksageApiKey", asksageApiKey)
+	await updateGlobalState(context, "asksageApiUrl", asksageApiUrl)
+	await updateGlobalState(context, "thinkingBudgetTokens", thinkingBudgetTokens)
+	await updateGlobalState(context, "reasoningEffort", reasoningEffort)
+	await storeSecret(context, "clineApiKey", clineApiKey)
 	await storeSecret(context, "sambanovaApiKey", sambanovaApiKey)
 	await storeSecret(context, "cerebrasApiKey", cerebrasApiKey)
 	await storeSecret(context, "nebiusApiKey", nebiusApiKey)
-	await storeSecret(context, "sapAiCoreClientId", sapAiCoreClientId)
-	await storeSecret(context, "sapAiCoreClientSecret", sapAiCoreClientSecret)
+	await updateGlobalState(context, "favoritedModelIds", favoritedModelIds)
+	await updateGlobalState(context, "requestTimeoutMs", apiConfiguration.requestTimeoutMs)
 }
 
-export async function resetWorkspaceState(context: vscode.ExtensionContext) {
-	for (const key of context.workspaceState.keys()) {
-		await context.workspaceState.update(key, undefined)
-	}
-}
-
-export async function resetGlobalState(context: vscode.ExtensionContext) {
-	// TODO: Reset all workspace states?
+export async function resetExtensionState(context: vscode.ExtensionContext) {
 	for (const key of context.globalState.keys()) {
 		await context.globalState.update(key, undefined)
 	}

src/core/task/index.ts

@@ -105,7 +105,7 @@ import {
 	getLocalCursorRules,
 } from "@core/context/instructions/user-instructions/external-rules"
 import { refreshWorkflowToggles } from "../context/instructions/user-instructions/workflows"
-import { getWorkspaceState } from "@core/storage/state"
+import { getGlobalState } from "@core/storage/state"
 import { parseSlashCommands } from "@core/slash-commands"
 import WorkspaceTracker from "@integrations/workspace/WorkspaceTracker"
 import { McpHub } from "@services/mcp/McpHub"
@@ -113,8 +113,6 @@ import { isInTestMode } from "../../services/test/TestMode"
 import { processFilesIntoText } from "@integrations/misc/extract-text"
 import { featureFlagsService } from "@services/posthog/feature-flags/FeatureFlagsService"
 import { StreamingJsonReplacer, ChangeLocation } from "@core/assistant-message/diff-json"
-import { isClaude4ModelFamily } from "@utils/model-utils"
-import { saveClineMessagesAndUpdateHistory } from "./message-state"
 
 export const USE_EXPERIMENTAL_CLAUDE4_FEATURES = false
 
@@ -141,11 +139,12 @@ export class Task {
 	readonly taskId: string
 	private taskIsFavorited?: boolean
 	api: ApiHandler
-	terminalManager: TerminalManager
+	private terminalManager: TerminalManager
 	private urlContentFetcher: UrlContentFetcher
 	browserSession: BrowserSession
 	contextManager: ContextManager
 	private didEditFile: boolean = false
+	customInstructions?: string
 	autoApprovalSettings: AutoApprovalSettings
 	browserSettings: BrowserSettings
 	chatSettings: ChatSettings
@@ -167,6 +166,7 @@ export class Task {
 	checkpointTrackerErrorMessage?: string
 	conversationHistoryDeletedRange?: [number, number]
 	isInitialized = false
+	private initTaskPromise?: Promise<void>
 	isAwaitingPlanResponse = false
 	didRespondToPlanAskBySwitchingMode = false
 
@@ -204,9 +204,8 @@ export class Task {
 		chatSettings: ChatSettings,
 		shellIntegrationTimeout: number,
 		terminalReuseEnabled: boolean,
-		terminalOutputLineLimit: number,
-		defaultTerminalProfile: string,
 		enableCheckpointsSetting: boolean,
+		customInstructions?: string,
 		task?: string,
 		images?: string[],
 		files?: string[],
@@ -225,23 +224,16 @@ export class Task {
 		this.terminalManager = new TerminalManager()
 		this.terminalManager.setShellIntegrationTimeout(shellIntegrationTimeout)
 		this.terminalManager.setTerminalReuseEnabled(terminalReuseEnabled ?? true)
-		this.terminalManager.setTerminalOutputLineLimit(terminalOutputLineLimit)
-		this.terminalManager.setDefaultTerminalProfile(defaultTerminalProfile)
 		this.urlContentFetcher = new UrlContentFetcher(context)
 		this.browserSession = new BrowserSession(context, browserSettings)
 		this.contextManager = new ContextManager()
 		this.diffViewProvider = new DiffViewProvider(cwd)
+		this.customInstructions = customInstructions
 		this.autoApprovalSettings = autoApprovalSettings
 		this.browserSettings = browserSettings
 		this.chatSettings = chatSettings
 		this.enableCheckpoints = enableCheckpointsSetting
 
-		// Set up MCP notification callback for real-time notifications
-		this.mcpHub.setNotificationCallback(async (serverName: string, level: string, message: string) => {
-			// Display notification in chat immediately
-			await this.say("mcp_notification", `[${serverName}] ${message}`)
-		})
-
 		// Initialize taskId first
 		if (historyItem) {
 			this.taskId = historyItem.id
@@ -306,9 +298,9 @@ export class Task {
 
 		// Continue with task initialization
 		if (historyItem) {
-			this.resumeTaskFromHistory()
+			this.initTaskPromise = this.resumeTaskFromHistory()
 		} else if (task || images || files) {
-			this.startTask(task, images, files)
+			this.initTaskPromise = this.startTask(task, images, files)
 		}
 
 		// initialize telemetry
@@ -348,31 +340,59 @@ export class Task {
 		message.conversationHistoryIndex = this.apiConversationHistory.length - 1 // NOTE: this is the index of the last added message which is the user message, and once the clinemessages have been presented we update the apiconversationhistory with the completed assistant message. This means when resetting to a message, we need to +1 this index to get the correct assistant message that this tool use corresponds to
 		message.conversationHistoryDeletedRange = this.conversationHistoryDeletedRange
 		this.clineMessages.push(message)
-		await saveClineMessagesAndUpdateHistory(
-			this.getContext(),
-			this.taskId,
-			this.clineMessages,
-			this.taskIsFavorited ?? false,
-			this.conversationHistoryDeletedRange,
-			this.checkpointTracker,
-			this.updateTaskHistory,
-		)
+		await this.saveClineMessagesAndUpdateHistory()
 	}
 
 	private async overwriteClineMessages(newMessages: ClineMessage[]) {
 		this.clineMessages = newMessages
-		await saveClineMessagesAndUpdateHistory(
-			this.getContext(),
-			this.taskId,
-			this.clineMessages,
-			this.taskIsFavorited ?? false,
-			this.conversationHistoryDeletedRange,
-			this.checkpointTracker,
-			this.updateTaskHistory,
-		)
+		await this.saveClineMessagesAndUpdateHistory()
+	}
+
+	private async saveClineMessagesAndUpdateHistory() {
+		try {
+			await saveClineMessages(this.getContext(), this.taskId, this.clineMessages)
+
+			// combined as they are in ChatView
+			const apiMetrics = getApiMetrics(combineApiRequests(combineCommandSequences(this.clineMessages.slice(1))))
+			const taskMessage = this.clineMessages[0] // first message is always the task say
+			const lastRelevantMessage =
+				this.clineMessages[
+					findLastIndex(this.clineMessages, (m) => !(m.ask === "resume_task" || m.ask === "resume_completed_task"))
+				]
+			const taskDir = await ensureTaskDirectoryExists(this.getContext(), this.taskId)
+			let taskDirSize = 0
+			try {
+				// getFolderSize.loose silently ignores errors
+				// returns # of bytes, size/1000/1000 = MB
+				taskDirSize = await getFolderSize.loose(taskDir)
+			} catch (error) {
+				console.error("Failed to get task directory size:", taskDir, error)
+			}
+			await this.updateTaskHistory({
+				id: this.taskId,
+				ts: lastRelevantMessage.ts,
+				task: taskMessage.text ?? "",
+				tokensIn: apiMetrics.totalTokensIn,
+				tokensOut: apiMetrics.totalTokensOut,
+				cacheWrites: apiMetrics.totalCacheWrites,
+				cacheReads: apiMetrics.totalCacheReads,
+				totalCost: apiMetrics.totalCost,
+				size: taskDirSize,
+				shadowGitConfigWorkTree: await this.checkpointTracker?.getShadowGitConfigWorkTree(),
+				cwdOnTaskInitialization: cwd,
+				conversationHistoryDeletedRange: this.conversationHistoryDeletedRange,
+				isFavorited: this.taskIsFavorited,
+			})
+		} catch (error) {
+			console.error("Failed to save cline messages:", error)
+		}
 	}
 
 	async restoreCheckpoint(messageTs: number, restoreType: ClineCheckpointRestore, offset?: number) {
+		if (this.initTaskPromise && !this.isInitialized) {
+			await this.initTaskPromise
+		}
+
 		const messageIndex = this.clineMessages.findIndex((m) => m.ts === messageTs) - (offset || 0)
 		// Find the last message before messageIndex that has a lastCheckpointHash
 		const lastHashIndex = findLastIndex(this.clineMessages.slice(0, messageIndex), (m) => m.lastCheckpointHash !== undefined)
@@ -429,18 +449,6 @@ export class Task {
 						vscode.window.showErrorMessage("Failed to restore offsetcheckpoint: " + errorMessage)
 						didWorkspaceRestoreFail = true
 					}
-				} else if (!offset && lastMessageWithHash.lastCheckpointHash && this.checkpointTracker) {
-					// Fallback: restore to most recent checkpoint when target message has no checkpoint hash
-					console.warn(`Message ${messageTs} has no checkpoint hash, falling back to previous checkpoint`)
-					try {
-						await this.checkpointTracker.resetHead(lastMessageWithHash.lastCheckpointHash)
-					} catch (error) {
-						const errorMessage = error instanceof Error ? error.message : "Unknown error"
-						vscode.window.showErrorMessage("Failed to restore checkpoint: " + errorMessage)
-						didWorkspaceRestoreFail = true
-					}
-				} else {
-					vscode.window.showErrorMessage("Failed to restore checkpoint")
 				}
 				break
 		}
@@ -466,18 +474,6 @@ export class Task {
 					const deletedMessages = this.clineMessages.slice(messageIndex + 1)
 					const deletedApiReqsMetrics = getApiMetrics(combineApiRequests(combineCommandSequences(deletedMessages)))
 
-					// Detect files edited after this message timestamp for file context warning
-					// Only needed for task-only restores when a user edits a message or restores the task context, but not the files.
-					if (restoreType === "task") {
-						const filesEditedAfterMessage = await this.fileContextTracker.detectFilesEditedAfterMessage(
-							messageTs,
-							deletedMessages,
-						)
-						if (filesEditedAfterMessage.length > 0) {
-							await this.fileContextTracker.storePendingFileContextWarning(filesEditedAfterMessage)
-						}
-					}
-
 					const newClineMessages = this.clineMessages.slice(0, messageIndex + 1)
 					await this.overwriteClineMessages(newClineMessages) // calls saveClineMessages which saves historyItem
 
@@ -520,15 +516,9 @@ export class Task {
 				})
 			}
 
-			await saveClineMessagesAndUpdateHistory(
-				this.getContext(),
-				this.taskId,
-				this.clineMessages,
-				this.taskIsFavorited ?? false,
-				this.conversationHistoryDeletedRange,
-				this.checkpointTracker,
-				this.updateTaskHistory,
-			)
+			await this.saveClineMessagesAndUpdateHistory()
+
+			sendRelinquishControlEvent()
 
 			this.cancelTask() // the task is already cancelled by the provider beforehand, but we need to re-init to get the updated messages
 		} else {
@@ -537,6 +527,10 @@ export class Task {
 	}
 
 	async presentMultifileDiff(messageTs: number, seeNewChangesSinceLastTaskCompletion: boolean) {
+		if (this.initTaskPromise && !this.isInitialized) {
+			await this.initTaskPromise
+		}
+
 		const relinquishButton = () => {
 			sendRelinquishControlEvent()
 		}
@@ -666,6 +660,10 @@ export class Task {
 	}
 
 	async doesLatestTaskCompletionHaveNewChanges() {
+		if (this.initTaskPromise && !this.isInitialized) {
+			await this.initTaskPromise
+		}
+
 		if (!this.enableCheckpoints) {
 			return false
 		}
@@ -801,15 +799,7 @@ export class Task {
 					// lastMessage.ts = askTs
 					lastMessage.text = text
 					lastMessage.partial = false
-					await saveClineMessagesAndUpdateHistory(
-						this.getContext(),
-						this.taskId,
-						this.clineMessages,
-						this.taskIsFavorited ?? false,
-						this.conversationHistoryDeletedRange,
-						this.checkpointTracker,
-						this.updateTaskHistory,
-					)
+					await this.saveClineMessagesAndUpdateHistory()
 					// await this.postStateToWebview()
 					const protoMessage = convertClineMessageToProto(lastMessage)
 					await sendPartialMessageEvent(protoMessage)
@@ -917,15 +907,7 @@ export class Task {
 					lastMessage.partial = false
 
 					// instead of streaming partialMessage events, we do a save and post like normal to persist to disk
-					await saveClineMessagesAndUpdateHistory(
-						this.getContext(),
-						this.taskId,
-						this.clineMessages,
-						this.taskIsFavorited ?? false,
-						this.conversationHistoryDeletedRange,
-						this.checkpointTracker,
-						this.updateTaskHistory,
-					)
+					await this.saveClineMessagesAndUpdateHistory()
 					// await this.postStateToWebview()
 					const protoMessage = convertClineMessageToProto(lastMessage)
 					await sendPartialMessageEvent(protoMessage) // more performant than an entire postStateToWebview
@@ -974,15 +956,8 @@ export class Task {
 		const lastMessage = this.clineMessages.at(-1)
 		if (lastMessage?.partial && lastMessage.type === type && (lastMessage.ask === askOrSay || lastMessage.say === askOrSay)) {
 			this.clineMessages.pop()
-			await saveClineMessagesAndUpdateHistory(
-				this.getContext(),
-				this.taskId,
-				this.clineMessages,
-				this.taskIsFavorited ?? false,
-				this.conversationHistoryDeletedRange,
-				this.checkpointTracker,
-				this.updateTaskHistory,
-			)
+			await this.saveClineMessagesAndUpdateHistory()
+			await this.postStateToWebview()
 		}
 	}
 
@@ -1155,17 +1130,12 @@ export class Task {
 
 		const wasRecent = lastClineMessage?.ts && Date.now() - lastClineMessage.ts < 30_000
 
-		// Check if there are pending file context warnings before calling taskResumption
-		const pendingContextWarning = await this.fileContextTracker.retrieveAndClearPendingFileContextWarning()
-		const hasPendingFileContextWarnings = pendingContextWarning && pendingContextWarning.length > 0
-
 		const [taskResumptionMessage, userResponseMessage] = formatResponse.taskResumption(
 			this.chatSettings?.mode === "plan" ? "plan" : "act",
 			agoText,
 			cwd,
 			wasRecent,
 			responseText,
-			hasPendingFileContextWarnings,
 		)
 
 		if (taskResumptionMessage !== "") {
@@ -1196,15 +1166,6 @@ export class Task {
 			}
 		}
 
-		// Inject file context warning if there were pending warnings from message editing
-		if (pendingContextWarning && pendingContextWarning.length > 0) {
-			const fileContextWarning = formatResponse.fileContextWarning(pendingContextWarning)
-			newUserContent.push({
-				type: "text",
-				text: fileContextWarning,
-			})
-		}
-
 		await this.overwriteApiConversationHistory(modifiedApiConversationHistory)
 		await this.initiateTaskLoop(newUserContent)
 	}
@@ -1248,14 +1209,15 @@ export class Task {
 		this.clineIgnoreController.dispose()
 		this.fileContextTracker.dispose()
 		await this.diffViewProvider.revertChanges() // need to await for when we want to make sure directories/files are reverted before re-starting the task from a checkpoint
-
-		// Clear the notification callback when task is aborted
-		this.mcpHub.clearNotificationCallback()
 	}
 
 	// Checkpoints
 
 	async saveCheckpoint(isAttemptCompletionMessage: boolean = false) {
+		if (this.initTaskPromise && !this.isInitialized) {
+			await this.initTaskPromise
+		}
+
 		if (!this.enableCheckpoints) {
 			// If checkpoints are disabled, do nothing.
 			return
@@ -1274,43 +1236,15 @@ export class Task {
 				return
 			}
 
-			// Initialize checkpoint tracker if it doesn't exist
-			if (!this.checkpointTracker && !this.checkpointTrackerErrorMessage) {
-				try {
-					this.checkpointTracker = await CheckpointTracker.create(
-						this.taskId,
-						this.context.globalStorageUri.fsPath,
-						this.enableCheckpoints,
-					)
-				} catch (error) {
-					const errorMessage = error instanceof Error ? error.message : "Unknown error"
-					console.error("Failed to initialize checkpoint tracker:", errorMessage)
-					this.checkpointTrackerErrorMessage = errorMessage
-					await this.postStateToWebview()
-					return
+			// For non-attempt completion we just say checkpoints
+			await this.say("checkpoint_created")
+			this.checkpointTracker?.commit().then(async (commitHash) => {
+				const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
+				if (lastCheckpointMessage) {
+					lastCheckpointMessage.lastCheckpointHash = commitHash
+					await this.saveClineMessagesAndUpdateHistory()
 				}
-			}
-
-			// Create a checkpoint commit and update clineMessages with a commitHash
-			if (this.checkpointTracker) {
-				const commitHash = await this.checkpointTracker.commit()
-				if (commitHash) {
-					await this.say("checkpoint_created")
-					const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
-					if (lastCheckpointMessage) {
-						lastCheckpointMessage.lastCheckpointHash = commitHash
-						await saveClineMessagesAndUpdateHistory(
-							this.getContext(),
-							this.taskId,
-							this.clineMessages,
-							this.taskIsFavorited ?? false,
-							this.conversationHistoryDeletedRange,
-							this.checkpointTracker,
-							this.updateTaskHistory,
-						)
-					}
-				}
-			} // silently fails for now
+			}) // silently fails for now
 
 			//
 		} else {
@@ -1340,15 +1274,7 @@ export class Task {
 				)
 				if (lastCompletionResultMessage) {
 					lastCompletionResultMessage.lastCheckpointHash = commitHash
-					await saveClineMessagesAndUpdateHistory(
-						this.getContext(),
-						this.taskId,
-						this.clineMessages,
-						this.taskIsFavorited ?? false,
-						this.conversationHistoryDeletedRange,
-						this.checkpointTracker,
-						this.updateTaskHistory,
-					)
+					await this.saveClineMessagesAndUpdateHistory()
 				}
 			} else {
 				console.error("Checkpoint tracker does not exist and could not be initialized for attempt completion")
@@ -1537,9 +1463,9 @@ export class Task {
 			chunkTimer = setTimeout(async () => await flushBuffer(), CHUNK_DEBOUNCE_MS)
 		}
 
-		const outputLines: string[] = []
+		let result = ""
 		process.on("line", async (line) => {
-			outputLines.push(line)
+			result += line + "\n"
 
 			if (!didContinue) {
 				outputBuffer.push(line)
@@ -1581,7 +1507,7 @@ export class Task {
 		// grouping command_output messages despite any gaps anyways)
 		await setTimeoutPromise(50)
 
-		let result = this.terminalManager.processOutput(outputLines)
+		result = result.trim()
 
 		if (userFeedback) {
 			await this.say("user_feedback", userFeedback.text, userFeedback.images, userFeedback.files)
@@ -1711,6 +1637,12 @@ export class Task {
 		}
 	}
 
+	private async isClaude4ModelFamily(): Promise<boolean> {
+		const model = this.api.getModel()
+		const modelId = model.id
+		return modelId.includes("sonnet-4") || modelId.includes("opus-4")
+	}
+
 	async *attemptApiRequest(previousApiReqIndex: number): ApiStream {
 		// Wait for MCP servers to be connected before generating system prompt
 		await pWaitFor(() => this.mcpHub.isConnecting !== true, { timeout: 10_000 }).catch(() => {
@@ -1724,9 +1656,10 @@ export class Task {
 
 		const supportsBrowserUse = modelSupportsBrowserUse && !disableBrowserTool // only enable browser use if the model supports it and the user hasn't disabled it
 
-		const isClaude4Model = isClaude4ModelFamily(this.api)
-		let systemPrompt = await SYSTEM_PROMPT(cwd, supportsBrowserUse, this.mcpHub, this.browserSettings, isClaude4Model)
+		const isClaude4ModelFamily = await this.isClaude4ModelFamily()
+		let systemPrompt = await SYSTEM_PROMPT(cwd, supportsBrowserUse, this.mcpHub, this.browserSettings, isClaude4ModelFamily)
 
+		let settingsCustomInstructions = this.customInstructions?.trim()
 		await this.migratePreferredLanguageToolSetting()
 		const preferredLanguage = getLanguageKey(this.chatSettings.preferredLanguage as LanguageDisplay)
 		const preferredLanguageInstructions =
@@ -1754,6 +1687,7 @@ export class Task {
 		}
 
 		if (
+			settingsCustomInstructions ||
 			globalClineRulesFileInstructions ||
 			localClineRulesFileInstructions ||
 			localCursorRulesFileInstructions ||
@@ -1764,6 +1698,7 @@ export class Task {
 		) {
 			// altering the system prompt mid-task will break the prompt cache, but in the grand scheme this will not change often so it's better to not pollute user messages with it the way we have to with <potentially relevant details>
 			const userInstructions = addUserInstructions(
+				settingsCustomInstructions,
 				globalClineRulesFileInstructions,
 				localClineRulesFileInstructions,
 				localCursorRulesFileInstructions,
@@ -1785,15 +1720,7 @@ export class Task {
 
 		if (contextManagementMetadata.updatedConversationHistoryDeletedRange) {
 			this.conversationHistoryDeletedRange = contextManagementMetadata.conversationHistoryDeletedRange
-			await saveClineMessagesAndUpdateHistory(
-				this.getContext(),
-				this.taskId,
-				this.clineMessages,
-				this.taskIsFavorited ?? false,
-				this.conversationHistoryDeletedRange,
-				this.checkpointTracker,
-				this.updateTaskHistory,
-			) // saves task history item which we use to keep track of conversation history deleted range
+			await this.saveClineMessagesAndUpdateHistory() // saves task history item which we use to keep track of conversation history deleted range
 		}
 
 		let stream = this.api.createMessage(systemPrompt, contextManagementMetadata.truncatedConversationHistory)
@@ -1818,15 +1745,7 @@ export class Task {
 					this.conversationHistoryDeletedRange,
 					"quarter", // Force aggressive truncation
 				)
-				await saveClineMessagesAndUpdateHistory(
-					this.getContext(),
-					this.taskId,
-					this.clineMessages,
-					this.taskIsFavorited ?? false,
-					this.conversationHistoryDeletedRange,
-					this.checkpointTracker,
-					this.updateTaskHistory,
-				)
+				await this.saveClineMessagesAndUpdateHistory()
 				await this.contextManager.triggerApplyStandardContextTruncationNoticeChange(
 					Date.now(),
 					await ensureTaskDirectoryExists(this.getContext(), this.taskId),
@@ -1840,15 +1759,7 @@ export class Task {
 						this.conversationHistoryDeletedRange,
 						"quarter", // Force aggressive truncation
 					)
-					await saveClineMessagesAndUpdateHistory(
-						this.getContext(),
-						this.taskId,
-						this.clineMessages,
-						this.taskIsFavorited ?? false,
-						this.conversationHistoryDeletedRange,
-						this.checkpointTracker,
-						this.updateTaskHistory,
-					)
+					await this.saveClineMessagesAndUpdateHistory()
 					await this.contextManager.triggerApplyStandardContextTruncationNoticeChange(
 						Date.now(),
 						await ensureTaskDirectoryExists(this.getContext(), this.taskId),
@@ -2027,6 +1938,7 @@ export class Task {
 
 			// Get final list of replacements
 			const allReplacements = this.streamingJsonReplacer.getSuccessfullyParsedItems()
+			// console.log(`Total replacements applied: ${allReplacements.length}`)
 
 			// Cleanup
 			this.streamingJsonReplacer = undefined
@@ -2056,6 +1968,7 @@ export class Task {
 			if (this.didCompleteReadingStream) {
 				this.userMessageContentReady = true
 			}
+			// console.log("no more content blocks to stream! this shouldn't happen?")
 			this.presentAssistantMessageLocked = false
 			return
 			//throw new Error("No more content blocks to stream! This shouldn't happen...") // remove and just return after testing
@@ -2191,11 +2104,11 @@ export class Task {
 					break
 				}
 
-				const pushToolResult = (content: ToolResponse, isClaude4Model: boolean = false) => {
+				const pushToolResult = (content: ToolResponse, isClaude4ModelFamily: boolean = false) => {
 					if (typeof content === "string") {
 						const resultText = content || "(tool did not return anything)"
 
-						if (isClaude4Model && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
+						if (isClaude4ModelFamily && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
 							// Claude 4 family: Use function_results format
 							this.userMessageContent.push({
 								type: "text",
@@ -2281,7 +2194,7 @@ export class Task {
 					}
 				}
 
-				const handleError = async (action: string, error: Error, isClaude4Model: boolean = false) => {
+				const handleError = async (action: string, error: Error, isClaude4ModelFamily: boolean = false) => {
 					if (this.abandoned) {
 						console.log("Ignoring error since task was abandoned (i.e. from task cancellation after resetting)")
 						return
@@ -2292,7 +2205,7 @@ export class Task {
 						`Error ${action}:\n${error.message ?? JSON.stringify(serializeError(error), null, 2)}`,
 					)
 
-					pushToolResult(formatResponse.toolError(errorString), isClaude4Model)
+					pushToolResult(formatResponse.toolError(errorString), isClaude4ModelFamily)
 				}
 
 				// If block is partial, remove partial closing tag so its not presented to user
@@ -2370,9 +2283,9 @@ export class Task {
 
 								const currentFullJson = block.params.diff
 								// Check if we should use streaming (e.g., for specific models)
-								const isClaude4Model = isClaude4ModelFamily(this.api)
+								const isClaude4ModelFamily = await this.isClaude4ModelFamily()
 								// Going through claude family of models
-								if (isClaude4Model && USE_EXPERIMENTAL_CLAUDE4_FEATURES && currentFullJson) {
+								if (isClaude4ModelFamily && USE_EXPERIMENTAL_CLAUDE4_FEATURES && currentFullJson) {
 									console.log("[EDIT] Streaming JSON replacement")
 									const streamingResult = await this.handleStreamingJsonReplacement(
 										block,
@@ -2764,7 +2677,7 @@ export class Task {
 						}
 					}
 					case "list_files": {
-						const isClaude4Model = isClaude4ModelFamily(this.api)
+						const isClaude4ModelFamily = await this.isClaude4ModelFamily()
 						const relDirPath: string | undefined = block.params.path
 						const recursiveRaw: string | undefined = block.params.recursive
 						const recursive = recursiveRaw?.toLowerCase() === "true"
@@ -2790,7 +2703,10 @@ export class Task {
 							} else {
 								if (!relDirPath) {
 									this.consecutiveMistakeCount++
-									pushToolResult(await this.sayAndCreateMissingParamError("list_files", "path"), isClaude4Model)
+									pushToolResult(
+										await this.sayAndCreateMissingParamError("list_files", "path"),
+										isClaude4ModelFamily,
+									)
 									await this.saveCheckpoint()
 									break
 								}
@@ -2841,12 +2757,12 @@ export class Task {
 										true,
 									)
 								}
-								pushToolResult(result, isClaude4Model)
+								pushToolResult(result, isClaude4ModelFamily)
 								await this.saveCheckpoint()
 								break
 							}
 						} catch (error) {
-							await handleError("listing files", error, isClaude4Model)
+							await handleError("listing files", error, isClaude4ModelFamily)
 							await this.saveCheckpoint()
 							break
 						}
@@ -2934,7 +2850,7 @@ export class Task {
 						}
 					}
 					case "search_files": {
-						const isClaude4Model = isClaude4ModelFamily(this.api)
+						const isClaude4ModelFamily = await this.isClaude4ModelFamily()
 						const relDirPath: string | undefined = block.params.path
 						const regex: string | undefined = block.params.regex
 						const filePattern: string | undefined = block.params.file_pattern
@@ -2964,7 +2880,7 @@ export class Task {
 									this.consecutiveMistakeCount++
 									pushToolResult(
 										await this.sayAndCreateMissingParamError("search_files", "path"),
-										isClaude4Model,
+										isClaude4ModelFamily,
 									)
 									await this.saveCheckpoint()
 									break
@@ -2973,7 +2889,7 @@ export class Task {
 									this.consecutiveMistakeCount++
 									pushToolResult(
 										await this.sayAndCreateMissingParamError("search_files", "regex"),
-										isClaude4Model,
+										isClaude4ModelFamily,
 									)
 									await this.saveCheckpoint()
 									break
@@ -3024,12 +2940,12 @@ export class Task {
 										true,
 									)
 								}
-								pushToolResult(results, isClaude4Model)
+								pushToolResult(results, isClaude4ModelFamily)
 								await this.saveCheckpoint()
 								break
 							}
 						} catch (error) {
-							await handleError("searching files", error, isClaude4Model)
+							await handleError("searching files", error, isClaude4ModelFamily)
 							await this.saveCheckpoint()
 							break
 						}
@@ -3424,21 +3340,8 @@ export class Task {
 
 								// now execute the tool
 								await this.say("mcp_server_request_started") // same as browser_action_result
-
-								// Check for any pending notifications before the tool call
-								const notificationsBefore = this.mcpHub.getPendingNotifications()
-								for (const notification of notificationsBefore) {
-									await this.say("mcp_notification", `[${notification.serverName}] ${notification.message}`)
-								}
-
 								const toolResult = await this.mcpHub.callTool(server_name, tool_name, parsedArguments)
 
-								// Check for any pending notifications after the tool call
-								const notificationsAfter = this.mcpHub.getPendingNotifications()
-								for (const notification of notificationsAfter) {
-									await this.say("mcp_notification", `[${notification.serverName}] ${notification.message}`)
-								}
-
 								// TODO: add progress indicator
 
 								const toolResultImages =
@@ -3612,15 +3515,8 @@ export class Task {
 											...sharedMessage,
 											selected: text,
 										} satisfies ClineAskQuestion)
-										await saveClineMessagesAndUpdateHistory(
-											this.getContext(),
-											this.taskId,
-											this.clineMessages,
-											this.taskIsFavorited ?? false,
-											this.conversationHistoryDeletedRange,
-											this.checkpointTracker,
-											this.updateTaskHistory,
-										)
+										await this.saveClineMessagesAndUpdateHistory()
+										telemetryService.captureOptionSelected(this.taskId, options.length, "act")
 									}
 								} else {
 									// Option not selected, send user feedback
@@ -3752,15 +3648,7 @@ export class Task {
 										this.conversationHistoryDeletedRange,
 										keepStrategy,
 									)
-									await saveClineMessagesAndUpdateHistory(
-										this.getContext(),
-										this.taskId,
-										this.clineMessages,
-										this.taskIsFavorited ?? false,
-										this.conversationHistoryDeletedRange,
-										this.checkpointTracker,
-										this.updateTaskHistory,
-									)
+									await this.saveClineMessagesAndUpdateHistory()
 									await this.contextManager.triggerApplyStandardContextTruncationNoticeChange(
 										Date.now(),
 										await ensureTaskDirectoryExists(this.getContext(), this.taskId),
@@ -3842,7 +3730,7 @@ export class Task {
 								const clineVersion =
 									vscode.extensions.getExtension("saoudrizwan.claude-dev")?.packageJSON.version || "Unknown"
 								const systemInfo = `VSCode: ${vscode.version}, Node.js: ${process.version}, Architecture: ${os.arch()}`
-								const providerAndModel = `${(await getWorkspaceState(this.getContext(), "apiProvider")) as string} / ${this.api.getModel().id}`
+								const providerAndModel = `${(await getGlobalState(this.getContext(), "apiProvider")) as string} / ${this.api.getModel().id}`
 
 								// Ask user for confirmation
 								const bugReportData = JSON.stringify({
@@ -4061,15 +3949,8 @@ export class Task {
 											...sharedMessage,
 											selected: text,
 										} satisfies ClinePlanModeResponse)
-										await saveClineMessagesAndUpdateHistory(
-											this.getContext(),
-											this.taskId,
-											this.clineMessages,
-											this.taskIsFavorited ?? false,
-											this.conversationHistoryDeletedRange,
-											this.checkpointTracker,
-											this.updateTaskHistory,
-										)
+										await this.saveClineMessagesAndUpdateHistory()
+										telemetryService.captureOptionSelected(this.taskId, options.length, "plan")
 									}
 								} else {
 									// Option not selected, send user feedback
@@ -4171,15 +4052,7 @@ export class Task {
 							) {
 								lastCompletionResultMessage.text += COMPLETION_RESULT_CHANGES_FLAG
 							}
-							await saveClineMessagesAndUpdateHistory(
-								this.getContext(),
-								this.taskId,
-								this.clineMessages,
-								this.taskIsFavorited ?? false,
-								this.conversationHistoryDeletedRange,
-								this.checkpointTracker,
-								this.updateTaskHistory,
-							)
+							await this.saveClineMessagesAndUpdateHistory()
 						}
 
 						try {
@@ -4371,7 +4244,7 @@ export class Task {
 		}
 
 		// Used to know what models were used in the task if user wants to export metadata for error reporting purposes
-		const currentProviderId = (await getWorkspaceState(this.getContext(), "apiProvider")) as string
+		const currentProviderId = (await getGlobalState(this.getContext(), "apiProvider")) as string
 		if (currentProviderId && this.api.getModel().id) {
 			try {
 				await this.modelContextTracker.recordModelUsage(currentProviderId, this.api.getModel().id, this.chatSettings.mode)
@@ -4473,8 +4346,8 @@ export class Task {
 		// Now, if it's the first request AND checkpoints are enabled AND tracker was successfully initialized,
 		// then say "checkpoint_created" and perform the commit.
 		if (isFirstRequest && this.enableCheckpoints && this.checkpointTracker) {
-			const commitHash = await this.checkpointTracker.commit() // Actual commit
 			await this.say("checkpoint_created") // Now this is conditional
+			const commitHash = await this.checkpointTracker.commit() // Actual commit
 			const lastCheckpointMessage = findLast(this.clineMessages, (m) => m.say === "checkpoint_created")
 			if (lastCheckpointMessage) {
 				lastCheckpointMessage.lastCheckpointHash = commitHash
@@ -4514,15 +4387,7 @@ export class Task {
 		this.clineMessages[lastApiReqIndex].text = JSON.stringify({
 			request: userContent.map((block) => formatContentBlockToMarkdown(block)).join("\n\n"),
 		} satisfies ClineApiReqInfo)
-		await saveClineMessagesAndUpdateHistory(
-			this.getContext(),
-			this.taskId,
-			this.clineMessages,
-			this.taskIsFavorited ?? false,
-			this.conversationHistoryDeletedRange,
-			this.checkpointTracker,
-			this.updateTaskHistory,
-		)
+		await this.saveClineMessagesAndUpdateHistory()
 		await this.postStateToWebview()
 
 		try {
@@ -4593,15 +4458,7 @@ export class Task {
 
 				// update api_req_started to have cancelled and cost, so that we can display the cost of the partial stream
 				updateApiReqMsg(cancelReason, streamingFailedMessage)
-				await saveClineMessagesAndUpdateHistory(
-					this.getContext(),
-					this.taskId,
-					this.clineMessages,
-					this.taskIsFavorited ?? false,
-					this.conversationHistoryDeletedRange,
-					this.checkpointTracker,
-					this.updateTaskHistory,
-				)
+				await this.saveClineMessagesAndUpdateHistory()
 
 				telemetryService.captureConversationTurnEvent(
 					this.taskId,
@@ -4663,8 +4520,9 @@ export class Task {
 							assistantMessage += chunk.text
 							// parse raw assistant message into content blocks
 							const prevLength = this.assistantMessageContent.length
-							const isClaude4Model = isClaude4ModelFamily(this.api)
-							if (isClaude4Model && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
+							const isClaude4ModelFamily = await this.isClaude4ModelFamily()
+
+							if (isClaude4ModelFamily && USE_EXPERIMENTAL_CLAUDE4_FEATURES) {
 								this.assistantMessageContent = parseAssistantMessageV3(assistantMessage)
 							} else {
 								this.assistantMessageContent = parseAssistantMessageV2(assistantMessage)
@@ -4727,15 +4585,7 @@ export class Task {
 						totalCost = apiStreamUsage.totalCost
 					}
 					updateApiReqMsg()
-					await saveClineMessagesAndUpdateHistory(
-						this.getContext(),
-						this.taskId,
-						this.clineMessages,
-						this.taskIsFavorited ?? false,
-						this.conversationHistoryDeletedRange,
-						this.checkpointTracker,
-						this.updateTaskHistory,
-					)
+					await this.saveClineMessagesAndUpdateHistory()
 					await this.postStateToWebview()
 				})
 			}
@@ -4759,15 +4609,7 @@ export class Task {
 			}
 
 			updateApiReqMsg()
-			await saveClineMessagesAndUpdateHistory(
-				this.getContext(),
-				this.taskId,
-				this.clineMessages,
-				this.taskIsFavorited ?? false,
-				this.conversationHistoryDeletedRange,
-				this.checkpointTracker,
-				this.updateTaskHistory,
-			)
+			await this.saveClineMessagesAndUpdateHistory()
 			await this.postStateToWebview()
 
 			// now add to apiconversationhistory

src/core/task/message-state.ts

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

src/core/webview/index.ts

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

src/exports/README.md

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

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

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

src/exports/cline.d.ts

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

src/exports/index.ts

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