Add voice mode functionality

2026-09-11 16:42:40 +08:00 · 2025-09-14 13:05:44 -07:00
parent 0b551de152
commit edebcb014e
381 changed files with 9833 additions and 17032 deletions
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix showing the ai core exisiting models when resource group field is empty (using the default resource group)
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fixes an issue where thinking text from litellm was not being passed through to Cline thinking UI
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix Ollama connection issue to default endpoint at port 11434
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Optimized Cline for GPT-5 model family with an aligned system prompt
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+REfactoring Tool Executor
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add search functionality to API provider dropdown
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Remove disabled approve / reject buttons from UI.
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add "Use custom prompt" option to Ollama provider
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Fix AutoApproveModal overflowing issue
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Dify.ai api integration
@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+support orchestration mode for sap provider
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Add speech-to-text dictation feature for Cline account users
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+fix: Support Anthropic Caching when using LiteLLM
@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Prompt changes for deep-planning in windows/powershell
@@ -1,69 +1,64 @@
 name: 🐛 Bug Report
 description: File a bug report
-labels: ['bug']
+labels: ["bug"]
 body:
-  - type: markdown
-    attributes:
-      value: |
-        **Important:** All bug reports must be reproducible using Claude Sonnet 4. Cline uses complex prompts so less capable models may not work as expected.
-  - type: dropdown
-    id: plugin-type
-    attributes:
-      label: Plugin Type
-      description: Which plugin are you reporting a bug for?
-      options:
-        - VSCode Extension
-        - JetBrains Plugin
-      default: 0
-    validations:
-      required: true
-  - type: input
-    id: cline-version
-    attributes:
-      label: Cline Version
-      description: What version of Cline are you using? (You can find this at the bottom of the Settings view)
-      placeholder: 'e.g., 1.2.3'
-    validations:
-      required: true
-  - type: textarea
-    id: what-happened
-    attributes:
-      label: What happened?
-      description: Also tell us, what did you expect to happen?
-      placeholder: Tell us what you see!
-    validations:
-      required: true
-  - type: textarea
-    id: steps
-    attributes:
-      label: Steps to reproduce
-      description: How do you trigger this bug? Please walk us through it step by step.
-      value: |
-        1.
-        2.
-        3.
-    validations:
-      required: false
-  - type: input
-    id: provider-model
-    attributes:
-      label: Provider/Model
-      description: What provider and model were you using when the issue occurred?
-      placeholder: 'e.g., cline:anthropic/claude-sonnet-4, gemini:gemini-2.5-pro-exp-03-25'
-    validations:
-      required: false
-  - type: textarea
-    id: system-info
-    attributes:
-      label: System Information
-      description: What operating system and hardware are you using?
-      placeholder: |
-        Operating System: Windows 11, macOS Sonoma, Ubuntu 22.04, etc.
-        Hardware: CPU, GPU, RAM specifications if relevant
-        e.g.,
-        OS: Windows 11
-        CPU: Intel Core i7-11700K
-        GPU: NVIDIA GeForce RTX 3070
-        RAM: 32GB DDR4
-    validations:
-      required: false
+    - type: markdown
+      attributes:
+          value: |
+              **Important:** All bug reports must be reproducible using Claude 4 Sonnet. Cline uses complex prompts so less capable models may not work as expected.
+    - type: textarea
+      id: what-happened
+      attributes:
+          label: What happened?
+          description: Also tell us, what did you expect to happen?
+          placeholder: Tell us what you see!
+      validations:
+          required: true
+    - type: textarea
+      id: steps
+      attributes:
+          label: Steps to reproduce
+          description: How do you trigger this bug? Please walk us through it step by step.
+          value: |
+              1.
+              2.
+              3.
+      validations:
+          required: false
+    - type: textarea
+      id: logs
+      attributes:
+          label: Relevant API REQUEST output
+          description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for backticks.
+          render: shell
+    - type: input
+      id: provider-model
+      attributes:
+          label: Provider/Model
+          description: What provider and model were you using when the issue occurred?
+          placeholder: "e.g., cline:anthropic/claude-3.7-sonnet, gemini:gemini-2.5-pro-exp-03-25"
+      validations:
+          required: true
+    - type: textarea
+      id: system-info
+      attributes:
+          label: System Information
+          description: What operating system and hardware are you using?
+          placeholder: |
+              Operating System: Windows 11, macOS Sonoma, Ubuntu 22.04, etc.
+              Hardware: CPU, GPU, RAM specifications if relevant
+              e.g.,
+              OS: Windows 11
+              CPU: Intel Core i7-11700K
+              GPU: NVIDIA GeForce RTX 3070
+              RAM: 32GB DDR4
+      validations:
+          required: true
+    - type: input
+      id: cline-version
+      attributes:
+          label: Cline Version
+          description: What version of Cline are you using? (You can find this at the bottom of the Settings view)
+          placeholder: "e.g., 1.2.3"
+      validations:
+          required: true
@@ -1,75 +0,0 @@
-name: "Publish Nightly Release"
-
-on:
-  schedule:
-    - cron: '0 12 * * *'  # 4 AM PST (UTC-8) = 12 UTC
-  workflow_dispatch:
-
-permissions:
-    contents: write
-    packages: write
-    checks: write
-    pull-requests: write
-
-jobs:
-    test:
-        uses: ./.github/workflows/test.yml
-
-    publish:
-        needs: test
-        name: Publish Cline (Nightly) Extension
-        if: github.repository == 'cline/cline'
-        runs-on: ubuntu-latest
-        environment: PublishNightly
-
-        steps:
-            - uses: actions/checkout@v4
-
-            - name: Check for recent commits
-              run: |
-                if [ $(git rev-list --count HEAD --since="24 hours ago") -eq 0 ]; then
-                  echo "No commits in last 24 hours, exiting"
-                  exit 0
-                fi
-                echo "Found recent commits, proceeding with build"
-                
-            - name: Setup Node.js
-              uses: actions/setup-node@v4
-              with:
-                  node-version: "lts/*"
-
-            # Cache root dependencies - only reuse if package-lock.json exactly matches
-            - name: Cache root dependencies
-              uses: actions/cache@v4
-              id: root-cache
-              with:
-                  path: node_modules
-                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
-
-            # Cache webview-ui dependencies - only reuse if package-lock.json exactly matches
-            - name: Cache webview-ui dependencies
-              uses: actions/cache@v4
-              id: webview-cache
-              with:
-                  path: webview-ui/node_modules
-                  key: ${{ runner.os }}-npm-webview-${{ hashFiles('webview-ui/package-lock.json') }}
-
-            - name: Install root dependencies
-              if: steps.root-cache.outputs.cache-hit != 'true'
-              run: npm ci --include=optional
-
-            - name: Install webview-ui dependencies
-              if: steps.webview-cache.outputs.cache-hit != 'true'
-              run: cd webview-ui && npm ci --include=optional
-
-            - name: Install Publishing Tools
-              run: npm install -g @vscode/vsce ovsx
-
-            - name: Publish Extension as Pre-release
-              env:
-                  VSCE_PAT: ${{ secrets.VSCE_PAT }}
-                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
-                  TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-                  ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
-                  CLINE_ENVIRONMENT: production
-              run: npm run publish:marketplace:nightly
@@ -95,8 +95,6 @@ jobs:
                  VSCE_PAT: ${{ secrets.VSCE_PAT }}
                  OVSX_PAT: ${{ secrets.OVSX_PAT }}
                  CLINE_ENVIRONMENT: production
-                  TELEMETRY_SERVICE_API_KEY: ${{ secrets.TELEMETRY_SERVICE_API_KEY }}
-                  ERROR_SERVICE_API_KEY: ${{ secrets.ERROR_SERVICE_API_KEY }}
              run: |
                  # Required to generate the .vsix
                  vsce package  --allow-package-secrets sendgrid --out "cline-${{ steps.get_version.outputs.version }}.vsix"
@@ -10,6 +10,5 @@
 		"source-map-support/register",
 		"./src/test/requires.ts"
 	],
-	"recursive": true,
-	"exit": true
+	"recursive": true
 }
@@ -12,7 +12,6 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--disable-workspace-trust",
-				"--disable-extensions", // Avoid conflicts with installed extensions
 				"${workspaceFolder}"
 			],
 			"outFiles": [
@@ -32,7 +31,6 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--disable-workspace-trust",
-				"--disable-extensions", // Avoid conflicts with installed extensions
 				"${workspaceFolder}"
 			],
 			"outFiles": [
@@ -52,7 +50,6 @@
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--disable-workspace-trust",
-				"--disable-extensions", // Avoid conflicts with installed extensions
 				"${workspaceFolder}"
 			],
 			"outFiles": [
@@ -74,7 +71,7 @@
 				"--user-data-dir=${workspaceFolder}/dist/tmp/user",
 				"--profile-temp",
 				"--sync=off",
-				"--disable-extensions", // Avoid conflicts with installed extensions
+				"--disable-extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"${workspaceFolder}"
 			],
@@ -94,7 +91,7 @@
 		{
 			"type": "node",
 			"request": "launch",
-			"name": "Debug Test Standalone Core Api Server (test:sca-server)",
+			"name": "Run cline-core service",
 			"skipFiles": [
 				"<node_internals>/**"
 			],
@@ -103,62 +100,18 @@
 				"${workspaceFolder}/**",
 				"!**/node_modules/**"
 			],
-			"cwd": "${workspaceFolder}",
+			"cwd": "${workspaceFolder}/dist-standalone",
 			"outFiles": [
-				"${workspaceFolder}/dist/**/*.js",
 				"${workspaceFolder}/dist-standalone/**/*.js"
 			],
 			"preLaunchTask": "compile-standalone",
-			"runtimeExecutable": "npx",
-			"runtimeArgs": [
-				"tsx"
-			],
-			"program": "scripts/test-standalone-core-api-server.ts",
 			"env": {
-				"PROTOBUS_PORT": "26040",
-				"HOSTBRIDGE_PORT": "26041",
-				"WORKSPACE_DIR": "${workspaceFolder}",
-				"E2E_TEST": "true",
-				"CLINE_ENVIRONMENT": "local"
+				// Turns on grpc debug log.
+				//"GRPC_TRACE": "all",
+				//"GRPC_VERBOSITY": "DEBUG",
+				"NODE_PATH": "${workspaceFolder}/dist-standalone/node_modules"
 			},
-			"console": "integratedTerminal",
-			"internalConsoleOptions": "neverOpen"
-		},
-		{
-			"type": "node",
-			"request": "launch",
-			"name": "Debug Current Test File",
-			"skipFiles": [
-				"<node_internals>/**"
-			],
-			"sourceMaps": true,
-			"resolveSourceMapLocations": [
-				"${workspaceFolder}/**",
-				"!**/node_modules/**"
-			],
-			"cwd": "${workspaceFolder}",
-			"runtimeExecutable": "npx",
-			"runtimeArgs": [
-				"mocha"
-			],
-			"args": [
-				"--require",
-				"ts-node/register",
-				"--require",
-				"source-map-support/register",
-				"--require",
-				"./src/test/requires.ts",
-				"--exit",
-				"${file}"
-			],
-			"env": {
-				"TS_NODE_PROJECT": "./tsconfig.unit-test.json",
-				"NODE_ENV": "test",
-				"IS_DEV": "true",
-				"CLINE_ENVIRONMENT": "local"
-			},
-			"console": "integratedTerminal",
-			"internalConsoleOptions": "openOnSessionStart"
+			"program": "cline-core.js"
 		}
 	]
 }
@@ -21,11 +21,16 @@
 	},
 	// Enable Lint and format using Biome
 	"biome.enabled": true,
-	"editor.defaultFormatter": "biomejs.biome",
-	"editor.codeActionsOnSave": {
-		"source.fixAll.biome": "explicit",
-		"source.removeUnused.biome": "always",
-		"source.removeUnusedImports": "always",
-		"source.organizeImports.biome": "always"
+	"[typescript]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[typescriptreact]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[jsonc]": {
+		"editor.defaultFormatter": "biomejs.biome"
+	},
+	"[json]": {
+		"editor.defaultFormatter": "biomejs.biome"
 	}
 }
@@ -37,8 +37,7 @@
 				"useYield": "off",
 				"noConstructorReturn": "off",
 				"noInvalidPositionAtImportRule": "off",
-				"noSwitchDeclarations": "off",
-				"noUnusedImports": "error"
+				"noSwitchDeclarations": "off"
 			},
 			"a11y": "off",
 			"style": {
@@ -123,8 +122,7 @@
 			"!**/node_modules/**",
 			"!**/webview-ui/build/**",
 			"!**/generated/**",
-			"!**/proto/**",
-			"!**/tests/specs/**"
+			"!**/proto/**"
 		]
 	},
 	"plugins": [
@@ -136,12 +134,7 @@
 				"**",
 				"!**/hosts/vscode/**",
 				"!**/test/**",
-				"!**/*.test.ts",
-				"!src/dev/**",
-				"!src/extension.ts",
-				"!src/integrations/git/commit-message-generator.ts",
-				"!src/integrations/terminal/**",
-				"!src/core/controller/ui/openWalkthrough.ts"
+				"!src/extension.ts"
 			],
 			"plugins": [
 				"src/dev/grit/vscode-api.grit"
@@ -154,7 +147,6 @@
 				"!src/core/storage/FileContextTracker.ts",
 				"!src/core/context/context-tracking/FileContextTracker.ts",
 				"!src/common.ts",
-				"!src/services/logging/distinctId.ts",
 				"!src/core/storage/utils/state-helpers.ts",
 				"!src/extension.ts"
 			],
@@ -60,7 +60,6 @@
 					"getting-started/what-is-cline",
 					"getting-started/model-selection-guide",
 					"getting-started/installing-cline",
-					"getting-started/installing-cline-jetbrains",
 					"getting-started/task-management",
 					"getting-started/understanding-context-management",
 					{
@@ -91,6 +90,7 @@
 					"features/focus-chain",
 					"features/auto-compact",
 					"features/editing-messages",
+					"features/dictation",
 					{
 						"group": "@ Mentions",
 						"pages": [
@@ -56,7 +56,7 @@ Cline is your AI assistant that can:

 ## Available Tools

-For the most up-to-date implementation details, you can view the full source code in the [Cline repository](https://github.com/cline/cline/blob/main/src/core/prompts/system-prompt/tools).
+For the most up-to-date implementation details, you can view the full source code in the [Cline repository](https://github.com/cline/cline/blob/main/src/core/Cline.ts).

 Cline has access to the following tools for various tasks:

@@ -0,0 +1,60 @@
+---
+title: Dictation
+description:
+---
+
+Cline lets you transcribe speech to text in an easy, built-in service
+
+## Get Started
+
+1. **Enable Dictation** in Feature Settings.
+2. **Click the microphone** in the chat input area.
+3. **Speak** - the button turns red while recording.
+4. **Click Stop Recording** when done.
+5. **Wait for transcription** - "[Transcribing...]" will appear and then the finished transcription will appear.
+
+## Settings
+
+Enable or disable dictation in Feature Settings by toggling "Enable Dictation." You can also change the transcription language to one of the supported languages.
+
+## Requirements
+
+Cline uses FFmpeg to capture your voice across all platforms:
+
+-   **macOS**: FFmpeg (via Homebrew: `brew install ffmpeg`)
+-   **Linux**: FFmpeg (via apt: `sudo apt-get install ffmpeg`)
+-   **Windows**: FFmpeg (via winget: `winget install Gyan.FFmpeg`)
+
+If you don't have FFmpeg installed, Cline will automatically detect this and prompt you to install it with a single click.
+
+## Technical Details
+
+### Independent from Chat Provider
+
+The voice transcription feature works completely independently from whatever chat provider you're using. You can use Claude, GPT-4, or any other model for your conversations, and voice transcription will always use Cline's own transcription service. As long as you have a valid Cline account with enough credits, dictation will work regardless of your chat model choice.
+
+### Audio Format
+
+Voice recordings are captured in WebM format using the Opus codec for optimal compression. The system records in mono (single channel) at a 16kHz sample rate, which is specifically optimized for voice recognition. The bitrate is set to 32kbps to keep file sizes efficient while maintaining good audio quality.
+
+### Privacy & Security
+
+Your audio is recorded locally on your machine and only the audio file itself is sent to Cline's transcription service for processing. No audio is stored anywhere after transcription is complete, and all temporary files are automatically cleaned up to protect your privacy.
+
+## Troubleshooting
+
+`Failed to start recording` - Audio recording tools aren't installed. Cline will prompt you to install FFmpeg - just follow the chat instructions.
+
+`Invalid audio format or request data` - Usually an audio recording issue. Make sure FFmpeg is properly installed and working.
+
+`Authentication failed` - You need to reauthenticate your Cline account. Sign out and back in, then check your internet connection.
+
+`Insufficient credits for transcription service` - Your Cline account doesn't have enough credits. Check your balance and purchase more if needed.
+
+`Cannot connect to transcription service` - Connection issue. Check your internet connection and firewall settings aren't blocking Cline's servers.
+
+## API Usage
+
+Voice transcription uses Cline's transcription service, which requires credits from your Cline account. Currently, voice transcription is billed at $0.006 per minute of audio.
+
+**Note:** We are still experimenting with this feature and pricing may change in the future.
@@ -1,135 +0,0 @@
---
-title: "Installing Cline for JetBrains (Early Access)"
-description: "Get early access to Cline in your favorite JetBrains IDE with the same powerful AI assistance you know from VSCode."
---
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/jetbrains-logo.svg"
-		alt="JetBrains logo"
-		style={{ width: "200px", height: "auto", margin: "0 auto 20px auto", display: "block" }}
-	/>
-</Frame>
-
-Cline for JetBrains works almost identically to Cline in VSCode. All the core features work properly: diff editing, using tools, logging in with different providers, MCP servers, Cline rules and workflows, and more.
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/jetbrains-demo-hifi.gif"
-		alt="Cline running in JetBrains IDE showing AI assistance"
-	/>
-</Frame>
-
-<Note>Cline for JetBrains is in early access. All core features are functional, with ongoing improvements based on user feedback.</Note>
-
-## Installation
-
-As part of our early access program, Cline for JetBrains is available through direct download before its official marketplace release. You'll need to install it manually from a downloaded file:
-
-### Manual Installation from Disk
-
-1. **Download the Plugin:**
-   - Go to [https://plugins.jetbrains.com/plugin/28247-cline/versions/eap](https://plugins.jetbrains.com/plugin/28247-cline/versions/eap)
-   - Click **Download** to get the `.zip` file
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/cline-jetbrains-marketplace-download.png"
-		alt="JetBrains plugin marketplace showing Cline download page"
-	/>
-</Frame>
-
-2. **Install from Disk:**
-   - Open your JetBrains IDE
-   - Go to **IntelliJ IDEA** (or whichever IDE you are in) → **Settings**
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/cline-jetbrains-settings.png"
-		alt="JetBrains IDE settings dialog"
-	/>
-</Frame>
-
-   - Select **Plugins** from the left sidebar
-   - Click the gear icon ⚙️ and select **Install Plugin from Disk...**
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/cline-jetbrains-install-disk.png"
-		alt="JetBrains IDE settings showing Install Plugin from Disk option"
-	/>
-</Frame>
-
-   - Select the downloaded `.zip` file
-
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/cline-jetbrains-zip-file.png"
-		alt="File selection dialog showing Cline plugin zip file"
-	/>
-</Frame>
-
-   - Restart your IDE when prompted
-
-## Getting Started with Cline
-
-After installation, you'll find Cline in your IDE:
-
-1. **Open Cline:**
-   - Look for the Cline tool window (usually on the right side)
-   - Or go to **View** → **Tool Windows** → **Cline**
-
-2. **Sign In (optional, BYOK is also available):**
-   - Click **Sign In** in the Cline panel
-   - You'll be taken to [app.cline.bot](https://app.cline.bot) to create your account
-   - No credit card needed to get started with free credits
-
-3. **Start Coding:**
-   - Try this first prompt: "Hey Cline! Can you help me create a simple Hello World program in this project?"
-
-## Key Differences from VSCode
-
-While Cline for JetBrains includes all the same powerful features, there's one important difference to be aware of:
-
-**Terminal Integration:** The terminal inside JetBrains isn't integrated with Cline the same way it is in VSCode. Cline can execute commands, but the output will only appear in the webview if you expand the **Command Output** section.
-
-This means:
- Commands still run successfully
- You can see the output by clicking to expand Command Output in the chat
- Terminal commands work the same way, just with a different display
-
-## What Works
-
-Everything else works exactly like VSCode:
-
- **Diff Editing:** Cline can read, write, and edit files with the same precision
- **Tool Usage:** All of Cline's tools (file operations, web browsing, etc.) work identically  
- **API Providers:** Connect to Anthropic, OpenAI, local models, and more
- **MCP Servers:** Full support for Model Context Protocol servers
- **Cline Rules:** Custom instructions and workflows work the same way
- **@ Mentions:** Reference files, folders, problems, and more
- **Drag & Drop:** Add files and images to conversations
-
-## Tips for JetBrains Users
-
- **Project Context:** Cline automatically understands your project structure, just like in VSCode
- **Language Support:** Cline works with any language your JetBrains IDE supports
- **Debugging Help:** Share error messages and stack traces directly in the chat
- **Code Review:** Ask Cline to review your code changes before committing
-
-## Troubleshooting
-
-If you don't see the Cline tool window after installation:
- Restart your IDE completely
- Check **View** → **Tool Windows** → **Cline**
- Ensure the plugin is enabled in **Settings** → **Plugins**
-
-Having other issues? Join our [Discord community](https://discord.gg/cline) for help from the team and other users.
-
-## Next Steps
-
-Now that you have Cline installed, you might want to:
- Learn about [model selection](/getting-started/model-selection-guide) to choose the best AI provider
- Explore [@ mentions](/features/at-mentions/overview) to reference files and context efficiently  
- Set up [Cline rules](/features/cline-rules) for your specific workflow
- Try [MCP servers](/mcp/mcp-overview) to extend Cline's capabilities
@@ -1,14 +0,0 @@
-// HubSpot Tracking Code for Cline Documentation
-;(() => {
-	// Check if HubSpot script is already loaded to prevent duplicates
-	if (!document.getElementById("hs-script-loader")) {
-		var script = document.createElement("script")
-		script.type = "text/javascript"
-		script.id = "hs-script-loader"
-		script.async = true
-		script.src = "https://js-na2.hs-scripts.com/243656267.js"
-
-		// Append the script to the document head
-		document.head.appendChild(script)
-	}
-})()
@@ -49,44 +49,6 @@ All models feature:
 4.  **Enter API Key:** Paste your Z AI API key into the "Z AI API Key" field.
 5.  **Select Model:** Choose your desired model from the "Model" dropdown.

-### GLM Coding Plans
-
-Z AI offers subscription plans specifically designed for coding applications. These plans provide cost-effective access to GLM-4.5 models through a prompt-based structure rather than traditional API usage billing.
-
-#### Plan Options
-
-**GLM Coding Lite** - $3/month
- 120 prompts per 5-hour cycle
- Access to GLM-4.5 model
- Works exclusively through coding tools like Cline
-
-**GLM Coding Pro** - $15/month  
- 600 prompts per 5-hour cycle
- Access to GLM-4.5 model
- Works exclusively through coding tools like Cline
-
-Both plans offer promotional pricing for the first month: Lite drops from \$6 to \$3, Pro drops from \$30 to \$15.
-
-<Frame>
-  <img src="https://storage.googleapis.com/cline_public_images/docs/assets/zAI-coding-plan.png" alt="zAI subscription page showing GLM Coding Lite and Pro plans with pricing" />
-</Frame>
-
-#### Setting up GLM Coding Plans
-
-To use the GLM Coding Plans with Cline:
-
-1. **Subscribe:** Go to [https://z.ai/subscribe](https://z.ai/subscribe) and choose your plan.
-
-2. **Create API Key:** After subscribing, log into your zAI dashboard and create an API key for your coding plan.
-
-3. **Configure in Cline:** Open Cline settings, select "Z AI" as your provider, and paste your API key into the "Z AI API Key" field.
-
-<Frame>
-  <img src="https://storage.googleapis.com/cline_public_images/docs/assets/zAI-provider.png" alt="Cline settings with zAI provider selected and API key field highlighted" />
-</Frame>
-
-The setup connects your subscription directly to Cline, giving you access to GLM-4.5's tool-calling capabilities optimized for coding workflows.
-
 ### Z AI's Hybrid Intelligence

 Z AI's GLM-4.5 series introduces revolutionary capabilities that set it apart from conventional language models:
@@ -160,9 +160,9 @@ const standaloneConfig = {
 	...baseConfig,
 	entryPoints: ["src/standalone/cline-core.ts"],
 	outfile: `${destDir}/cline-core.js`,
-	// These modules need to load files from the module directory at runtime,
+	// These gRPC protos need to load files from the module directory at runtime,
 	// so they cannot be bundled.
-	external: ["vscode", "@grpc/reflection", "grpc-health-check", "better-sqlite3"],
+	external: ["vscode", "@grpc/reflection", "grpc-health-check"],
 }

 // E2E build script configuration
@@ -1,6 +1,5 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { ToolParamName } from "../../src/core/assistant-message"
-import { ClineDefaultTool } from "../../src/shared/tools"
+import { ToolUseName, ToolParamName } from "../../src/core/assistant-message"

 export interface InputMessage {
 	role: "user" | "assistant"
@@ -89,7 +88,7 @@ export interface TestResult {
 }

 export interface ExtractedToolCall {
-	name: ClineDefaultTool
+	name: ToolUseName
 	input: Partial<Record<ToolParamName, string>>
 }

@@ -16,7 +16,7 @@
 				"@bufbuild/protobuf": "^2.2.5",
 				"@cerebras/cerebras_cloud_sdk": "^1.35.0",
 				"@google-cloud/vertexai": "^1.9.3",
-				"@google/genai": "^1.11.0",
+				"@google/genai": "1.0.0",
 				"@grpc/grpc-js": "^1.9.15",
 				"@grpc/reflection": "^1.0.4",
 				"@mistralai/mistralai": "^1.5.0",
@@ -66,7 +66,7 @@
 				"p-timeout": "^6.1.4",
 				"p-wait-for": "^5.0.2",
 				"pdf-parse": "^1.1.1",
-				"posthog-node": "^5.8.0",
+				"posthog-node": "^4.8.1",
 				"puppeteer-chromium-resolver": "^23.0.0",
 				"puppeteer-core": "^23.4.0",
 				"reconnecting-eventsource": "^1.6.4",
@@ -86,7 +86,6 @@
 				"@biomejs/biome": "^2.1.4",
 				"@bufbuild/buf": "^1.54.0",
 				"@changesets/cli": "^2.27.12",
-				"@types/better-sqlite3": "^7.6.13",
 				"@types/chai": "^5.0.1",
 				"@types/clone-deep": "^4.0.4",
 				"@types/diff": "^5.2.1",
@@ -110,7 +109,6 @@
 				"lint-staged": "^16.1.0",
 				"minimatch": "^3.0.3",
 				"npm-run-all": "^4.1.5",
-				"prebuild-install": "^7.1.3",
 				"protoc-gen-ts": "^0.8.7",
 				"proxyquire": "^2.1.3",
 				"rimraf": "^6.0.1",
@@ -2533,24 +2531,19 @@
 			}
 		},
 		"node_modules/@google/genai": {
-			"version": "1.15.0",
-			"resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.15.0.tgz",
-			"integrity": "sha512-4CSW+hRTESWl3xVtde7pkQ3E+dDFhDq+m4ztmccRctZfx1gKy3v0M9STIMGk6Nq0s6O2uKMXupOZQ1JGorXVwQ==",
+			"version": "1.0.0",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"google-auth-library": "^9.14.2",
-				"ws": "^8.18.0"
+				"ws": "^8.18.0",
+				"zod": "^3.22.4",
+				"zod-to-json-schema": "^3.22.4"
 			},
 			"engines": {
-				"node": ">=20.0.0"
+				"node": ">=18.0.0"
 			},
 			"peerDependencies": {
 				"@modelcontextprotocol/sdk": "^1.11.0"
-			},
-			"peerDependenciesMeta": {
-				"@modelcontextprotocol/sdk": {
-					"optional": true
-				}
 			}
 		},
 		"node_modules/@grpc/grpc-js": {
@@ -3692,12 +3685,6 @@
 				"node": ">=18"
 			}
 		},
-		"node_modules/@posthog/core": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/@posthog/core/-/core-1.0.1.tgz",
-			"integrity": "sha512-bwXUeHe+MLgENm8+/FxEbiNocOw1Vjewmm+HEUaYQe6frq8OhZnrvtnzZU3Q3DF6N0UbAmD/q+iNfNgyx8mozg==",
-			"license": "MIT"
-		},
 		"node_modules/@protobufjs/aspromise": {
 			"version": "1.1.2",
 			"license": "BSD-3-Clause"
@@ -5092,16 +5079,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/@types/better-sqlite3": {
-			"version": "7.6.13",
-			"resolved": "https://registry.npmjs.org/@types/better-sqlite3/-/better-sqlite3-7.6.13.tgz",
-			"integrity": "sha512-NMv9ASNARoKksWtsq/SHakpYAYnhBrQgGD8zkLYk/jaK8jUGn08CfEdTRgYhMypUQAfzSP8W6gNLe0q19/t4VA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@types/node": "*"
-			}
-		},
 		"node_modules/@types/chai": {
 			"version": "5.0.1",
 			"dev": true,
@@ -7125,6 +7102,7 @@
 			"version": "6.0.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"mimic-response": "^3.1.0"
 			},
@@ -7139,6 +7117,7 @@
 			"version": "3.1.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"engines": {
 				"node": ">=10"
 			},
@@ -7161,6 +7140,7 @@
 			"version": "0.6.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"engines": {
 				"node": ">=4.0.0"
 			}
@@ -8114,6 +8094,7 @@
 			"version": "2.0.3",
 			"dev": true,
 			"license": "(MIT OR WTFPL)",
+			"optional": true,
 			"engines": {
 				"node": ">=6"
 			}
@@ -8971,7 +8952,8 @@
 		"node_modules/github-from-package": {
 			"version": "0.0.0",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT",
+			"optional": true
 		},
 		"node_modules/glob": {
 			"version": "10.4.3",
@@ -9401,7 +9383,8 @@
 		"node_modules/ini": {
 			"version": "1.3.8",
 			"dev": true,
-			"license": "ISC"
+			"license": "ISC",
+			"optional": true
 		},
 		"node_modules/internal-slot": {
 			"version": "1.1.0",
@@ -10981,7 +10964,8 @@
 		"node_modules/mkdirp-classic": {
 			"version": "0.5.3",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT",
+			"optional": true
 		},
 		"node_modules/mocha": {
 			"version": "10.6.0",
@@ -11209,7 +11193,8 @@
 		"node_modules/napi-build-utils": {
 			"version": "2.0.0",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT",
+			"optional": true
 		},
 		"node_modules/negotiator": {
 			"version": "1.0.0",
@@ -11273,6 +11258,7 @@
 			"version": "3.75.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"semver": "^7.3.5"
 			},
@@ -12401,23 +12387,20 @@
 			}
 		},
 		"node_modules/posthog-node": {
-			"version": "5.8.0",
-			"resolved": "https://registry.npmjs.org/posthog-node/-/posthog-node-5.8.0.tgz",
-			"integrity": "sha512-Idj6TgjYN0POXvrGK97ZKTLbLEY7sUjsaeMaquKt9UlK3Z9ps0nj0wRkFYKEYvfQ8OMwTwgKaze+5hXgmudwdw==",
+			"version": "4.8.1",
 			"license": "MIT",
 			"dependencies": {
-				"@posthog/core": "1.0.1"
+				"axios": "^1.7.4"
 			},
 			"engines": {
-				"node": ">=20"
+				"node": ">=15.0.0"
 			}
 		},
 		"node_modules/prebuild-install": {
 			"version": "7.1.3",
-			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz",
-			"integrity": "sha512-8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"detect-libc": "^2.0.0",
 				"expand-template": "^2.0.3",
@@ -12443,6 +12426,7 @@
 			"version": "4.1.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"buffer": "^5.5.0",
 				"inherits": "^2.0.4",
@@ -12467,6 +12451,7 @@
 				}
 			],
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"base64-js": "^1.3.1",
 				"ieee754": "^1.1.13"
@@ -12475,12 +12460,14 @@
 		"node_modules/prebuild-install/node_modules/chownr": {
 			"version": "1.1.4",
 			"dev": true,
-			"license": "ISC"
+			"license": "ISC",
+			"optional": true
 		},
 		"node_modules/prebuild-install/node_modules/detect-libc": {
 			"version": "2.0.4",
 			"dev": true,
 			"license": "Apache-2.0",
+			"optional": true,
 			"engines": {
 				"node": ">=8"
 			}
@@ -12489,6 +12476,7 @@
 			"version": "3.6.2",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"inherits": "^2.0.3",
 				"string_decoder": "^1.1.1",
@@ -12502,6 +12490,7 @@
 			"version": "2.1.3",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"chownr": "^1.1.1",
 				"mkdirp-classic": "^0.5.2",
@@ -12513,6 +12502,7 @@
 			"version": "2.2.0",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"bl": "^4.0.3",
 				"end-of-stream": "^1.4.1",
@@ -12742,6 +12732,7 @@
 			"version": "1.2.8",
 			"dev": true,
 			"license": "(BSD-2-Clause OR MIT OR Apache-2.0)",
+			"optional": true,
 			"dependencies": {
 				"deep-extend": "^0.6.0",
 				"ini": "~1.3.0",
@@ -12767,6 +12758,7 @@
 			"version": "2.0.1",
 			"dev": true,
 			"license": "MIT",
+			"optional": true,
 			"engines": {
 				"node": ">=0.10.0"
 			}
@@ -13647,7 +13639,8 @@
 					"url": "https://feross.org/support"
 				}
 			],
-			"license": "MIT"
+			"license": "MIT",
+			"optional": true
 		},
 		"node_modules/simple-get": {
 			"version": "4.0.1",
@@ -13667,6 +13660,7 @@
 				}
 			],
 			"license": "MIT",
+			"optional": true,
 			"dependencies": {
 				"decompress-response": "^6.0.0",
 				"once": "^1.3.1",
@@ -14560,6 +14554,7 @@
 			"version": "0.6.0",
 			"dev": true,
 			"license": "Apache-2.0",
+			"optional": true,
 			"dependencies": {
 				"safe-buffer": "^5.0.1"
 			},
@@ -102,8 +102,15 @@
 			"activitybar": [
 				{
 					"id": "claude-dev-ActivityBar",
-					"title": "Cline",
-					"icon": "assets/icons/icon.svg"
+					"title": "Cline (⌘+')",
+					"icon": "assets/icons/icon.svg",
+					"when": "isMac"
+				},
+				{
+					"id": "claude-dev-ActivityBar",
+					"title": "Cline (Ctrl+')",
+					"icon": "assets/icons/icon.svg",
+					"when": "!isMac"
 				}
 			]
 		},
@@ -341,9 +348,7 @@
 		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.mjs --production",
 		"protos": "node scripts/build-proto.mjs",
 		"postprotos": "biome format src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --no-errors-on-unmatched",
-		"clean:build": "rimraf dist dist-standalone webview-ui/build src/generated out/",
-		"clean:deps": "rimraf node_modules webview-ui/node_modules",
-		"clean:all": "npm run clean:build && npm run clean:deps",
+		"clean": "rimraf dist dist-standalone webview-ui/build src/generated out/",
 		"compile-tests": "node ./scripts/build-tests.js",
 		"watch-tests": "tsc -p . -w --outDir out",
 		"check-types": "npm run protos && npx tsc --noEmit && cd webview-ui && npx tsc -b --noEmit",
@@ -357,18 +362,15 @@
 		"test:integration": "vscode-test",
 		"test:unit": "TS_NODE_PROJECT='./tsconfig.unit-test.json' mocha",
 		"test:coverage": "vscode-test --coverage",
-		"test:sca-server": "npx tsx watch scripts/test-standalone-core-api-server.ts",
-		"test:tp-orchestrator": "npx tsx scripts/testing-platform-orchestrator.ts",
 		"e2e": "playwright test -c playwright.config.ts",
-		"test:e2e": "playwright install && vsce package --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
-		"test:e2e:optimal": "vsce package --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e": "playwright install && vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e:optimal": "vsce package --no-dependencies --allow-package-secrets sendgrid --out dist/e2e.vsix && node src/test/e2e/utils/build.mjs && playwright test",
 		"install:all": "npm install && cd webview-ui && npm install",
 		"dev:webview": "cd webview-ui && npm run dev",
 		"build:webview": "cd webview-ui && npm run build",
 		"test:webview": "cd webview-ui && npm run test",
 		"publish:marketplace": "vsce publish --allow-package-secrets sendgrid && ovsx publish",
 		"publish:marketplace:prerelease": "vsce publish --allow-package-secrets sendgrid --pre-release && ovsx publish --pre-release",
-		"publish:marketplace:nightly": "node ./scripts/publish-nightly.mjs",
 		"prepare": "husky",
 		"changeset": "changeset",
 		"version-packages": "changeset version",
@@ -386,7 +388,6 @@
 		"@biomejs/biome": "^2.1.4",
 		"@bufbuild/buf": "^1.54.0",
 		"@changesets/cli": "^2.27.12",
-		"@types/better-sqlite3": "^7.6.13",
 		"@types/chai": "^5.0.1",
 		"@types/clone-deep": "^4.0.4",
 		"@types/diff": "^5.2.1",
@@ -410,7 +411,6 @@
 		"lint-staged": "^16.1.0",
 		"minimatch": "^3.0.3",
 		"npm-run-all": "^4.1.5",
-		"prebuild-install": "^7.1.3",
 		"protoc-gen-ts": "^0.8.7",
 		"proxyquire": "^2.1.3",
 		"rimraf": "^6.0.1",
@@ -426,10 +426,12 @@
 		"@anthropic-ai/vertex-sdk": "^0.6.4",
 		"@aws-sdk/client-bedrock-runtime": "^3.840.0",
 		"@aws-sdk/credential-providers": "^3.840.0",
+		"@sap-ai-sdk/ai-api": "^1.17.0",
+		"@sap-ai-sdk/orchestration": "^1.17.0",
 		"@bufbuild/protobuf": "^2.2.5",
 		"@cerebras/cerebras_cloud_sdk": "^1.35.0",
 		"@google-cloud/vertexai": "^1.9.3",
-		"@google/genai": "^1.11.0",
+		"@google/genai": "1.0.0",
 		"@grpc/grpc-js": "^1.9.15",
 		"@grpc/reflection": "^1.0.4",
 		"@mistralai/mistralai": "^1.5.0",
@@ -441,8 +443,6 @@
 		"@opentelemetry/sdk-trace-node": "^1.30.1",
 		"@opentelemetry/semantic-conventions": "^1.30.0",
 		"@playwright/test": "^1.53.2",
-		"@sap-ai-sdk/ai-api": "^1.17.0",
-		"@sap-ai-sdk/orchestration": "^1.17.0",
 		"@sentry/browser": "^9.12.0",
 		"@streamparser/json": "^0.0.22",
 		"@types/uuid": "^10.0.0",
@@ -479,7 +479,7 @@
 		"p-timeout": "^6.1.4",
 		"p-wait-for": "^5.0.2",
 		"pdf-parse": "^1.1.1",
-		"posthog-node": "^5.8.0",
+		"posthog-node": "^4.8.1",
 		"puppeteer-chromium-resolver": "^23.0.0",
 		"puppeteer-core": "^23.4.0",
 		"reconnecting-eventsource": "^1.6.4",
@@ -2,7 +2,6 @@ syntax = "proto3";

 package cline;
 import "cline/common.proto";
-import "cline/state.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;

@@ -11,6 +10,7 @@ service BrowserService {
  rpc testBrowserConnection(StringRequest) returns (BrowserConnection);
  rpc discoverBrowser(EmptyRequest) returns (BrowserConnection);
  rpc getDetectedChromePath(EmptyRequest) returns (ChromePath);
+  rpc updateBrowserSettings(UpdateBrowserSettingsRequest) returns (Boolean);
  rpc relaunchChromeDebugMode(EmptyRequest) returns (String);
 }

@@ -31,6 +31,11 @@ message ChromePath {
  bool is_bundled = 2;
 }

+message Viewport {
+  int32 width = 1;
+  int32 height = 2;
+}
+
 message BrowserSettings {
  Viewport viewport = 1;
  optional string remote_browser_host = 2;
@@ -8,16 +8,19 @@ message Metadata {
 }

 message EmptyRequest {
+  Metadata metadata = 1;
 }

 message Empty {
 }

 message StringRequest {
+  Metadata metadata = 1;
  string value = 2;
 }

 message StringArrayRequest {
+  Metadata metadata = 1;
  repeated string value = 2;
 }

@@ -26,6 +29,7 @@ message String {
 }

 message Int64Request {
+  Metadata metadata = 1;
  int64 value = 2;
 }

@@ -34,6 +38,7 @@ message Int64 {
 }

 message BytesRequest {
+  Metadata metadata = 1;
  bytes value = 2;
 }

@@ -42,6 +47,7 @@ message Bytes {
 }

 message BooleanRequest {
+  Metadata metadata = 1;
  bool value = 2;
 }

@@ -0,0 +1,41 @@
+syntax = "proto3";
+
+package cline;
+import "cline/common.proto";
+option java_package = "bot.cline.proto";
+option java_multiple_files = true;
+
+service DictationService {
+  rpc startRecording(EmptyRequest) returns (RecordingResult);
+  rpc stopRecording(EmptyRequest) returns (RecordedAudio);
+  rpc cancelRecording(EmptyRequest) returns (RecordingResult);
+  rpc getRecordingStatus(EmptyRequest) returns (RecordingStatus);
+  rpc transcribeAudio(TranscribeAudioRequest) returns (Transcription);
+}
+
+message TranscribeAudioRequest {
+  string audio_base64 = 2;
+  string language = 3;
+}
+
+message RecordingResult {
+  bool success = 1;
+  string error = 2;
+}
+
+message RecordedAudio {
+  bool success = 1;
+  string audio_base64 = 2;
+  string error = 3;
+}
+
+message RecordingStatus {
+  bool is_recording = 1;
+  double duration_seconds = 2;
+  string error = 3;
+}
+
+message Transcription {
+  string text = 1;
+  string error = 2;
+}
@@ -50,20 +50,20 @@ message LanguageModelChatSelector {

 // Price tier for tiered pricing models
 message PriceTier {
-  int64 token_limit = 1;  // Upper limit (inclusive) of input tokens for this price
+  int32 token_limit = 1;  // Upper limit (inclusive) of input tokens for this price
  double price = 2;       // Price per million tokens for this tier
 }

 // Thinking configuration for models that support thinking/reasoning
 message ThinkingConfig {
-  optional int64 max_budget = 1;                    // Max allowed thinking budget tokens
+  optional int32 max_budget = 1;                    // Max allowed thinking budget tokens
  optional double output_price = 2;                 // Output price per million tokens when budget > 0
  repeated PriceTier output_price_tiers = 3;        // Optional: Tiered output price when budget > 0
 }

 // Model tier for tiered pricing structures
 message ModelTier {
-  int64 context_window = 1;
+  int32 context_window = 1;
  optional double input_price = 2;
  optional double output_price = 3;
  optional double cache_writes_price = 4;
@@ -108,16 +108,9 @@ message SapAiCoreModelsRequest {
  string resource_group = 6;
 }

-// SAP AI Core model with deployment information
-message SapAiCoreModelDeployment {
-  string model_name = 1;
-  string deployment_id = 2;
-}
-
-
 // Response for SAP AI Core models with orchestration availability
 message SapAiCoreModelsResponse {
-  repeated SapAiCoreModelDeployment deployments = 1;
+  repeated string model_names = 1;
  bool orchestration_available = 2;
 }

@@ -168,8 +161,8 @@ enum ApiProvider {

 // Model info for OpenAI-compatible models
 message OpenAiCompatibleModelInfo {
-  optional int64 max_tokens = 1;
-  optional int64 context_window = 2;
+  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;
@@ -186,8 +179,8 @@ message OpenAiCompatibleModelInfo {

 // Model info for LiteLLM models
 message LiteLLMModelInfo {
-  optional int64 max_tokens = 1;
-  optional int64 context_window = 2;
+  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;
@@ -239,8 +232,8 @@ message ModelsApiConfiguration {
  optional string requesty_base_url = 33;
  optional string together_api_key = 34;
  optional string fireworks_api_key = 35;
-  optional int64 fireworks_model_max_completion_tokens = 36;
-  optional int64 fireworks_model_max_tokens = 37;
+  optional int32 fireworks_model_max_completion_tokens = 36;
+  optional int32 fireworks_model_max_tokens = 37;
  optional string qwen_api_key = 38;
  optional string doubao_api_key = 39;
  optional string mistral_api_key = 40;
@@ -252,7 +245,7 @@ message ModelsApiConfiguration {
  optional string xai_api_key = 46;
  optional string sambanova_api_key = 47;
  optional string cerebras_api_key = 48;
-  optional int64 request_timeout_ms = 49;
+  optional int32 request_timeout_ms = 49;
  optional string sap_ai_core_client_id = 50;
  optional string sap_ai_core_client_secret = 51;
  optional string sap_ai_resource_group = 52;
@@ -280,7 +273,7 @@ message ModelsApiConfiguration {
  // Plan mode configurations
  optional ApiProvider plan_mode_api_provider = 100;
  optional string plan_mode_api_model_id = 101;
-  optional int64 plan_mode_thinking_budget_tokens = 102;
+  optional int32 plan_mode_thinking_budget_tokens = 102;
  optional string plan_mode_reasoning_effort = 103;
  optional LanguageModelChatSelector plan_mode_vs_code_lm_model_selector = 104;
  optional bool plan_mode_aws_bedrock_custom_selected = 105;
@@ -298,23 +291,21 @@ message ModelsApiConfiguration {
  optional string plan_mode_together_model_id = 117;
  optional string plan_mode_fireworks_model_id = 118;
  optional string plan_mode_sap_ai_core_model_id = 119;
-  optional string plan_mode_sap_ai_core_deployment_id = 120;
-  optional string plan_mode_groq_model_id = 121;
-  optional OpenRouterModelInfo plan_mode_groq_model_info = 122;
-  optional string plan_mode_hugging_face_model_id = 123;
-  optional OpenRouterModelInfo plan_mode_hugging_face_model_info = 124;
-  optional string plan_mode_huawei_cloud_maas_model_id = 125;
-  optional OpenRouterModelInfo plan_mode_huawei_cloud_maas_model_info = 126; 
-  optional string plan_mode_baseten_model_id = 127;
-  optional OpenRouterModelInfo plan_mode_baseten_model_info = 128;
-  optional string plan_mode_vercel_ai_gateway_model_id = 129;
-  optional OpenRouterModelInfo plan_mode_vercel_ai_gateway_model_info = 130;
-
+  optional string plan_mode_groq_model_id = 120;
+  optional OpenRouterModelInfo plan_mode_groq_model_info = 121;
+  optional string plan_mode_hugging_face_model_id = 122;
+  optional OpenRouterModelInfo plan_mode_hugging_face_model_info = 123;
+  optional string plan_mode_huawei_cloud_maas_model_id = 124;
+  optional OpenRouterModelInfo plan_mode_huawei_cloud_maas_model_info = 125; 
+  optional string plan_mode_baseten_model_id = 126;
+  optional OpenRouterModelInfo plan_mode_baseten_model_info = 127;
+  optional string plan_mode_vercel_ai_gateway_model_id = 128;
+  optional OpenRouterModelInfo plan_mode_vercel_ai_gateway_model_info = 129;

  // Act mode configurations
  optional ApiProvider act_mode_api_provider = 200;
  optional string act_mode_api_model_id = 201;
-  optional int64 act_mode_thinking_budget_tokens = 202;
+  optional int32 act_mode_thinking_budget_tokens = 202;
  optional string act_mode_reasoning_effort = 203;
  optional LanguageModelChatSelector act_mode_vs_code_lm_model_selector = 204;
  optional bool act_mode_aws_bedrock_custom_selected = 205;
@@ -332,18 +323,16 @@ message ModelsApiConfiguration {
  optional string act_mode_together_model_id = 217;
  optional string act_mode_fireworks_model_id = 218;
  optional string act_mode_sap_ai_core_model_id = 219;
-  optional string act_mode_sap_ai_core_deployment_id = 220;
-  optional string act_mode_groq_model_id = 221;
-  optional OpenRouterModelInfo act_mode_groq_model_info = 222;
-  optional string act_mode_hugging_face_model_id = 223;
-  optional OpenRouterModelInfo act_mode_hugging_face_model_info = 224;
-  optional string act_mode_huawei_cloud_maas_model_id = 225;
-  optional OpenRouterModelInfo act_mode_huawei_cloud_maas_model_info = 226;
-  optional string act_mode_baseten_model_id = 227;
-  optional OpenRouterModelInfo act_mode_baseten_model_info = 228;
-  optional string act_mode_vercel_ai_gateway_model_id = 229;
-  optional OpenRouterModelInfo act_mode_vercel_ai_gateway_model_info = 230;
-
+  optional string act_mode_groq_model_id = 220;
+  optional OpenRouterModelInfo act_mode_groq_model_info = 221;
+  optional string act_mode_hugging_face_model_id = 222;
+  optional OpenRouterModelInfo act_mode_hugging_face_model_info = 223;
+  optional string act_mode_huawei_cloud_maas_model_id = 224;
+  optional OpenRouterModelInfo act_mode_huawei_cloud_maas_model_info = 225;
+  optional string act_mode_baseten_model_id = 226;
+  optional OpenRouterModelInfo act_mode_baseten_model_info = 227;
+  optional string act_mode_vercel_ai_gateway_model_id = 228;
+  optional OpenRouterModelInfo act_mode_vercel_ai_gateway_model_info = 229;

  repeated string favorited_model_ids = 300;
 }
@@ -8,6 +8,7 @@ service StateService {
  rpc getLatestState(EmptyRequest) returns (State);
  rpc updateTerminalConnectionTimeout(UpdateTerminalConnectionTimeoutRequest) returns (UpdateTerminalConnectionTimeoutResponse);
  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);
@@ -55,7 +56,6 @@ enum OpenaiReasoningEffort {
  LOW = 0;
  MEDIUM = 1;
  HIGH = 2;
-  MINIMAL = 3;
 }

 enum McpDisplayMode {
@@ -106,16 +106,6 @@ message TelemetrySettingRequest {
  TelemetrySettingEnum setting = 2;
 }

-// Browser settings for UpdateSettingsRequest
-message BrowserSettingsUpdate {
-  optional Viewport viewport = 1;
-  optional string remote_browser_host = 2;
-  optional bool remote_browser_enabled = 3;
-  optional string chrome_executable_path = 4;
-  optional bool disable_tool_use = 5;
-  optional string custom_args = 6;
-}
-
 // Message for updating settings
 message UpdateSettingsRequest {
  Metadata metadata = 1;
@@ -133,11 +123,10 @@ message UpdateSettingsRequest {
  optional string preferred_language = 14;
  optional OpenaiReasoningEffort openai_reasoning_effort = 15;
  optional bool strict_plan_mode_enabled = 16;
-  optional FocusChainSettings focus_chain_settings = 17;
-  optional bool use_auto_condense = 18;
-  optional string custom_prompt = 19;
-  optional BrowserSettingsUpdate browser_settings = 20;
-  optional string default_terminal_profile = 21;
+  optional DictationSettings dictation_settings = 17;
+  optional FocusChainSettings focus_chain_settings = 18;
+  optional bool use_auto_condense = 19;
+  optional string custom_prompt = 20;
 }

 // Complete API Configuration message
@@ -275,16 +264,16 @@ message UpdateTerminalConnectionTimeoutRequest {
  optional int32 timeout_ms = 1;
 }

+message DictationSettings {
+  bool dictation_enabled = 1;
+  string dictation_language = 2;
+}
+
 message FocusChainSettings {
  bool enabled = 1;
  int32 remind_cline_interval = 2;
 }

-message Viewport {
-  int32 width = 1;
-  int32 height = 2;
-}
-
 message UpdateTerminalConnectionTimeoutResponse {
  optional int32 timeout_ms = 1;
 }
@@ -17,20 +17,7 @@ service EnvService {
  // Returns a stable machine identifier for telemetry distinctId purposes.
  rpc getMachineId(cline.EmptyRequest) returns (cline.String);

-  // Returns the name and version of the host IDE or environment.
  rpc getHostVersion(cline.EmptyRequest) returns (GetHostVersionResponse);
-
-  // Returns the URI scheme for URIs that will redirect to the host environment.
-  // e.g. vscode, idea, pycharm, etc. If the host does not support URIs it should
-  // return an empty uriScheme.
-  rpc getUriScheme(cline.EmptyRequest) returns (GetUriSchemeResponse);
-
-  // Returns the telemetry settings of the host environment. This may return UNSUPPORTED
-  // if the host does not specify telemetry settings for the plugin.
-  rpc getTelemetrySettings(cline.EmptyRequest) returns (GetTelemetrySettingsResponse);
-
-  // Returns events when the telemetry settings change.
-  rpc subscribeToTelemetrySettings(cline.EmptyRequest) returns (stream TelemetrySettingsEvent);
 }

 message GetHostVersionResponse {
@@ -39,20 +26,3 @@ message GetHostVersionResponse {
  // The version of the host platform, e.g. 1.103.0
  optional string version = 2;
 }
-
-enum Setting {
-  UNSUPPORTED = 0; // This host does not support this setting.
-  ENABLED = 1;
-  DISABLED = 2;
-}
-message GetTelemetrySettingsResponse {
-  Setting is_enabled = 1;
-}
-
-message TelemetrySettingsEvent {
-  Setting is_enabled = 1; 
-}
-
-message GetUriSchemeResponse {
-  string uri_scheme = 1;
-}
@@ -0,0 +1,36 @@
+syntax = "proto3";
+
+package host;
+option java_package = "bot.cline.host.proto";
+option java_multiple_files = true;
+
+import "cline/common.proto";
+
+/** 
+ * The watch service is only here as example of a streaming rpc in the host bridge. 
+ * This being replaced with a native JS file watcher.
+ */
+// WatchService provides methods for watching files in the IDE
+service WatchService {
+  // Subscribe to file changes
+  rpc subscribeToFile(SubscribeToFileRequest) returns (stream FileChangeEvent);
+}
+
+// Request to subscribe to file changes
+message SubscribeToFileRequest {
+  cline.Metadata metadata = 1;
+  string path = 2;
+}
+
+// Event representing a file change
+message FileChangeEvent {
+  enum ChangeType {
+    CREATED = 0;
+    CHANGED = 1;
+    DELETED = 2;
+  }
+  
+  string path = 1;
+  ChangeType type = 2;
+  string content = 3; // Optional content of the file after change
+}
@@ -4,6 +4,8 @@ package host;
 option java_package = "bot.cline.host.proto";
 option java_multiple_files = true;

+import "cline/common.proto";
+
 // Provides methods for working with IDE windows and editors.
 service WindowService {
  // Opens a text document in the IDE editor and returns editor information.
@@ -38,6 +40,7 @@ service WindowService {
 }

 message ShowTextDocumentRequest {
+  cline.Metadata metadata = 1;
  string path = 2;
  optional ShowTextDocumentOptions options = 3;
 }
@@ -56,6 +59,7 @@ message TextEditorInfo {
 }

 message ShowOpenDialogueRequest {
+  cline.Metadata metadata = 1;
  optional bool can_select_many = 2;
  optional string open_label = 3;
  optional ShowOpenDialogueFilterOption filters = 4;
@@ -18,6 +18,8 @@ service WorkspaceService {

  // Get diagnostics from the workspace.
  rpc getDiagnostics(GetDiagnosticsRequest) returns (GetDiagnosticsResponse);
+  // Returns workspace items (files/folders) matching a query for mention autocomplete
+  rpc searchWorkspaceItems(SearchWorkspaceItemsRequest) returns (SearchWorkspaceItemsResponse);

  // Makes the problems panel/pane visible in the IDE and focuses it.
  rpc openProblemsPanel(OpenProblemsPanelRequest) returns (OpenProblemsPanelResponse);
@@ -10,6 +10,7 @@ import * as path from "path"
 import { rmrf } from "./file-utils.mjs"
 import { main as generateHostBridgeClient } from "./generate-host-bridge-client.mjs"
 import { main as generateProtoBusSetup } from "./generate-protobus-setup.mjs"
+import { loadProtoDescriptorSet } from "./proto-utils.mjs"

 const require = createRequire(import.meta.url)
 const PROTOC = path.join(require.resolve("grpc-tools"), "../bin/protoc")
@@ -30,13 +31,14 @@ const TS_PROTO_OPTIONS = [
 	"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=none", // scalar and message fields are required unless they are marked as optional.
+	"useOptionals=messages", // Message fields are optional, scalars are not.
 	"useDate=false", // Timestamp fields will not be automatically converted to Date.
 ]

 async function main() {
 	await cleanup()
 	await compileProtos()
+	await checkProtos()
 	await generateProtoBusSetup()
 	await generateHostBridgeClient()
 }
@@ -57,7 +59,7 @@ async function compileProtos() {

 	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", ...TS_PROTO_OPTIONS])
+	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])

@@ -185,6 +187,51 @@ function checkAppleSiliconCompatibility() {
 	}
 }

+const int64TypeNames = ["TYPE_INT64", "TYPE_UINT64", "TYPE_SINT64", "TYPE_FIXED64", "TYPE_SFIXED64"]
+
+async function checkProtos() {
+	const proto = await loadProtoDescriptorSet()
+	const int64Fields = []
+
+	for (const [packageName, packageDef] of Object.entries(proto)) {
+		for (const [messageName, def] of Object.entries(packageDef)) {
+			// Skip service definitions
+			if (def && typeof def === "object" && "service" in def) {
+				continue
+			}
+			// Check message fields
+			if (def && def.type && def.type.field) {
+				for (const field of def.type.field) {
+					if (int64TypeNames.includes(field.type)) {
+						const name = `${packageName}.${messageName}.${field.name}`
+						int64Fields.push({
+							name: name,
+							type: field.type,
+						})
+					}
+				}
+			}
+		}
+	}
+
+	if (int64Fields.length > 0) {
+		console.log(chalk.yellow(`\nWarning: Found ${int64Fields.length} fields using 64-bit integer types`))
+		for (const field of int64Fields) {
+			const typeNames = {
+				TYPE_INT64: "int64",
+				TYPE_UINT64: "uint64",
+				TYPE_SINT64: "sint64",
+				TYPE_FIXED64: "fixed64",
+				TYPE_SFIXED64: "sfixed64",
+			}
+			log_verbose(chalk.yellow(`  - ${field.name} (${typeNames[field.type]})`))
+		}
+		log_verbose(chalk.yellow("\nWARNING: 64-bit integer fields detected in proto definitions"))
+		log_verbose(chalk.yellow("JavaScript cannot safely represent integers larger than 2^53-1 (Number.MAX_SAFE_INTEGER)."))
+		log_verbose(chalk.yellow("Consider using string representation for large numbers or implementing BigInt support.\n"))
+	}
+}
+
 function log_verbose(s) {
 	if (process.argv.includes("-v") || process.argv.includes("--verbose")) {
 		console.log(s)
@@ -6,102 +6,40 @@ import fs from "fs"
 import { cp } from "fs/promises"
 import { glob } from "glob"
 import minimatch from "minimatch"
-import os from "os"
 import path from "path"
-import { rmrf } from "./file-utils.mjs"

 const BUILD_DIR = "dist-standalone"
-const BINARIES_DIR = `${BUILD_DIR}/binaries`
 const RUNTIME_DEPS_DIR = "standalone/runtime-files"
-const IS_DEBUG_BUILD = process.env.IS_DEBUG_BUILD === "true"
-
-// This should match the node version packaged with the JetBrains plugin.
-const TARGET_NODE_VERSION = "22.15.0"
-const TARGET_PLATFORMS = [
-	{ platform: "win32", arch: "x64", targetDir: "win-x64" },
-	{ platform: "darwin", arch: "x64", targetDir: "darwin-x64" },
-	{ platform: "darwin", arch: "arm64", targetDir: "darwin-arm64" },
-	{ platform: "linux", arch: "x64", targetDir: "linux-x64" },
-]
-const SUPPORTED_BINARY_MODULES = ["better-sqlite3"]
-
-const UNIVERSAL_BUILD = !process.argv.includes("-s")
-const IS_VERBOSE = process.argv.includes("-v") || process.argv.includes("--verbose")

 async function main() {
 	await installNodeDependencies()
-	if (UNIVERSAL_BUILD) {
-		console.log("Building universal package for all platforms...")
-		await packageAllBinaryDeps()
-	} else {
-		console.log(`Building package for ${os.platform()}-${os.arch()}...`)
-	}
 	await zipDistribution()
 }

 async function installNodeDependencies() {
-	// Clean modules from any previous builds
-	await rmrf(path.join(BUILD_DIR, "node_modules"))
-	await rmrf(path.join(BINARIES_DIR))
-
 	await cpr(RUNTIME_DEPS_DIR, BUILD_DIR)

 	console.log("Running npm install in distribution directory...")
-	execSync("npm install", { stdio: "inherit", cwd: BUILD_DIR })
+	const cwd = process.cwd()
+	process.chdir(BUILD_DIR)

-	// Move the vscode directory into node_modules.
-	// It can't be installed using npm because it will create a symlink which cannot be unzipped correctly on windows.
-	fs.renameSync(`${BUILD_DIR}/vscode`, `${BUILD_DIR}/node_modules/vscode`)
-}
-
-/**
- * Downloads prebuilt binaries for each platform for the modules that include binaries. It uses `npx prebuild-install`
- * to download the binary.
- *
- * The modules are downloaded to dist-standalone/binaries/{os}-{platform}/.
- * When cline-core is installed, the installer should use the correct module for the current platform.
- */
-async function packageAllBinaryDeps() {
-	// Check for native .node modules.
-	const allNativeModules = await glob("**/*.node", { cwd: path.join(BUILD_DIR, "node_modules"), nodir: true })
-	const isAllowed = (path) => SUPPORTED_BINARY_MODULES.some((allowed) => path.includes(allowed))
-	const blocked = allNativeModules.filter((x) => !isAllowed(x))
-
-	if (blocked.length > 0) {
-		console.error(`Error: Native node modules cannot be included in the standalone distribution:\n\n${blocked.join("\n")}`)
-		console.error(
-			"\nThese modules must support prebuilt-install and be added to the supported list in scripts/package-standalone.mjs",
-		)
+	try {
+		execSync("npm install", { stdio: "inherit" })
+		// Move the vscode directory into node_modules.
+		// It can't be installed using npm because it will create a symlink which cannot be unzipped correctly on windows.
+		fs.renameSync("vscode", path.join("node_modules", "vscode"))
+	} catch (error) {
+		console.error("Error during setup:", error)
 		process.exit(1)
+	} finally {
+		process.chdir(cwd)
 	}

-	for (const module of SUPPORTED_BINARY_MODULES) {
-		console.log(`Installing binaries for ${module}...`)
-		const src = path.join(BUILD_DIR, "node_modules", module)
-		if (!fs.existsSync(src)) {
-			console.warn(`Warning: Trying to install binaries for the module '${module}', but it is not being used by cline.`)
-			continue
-		}
-
-		for (const { platform, arch, targetDir } of TARGET_PLATFORMS) {
-			const binaryDir = `${BINARIES_DIR}/${targetDir}/node_modules`
-			fs.mkdirSync(binaryDir, { recursive: true })
-
-			// Copy the module from the build dir
-			const dest = path.join(binaryDir, module)
-			await cpr(src, dest)
-
-			// Download the binary libs
-			const v = IS_VERBOSE ? "--verbose" : ""
-			const cmd = `npx prebuild-install --platform=${platform} --arch=${arch} --target=${TARGET_NODE_VERSION} ${v}`
-			log_verbose(`${module}: ${cmd}`)
-			execSync(cmd, { cwd: dest, stdio: "inherit" })
-			log_verbose("")
-		}
-		// Remove the original module with the host platform binaries installed directly into node_modules.
-		log_verbose(`Cleaning up host version of ${module}`)
-		await rmrf(src)
-		log_verbose("")
+	// Check for native .node modules.
+	const nativeModules = await glob("**/*.node", { cwd: BUILD_DIR, nodir: true })
+	if (nativeModules.length > 0) {
+		console.error("Native node modules cannot be included in the standalone distribution:\n", nativeModules.join("\n"))
+		process.exit(1)
 	}
 }

@@ -109,13 +47,10 @@ async function zipDistribution() {
 	// Zip the build directory (excluding any pre-existing output zip).
 	const zipPath = path.join(BUILD_DIR, "standalone.zip")
 	const output = fs.createWriteStream(zipPath)
-	const startTime = Date.now()
-	const archive = archiver("zip", { zlib: { level: 6 } })
+	const archive = archiver("zip", { zlib: { level: 3 } })

 	output.on("close", () => {
-		const endTime = Date.now()
-		const duration = (endTime - startTime) / 1000
-		console.log(`Created ${zipPath} (${(archive.pointer() / 1024 / 1024).toFixed(1)} MB) in ${duration.toFixed(2)} seconds`)
+		console.log(`Created ${zipPath} (${(archive.pointer() / 1024 / 1024).toFixed(1)} MB)`)
 	})
 	archive.on("warning", (err) => {
 		console.warn(`Warning: ${err}`)
@@ -138,7 +73,7 @@ async function zipDistribution() {
 	// Add the whole cline directory under "extension", except the for the ignored files.
 	archive.directory(process.cwd(), "extension", (entry) => {
 		if (isIgnored(entry.name)) {
-			//log_verbose("Ignoring", entry.name)
+			log_verbose("Ignoring", entry.name)
 			return false
 		}
 		return entry
@@ -210,7 +145,7 @@ function createIsIgnored(standaloneIgnores) {
 	let allIgnore = [...defaultIgnore, ...expandedIgnore, ...standaloneIgnores]

 	// Map files need to be included in the debug build. Remove .map ignores when IS_DEBUG_BUILD is set
-	if (IS_DEBUG_BUILD) {
+	if (process.env.IS_DEBUG_BUILD) {
 		allIgnore = allIgnore.filter((pattern) => !pattern.endsWith(".map"))
 		console.log("Debug build: Including .map files in package")
 	}
@@ -232,7 +167,6 @@ function createIsIgnored(standaloneIgnores) {

 /* cp -r */
 async function cpr(source, dest) {
-	log_verbose(`Copying ${source} -> ${dest}`)
 	await cp(source, dest, {
 		recursive: true,
 		preserveTimestamps: true,
@@ -241,7 +175,7 @@ async function cpr(source, dest) {
 }

 function log_verbose(...args) {
-	if (IS_VERBOSE) {
+	if (process.argv.includes("-v") || process.argv.includes("--verbose")) {
 		console.log(...args)
 	}
 }
@@ -1,377 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Nightly publish script for VS Code extension
- * Converts package.json to testing version, packages, publishes, and restores
- *
- * This script:
- * 1. Backs up the original package.json
- * 2. Updates package.json with:
- *    - New version (major.minor.timestamp format)
- *    - Changes name to "cline-nightly"
- *    - Changes displayName to "Cline (Nightly)"
- * 3. Packages the extension as a .vsix file
- * 4. Publishes to VS Code Marketplace (if VSCE_PAT is set)
- * 5. Publishes to OpenVSX Registry (if OVSX_PAT is set)
- * 6. Restores the original package.json
- *
- * Usage:
- *   npm run publish:marketplace:nightly
- *   npm run publish:marketplace:nightly -- --dry-run
- *
- * Environment variables:
- *   VSCE_PAT  - Personal Access Token for VS Code Marketplace
- *   OVSX_PAT  - Personal Access Token for OpenVSX Registry
- *
- * Dependencies:
- *   - vsce (VS Code Extension Manager)
- *   - ovsx (OpenVSX CLI)
- */
-
-import { execFileSync, execSync } from "node:child_process"
-import fs from "node:fs"
-import path from "node:path"
-import { fileURLToPath } from "node:url"
-
-// Get __dirname equivalent in ES modules
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-
-// ANSI color codes for console output
-const colors = {
-	reset: "\x1b[0m",
-	red: "\x1b[31m",
-	green: "\x1b[32m",
-	yellow: "\x1b[33m",
-}
-
-// Logging utilities
-const log = {
-	info: (msg) => console.log(`${colors.green}[INFO]${colors.reset} ${msg}`),
-	warn: (msg) => console.log(`${colors.yellow}[WARN]${colors.reset} ${msg}`),
-	error: (msg) => console.error(`${colors.red}[ERROR]${colors.reset} ${msg}`),
-}
-
-// Configuration
-const config = {
-	// The name and display name for the nightly version
-	nightlyName: "cline-nightly",
-	nightlyDisplayName: "Cline (Nightly)",
-	projectRoot: path.join(__dirname, ".."),
-	get packageJsonPath() {
-		return path.join(this.projectRoot, "package.json")
-	},
-	get packageBackupPath() {
-		return path.join(this.projectRoot, "package.json.backup")
-	},
-	get distDir() {
-		return path.join(this.projectRoot, "dist")
-	},
-	get vsixPath() {
-		return path.join(this.distDir, "cline-nightly.vsix")
-	},
-}
-
-// Utility class for managing the publish process
-class NightlyPublisher {
-	constructor() {
-		this.originalPackageJson = null
-		this.hasBackup = false
-	}
-
-	/**
-	 * Check if required dependencies are installed
-	 */
-	checkDependencies() {
-		const dependencies = [
-			{ name: "vsce", check: "vsce --version" },
-			{ name: "npx", check: "npx --version" },
-		]
-
-		const missing = []
-
-		for (const dep of dependencies) {
-			try {
-				execSync(dep.check, { stdio: "ignore" })
-			} catch {
-				missing.push(dep.name)
-			}
-		}
-
-		if (missing.length > 0) {
-			throw new Error(
-				`Missing required dependencies: ${missing.join(", ")}. Please install them before running this script.`,
-			)
-		}
-
-		log.info("All dependencies are installed")
-	}
-
-	/**
-	 * Check if a command exists
-	 */
-	commandExists(command) {
-		try {
-			execSync(`which ${command}`, { stdio: "ignore" })
-			return true
-		} catch {
-			return false
-		}
-	}
-
-	/**
-	 * Create backup of package.json
-	 */
-	backupPackageJson() {
-		if (!fs.existsSync(config.packageJsonPath)) {
-			throw new Error(`package.json not found at ${config.packageJsonPath}`)
-		}
-
-		log.info("Backing up original package.json")
-		this.originalPackageJson = fs.readFileSync(config.packageJsonPath, "utf-8")
-		fs.writeFileSync(config.packageBackupPath, this.originalPackageJson)
-		this.hasBackup = true
-	}
-
-	/**
-	 * Restore original package.json
-	 */
-	restorePackageJson() {
-		if (this.hasBackup && fs.existsSync(config.packageBackupPath)) {
-			log.info("Restoring original package.json")
-			fs.writeFileSync(config.packageJsonPath, this.originalPackageJson)
-			fs.unlinkSync(config.packageBackupPath)
-			this.hasBackup = false
-		}
-	}
-
-	/**
-	 * Generate new version with timestamp
-	 * Format: major.minor.timestamp
-	 */
-	generateVersion(currentVersion) {
-		// Extract major.minor from current version (e.g., "3.27.1" -> "3.27")
-		const versionParts = currentVersion.split(".")
-		if (versionParts.length < 2) {
-			throw new Error(`Invalid version format: ${currentVersion}`)
-		}
-
-		const major = versionParts[0]
-		const minor = versionParts[1]
-		const timestamp = Math.floor(Date.now() / 1000)
-
-		return `${major}.${minor}.${timestamp}`
-	}
-
-	/**
-	 * Update package.json with nightly configuration
-	 */
-	updatePackageJson() {
-		// Replace any occurrences cline. or claude-dev with nightly name
-		const rawContent = fs.readFileSync(config.packageJsonPath, "utf-8")
-		const content = rawContent.replaceAll("claude-dev", config.nightlyName).replaceAll('"cline.', `"${config.nightlyName}.`)
-
-		const pkg = JSON.parse(content)
-		const currentVersion = pkg.version
-
-		if (!currentVersion) {
-			throw new Error("Could not read version from package.json")
-		}
-
-		log.info(`Current version: ${currentVersion}`)
-
-		const newVersion = this.generateVersion(currentVersion)
-		log.info(`New version: ${newVersion}`)
-
-		// Update package.json fields
-		pkg.version = newVersion
-		pkg.name = config.nightlyName
-		pkg.displayName = config.nightlyDisplayName
-		pkg.contributes.viewsContainers.activitybar.title = config.nightlyDisplayName
-
-		// Save updated package.json
-		log.info("Updating package.json for nightly build")
-		fs.writeFileSync(config.packageJsonPath, JSON.stringify(pkg, null, "\t"))
-
-		return newVersion
-	}
-
-	/**
-	 * Package the extension
-	 */
-	packageExtension() {
-		// Ensure dist directory exists
-		if (!fs.existsSync(config.distDir)) {
-			fs.mkdirSync(config.distDir, { recursive: true })
-		}
-
-		log.info("Packaging extension")
-
-		const args = ["package", "--pre-release", "--no-update-package-json", "--no-git-tag-version", "--out", config.vsixPath]
-
-		try {
-			execFileSync("vsce", args, {
-				stdio: "inherit",
-				cwd: config.projectRoot,
-			})
-			log.info(`Package created: ${config.vsixPath}`)
-		} catch (error) {
-			throw new Error(`Failed to package extension: ${error.message}`)
-		}
-	}
-
-	/**
-	 * Publish to VS Code Marketplace
-	 */
-	publishToVSCodeMarketplace() {
-		const token = process.env.VSCE_PAT
-
-		if (!token) {
-			log.warn("VSCE_PAT not set, skipping VS Code Marketplace publish")
-			return false
-		}
-
-		log.info("Publishing to VS Code Marketplace")
-
-		const args = ["publish", "--pre-release", "--no-git-tag-version", "--packagePath", config.vsixPath]
-
-		try {
-			execFileSync("vsce", args, {
-				env: { ...process.env, VSCE_PAT: token },
-				stdio: "inherit",
-				cwd: config.projectRoot,
-			})
-			log.info("Successfully published to VS Code Marketplace")
-			return true
-		} catch (error) {
-			throw new Error(`Failed to publish to VS Code Marketplace: ${error.message}`)
-		}
-	}
-
-	/**
-	 * Publish to OpenVSX Registry
-	 */
-	publishToOpenVSX() {
-		const token = process.env.OVSX_PAT
-
-		if (!token) {
-			log.warn("OVSX_PAT not set, skipping OpenVSX Registry publish")
-			return false
-		}
-
-		log.info("Publishing to OpenVSX Registry")
-
-		const args = ["ovsx", "publish", "--pre-release", "--packagePath", config.vsixPath, "--pat", token]
-
-		try {
-			execFileSync("npx", args, {
-				stdio: "inherit",
-				cwd: config.projectRoot,
-			})
-			log.info("Successfully published to OpenVSX Registry")
-			return true
-		} catch (error) {
-			throw new Error(`Failed to publish to OpenVSX Registry: ${error.message}`)
-		}
-	}
-
-	/**
-	 * Main execution flow
-	 */
-	async run(isDryRun = false) {
-		try {
-			log.info(`Starting nightly publish process${isDryRun ? " (dry run)" : ""}`)
-
-			// Step 1: Check dependencies
-			this.checkDependencies()
-
-			// Step 2: Backup package.json
-			this.backupPackageJson()
-
-			// Step 3: Update package.json
-			const newVersion = this.updatePackageJson()
-
-			// Step 4: Package extension
-			this.packageExtension()
-
-			// Step 5: Publish to marketplaces (skip if dry run)
-			let vsCodePublished = false
-			let openVSXPublished = false
-
-			if (isDryRun) {
-				log.info("Dry run mode: Skipping marketplace publishing")
-			} else {
-				vsCodePublished = this.publishToVSCodeMarketplace()
-				openVSXPublished = this.publishToOpenVSX()
-			}
-
-			// Summary
-			log.info(`Nightly publish process completed successfully${isDryRun ? " (dry run)" : ""}`)
-			log.info(`Package created for v${newVersion}: ${config.vsixPath}`)
-
-			if (!isDryRun && !vsCodePublished && !openVSXPublished) {
-				log.warn("Extension was packaged but not published to any marketplace")
-				log.warn("Set VSCE_PAT and/or OVSX_PAT environment variables to enable publishing")
-			}
-		} catch (error) {
-			log.error(`Publish failed: ${error.message}`)
-			process.exit(1)
-		} finally {
-			// Always restore package.json
-			this.restorePackageJson()
-		}
-	}
-}
-
-// Handle cleanup on process exit
-const publisher = new NightlyPublisher()
-
-process.on("exit", () => {
-	publisher.restorePackageJson()
-})
-
-process.on("SIGINT", () => {
-	log.info("\nInterrupted, cleaning up...")
-	publisher.restorePackageJson()
-	process.exit(130)
-})
-
-process.on("SIGTERM", () => {
-	log.info("\nTerminated, cleaning up...")
-	publisher.restorePackageJson()
-	process.exit(143)
-})
-
-// Parse command line arguments
-const args = process.argv.slice(2)
-const isDryRun = args.includes("--dry-run") || args.includes("-n")
-const showHelp = args.includes("--help") || args.includes("-h")
-
-if (showHelp) {
-	console.log(`
-Nightly publish script for VS Code extension
-
-Usage:
-  npm run publish:marketplace:nightly [options]
-
-Options:
-  --dry-run, -n    Run without actually publishing (package only)
-  --help, -h       Show this help message
-
-Environment variables:
-  VSCE_PAT         Personal Access Token for VS Code Marketplace
-  OVSX_PAT         Personal Access Token for OpenVSX Registry
-
-Examples:
-  npm run publish:marketplace:nightly                    # Full publish
-  npm run publish:marketplace:nightly  -- --dry-run      # Package only
-  VSCE_PAT="token" npm run publish:marketplace:nightly   # Publish to VS Code only
-`)
-	process.exit(0)
-}
-
-// Run the publisher
-publisher.run(isDryRun).catch((error) => {
-	log.error(error.message)
-	process.exit(1)
-})
@@ -3,11 +3,7 @@ import * as grpc from "@grpc/grpc-js"
 import { ReflectionService } from "@grpc/reflection"
 import * as health from "grpc-health-check"
 import * as os from "os"
-import { type DiffServiceServer, DiffServiceService } from "../src/generated/grpc-js/host/diff"
-import { type EnvServiceServer, EnvServiceService } from "../src/generated/grpc-js/host/env"
-import { type TestingServiceServer, TestingServiceService } from "../src/generated/grpc-js/host/testing"
-import { type WindowServiceServer, WindowServiceService } from "../src/generated/grpc-js/host/window"
-import { type WorkspaceServiceServer, WorkspaceServiceService } from "../src/generated/grpc-js/host/workspace"
+import { host } from "src/generated/grpc-js/index"
 import { getPackageDefinition } from "./proto-utils.mjs"

 export async function startTestHostBridgeServer() {
@@ -18,11 +14,11 @@ export async function startTestHostBridgeServer() {
 	healthImpl.addToServer(server)

 	// Add host bridge services using the mock implementations
-	server.addService(WorkspaceServiceService, createMockService<WorkspaceServiceServer>("WorkspaceService"))
-	server.addService(WindowServiceService, createMockService<WindowServiceServer>("WindowService"))
-	server.addService(EnvServiceService, createMockService<EnvServiceServer>("EnvService"))
-	server.addService(DiffServiceService, createMockService<DiffServiceServer>("DiffService"))
-	server.addService(TestingServiceService, createMockService<TestingServiceServer>("TestingService"))
+	server.addService(host.WorkspaceServiceService, createMockService<host.WorkspaceServiceServer>("WorkspaceService"))
+	server.addService(host.WindowServiceService, createMockService<host.WindowServiceServer>("WindowService"))
+	server.addService(host.EnvServiceService, createMockService<host.EnvServiceServer>("EnvService"))
+	server.addService(host.DiffServiceService, createMockService<host.DiffServiceServer>("DiffService"))
+	server.addService(host.WatchServiceService, createMockService<host.WatchServiceServer>("WatchService"))

 	// Load package definition for reflection service
 	const packageDefinition = await getPackageDefinition()
@@ -62,9 +58,8 @@ function createMockService<T extends grpc.UntypedServiceImplementation>(serviceN
 				// Special cases that need specific return values
 				switch (prop) {
 					case "getWorkspacePaths":
-						const workspaceDir = process.env.TEST_HOSTBRIDGE_WORKSPACE_DIR || "/test-workspace"
 						callback(null, {
-							paths: [workspaceDir],
+							paths: ["/test-workspace"],
 						})
 						return

@@ -74,12 +69,6 @@ function createMockService<T extends grpc.UntypedServiceImplementation>(serviceN
 						})
 						return

-					case "getTelemetrySettings":
-						callback(null, {
-							isEnabled: 2, // Setting.DISABLED
-						})
-						return
-
 					case "clipboardReadText":
 						callback(null, {
 							value: "",
@@ -126,8 +115,8 @@ function createMockService<T extends grpc.UntypedServiceImplementation>(serviceN
 						})
 						return

-					// For streaming methods (like subscribeToTelemetrySettings)
-					case "subscribeToTelemetrySettings":
+					// For streaming methods (like subscribeToFile)
+					case "subscribeToFile":
 						// Just end the stream immediately
 						call.end()
 						return
@@ -1,178 +0,0 @@
-#!/usr/bin/env npx tsx
-
-/**
- * Simple Cline gRPC Server
- *
- * This script provides a minimal way to run the Cline core gRPC service
- * without requiring the full installation, while automatically mocking all external services. Simply run:
- *
- *   # One-time setup (generates protobuf files)
- *	 npm run compile-standalone
- *   npm run test:sca-server
- *
- * The following components are started automatically:
- *   1. HostBridge test server
- *   2. ClineApiServerMock (mock implementation of the Cline API)
- *   3. AuthServiceMock (activated if E2E_TEST="true")
- *
- * Environment Variables for Customization:
- *   PROJECT_ROOT - Override project root directory (default: parent of scripts dir)
- *   CLINE_DIST_DIR - Override distribution directory (default: PROJECT_ROOT/dist-standalone)
- *   CLINE_CORE_FILE - Override core file name (default: cline-core.js)
- *   PROTOBUS_PORT - gRPC server port (default: 26040)
- *   HOSTBRIDGE_PORT - HostBridge server port (default: 26041)
- *   WORKSPACE_DIR - Working directory (default: current directory)
- *   E2E_TEST - Enable E2E test mode (default: true)
- *   CLINE_ENVIRONMENT - Environment setting (default: local)
- *
- * Ideal for local development, testing, or lightweight E2E scenarios.
- */
-
-import { mkdtempSync, rmSync } from "node:fs"
-import * as os from "node:os"
-import { ChildProcess, execSync, spawn } from "child_process"
-import * as fs from "fs"
-import * as path from "path"
-import { ClineApiServerMock } from "../src/test/e2e/fixtures/server/index"
-
-// Configuration
-const PROTOBUS_PORT = process.env.PROTOBUS_PORT || "26040"
-const HOSTBRIDGE_PORT = process.env.HOSTBRIDGE_PORT || "26041"
-const WORKSPACE_DIR = process.env.WORKSPACE_DIR || process.cwd()
-const E2E_TEST = process.env.E2E_TEST || "true"
-const CLINE_ENVIRONMENT = process.env.CLINE_ENVIRONMENT || "local"
-
-// Locate the standalone build directory and core file with flexible path resolution
-const projectRoot = process.env.PROJECT_ROOT || path.resolve(__dirname, "..")
-const distDir = process.env.CLINE_DIST_DIR || path.join(projectRoot, "dist-standalone")
-const clineCoreFile = process.env.CLINE_CORE_FILE || "cline-core.js"
-const coreFile = path.join(distDir, clineCoreFile)
-
-async function main(): Promise<void> {
-	console.log("Starting Simple Cline gRPC Server...")
-	console.log(`Workspace: ${WORKSPACE_DIR}`)
-	console.log(`ProtoBus Port: ${PROTOBUS_PORT}`)
-	console.log(`HostBridge Port: ${HOSTBRIDGE_PORT}`)
-
-	console.log(`Looking for standalone build at: ${coreFile}`)
-
-	if (!fs.existsSync(coreFile)) {
-		console.error(`Standalone build not found at: ${coreFile}`)
-		console.error("Available environment variables for customization:")
-		console.error("  PROJECT_ROOT - Override project root directory")
-		console.error("  CLINE_DIST_DIR - Override distribution directory")
-		console.error("  CLINE_CORE_FILE - Override core file name")
-		console.error("")
-		console.error("To build the standalone version, run: npm run compile-standalone")
-		process.exit(1)
-	}
-
-	try {
-		await ClineApiServerMock.startGlobalServer()
-		console.log("Cline API Server started in-process")
-	} catch (error) {
-		console.error("Failed to start Cline API Server:", error)
-		process.exit(1)
-	}
-
-	// Create temporary directories like e2e tests
-	const userDataDir = mkdtempSync(path.join(os.tmpdir(), "vsce"))
-	const extensionsDir = mkdtempSync(path.join(os.tmpdir(), "vsce"))
-	const clineTestWorkspace = mkdtempSync(path.join(os.tmpdir(), "cline-test-workspace-"))
-
-	// Start hostbridge test server in background.
-	// We run it as a child process to emulate how the extension currently operates
-	console.log("Starting HostBridge test server...")
-	const hostbridge: ChildProcess = spawn("npx", ["tsx", path.join(__dirname, "test-hostbridge-server.ts")], {
-		stdio: "pipe",
-		detached: false,
-		env: {
-			...process.env,
-			TEST_HOSTBRIDGE_WORKSPACE_DIR: clineTestWorkspace,
-		},
-	})
-
-	console.log(`Temp user data dir: ${userDataDir}`)
-	console.log(`Temp extensions dir: ${extensionsDir}`)
-
-	// Extract standalone.zip to the extensions directory
-	const standaloneZipPath = path.join(distDir, "standalone.zip")
-	if (!fs.existsSync(standaloneZipPath)) {
-		console.error(`standalone.zip not found at: ${standaloneZipPath}`)
-		process.exit(1)
-	}
-
-	console.log("Extracting standalone.zip to extensions directory...")
-	try {
-		execSync(`unzip -q "${standaloneZipPath}" -d "${extensionsDir}"`, { stdio: "inherit" })
-		console.log(`Successfully extracted standalone.zip to: ${extensionsDir}`)
-	} catch (error) {
-		console.error("Failed to extract standalone.zip:", error)
-		process.exit(1)
-	}
-
-	// Start the core service
-	// We run it as a child process to emulate how the extension currently operates
-	console.log("Starting Cline Core Service...")
-	const coreService: ChildProcess = spawn("node", [clineCoreFile], {
-		cwd: distDir,
-		env: {
-			...process.env,
-			NODE_PATH: "./node_modules",
-			DEV_WORKSPACE_FOLDER: WORKSPACE_DIR,
-			PROTOBUS_ADDRESS: `127.0.0.1:${PROTOBUS_PORT}`,
-			HOST_BRIDGE_ADDRESS: `localhost:${HOSTBRIDGE_PORT}`,
-			E2E_TEST: E2E_TEST,
-			CLINE_ENVIRONMENT: CLINE_ENVIRONMENT,
-			CLINE_DIR: userDataDir,
-			INSTALL_DIR: extensionsDir,
-		},
-		stdio: "inherit",
-	})
-
-	// Handle graceful shutdown
-	const shutdown = async (): Promise<void> => {
-		console.log(`\n Shutting down services...\n${userDataDir}\n${extensionsDir}\n${clineTestWorkspace}\n`)
-		hostbridge.kill()
-		coreService.kill()
-		await ClineApiServerMock.stopGlobalServer()
-
-		// Cleanup temp directories
-		try {
-			rmSync(userDataDir, { recursive: true, force: true })
-			rmSync(extensionsDir, { recursive: true, force: true })
-			rmSync(clineTestWorkspace, { recursive: true, force: true })
-			console.log("Cleaned up temporary directories")
-		} catch (error) {
-			console.warn("Failed to cleanup temp directories:", error)
-		}
-
-		process.exit(0)
-	}
-
-	process.on("SIGINT", shutdown)
-	process.on("SIGTERM", shutdown)
-
-	coreService.on("exit", (code) => {
-		console.log(`Core service exited with code ${code}`)
-		hostbridge.kill()
-		process.exit(code || 0)
-	})
-
-	hostbridge.on("exit", (code) => {
-		console.log(`HostBridge exited with code ${code}`)
-		coreService.kill()
-		process.exit(code || 0)
-	})
-
-	console.log("Cline gRPC Server is running!")
-	console.log(`Connect to: 127.0.0.1:${PROTOBUS_PORT}`)
-	console.log("Press Ctrl+C to stop")
-}
-
-if (require.main === module) {
-	main().catch((error) => {
-		console.error("Failed to start simple Cline server:", error)
-		process.exit(1)
-	})
-}
@@ -1,159 +0,0 @@
-#!/usr/bin/env npx tsx
-/**
- * Test Orchestrator
- *
- * Automates server lifecycle for running spec files against the standalone server.
- *
- * Prerequisites:
- *   Build standalone first: `npm run compile-standalone`
- *
- * Usage:
- *   - Single file:   `npm run test:tp-orchestrator path/to/spec.json`
- *   - All specs dir: `npm run test:tp-orchestrator tests/specs`
- *
- * Flags:
- *   --server-logs        Show server logs (hidden by default)
- *   --count=<number>     Repeat execution N times (default: 1)
- *
- * Environment Variables:
- *   HOSTBRIDGE_PORT      gRPC server port (default: 26040)
- *   SERVER_BOOT_DELAY    Server startup delay in ms (default: 3000)
- */
-
-import { ChildProcess, spawn } from "child_process"
-import fs from "fs"
-import minimist from "minimist"
-import path from "path"
-
-const STANDALONE_GRPC_SERVER_PORT = process.env.STANDALONE_GRPC_SERVER_PORT || "26040"
-const SERVER_BOOT_DELAY = Number(process.env.SERVER_BOOT_DELAY) || 3000
-
-let showServerLogs = false
-
-function startServer(): Promise<ChildProcess> {
-	return new Promise((resolve, reject) => {
-		const server = spawn("npx", ["tsx", "scripts/test-standalone-core-api-server.ts"], {
-			stdio: showServerLogs ? "inherit" : "ignore",
-		})
-
-		server.once("error", reject)
-
-		setTimeout(() => {
-			if (server.killed) {
-				reject(new Error("Server died during startup"))
-			} else {
-				resolve(server)
-			}
-		}, SERVER_BOOT_DELAY)
-	})
-}
-
-function stopServer(server: ChildProcess): Promise<void> {
-	return new Promise((resolve) => {
-		server.once("exit", () => resolve())
-		server.kill("SIGINT")
-		setTimeout(() => {
-			if (!server.killed) {
-				server.kill("SIGKILL")
-				resolve()
-			}
-		}, 5000)
-	})
-}
-
-function runTestingPlatform(specFile: string): Promise<void> {
-	return new Promise((resolve, reject) => {
-		const testProcess = spawn("npx", ["ts-node", "index.ts", specFile], {
-			cwd: path.join(process.cwd(), "testing-platform"),
-			stdio: "inherit",
-			env: {
-				...process.env,
-				HOSTBRIDGE_PORT: STANDALONE_GRPC_SERVER_PORT,
-			},
-		})
-
-		testProcess.once("error", reject)
-		testProcess.once("exit", (code) => {
-			code === 0 ? resolve() : reject(new Error(`Exit code ${code}`))
-		})
-	})
-}
-
-async function runSpec(specFile: string): Promise<void> {
-	const server = await startServer()
-	try {
-		await runTestingPlatform(specFile)
-		console.log(`✅ ${path.basename(specFile)} passed`)
-	} finally {
-		await stopServer(server)
-	}
-}
-
-function collectSpecFiles(inputPath: string): string[] {
-	const fullPath = path.resolve(inputPath)
-	if (!fs.existsSync(fullPath)) throw new Error(`Path does not exist: ${fullPath}`)
-
-	const stat = fs.statSync(fullPath)
-	if (stat.isDirectory()) {
-		return fs
-			.readdirSync(fullPath)
-			.filter((f) => f.endsWith(".json"))
-			.map((f) => path.join(fullPath, f))
-	}
-	if (fullPath.endsWith(".json")) return [fullPath]
-	throw new Error("Spec path must be a JSON file or a folder containing JSON files")
-}
-
-async function runAll(inputPath: string, count: number) {
-	const specFiles = collectSpecFiles(inputPath)
-	if (specFiles.length === 0) {
-		console.warn(`⚠️ No spec files found in ${inputPath}`)
-		return
-	}
-
-	let success = 0
-	let failure = 0
-	const totalStart = Date.now()
-
-	for (let i = 0; i < count; i++) {
-		console.log(`\n🔁 Run #${i + 1} of ${count}`)
-		for (const specFile of specFiles) {
-			try {
-				await runSpec(specFile)
-				success++
-			} catch (err) {
-				console.error(`❌ run #${i + 1}: ${path.basename(specFile)} failed:`, (err as Error).message)
-				failure++
-			}
-		}
-
-		if (failure > 0) process.exitCode = 1
-	}
-
-	console.log(`✅ Passed: ${success}`)
-	if (failure > 0) console.log(`❌ Failed: ${failure}`)
-	console.log(`📋 Total specs: ${specFiles.length} Total runs: ${specFiles.length * count}`)
-	const totalElapsed = ((Date.now() - totalStart) / 1000).toFixed(2)
-	console.log(`\n🏁 All runs completed in ${totalElapsed}s`)
-}
-
-async function main() {
-	const args = minimist(process.argv.slice(2), { default: { count: 1 } })
-	const inputPath = args._[0]
-	const count = Number(args.count)
-	showServerLogs = Boolean(args["server-logs"])
-
-	if (!inputPath) {
-		console.error("Usage: npx tsx scripts/testing-platform-orchestrator.ts <spec-file-or-folder> [--count=N] [--server-logs]")
-		process.exit(1)
-	}
-
-	await runAll(inputPath, count)
-}
-
-if (require.main === module) {
-	main().catch((err) => {
-		console.error("❌ Fatal error:", err)
-		process.exit(1)
-	})
-}
@@ -1,22 +1,19 @@
 import * as vscode from "vscode"
 import {
 	migrateCustomInstructionsToGlobalRules,
-	migrateTaskHistoryToFile,
 	migrateWelcomeViewCompleted,
 	migrateWorkspaceToGlobalStorage,
 } from "./core/storage/state-migrations"
 import { WebviewProvider } from "./core/webview"
 import { Logger } from "./services/logging/Logger"
+import { PostHogClientProvider } from "./services/posthog/PostHogClientProvider"
+import { EmptyRequest } from "./shared/proto/cline/common"
 import { WebviewProviderType } from "./shared/webview/types"
 import "./utils/path" // necessary to have access to String.prototype.toPosix

 import { HostProvider } from "@/hosts/host-provider"
 import { FileContextTracker } from "./core/context/context-tracking/FileContextTracker"
-import { ErrorService } from "./services/error"
-import { featureFlagsService } from "./services/feature-flags"
-import { initializeDistinctId } from "./services/logging/distinctId"
-import { PostHogClientProvider } from "./services/posthog/PostHogClientProvider"
-import { telemetryService } from "./services/telemetry"
+import { telemetryService } from "./services/posthog/PostHogClientProvider"
 import { ShowMessageType } from "./shared/proto/host/window"
 import { getLatestAnnouncementId } from "./utils/announcements"
 /**
@@ -26,15 +23,18 @@ import { getLatestAnnouncementId } from "./utils/announcements"
 * @returns The webview provider
 */
 export async function initialize(context: vscode.ExtensionContext): Promise<WebviewProvider> {
-	// Set the distinct ID for logging and telemetry
-	await initializeDistinctId(context)
-
 	// Initialize PostHog client provider
-	PostHogClientProvider.getInstance()
-
-	// Setup the external services
-	await ErrorService.initialize()
-	await featureFlagsService.poll()
+	let distinctId = context.globalState.get<string>("cline.distinctId")
+	if (!distinctId) {
+		try {
+			const response = await HostProvider.env.getMachineId(EmptyRequest.create({}))
+			distinctId = response.value
+		} catch (e) {
+			Logger.warn(`Failed to get machine ID: ${e instanceof Error ? e.message : String(e)}`)
+			// PostHogProvider will fall back to uuid
+		}
+	}
+	PostHogClientProvider.getInstance(distinctId)

 	// Migrate custom instructions to global Cline rules (one-time cleanup)
 	await migrateCustomInstructionsToGlobalRules(context)
@@ -45,9 +45,6 @@ export async function initialize(context: vscode.ExtensionContext): Promise<Webv
 	// Migrate workspace storage values back to global storage (reverting previous migration)
 	await migrateWorkspaceToGlobalStorage(context)

-	// Ensure taskHistory.json exists and migrate legacy state (runs once)
-	await migrateTaskHistoryToFile(context)
-
 	// Clean up orphaned file context warnings (startup cleanup)
 	await FileContextTracker.cleanupOrphanedWarnings(context)

@@ -99,9 +96,7 @@ async function showVersionUpdateAnnouncement(context: vscode.ExtensionContext) {
 */
 export async function tearDown(): Promise<void> {
 	PostHogClientProvider.getInstance().dispose()
-	telemetryService.dispose()
-	ErrorService.get().dispose()
-	featureFlagsService.dispose()
+
 	// Dispose all webview instances
 	await WebviewProvider.disposeAllInstances()
 }
@@ -210,7 +210,6 @@ function createHandlerForProvider(
 			})
 		case "qwen-code":
 			return new QwenCodeHandler({
-				onRetryAttempt: options.onRetryAttempt,
 				qwenCodeOauthPath: options.qwenCodeOauthPath,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
 			})
@@ -313,7 +312,6 @@ function createHandlerForProvider(
 			})
 		case "baseten":
 			return new BasetenHandler({
-				onRetryAttempt: options.onRetryAttempt,
 				basetenApiKey: options.basetenApiKey,
 				basetenModelId: mode === "plan" ? options.planModeBasetenModelId : options.actModeBasetenModelId,
 				basetenModelInfo: mode === "plan" ? options.planModeBasetenModelInfo : options.actModeBasetenModelInfo,
@@ -331,7 +329,6 @@ function createHandlerForProvider(
 				thinkingBudgetTokens:
 					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
 				reasoningEffort: mode === "plan" ? options.planModeReasoningEffort : options.actModeReasoningEffort,
-				deploymentId: mode === "plan" ? options.planModeSapAiCoreDeploymentId : options.actModeSapAiCoreDeploymentId,
 				sapAiCoreUseOrchestrationMode: options.sapAiCoreUseOrchestrationMode,
 			})
 		case "claude-code":
@@ -344,7 +341,6 @@ function createHandlerForProvider(
 			})
 		case "huawei-cloud-maas":
 			return new HuaweiCloudMaaSHandler({
-				onRetryAttempt: options.onRetryAttempt,
 				huaweiCloudMaasApiKey: options.huaweiCloudMaasApiKey,
 				huaweiCloudMaasModelId:
 					mode === "plan" ? options.planModeHuaweiCloudMaasModelId : options.actModeHuaweiCloudMaasModelId,
@@ -362,7 +358,6 @@ function createHandlerForProvider(
 			})
 		case "vercel-ai-gateway":
 			return new VercelAIGatewayHandler({
-				onRetryAttempt: options.onRetryAttempt,
 				vercelAiGatewayApiKey: options.vercelAiGatewayApiKey,
 				vercelAiGatewayModelId:
 					mode === "plan" ? options.planModeVercelAiGatewayModelId : options.actModeVercelAiGatewayModelId,
@@ -371,7 +366,6 @@ function createHandlerForProvider(
 			})
 		case "zai":
 			return new ZAiHandler({
-				onRetryAttempt: options.onRetryAttempt,
 				zaiApiLine: options.zaiApiLine,
 				zaiApiKey: options.zaiApiKey,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
@@ -401,7 +395,7 @@ export function buildApiHandler(configuration: ApiConfiguration, mode: Mode): Ap
 			const handler = createHandlerForProvider(apiProvider, options, mode)

 			const modelInfo = handler.getModel().info
-			if (modelInfo?.maxTokens && modelInfo.maxTokens > 0 && thinkingBudgetTokens > modelInfo.maxTokens) {
+			if (modelInfo.maxTokens && thinkingBudgetTokens > modelInfo.maxTokens) {
 				const clippedValue = modelInfo.maxTokens - 1
 				if (mode === "plan") {
 					options.planModeThinkingBudgetTokens = clippedValue
@@ -2,12 +2,12 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { BasetenModelId, basetenDefaultModelId, basetenModels, ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import { ApiHandler } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"

-interface BasetenHandlerOptions extends CommonApiHandlerOptions {
+interface BasetenHandlerOptions {
 	basetenApiKey?: string
 	basetenModelId?: string
 	basetenModelInfo?: ModelInfo
@@ -32,7 +32,6 @@ export class ClineHandler implements ApiHandler {
 	private client: OpenAI | undefined
 	private readonly _baseUrl = clineEnvConfig.apiBaseUrl
 	lastGenerationId?: string
-	private lastRequestId?: string

 	constructor(options: ClineHandlerOptions) {
 		this.options = options
@@ -55,31 +54,6 @@ export class ClineHandler implements ApiHandler {
 						"X-Task-ID": this.options.ulid || "",
 						"X-Cline-Version": extensionVersion,
 					},
-					// Capture real HTTP request ID from initial streaming response headers
-					fetch: async (...args: Parameters<typeof fetch>): Promise<Awaited<ReturnType<typeof fetch>>> => {
-						const [input, init] = args
-						const resp = await fetch(input, init)
-						try {
-							let urlStr = ""
-							if (typeof input === "string") {
-								urlStr = input
-							} else if (input instanceof URL) {
-								urlStr = input.toString()
-							} else if (typeof (input as { url?: unknown }).url === "string") {
-								urlStr = (input as { url: string }).url
-							}
-							// Only record for chat completions (the primary streaming request)
-							if (urlStr.includes("/chat/completions")) {
-								const rid = resp.headers.get("x-request-id") || resp.headers.get("request-id")
-								if (rid) {
-									this.lastRequestId = rid
-								}
-							}
-						} catch {
-							// ignore header capture errors
-						}
-						return resp
-					},
 				})
 			} catch (error: any) {
 				throw new Error(`Error creating Cline client: ${error.message}`)
@@ -96,7 +70,6 @@ export class ClineHandler implements ApiHandler {
 			const client = await this.ensureClient()

 			this.lastGenerationId = undefined
-			this.lastRequestId = undefined

 			let didOutputUsage: boolean = false

@@ -119,7 +92,6 @@ export class ClineHandler implements ApiHandler {
 					const metadataStr = error.metadata ? `\nMetadata: ${JSON.stringify(error.metadata, null, 2)}` : ""
 					throw new Error(`Cline API Error ${error.code}: ${error.message}${metadataStr}`)
 				}
-
 				if (!this.lastGenerationId && chunk.id) {
 					this.lastGenerationId = chunk.id
 				}
@@ -231,11 +203,6 @@ export class ClineHandler implements ApiHandler {
 		return undefined
 	}

-	// Expose the last HTTP request ID captured from response headers (X-Request-ID)
-	getLastRequestId(): string | undefined {
-		return this.lastRequestId
-	}
-
 	getModel(): { id: string; info: ModelInfo } {
 		const modelId = this.options.openRouterModelId
 		const modelInfo = this.options.openRouterModelInfo
@@ -1,18 +1,16 @@
 import type { Anthropic } from "@anthropic-ai/sdk"
 // Restore GenerateContentConfig import and add GenerateContentResponseUsageMetadata
-import { ApiError, type GenerateContentConfig, type GenerateContentResponseUsageMetadata, GoogleGenAI, Part } from "@google/genai"
+import { type GenerateContentConfig, type GenerateContentResponseUsageMetadata, GoogleGenAI, Part } from "@google/genai"
+import { telemetryService } from "@services/posthog/PostHogClientProvider"
 import { GeminiModelId, geminiDefaultModelId, geminiModels, ModelInfo } from "@shared/api"
-import { telemetryService } from "@/services/telemetry"
 import { ApiHandler, CommonApiHandlerOptions } from "../"
-import { RetriableError, withRetry } from "../retry"
+import { withRetry } from "../retry"
 import { convertAnthropicMessageToGemini } from "../transform/gemini-format"
 import { ApiStream } from "../transform/stream"

 // Define a default TTL for the cache (e.g., 15 minutes in seconds)
 const _DEFAULT_CACHE_TTL_SECONDS = 900

-const rateLimitPatterns = [/got status: 429/i, /429 Too Many Requests/i, /rate limit exceeded/i, /too many requests/i]
-
 interface GeminiHandlerOptions extends CommonApiHandlerOptions {
 	isVertex?: boolean
 	vertexProjectId?: string
@@ -224,40 +222,24 @@ export class GeminiHandler implements ApiHandler {
 			if (error instanceof Error) {
 				apiError = error.message

-				if (error instanceof ApiError) {
-					if (error.status === 429) {
-						// The API includes more details in the message
-						// https://github.com/googleapis/js-genai/blob/v1.11.0/src/_api_client.ts#L758
-						const response = this.attemptParse(error.message)
+				// Gemini doesn't include status codes in their errors
+				// https://github.com/googleapis/js-genai/blob/61f7f27b866c74333ca6331883882489bcb708b9/src/_api_client.ts#L569
+				const rateLimitPatterns = [
+					/got status: 429/i,
+					/429 Too Many Requests/i,
+					/rate limit exceeded/i,
+					/too many requests/i,
+				]

-						if (response && response.error) {
-							const responseBody = this.attemptParse(response.error.message)
+				const isRateLimit =
+					error.name === "ClientError" && rateLimitPatterns.some((pattern) => pattern.test(error.message))

-							if (responseBody.error) {
-								const detail = responseBody.error.details?.find(
-									(d: any) => d["@type"] === "type.googleapis.com/google.rpc.RetryInfo",
-								)
-
-								const detailedError = new RetriableError(
-									apiError,
-									this.parseRetryDelay(detail?.retryDelay) || undefined,
-									{
-										cause: error,
-									},
-								)
-								throw detailedError
-							}
-						}
-
-						throw new RetriableError(apiError, undefined, { cause: error })
-					}
-
-					// Fallback in case Gemini throws a rate limit error without a 429 status code
-					// https://github.com/cline/cline/pull/5205#discussion_r2311761559
-					const isRateLimit = rateLimitPatterns.some((pattern) => pattern.test(error.message))
-					if (isRateLimit) {
-						throw new RetriableError(apiError, undefined, { cause: error })
-					}
+				if (isRateLimit) {
+					const rateLimitError = Object.assign(new Error(error.message), {
+						...error,
+						status: 429,
+					})
+					throw rateLimitError
 				}
 			} else {
 				apiError = String(error)
@@ -438,35 +420,4 @@ export class GeminiHandler implements ApiHandler {

 		return Math.ceil(totalChars / 4)
 	}
-
-	private parseRetryDelay(retryAfter?: string): number {
-		if (!retryAfter) {
-			return 0
-		}
-
-		const unit = retryAfter.at(-1)
-		const value = parseInt(retryAfter, 10)
-
-		if (Number.isNaN(value)) {
-			return 0
-		}
-
-		if (unit === "s") {
-			return value
-		} else if (unit === "m") {
-			return value * 60 // Convert minutes to seconds
-		} else if (unit === "h") {
-			return value * 60 * 60 // Convert hours to seconds
-		}
-
-		return value
-	}
-
-	private attemptParse(str: string) {
-		try {
-			return JSON.parse(str)
-		} catch (_) {
-			return null
-		}
-	}
 }
@@ -1,12 +1,12 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { HuaweiCloudMaasModelId, huaweiCloudMaasDefaultModelId, huaweiCloudMaasModels, ModelInfo } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import { ApiHandler } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"

-interface HuaweiCloudMaaSHandlerOptions extends CommonApiHandlerOptions {
+interface HuaweiCloudMaaSHandlerOptions {
 	huaweiCloudMaasApiKey?: string
 	huaweiCloudMaasModelId?: string
 	huaweiCloudMaasModelInfo?: ModelInfo
@@ -1,7 +1,6 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { LiteLLMModelInfo, liteLlmDefaultModelId, liteLlmModelInfoSaneDefaults } from "@shared/api"
 import OpenAI from "openai"
-import { isAnthropicModelId } from "@/utils/model-utils"
 import { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
@@ -198,8 +197,8 @@ export class LiteLlmHandler implements ApiHandler {

 		let temperature: number | undefined = this.options.liteLlmModelInfo?.temperature ?? 0

-		if ((isOminiModel || isAnthropicModelId(modelId)) && reasoningOn) {
-			temperature = undefined // OAI omni and Anthropic extended thinking mode doesn't support temperature
+		if (isOminiModel && reasoningOn) {
+			temperature = undefined // Thinking mode doesn't support temperature
 		}

 		const modelInfo = await this.modelInfo(modelId)
@@ -4,7 +4,7 @@ import { ModelInfo, QwenCodeModelId, qwenCodeDefaultModelId, qwenCodeModels } fr
 import OpenAI from "openai"
 import * as os from "os"
 import * as path from "path"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import { ApiHandler } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
@@ -24,7 +24,7 @@ interface QwenOAuthCredentials {
 	resource_url?: string
 }

-interface QwenCodeHandlerOptions extends CommonApiHandlerOptions {
+interface QwenCodeHandlerOptions {
 	qwenCodeOauthPath?: string
 	apiModelId?: string
 }
@@ -2,7 +2,6 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { ModelInfo, requestyDefaultModelId, requestyDefaultModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
-import { toRequestyServiceStringUrl } from "@/shared/providers/requesty"
 import { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
@@ -42,7 +41,7 @@ export class RequestyHandler implements ApiHandler {
 			}
 			try {
 				this.client = new OpenAI({
-					baseURL: toRequestyServiceStringUrl(this.options.requestyBaseUrl),
+					baseURL: this.options.requestyBaseUrl || "https://router.requesty.ai/v1",
 					apiKey: this.options.requestyApiKey,
 					defaultHeaders: {
 						"HTTP-Referer": "https://cline.bot",
@@ -83,6 +82,7 @@ export class RequestyHandler implements ApiHandler {
 				? thinking
 				: {}

+		// @ts-ignore-next-line
 		const stream = await client.chat.completions.create({
 			model: model.id,
 			max_tokens: model.info.maxTokens || undefined,
@@ -21,7 +21,6 @@ interface SapAiCoreHandlerOptions extends CommonApiHandlerOptions {
 	apiModelId?: string
 	sapAiCoreUseOrchestrationMode?: boolean
 	thinkingBudgetTokens?: number
-	deploymentId?: string
 	reasoningEffort?: string
 }

@@ -29,7 +28,6 @@ interface Deployment {
 	id: string
 	name: string
 }
-
 interface Token {
 	access_token: string
 	expires_in: number
@@ -396,8 +394,11 @@ export class SapAiCoreHandler implements ApiHandler {
 		return this.token.access_token
 	}

-	// TODO: these fallback fetching deployment id methods can be removed in future version if decided that users migration to fetching deployment id in design-time (open SAP AI Core provider UI) considered as completed.
 	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}`,
@@ -544,13 +545,7 @@ export class SapAiCoreHandler implements ApiHandler {
 		}

 		const model = this.getModel()
-		let deploymentId = this.options.deploymentId
-
-		if (!deploymentId) {
-			// Fallback to runtime deployment id fetching for users who haven't opened the SAP provider UI
-			console.log(`No pre-configured deployment ID found for model ${model.id}, falling back to runtime fetching`)
-			deploymentId = await this.getDeploymentForModel(model.id)
-		}
+		const deploymentId = await this.getDeploymentForModel(model.id)

 		const anthropicModels = [
 			"anthropic--claude-4-sonnet",
@@ -1,12 +1,12 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { ModelInfo, vercelAiGatewayDefaultModelId, vercelAiGatewayDefaultModelInfo } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import { ApiHandler } from "../index"
 import { withRetry } from "../retry"
 import { ApiStream } from "../transform/stream"
 import { createVercelAIGatewayStream } from "../transform/vercel-ai-gateway-stream"

-interface VercelAIGatewayHandlerOptions extends CommonApiHandlerOptions {
+interface VercelAIGatewayHandlerOptions {
 	vercelAiGatewayApiKey?: string
 	vercelAiGatewayModelId?: string
 	vercelAiGatewayModelInfo?: ModelInfo
@@ -10,12 +10,12 @@ import {
 } from "@shared/api"
 import OpenAI from "openai"
 import { version as extensionVersion } from "../../../../package.json"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import { ApiHandler } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"

-interface ZAiHandlerOptions extends CommonApiHandlerOptions {
+interface ZAiHandlerOptions {
 	zaiApiLine?: string
 	zaiApiKey?: string
 	apiModelId?: string
@@ -12,18 +12,6 @@ const DEFAULT_OPTIONS: Required<RetryOptions> = {
 	retryAllErrors: false,
 }

-export class RetriableError extends Error {
-	status: number = 429
-	retryAfter?: number
-
-	constructor(message: string, retryAfter?: number, options?: ErrorOptions) {
-		super(message, options)
-		this.name = "RetriableError"
-
-		this.retryAfter = retryAfter
-	}
-}
-
 export function withRetry(options: RetryOptions = {}) {
 	const { maxRetries, baseDelay, maxDelay, retryAllErrors } = { ...DEFAULT_OPTIONS, ...options }

@@ -36,7 +24,7 @@ export function withRetry(options: RetryOptions = {}) {
 					yield* originalMethod.apply(this, args)
 					return
 				} catch (error: any) {
-					const isRateLimit = error?.status === 429 || error instanceof RetriableError
+					const isRateLimit = error?.status === 429
 					const isLastAttempt = attempt === maxRetries - 1

 					if ((!isRateLimit && !retryAllErrors) || isLastAttempt) {
@@ -48,8 +36,7 @@ export function withRetry(options: RetryOptions = {}) {
 					const retryAfter =
 						error.headers?.["retry-after"] ||
 						error.headers?.["x-ratelimit-reset"] ||
-						error.headers?.["ratelimit-reset"] ||
-						error.retryAfter
+						error.headers?.["ratelimit-reset"]

 					let delay: number
 					if (retryAfter) {
@@ -1,6 +1,7 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo, openRouterClaudeSonnet41mModelId } from "@shared/api"
 import OpenAI from "openai"
+import { isGPT5ModelFamily } from "../../prompts/system-prompt/utils"
 import { convertToOpenAiMessages } from "./openai-format"
 import { convertToR1Format } from "./r1-format"

@@ -1,4 +1,3 @@
-import { ClineDefaultTool } from "@shared/tools"
 export type AssistantMessageContent = TextContent | ToolUse

 export { parseAssistantMessageV2 } from "./parse-assistant-message"
@@ -9,6 +8,32 @@ export interface TextContent {
 	partial: boolean
 }

+export const toolUseNames = [
+	"execute_command",
+	"read_file",
+	"write_to_file",
+	"replace_in_file",
+	"search_files",
+	"list_files",
+	"list_code_definition_names",
+	"browser_action",
+	"use_mcp_tool",
+	"access_mcp_resource",
+	"ask_followup_question",
+	"plan_mode_respond",
+	"load_mcp_documentation",
+	"attempt_completion",
+	"new_task",
+	"condense",
+	"summarize_task",
+	"report_bug",
+	"new_rule",
+	"web_fetch",
+] as const
+
+// Converts array of tool call names into a union type ("execute_command" | "read_file" | ...)
+export type ToolUseName = (typeof toolUseNames)[number]
+
 export const toolParamNames = [
 	"command",
 	"requires_approval",
@@ -44,7 +69,7 @@ export type ToolParamName = (typeof toolParamNames)[number]

 export interface ToolUse {
 	type: "tool_use"
-	name: ClineDefaultTool // id of the tool being used
+	name: ToolUseName
 	// params is a partial record, allowing only some or none of the possible parameters to be used
 	params: Partial<Record<ToolParamName, string>>
 	partial: boolean
@@ -1,5 +1,4 @@
-import { ClineDefaultTool, toolUseNames } from "@shared/tools"
-import { AssistantMessageContent, TextContent, ToolParamName, ToolUse, toolParamNames } from "." // Assuming types are defined in index.ts or a similar file
+import { AssistantMessageContent, TextContent, ToolParamName, ToolUse, ToolUseName, toolParamNames, toolUseNames } from "." // Assuming types are defined in index.ts or a similar file

 // parseAssistantmessageV1 removed in https://github.com/cline/cline/pull/5425

@@ -34,7 +33,7 @@ export function parseAssistantMessageV2(assistantMessage: string): AssistantMess
 	let currentParamName: ToolParamName | undefined

 	// Precompute tags for faster lookups
-	const toolUseOpenTags = new Map<string, ClineDefaultTool>()
+	const toolUseOpenTags = new Map<string, ToolUseName>()
 	const toolParamOpenTags = new Map<string, ToolParamName>()
 	for (const name of toolUseNames) {
 		toolUseOpenTags.set(`<${name}>`, name)
@@ -1,9 +1,10 @@
-import { getTaskMetadata, readTaskHistoryFromState, saveTaskMetadata } from "@core/storage/disk"
+import { getTaskMetadata, saveTaskMetadata } from "@core/storage/disk"
 import type { ClineMessage } from "@shared/ExtensionMessage"
 import chokidar, { FSWatcher } from "chokidar"
 import * as path from "path"
 import * as vscode from "vscode"
 import { Controller } from "@/core/controller"
+import { HistoryItem } from "@/shared/HistoryItem"
 import { getCwd } from "@/utils/path"
 import type { FileMetadataEntry } from "./ContextTrackerTypes"

@@ -285,7 +286,8 @@ export class FileContextTracker {
 	static async cleanupOrphanedWarnings(context: vscode.ExtensionContext): Promise<void> {
 		const startTime = Date.now()
 		try {
-			const taskHistory = await readTaskHistoryFromState(context)
+			// eslint-disable-next-line eslint-rules/no-direct-vscode-state-api
+			const taskHistory = (context.globalState.get("taskHistory") as HistoryItem[]) || []
 			const existingTaskIds = new Set(taskHistory.map((task) => task.id))
 			const allStateKeys = context.workspaceState.keys()
 			const pendingWarningKeys = allStateKeys.filter((key) => key.startsWith("pendingFileContextWarning_"))
@@ -310,7 +312,7 @@ export class FileContextTracker {
 				`FileContextTracker: Processed ${existingTaskIds.size} tasks, found ${pendingWarningKeys.length} pending warnings, ${orphanedPendingContextTasks.length} orphaned, deleted ${orphanedPendingContextTasks.length}, took ${duration}ms`,
 			)
 		} catch (error) {
-			console.error("[FileContextTracker] Error cleaning up orphaned file context warnings:", error)
+			console.error("Error cleaning up orphaned file context warnings:", error)
 		}
 	}
 }
@@ -7,10 +7,10 @@ import { Controller } from ".."
 * Initiates OpenRouter auth
 */
 export async function openrouterAuthClicked(_: Controller, __: EmptyRequest): Promise<Empty> {
-	const callbackUrl = await HostProvider.get().getCallbackUrl()
-	const authUrl = `https://openrouter.ai/auth?callback_url=${callbackUrl}/openrouter`
+	const callbackUri = await HostProvider.get().getCallbackUri()
+	const authUri = `https://openrouter.ai/auth?callback_url=${callbackUri}/openrouter`

-	await openExternal(authUrl)
+	await openExternal(authUri)

 	return {}
 }
@@ -0,0 +1,62 @@
+import { UpdateBrowserSettingsRequest } from "@shared/proto/cline/browser"
+import { Boolean } from "@shared/proto/cline/common"
+import { DEFAULT_BROWSER_SETTINGS, BrowserSettings as SharedBrowserSettings } from "../../../shared/BrowserSettings"
+import { Controller } from "../index"
+
+/**
+ * Update browser settings
+ * @param controller The controller instance
+ * @param request The browser settings request message
+ * @returns Success response
+ */
+export async function updateBrowserSettings(controller: Controller, request: UpdateBrowserSettingsRequest): Promise<Boolean> {
+	try {
+		// Get current browser settings to preserve fields not in the request
+		const currentSettings = controller.stateManager.getGlobalStateKey("browserSettings")
+		const mergedWithDefaults = { ...DEFAULT_BROWSER_SETTINGS, ...currentSettings }
+
+		// Convert from protobuf format to shared format, merging with existing settings
+		const newBrowserSettings: SharedBrowserSettings = {
+			...mergedWithDefaults, // Start with existing settings (and defaults)
+			viewport: {
+				// Apply updates from request
+				width: request.viewport?.width || mergedWithDefaults.viewport.width,
+				height: request.viewport?.height || mergedWithDefaults.viewport.height,
+			},
+			// Explicitly handle optional boolean and string fields from the request
+			remoteBrowserEnabled:
+				request.remoteBrowserEnabled === undefined
+					? mergedWithDefaults.remoteBrowserEnabled
+					: request.remoteBrowserEnabled,
+			remoteBrowserHost:
+				request.remoteBrowserHost === undefined ? mergedWithDefaults.remoteBrowserHost : request.remoteBrowserHost,
+			chromeExecutablePath:
+				// If chromeExecutablePath is explicitly in the request (even as ""), use it.
+				// Otherwise, fall back to mergedWithDefaults.
+				"chromeExecutablePath" in request ? request.chromeExecutablePath : mergedWithDefaults.chromeExecutablePath,
+			disableToolUse: request.disableToolUse === undefined ? mergedWithDefaults.disableToolUse : request.disableToolUse,
+			customArgs: "customArgs" in request ? request.customArgs : mergedWithDefaults.customArgs,
+		}
+
+		// Update global state with new settings
+		controller.stateManager.setGlobalState("browserSettings", newBrowserSettings)
+
+		// Update task browser settings if task exists
+		if (controller.task) {
+			controller.task.browserSettings = newBrowserSettings
+			controller.task.browserSession.browserSettings = newBrowserSettings
+		}
+
+		// Post updated state to webview
+		await controller.postStateToWebview()
+
+		return Boolean.create({
+			value: true,
+		})
+	} catch (error) {
+		console.error("Error updating browser settings:", error)
+		return Boolean.create({
+			value: false,
+		})
+	}
+}
@@ -3,7 +3,7 @@ import { Controller } from ".."

 export async function checkpointDiff(controller: Controller, request: Int64Request): Promise<Empty> {
 	if (request.value) {
-		await controller.task?.checkpointManager?.presentMultifileDiff?.(request.value, false)
+		await controller.task?.presentMultifileDiff(request.value, false)
 	}
-	return Empty.create()
+	return Empty
 }
@@ -23,11 +23,7 @@ export async function checkpointRestore(controller: Controller, request: Checkpo
 		})

 		// NOTE: cancelTask awaits abortTask, which awaits diffViewProvider.revertChanges, which reverts any edited files, allowing us to reset to a checkpoint rather than running into a state where the revertChanges function is called alongside or after the checkpoint reset
-		await controller.task?.checkpointManager?.restoreCheckpoint(
-			request.number,
-			request.restoreType as ClineCheckpointRestore,
-			request.offset,
-		)
+		await controller.task?.restoreCheckpoint(request.number, request.restoreType as ClineCheckpointRestore, request.offset)
 	}
 	return Empty.create({})
 }
@@ -1,7 +1,7 @@
 import { getFileMentionFromPath } from "@/core/mentions"
 import { WebviewProvider } from "@/core/webview"
 import { singleFileDiagnosticsToProblemsString } from "@/integrations/diagnostics"
-import { telemetryService } from "@/services/telemetry"
+import { telemetryService } from "@/services/posthog/PostHogClientProvider"
 import { CommandContext, Empty } from "@/shared/proto/index.cline"
 import { Controller } from "../index"
 import { sendAddToInputEventToClient } from "../ui/subscribeToAddToInput"
@@ -1,6 +1,6 @@
 import { getFileMentionFromPath } from "@/core/mentions"
 import { HostProvider } from "@/hosts/host-provider"
-import { telemetryService } from "@/services/telemetry"
+import { telemetryService } from "@/services/posthog/PostHogClientProvider"
 import { CommandContext, Empty } from "@/shared/proto/index.cline"
 import { ShowMessageType } from "@/shared/proto/index.host"
 import { Controller } from "../index"
@@ -1,6 +1,6 @@
 import { getFileMentionFromPath } from "@/core/mentions"
 import { singleFileDiagnosticsToProblemsString } from "@/integrations/diagnostics"
-import { telemetryService } from "@/services/telemetry"
+import { telemetryService } from "@/services/posthog/PostHogClientProvider"
 import { CommandContext, Empty } from "@/shared/proto/index.cline"
 import { Controller } from "../index"

@@ -1,6 +1,6 @@
 import { getFileMentionFromPath } from "@/core/mentions"
 import { HostProvider } from "@/hosts/host-provider"
-import { telemetryService } from "@/services/telemetry"
+import { telemetryService } from "@/services/posthog/PostHogClientProvider"
 import { CommandContext, Empty } from "@/shared/proto/index.cline"
 import { ShowMessageType } from "@/shared/proto/index.host"
 import { Controller } from "../index"
@@ -0,0 +1,35 @@
+import { telemetryService } from "@services/posthog/PostHogClientProvider"
+import { RecordingResult } from "@shared/proto/cline/dictation"
+import { audioRecordingService } from "@/services/dictation/AudioRecordingService"
+import { Controller } from ".."
+
+/**
+ * Cancels audio recording without saving or transcribing the audio
+ * @param controller The controller instance
+ * @returns RecordingResult indicating success or failure
+ */
+export const cancelRecording = async (controller: Controller): Promise<RecordingResult> => {
+	const taskId = controller.task?.taskId
+	const recordingStatus = audioRecordingService.getRecordingStatus()
+	const recordingDuration = recordingStatus.durationSeconds * 1000 // Convert to milliseconds
+
+	try {
+		const result = await audioRecordingService.cancelRecording()
+
+		telemetryService.captureVoiceRecordingStopped(taskId, recordingDuration, false, process.platform)
+
+		return RecordingResult.create({
+			success: result.success,
+			error: result.error || "",
+		})
+	} catch (error) {
+		console.error("Error canceling recording:", error)
+
+		telemetryService.captureVoiceRecordingStopped(taskId, recordingDuration, false, process.platform)
+
+		return RecordingResult.create({
+			success: false,
+			error: error instanceof Error ? error.message : "Unknown error occurred",
+		})
+	}
+}
@@ -0,0 +1,25 @@
+import { RecordingStatus } from "@shared/proto/cline/dictation"
+import { audioRecordingService } from "@/services/dictation/AudioRecordingService"
+
+/**
+ * Gets the current recording status
+ * @returns RecordingStatus with current status
+ */
+export const getRecordingStatus = async (): Promise<RecordingStatus> => {
+	try {
+		const status = audioRecordingService.getRecordingStatus()
+
+		return RecordingStatus.create({
+			isRecording: status.isRecording,
+			durationSeconds: status.durationSeconds,
+			error: status.error || "",
+		})
+	} catch (error) {
+		console.error("Error getting recording status:", error)
+		return RecordingStatus.create({
+			isRecording: false,
+			durationSeconds: 0,
+			error: error instanceof Error ? error.message : "Unknown error occurred",
+		})
+	}
+}
@@ -0,0 +1,52 @@
+import { RecordingResult } from "@shared/proto/cline/dictation"
+import { HostProvider } from "@/hosts/host-provider"
+import { audioRecordingService } from "@/services/dictation/AudioRecordingService"
+import { telemetryService } from "@/services/posthog/PostHogClientProvider"
+import { ShowMessageType } from "@/shared/proto/host/window"
+import { Controller } from ".."
+
+/**
+ * Starts audio recording using the Extension Host
+ * @param controller The controller instance
+ * @returns RecordingResult with success status
+ */
+export const startRecording = async (controller: Controller): Promise<RecordingResult> => {
+	const taskId = controller.task?.taskId
+
+	try {
+		const userInfo = controller.authService.getInfo()
+		if (!userInfo?.user?.uid) {
+			throw new Error("Please sign in to your Cline Account to use Dictation.")
+		}
+
+		const result = await audioRecordingService.startRecording()
+
+		if (result.success) {
+			telemetryService.captureVoiceRecordingStarted(taskId, process.platform)
+		}
+
+		return RecordingResult.create({
+			success: result.success,
+			error: result.error || "",
+		})
+	} catch (error) {
+		console.error("Error starting recording:", error)
+		const errorMessage = error instanceof Error ? error.message : "Unknown error occurred"
+
+		const signInAction = "Sign in to Cline"
+		const action = await HostProvider.window.showMessage({
+			type: ShowMessageType.ERROR,
+			message: `Voice recording error: ${errorMessage}`,
+			options: { items: [signInAction] },
+		})
+
+		if (action.selectedOption === signInAction) {
+			await controller.authService.createAuthRequest()
+		}
+
+		return RecordingResult.create({
+			success: false,
+			error: errorMessage,
+		})
+	}
+}
@@ -0,0 +1,37 @@
+import { telemetryService } from "@services/posthog/PostHogClientProvider"
+import { RecordedAudio } from "@shared/proto/cline/dictation"
+import { audioRecordingService } from "@/services/dictation/AudioRecordingService"
+import { Controller } from ".."
+
+/**
+ * Stops audio recording and returns the recorded audio
+ * @param controller The controller instance
+ * @returns RecordedAudio with audio data
+ */
+export const stopRecording = async (controller: Controller): Promise<RecordedAudio> => {
+	const taskId = controller.task?.taskId
+	const recordingStatus = audioRecordingService.getRecordingStatus()
+	const recordingDuration = recordingStatus.durationSeconds * 1000 // Convert to milliseconds
+
+	try {
+		const result = await audioRecordingService.stopRecording()
+
+		telemetryService.captureVoiceRecordingStopped(taskId, recordingDuration, result.success, process.platform)
+
+		return RecordedAudio.create({
+			success: result.success,
+			audioBase64: result.audioBase64 || "",
+			error: result.error || "",
+		})
+	} catch (error) {
+		console.error("Error stopping recording:", error)
+
+		telemetryService.captureVoiceRecordingStopped(taskId, recordingDuration, false, process.platform)
+
+		return RecordedAudio.create({
+			success: false,
+			audioBase64: "",
+			error: error instanceof Error ? error.message : "Unknown error occurred",
+		})
+	}
+}
@@ -0,0 +1,77 @@
+import { telemetryService } from "@services/posthog/PostHogClientProvider"
+import { TranscribeAudioRequest, Transcription } from "@shared/proto/cline/dictation"
+import { HostProvider } from "@/hosts/host-provider"
+import { voiceTranscriptionService } from "@/services/dictation/VoiceTranscriptionService"
+import { ShowMessageType } from "@/shared/proto/host/window"
+import { Controller } from ".."
+
+/**
+ * Transcribes audio using Cline transcription service
+ * @param controller The controller instance
+ * @param request TranscribeAudioRequest containing base64 audio data
+ * @returns Transcription with transcribed text or error
+ */
+export const transcribeAudio = async (controller: Controller, request: TranscribeAudioRequest): Promise<Transcription> => {
+	const taskId = controller.task?.taskId
+	const startTime = Date.now()
+
+	// Capture telemetry for transcription start
+	telemetryService.captureVoiceTranscriptionStarted(taskId, request.language || "en")
+
+	try {
+		// Transcribe the audio
+		const result = await voiceTranscriptionService.transcribeAudio(request.audioBase64, request.language || "en")
+		const durationMs = Date.now() - startTime
+
+		if (result.error) {
+			let errorType = "api_error"
+			if (result.error.includes("Authentication failed")) {
+				errorType = "invalid_jwt_token"
+			} else if (result.error.includes("Insufficient credits")) {
+				errorType = "insufficient_credits"
+			} else if (result.error.includes("Invalid audio format")) {
+				errorType = "invalid_audio_format"
+			} else if (result.error.includes("Cannot connect")) {
+				errorType = "connection_error"
+			} else if (result.error.includes("Network error")) {
+				errorType = "network_error"
+			}
+
+			telemetryService.captureVoiceTranscriptionError(taskId, errorType, result.error, durationMs)
+
+			let errorMessage = ""
+			if (result.error.includes("Authentication failed")) {
+				errorMessage = "Authentication failed. Please log in again."
+			} else if (result.error.includes("Insufficient credits")) {
+				errorMessage = "Insufficient credits for transcription service."
+			} else if (result.error.includes("Cannot connect")) {
+				errorMessage = "Cannot connect to transcription service."
+			} else {
+				errorMessage = `Voice transcription failed: ${result.error}`
+			}
+
+			HostProvider.window.showMessage({
+				type: ShowMessageType.ERROR,
+				message: errorMessage,
+			})
+		} else if (result.text) {
+			telemetryService.captureVoiceTranscriptionCompleted(taskId, result.text.length, durationMs, request.language || "en")
+		}
+
+		return Transcription.create({
+			text: result.text || "",
+			error: result.error || "",
+		})
+	} catch (error) {
+		console.error("Error transcribing audio:", error)
+		const durationMs = Date.now() - startTime
+		const errorMessage = error instanceof Error ? error.message : "Unknown error occurred"
+
+		telemetryService.captureVoiceTranscriptionError(taskId, "unexpected_error", errorMessage, durationMs)
+
+		return Transcription.create({
+			text: "",
+			error: errorMessage,
+		})
+	}
+}
@@ -1,7 +1,7 @@
 import { refreshClineRulesToggles } from "@core/context/instructions/user-instructions/cline-rules"
 import { createRuleFile as createRuleFileImpl } from "@core/context/instructions/user-instructions/rule-helpers"
-import { getWorkspaceBasename } from "@core/workspace"
 import { RuleFile, RuleFileRequest } from "@shared/proto/cline/file"
+import * as path from "path"
 import { refreshWorkflowToggles } from "@/core/context/instructions/user-instructions/workflows"
 import { HostProvider } from "@/hosts/host-provider"
 import { ShowMessageType } from "@/shared/proto/host/window"
@@ -68,7 +68,7 @@ export async function createRuleFile(controller: Controller, request: RuleFileRe

 	return RuleFile.create({
 		filePath: filePath,
-		displayName: getWorkspaceBasename(filePath, "Controller.createRuleFile"),
+		displayName: path.basename(filePath),
 		alreadyExists: fileExists,
 	})
 }
@@ -1,6 +1,6 @@
 import { deleteRuleFile as deleteRuleFileImpl } from "@core/context/instructions/user-instructions/rule-helpers"
-import { getWorkspaceBasename } from "@core/workspace"
 import { RuleFile, RuleFileRequest } from "@shared/proto/cline/file"
+import * as path from "path"
 import { HostProvider } from "@/hosts/host-provider"
 import { ShowMessageType } from "@/shared/proto/host/window"
 import { Controller } from ".."
@@ -40,7 +40,7 @@ export async function deleteRuleFile(controller: Controller, request: RuleFileRe
 	//await refreshWorkflowToggles(controller.context, cwd)
 	await controller.postStateToWebview()

-	const fileName = getWorkspaceBasename(request.rulePath, "Controller.deleteRuleFile")
+	const fileName = path.basename(request.rulePath)

 	const fileTypeName = request.type === "workflow" ? "workflow" : "rule"

@@ -1,7 +1,7 @@
-import { workspaceResolver } from "@core/workspace"
 import { BooleanResponse, StringRequest } from "@shared/proto/cline/common"
 import { getWorkspacePath } from "@utils/path"
 import * as fs from "fs"
+import * as path from "path"
 import { Controller } from ".."

 /**
@@ -25,12 +25,7 @@ export async function ifFileExistsRelativePath(_controller: Controller, request:
 	}

 	// Resolve the relative path to absolute path
-	const resolvedPath = workspaceResolver.resolveWorkspacePath(
-		workspacePath,
-		request.value,
-		"Controller.ifFileExistsRelativePath",
-	)
-	const absolutePath = typeof resolvedPath === "string" ? resolvedPath : resolvedPath.absolutePath
+	const absolutePath = path.resolve(workspacePath, request.value)
 	// Check if the file exists
 	try {
 		return BooleanResponse.create({ value: fs.statSync(absolutePath).isFile() })
@@ -1,7 +1,7 @@
-import { workspaceResolver } from "@core/workspace"
 import { openFile as openFileIntegration } from "@integrations/misc/open-file"
 import { Empty, StringRequest } from "@shared/proto/cline/common"
 import { getWorkspacePath } from "@utils/path"
+import * as path from "path"
 import { Controller } from ".."

 /**
@@ -20,12 +20,7 @@ export async function openFileRelativePath(_controller: Controller, request: Str

 	if (request.value) {
 		// Resolve the relative path to absolute path
-		const resolvedPath = workspaceResolver.resolveWorkspacePath(
-			workspacePath,
-			request.value,
-			"Controller.openFileRelativePath",
-		)
-		const absolutePath = typeof resolvedPath === "string" ? resolvedPath : resolvedPath.absolutePath
+		const absolutePath = path.resolve(workspacePath, request.value)

 		// Open the file using the existing integration
 		openFileIntegration(absolutePath)
@@ -1,5 +1,5 @@
 import { openFile as openFileIntegration } from "@integrations/misc/open-file"
-import { telemetryService } from "../../../services/telemetry"
+import { telemetryService } from "../../../services/posthog/PostHogClientProvider"
 import { Empty, StringRequest } from "../../../shared/proto/cline/common"
 import { ensureFocusChainFile, extractFocusChainListFromText } from "../../task/focus-chain/file-utils"
 import { Controller } from ".."
@@ -1,5 +1,6 @@
 import { StringRequest } from "@shared/proto/cline/common"
 import { GitCommits } from "@shared/proto/cline/file"
+import { convertGitCommitsToProtoGitCommits } from "@shared/proto-conversions/file/git-commit-conversion"
 import { searchCommits as searchCommitsUtil } from "@utils/git"
 import { getWorkspacePath } from "@utils/path"
 import { Controller } from ".."
@@ -19,7 +20,9 @@ export async function searchCommits(_controller: Controller, request: StringRequ
 	try {
 		const commits = await searchCommitsUtil(request.value || "", cwd)

-		return GitCommits.create({ commits })
+		const protoCommits = convertGitCommitsToProtoGitCommits(commits)
+
+		return GitCommits.create({ commits: protoCommits })
 	} catch (error) {
 		console.error(`Error searching commits: ${JSON.stringify(error)}`)
 		return GitCommits.create({ commits: [] })
@@ -1,7 +1,8 @@
-import { searchWorkspaceFiles } from "@services/search/file-search"
 import { FileSearchRequest, FileSearchResults, FileSearchType } from "@shared/proto/cline/file"
+import { SearchWorkspaceItemsRequest_SearchItemType } from "@shared/proto/host/workspace"
 import { convertSearchResultsToProtoFileInfos } from "@shared/proto-conversions/file/search-result-conversion"
 import { getWorkspacePath } from "@utils/path"
+import { HostProvider } from "@/hosts/host-provider"
 import { Controller } from ".."

 /**
@@ -16,36 +17,47 @@ export async function searchFiles(_controller: Controller, request: FileSearchRe
 	if (!workspacePath) {
 		// Handle case where workspace path is not available
 		console.error("Error in searchFiles: No workspace path available")
-		return { results: [], mentionsRequestId: request.mentionsRequestId }
+		return FileSearchResults.create({
+			results: [],
+			mentionsRequestId: request.mentionsRequestId,
+		})
 	}

 	try {
-		// Map enum to string for the search service
-		let selectedTypeString: "file" | "folder" | undefined
-		if (request.selectedType === FileSearchType.FILE) {
-			selectedTypeString = "file"
-		} else if (request.selectedType === FileSearchType.FOLDER) {
-			selectedTypeString = "folder"
-		}
+		// Map enum to host SearchItemType (0 = FILE, 1 = FOLDER)
+		const selectedTypeValue: SearchWorkspaceItemsRequest_SearchItemType | undefined =
+			request.selectedType === FileSearchType.FILE
+				? SearchWorkspaceItemsRequest_SearchItemType.FILE
+				: request.selectedType === FileSearchType.FOLDER
+					? SearchWorkspaceItemsRequest_SearchItemType.FOLDER
+					: undefined

-		// Call file search service with query from request
-		const searchResults = await searchWorkspaceFiles(
-			request.query || "",
-			workspacePath,
-			request.limit || 20, // Use default limit of 20 if not specified
-			selectedTypeString,
+		// Use host-provided search via hostbridge (no fallback)
+		const hostResponse = await HostProvider.workspace.searchWorkspaceItems({
+			query: request.query || "",
+			limit: request.limit || 20,
+			selectedType: selectedTypeValue,
+		})
+
+		const mapped: { path: string; type: "file" | "folder"; label?: string }[] = (hostResponse.items || []).map(
+			(item: { path?: string; type: SearchWorkspaceItemsRequest_SearchItemType; label?: string }) => ({
+				path: String(item.path || ""),
+				type: item.type === SearchWorkspaceItemsRequest_SearchItemType.FOLDER ? "folder" : "file",
+				label: item.label || undefined,
+			}),
 		)

-		// Convert search results to proto FileInfo objects using the conversion function
-		const protoResults = convertSearchResultsToProtoFileInfos(searchResults)
+		const protoResults = convertSearchResultsToProtoFileInfos(mapped)

-		// Return successful results
-		return { results: protoResults, mentionsRequestId: request.mentionsRequestId }
+		return FileSearchResults.create({
+			results: protoResults,
+			mentionsRequestId: request.mentionsRequestId,
+		})
 	} catch (error) {
-		// Log the error but don't include it in the response, following the pattern in searchCommits
-		console.error("Error in searchFiles:", error)
-
-		// Return empty results without error message
-		return { results: [], mentionsRequestId: request.mentionsRequestId }
+		console.error("Error in host searchWorkspaceItems:", error instanceof Error ? error.message : String(error))
+		return FileSearchResults.create({
+			results: [],
+			mentionsRequestId: request.mentionsRequestId,
+		})
 	}
 }
@@ -1,7 +1,7 @@
-import { getWorkspaceBasename } from "@core/workspace"
+import path from "node:path"
+import { telemetryService } from "@services/posthog/PostHogClientProvider"
 import type { ToggleClineRuleRequest } from "@shared/proto/cline/file"
 import { ToggleClineRules } from "@shared/proto/cline/file"
-import { telemetryService } from "@/services/telemetry"
 import type { Controller } from "../index"

 /**
@@ -36,7 +36,14 @@ export async function toggleClineRule(controller: Controller, request: ToggleCli
 	// Track rule toggle telemetry with current task context
 	if (controller.task?.ulid) {
 		// Extract just the filename for privacy (no full paths)
-		const ruleFileName = getWorkspaceBasename(rulePath, "Controller.toggleClineRule")
+		const ruleFileName = path.basename(rulePath)
+		telemetryService.captureClineRuleToggled(controller.task.ulid, ruleFileName, enabled, isGlobal)
+	}
+
+	// Track rule toggle telemetry with current task context
+	if (controller.task?.ulid) {
+		// Extract just the filename for privacy (no full paths)
+		const ruleFileName = path.basename(rulePath)
 		telemetryService.captureClineRuleToggled(controller.task.ulid, ruleFileName, enabled, isGlobal)
 	}

@@ -1,3 +1,4 @@
+import { ClineRulesToggles as AppClineRulesToggles } from "@shared/cline-rules"
 import type { ToggleWindsurfRuleRequest } from "@shared/proto/cline/file"
 import { ClineRulesToggles } from "@shared/proto/cline/file"
 import type { Controller } from "../index"
@@ -1,9 +1,8 @@
-import { Controller } from "@core/controller/index"
 import { serviceHandlers } from "@generated/hosts/vscode/protobus-services"
-import { GrpcRecorderBuilder } from "@/core/controller/grpc-recorder/grpc-recorder.builder"
-import { GrpcRequestRegistry } from "@/core/controller/grpc-request-registry"
 import { ExtensionMessage } from "@/shared/ExtensionMessage"
 import { GrpcCancel, GrpcRequest } from "@/shared/WebviewMessage"
+import { GrpcRequestRegistry } from "./grpc-request-registry"
+import { Controller } from "./index"

 /**
 * Type definition for a streaming response handler
@@ -16,36 +15,6 @@ export type StreamingResponseHandler<TResponse> = (

 export type PostMessageToWebview = (message: ExtensionMessage) => Thenable<boolean | undefined>

-/**
- * Creates a middleware wrapper for recording gRPC requests and responses
- */
-function withRecordingMiddleware(postMessage: PostMessageToWebview, controller: Controller): PostMessageToWebview {
-	return async (response: ExtensionMessage) => {
-		if (response?.grpc_response) {
-			try {
-				GrpcRecorderBuilder.getRecorder(controller).recordResponse(
-					response.grpc_response.request_id,
-					response.grpc_response,
-				)
-			} catch (e) {
-				console.warn("Failed to record gRPC response:", e)
-			}
-		}
-		return postMessage(response)
-	}
-}
-
-/**
- * Records gRPC request with error handling
- */
-function recordRequest(request: GrpcRequest, controller: Controller): void {
-	try {
-		GrpcRecorderBuilder.getRecorder(controller).recordRequest(request)
-	} catch (e) {
-		console.warn("Failed to record gRPC request:", e)
-	}
-}
-
 /**
 * Handles a gRPC request from the webview.
 */
@@ -54,15 +23,10 @@ export async function handleGrpcRequest(
 	postMessageToWebview: PostMessageToWebview,
 	request: GrpcRequest,
 ): Promise<void> {
-	recordRequest(request, controller)
-
-	// Create recording middleware wrapper
-	const postMessageWithRecording = withRecordingMiddleware(postMessageToWebview, controller)
-
 	if (request.is_streaming) {
-		await handleStreamingRequest(controller, postMessageWithRecording, request)
+		await handleStreamingRequest(controller, postMessageToWebview, request)
 	} else {
-		await handleUnaryRequest(controller, postMessageWithRecording, request)
+		await handleUnaryRequest(controller, postMessageToWebview, request)
 	}
 }

@@ -1,50 +0,0 @@
-import { describe, it } from "mocha"
-import "should"
-import { GrpcRecorderNoops } from "@/core/controller/grpc-recorder/grpc-recorder"
-import { GrpcRecorderBuilder } from "@/core/controller/grpc-recorder/grpc-recorder.builder"
-import { LogFileHandler } from "@/core/controller/grpc-recorder/log-file-handler"
-
-describe("GrpcRecorderBuilder", () => {
-	describe("when not enabling", () => {
-		it("should return GrpcRecorderNoops when enableIf is false", () => {
-			const builder = new GrpcRecorderBuilder()
-			const recorder = builder.enableIf(false).build()
-
-			recorder.should.be.instanceOf(GrpcRecorderNoops)
-		})
-
-		it("should return GrpcRecorderNoops when enableIf is false even with log file handler", () => {
-			const builder = new GrpcRecorderBuilder()
-			const logFileHandler = new LogFileHandler()
-			const recorder = builder.withLogFileHandler(logFileHandler).enableIf(false).build()
-
-			recorder.should.be.instanceOf(GrpcRecorderNoops)
-		})
-	})
-
-	describe("GrpcRecorderNoops functionality", () => {
-		it("should have no-op methods that don't throw errors", () => {
-			const recorder = new GrpcRecorderNoops()
-
-			recorder.recordRequest({
-				request_id: "test-id",
-				service: "TestService",
-				method: "testMethod",
-				message: {},
-				is_streaming: false,
-			})
-
-			recorder.recordResponse("test-id", {
-				request_id: "test-id",
-				message: {},
-			})
-
-			recorder.recordError("test-id", "test error")
-
-			const sessionLog = recorder.getSessionLog()
-			sessionLog.should.have.property("startTime").which.is.a.String()
-			sessionLog.should.have.property("entries").which.is.an.Array()
-			sessionLog.entries.should.have.length(0)
-		})
-	})
-})
@@ -1,106 +0,0 @@
-import { GrpcPostRecordHook, GrpcRequestFilter } from "@core/controller/grpc-recorder/types"
-import { Controller } from "@/core/controller"
-import { GrpcRecorder, GrpcRecorderNoops, IRecorder } from "@/core/controller/grpc-recorder/grpc-recorder"
-import { LogFileHandler, LogFileHandlerNoops } from "@/core/controller/grpc-recorder/log-file-handler"
-import { testHooks } from "@/core/controller/grpc-recorder/test-hooks"
-
-/**
- * A builder class for constructing a gRPC recorder instance.
- *
- * This class follows the Builder pattern, allowing consumers
- * to configure logging behavior and control whether recording
- * is enabled or disabled before creating a final `IRecorder`.
- */
-export class GrpcRecorderBuilder {
-	private fileHandler: LogFileHandler | null = null
-	private enabled: boolean = true
-	private filters: GrpcRequestFilter[] = []
-	private hooks: GrpcPostRecordHook[] = []
-
-	public withLogFileHandler(handler: LogFileHandler): this {
-		this.fileHandler = handler
-		return this
-	}
-
-	public enableIf(condition: boolean): this {
-		this.enabled = condition
-		return this
-	}
-
-	public withFilters(...filters: GrpcRequestFilter[]): this {
-		this.filters.push(...filters)
-		return this
-	}
-
-	public withPostRecordHooks(...hooks: GrpcPostRecordHook[]): this {
-		this.hooks.push(...hooks)
-		return this
-	}
-
-	// Initialize the recorder as a singleton
-	private static recorder: IRecorder
-
-	/**
-	 * Gets or creates the GrpcRecorder instance
-	 */
-	static getRecorder(controller: Controller): IRecorder {
-		if (!GrpcRecorderBuilder.recorder) {
-			GrpcRecorderBuilder.recorder = GrpcRecorder.builder()
-				.enableIf(process.env.GRPC_RECORDER_ENABLED === "true" && process.env.CLINE_ENVIRONMENT === "local")
-				.withLogFileHandler(new LogFileHandler())
-				.build(controller)
-		}
-		return GrpcRecorderBuilder.recorder
-	}
-
-	public build(controller?: Controller): IRecorder {
-		if (!this.enabled) {
-			return new GrpcRecorderNoops()
-		}
-
-		let filters: GrpcRequestFilter[] = filtersFromEnv()
-		if (this.filters.length > 0) {
-			filters = filters.concat(this.filters)
-		}
-
-		let hooks: GrpcPostRecordHook[] = hooksFromEnv(controller)
-		if (this.hooks.length > 0) {
-			hooks = hooks.concat(this.hooks)
-		}
-
-		const handler = this.fileHandler ?? new LogFileHandlerNoops()
-		return new GrpcRecorder(handler, filters, hooks)
-	}
-}
-
-function filtersFromEnv(): GrpcRequestFilter[] {
-	const filters: GrpcRequestFilter[] = []
-
-	if (process.env.GRPC_RECORDER_TESTS_FILTERS_ENABLED === "true") {
-		filters.push(...testFilters())
-	}
-
-	return filters
-}
-
-function testFilters(): GrpcRequestFilter[] {
-	/*
-	 * Ignores streaming messages and unwanted services messages
-	 * that record more than expected.
-	 */
-	return [
-		(req) => req.is_streaming,
-		(req) => ["cline.UiService", "cline.McpService", "cline.WebService"].includes(req.service),
-		(req) => ["refreshOpenRouterModels", "getAvailableTerminalProfiles"].includes(req.method),
-	]
-}
-
-function hooksFromEnv(controller?: Controller): GrpcPostRecordHook[] {
-	const hooks: GrpcPostRecordHook[] = []
-
-	if (controller && process.env.GRPC_RECORDER_TESTS_FILTERS_ENABLED === "true") {
-		hooks.push(...testHooks(controller))
-	}
-
-	return hooks
-}
@@ -1,214 +0,0 @@
-import { GrpcRecorder, IRecorder } from "@core/controller/grpc-recorder/grpc-recorder"
-import { expect } from "chai"
-import { ExtensionMessage } from "@/shared/ExtensionMessage"
-import { GrpcRequest } from "@/shared/WebviewMessage"
-
-describe("grpc-recorder", () => {
-	let recorder: IRecorder
-
-	before(async () => {
-		recorder = GrpcRecorder.builder()
-			.withFilters((req: GrpcRequest) => req.service === "the-unwanted-service")
-			.enableIf(true)
-			.build()
-	})
-
-	describe("GrpcRecorder", () => {
-		it("matches multiple request, response and stats", async () => {
-			interface UseCase {
-				request: GrpcRequest
-				response: ExtensionMessage["grpc_response"]
-				expectedStatus: string
-			}
-			const requestResponseUseCases: UseCase[] = [
-				{
-					request: {
-						service: "the-service",
-						method: "the-method",
-						message: "the-message",
-						request_id: "request-id-1",
-						is_streaming: false,
-					},
-					response: {
-						request_id: "request-id-1",
-						message: "the-message-response",
-						error: "",
-					},
-					expectedStatus: "completed",
-				},
-				{
-					request: {
-						service: "streaming-service",
-						method: "stream-method",
-						message: { data: "streaming-data", count: 42 },
-						request_id: "request-id-2",
-						is_streaming: true,
-					},
-					response: {
-						request_id: "request-id-2",
-						message: { streamData: "chunk-1" },
-						error: "",
-						is_streaming: true,
-						sequence_number: 1,
-					},
-					expectedStatus: "completed",
-				},
-				{
-					request: {
-						service: "another-service",
-						method: "another-method",
-						message: { complex: { nested: "object", array: [1, 2, 3] } },
-						request_id: "request-id-3",
-						is_streaming: false,
-					},
-					response: {
-						request_id: "request-id-3",
-						message: "",
-						error: "Something went wrong",
-					},
-					expectedStatus: "error",
-				},
-			]
-
-			const initialExpectedStatus = "pending"
-
-			requestResponseUseCases.forEach((us: UseCase, index: number) => {
-				recorder.recordRequest(us.request)
-
-				let sessionLog = recorder.getSessionLog()
-				expect(sessionLog.entries).length(index + 1, `unexpected request_id: ${us.request.request_id}`)
-
-				expect(sessionLog.entries[index]).to.include({
-					service: us.request.service,
-					method: us.request.method,
-					isStreaming: us.request.is_streaming,
-					requestId: us.request.request_id,
-					status: initialExpectedStatus,
-				})
-
-				if (us.response) {
-					recorder.recordResponse(us.request.request_id, us.response)
-				}
-				sessionLog = recorder.getSessionLog()
-
-				expect(sessionLog.entries[index].status).equal(us.expectedStatus)
-				expect(sessionLog.entries[index].response).to.deep.include({
-					error: us.response?.error,
-				})
-			})
-
-			const sessionLog = recorder.getSessionLog()
-			expect(sessionLog.stats).to.include({
-				totalRequests: 3,
-				pendingRequests: 0,
-				completedRequests: 2,
-				errorRequests: 1,
-			})
-
-			recorder.recordRequest({
-				service: "the-unwanted-service",
-				method: "the-method",
-				message: "the-message",
-				request_id: "request-id-1",
-				is_streaming: false,
-			})
-
-			expect(sessionLog.entries).length(3)
-		})
-
-		it("using default filtering should filter out unwanted requests", async () => {
-			const customRecorder = GrpcRecorder.builder()
-				.withFilters(
-					(req) => req.is_streaming,
-					(req) => ["cline.UiService", "cline.McpService", "cline.WebService"].includes(req.service),
-				)
-				.enableIf(true)
-				.build()
-			const unwantedServices = ["cline.UiService", "cline.McpService", "cline.WebService"]
-			unwantedServices.forEach((us) => {
-				customRecorder.recordRequest({
-					service: us,
-					method: "the-method",
-					message: "the-message",
-					request_id: "request-id-1",
-					is_streaming: false,
-				})
-			})
-			let sessionLog = customRecorder.getSessionLog()
-			expect(sessionLog.entries).length(0)
-			customRecorder.recordRequest({
-				service: "streaming-request",
-				method: "the-method",
-				message: "the-message",
-				request_id: "request-id-1",
-				is_streaming: true,
-			})
-			sessionLog = customRecorder.getSessionLog()
-			expect(sessionLog.entries).length(0)
-		})
-
-		it("cleanupSyntheticEntries removes synthetic entries from session log", async () => {
-			const testRecorder = GrpcRecorder.builder().enableIf(true).build()
-
-			// Add regular request
-			testRecorder.recordRequest({
-				service: "regular-service",
-				method: "regular-method",
-				message: "regular-message",
-				request_id: "regular-id",
-				is_streaming: false,
-			})
-
-			// Add synthetic request
-			testRecorder.recordRequest(
-				{
-					service: "synthetic-service",
-					method: "synthetic-method",
-					message: "synthetic-message",
-					request_id: "synthetic-id",
-					is_streaming: false,
-				},
-				true, // synthetic = true
-			)
-
-			let sessionLog = testRecorder.getSessionLog()
-			expect(sessionLog.entries).length(2)
-
-			testRecorder.cleanupSyntheticEntries()
-
-			sessionLog = testRecorder.getSessionLog()
-			expect(sessionLog.entries).length(1)
-			expect(sessionLog.entries[0].requestId).equal("regular-id")
-		})
-
-		it("recordResponse executes post-record hooks", async () => {
-			let hookExecuted = false
-			let hookEntry: any = null
-
-			const mockHook = async (entry: any) => {
-				hookExecuted = true
-				hookEntry = entry
-			}
-
-			const testRecorder = GrpcRecorder.builder().withPostRecordHooks(mockHook).enableIf(true).build()
-
-			testRecorder.recordRequest({
-				service: "test-service",
-				method: "test-method",
-				message: "test-message",
-				request_id: "test-id",
-				is_streaming: false,
-			})
-
-			testRecorder.recordResponse("test-id", {
-				request_id: "test-id",
-				message: "response-message",
-				error: "",
-			})
-
-			expect(hookExecuted).to.be.true
-			expect(hookEntry).to.not.be.null
-			expect(hookEntry.requestId).equal("test-id")
-		})
-	})
-})
@@ -1,225 +0,0 @@
-import { GrpcResponse } from "@shared/ExtensionMessage"
-import { GrpcRequest } from "@shared/WebviewMessage"
-import { GrpcRecorderBuilder } from "@/core/controller/grpc-recorder/grpc-recorder.builder"
-import { ILogFileHandler } from "@/core/controller/grpc-recorder/log-file-handler"
-import {
-	GrpcLogEntry,
-	GrpcPostRecordHook,
-	GrpcRequestFilter,
-	GrpcSessionLog,
-	SessionStats,
-} from "@/core/controller/grpc-recorder/types"
-
-export class GrpcRecorderNoops implements IRecorder {
-	recordRequest(_request: GrpcRequest): void {}
-	recordResponse(_requestId: string, _response: GrpcResponse): void {}
-	recordError(_requestId: string, _error: string): void {}
-	getSessionLog(): GrpcSessionLog {
-		return {
-			startTime: "",
-			entries: [],
-		}
-	}
-	cleanupSyntheticEntries(): void {}
-}
-
-export interface IRecorder {
-	recordRequest(request: GrpcRequest, synthetic?: boolean): void
-	recordResponse(requestId: string, response: GrpcResponse): void
-	recordError(requestId: string, error: string): void
-	getSessionLog(): GrpcSessionLog
-	cleanupSyntheticEntries(): void
-}
-
-/**
- * Default implementation of a gRPC recorder.
- *
- * Responsibilities:
- * - Records requests, responses, and errors.
- * - Tracks request/response lifecycle, including duration and status.
- * - Maintains a session log of all recorded entries.
- * - Persists logs asynchronously through a file handler.
- */
-export class GrpcRecorder implements IRecorder {
-	private sessionLog: GrpcSessionLog
-	private pendingRequests: Map<string, { entry: GrpcLogEntry; startTime: number }> = new Map()
-
-	constructor(
-		private fileHandler: ILogFileHandler,
-		private requestFilters: GrpcRequestFilter[] = [],
-		private postRecordHooks: GrpcPostRecordHook[] = [],
-	) {
-		this.sessionLog = {
-			startTime: new Date().toISOString(),
-			entries: [],
-		}
-
-		this.fileHandler.initialize(this.sessionLog).catch((error) => {
-			console.error("Failed to initialize gRPC log file:", error)
-		})
-	}
-
-	public static builder(): GrpcRecorderBuilder {
-		return new GrpcRecorderBuilder()
-	}
-
-	/**
-	 * Records a gRPC request.
-	 *
-	 * - Stores the request as a "pending" log entry.
-	 * - Tracks the request start time for later duration calculation.
-	 * - Persists the log asynchronously.
-	 *
-	 * @param request - The incoming gRPC request.
-	 */
-	public recordRequest(request: GrpcRequest, synthetic: boolean = false): void {
-		if (this.shouldFilter(request)) {
-			return
-		}
-
-		const entry: GrpcLogEntry = {
-			requestId: request.request_id,
-			service: request.service,
-			method: request.method,
-			isStreaming: request.is_streaming || false,
-			request: {
-				message: request.message,
-			},
-			status: "pending",
-			meta: { synthetic },
-		}
-
-		this.pendingRequests.set(request.request_id, {
-			entry,
-			startTime: Date.now(),
-		})
-
-		this.sessionLog.entries.push(entry)
-		this.flushLogAsync()
-	}
-
-	public getSessionLog(): GrpcSessionLog {
-		return this.sessionLog
-	}
-
-	/**
-	 * Records a gRPC response for a given request.
-	 *
-	 * - Looks up the pending request entry.
-	 * - Updates the entry with response data, status, and duration.
-	 * - Removes the request from pending if it's not streaming.
-	 * - Recomputes session stats.
-	 * - Persists the log asynchronously.
-	 *
-	 * @param requestId - The ID of the request being responded to.
-	 * @param response - The corresponding gRPC response.
-	 */
-	public recordResponse(requestId: string, response: GrpcResponse): void {
-		const pendingRequest = this.pendingRequests.get(requestId)
-
-		if (!pendingRequest) {
-			console.warn(`No pending request found for response with ID: ${requestId}`)
-			return
-		}
-
-		const { entry, startTime } = pendingRequest
-
-		entry.response = {
-			message: response?.message ? response.message : undefined,
-			error: response?.error,
-			isStreaming: response?.is_streaming,
-			sequenceNumber: response?.sequence_number,
-		}
-
-		entry.duration = Date.now() - startTime
-		entry.status = response?.error ? "error" : "completed"
-
-		if (!response?.is_streaming) {
-			this.pendingRequests.delete(requestId)
-		}
-
-		this.sessionLog.stats = this.getStats()
-
-		this.flushLogAsync()
-
-		this.runHooks(entry).catch((e) => console.error("Post-record hook failed:", e))
-	}
-
-	private async runHooks(entry: GrpcLogEntry): Promise<void> {
-		if (entry.meta?.synthetic) return
-		for (const hook of this.postRecordHooks) {
-			await hook(entry)
-		}
-	}
-
-	public cleanupSyntheticEntries(): void {
-		// Remove synthetic entries from session log
-		this.sessionLog.entries = this.sessionLog.entries.filter((entry) => !entry.meta?.synthetic)
-
-		// clean up from pending requests if needed
-		for (const [requestId, pendingRequest] of this.pendingRequests.entries()) {
-			if (pendingRequest.entry.meta?.synthetic) {
-				this.pendingRequests.delete(requestId)
-			}
-		}
-
-		this.sessionLog.stats = this.getStats()
-		this.flushLogAsync()
-	}
-
-	/**
-	 * Records an error for a given request.
-	 *
-	 * - Marks the request as failed.
-	 * - Records the error message and request duration.
-	 * - Removes it from the pending requests.
-	 * - Persists the log asynchronously.
-	 *
-	 * @param requestId - The ID of the request that errored.
-	 * @param error - Error message.
-	 */
-	public recordError(requestId: string, error: string): void {
-		const pendingRequest = this.pendingRequests.get(requestId)
-		if (!pendingRequest) {
-			console.warn(`No pending request found for error with ID: ${requestId}`)
-			return
-		}
-
-		const { entry, startTime } = pendingRequest
-
-		entry.response = {
-			error: error,
-		}
-		entry.duration = Date.now() - startTime
-		entry.status = "error"
-
-		this.pendingRequests.delete(requestId)
-		this.flushLogAsync()
-	}
-
-	private flushLogAsync(): void {
-		setImmediate(() => {
-			this.fileHandler.write(this.sessionLog).catch((error) => {
-				console.error("Failed to flush gRPC log:", error)
-			})
-		})
-	}
-
-	public getStats(): SessionStats {
-		const totalRequests = this.sessionLog.entries.length
-		const pendingRequests = this.sessionLog.entries.filter((e) => e.status === "pending").length
-		const completedRequests = this.sessionLog.entries.filter((e) => e.status === "completed").length
-		const errorRequests = this.sessionLog.entries.filter((e) => e.status === "error").length
-
-		return {
-			totalRequests,
-			pendingRequests,
-			completedRequests,
-			errorRequests,
-		}
-	}
-
-	private shouldFilter(request: GrpcRequest): boolean {
-		return this.requestFilters.some((filter) => filter(request))
-	}
-}
@@ -1,19 +0,0 @@
-import { expect } from "chai"
-import { before, describe, it } from "mocha"
-import { LogFileHandler } from "@/core/controller/grpc-recorder/log-file-handler"
-
-describe("log-file-handler", () => {
-	let logHandler: LogFileHandler
-
-	before(async () => {
-		logHandler = new LogFileHandler()
-		expect(logHandler.getFilePath()).not.empty
-	})
-
-	describe("LogFileHandler", () => {
-		it("returns file name with timestamp when env var not set", () => {
-			const result = logHandler.getFileName()
-			expect(result).to.contains("grpc_recorded_session")
-		})
-	})
-})
@@ -1,57 +0,0 @@
-import { writeFile } from "@utils/fs"
-import fs from "fs/promises"
-import * as path from "path"
-import { GrpcSessionLog } from "@/core/controller/grpc-recorder/types"
-
-const LOG_FILE_PREFIX = "grpc_recorded_session"
-
-export class LogFileHandlerNoops implements ILogFileHandler {
-	async initialize(_initialData: GrpcSessionLog): Promise<void> {}
-	async write(_sessionLog: GrpcSessionLog): Promise<void> {}
-}
-
-export interface ILogFileHandler {
-	initialize(initialData: GrpcSessionLog): Promise<void>
-	write(sessionLog: GrpcSessionLog): Promise<void>
-}
-
-/**
- * Default implementation of `ILogFileHandler` that persists logs to disk.
- *
- * - Creates a log file inside the workspace `tests/specs` folder.
- * - Uses a timestamped filename by default, unless overridden by an env var.
- * - Saves logs in JSON format.
- */
-export class LogFileHandler implements ILogFileHandler {
-	private logFilePath: string
-
-	constructor() {
-		const fileName = this.getFileName()
-		const workspaceFolder = process.env.DEV_WORKSPACE_FOLDER ?? process.cwd()
-		const folderPath = path.join(workspaceFolder, "tests", "specs")
-		this.logFilePath = path.join(folderPath, fileName)
-	}
-
-	public getFilePath(): string {
-		return this.logFilePath
-	}
-
-	public getFileName(): string {
-		const envFileName = path.basename(process.env.GRPC_RECORDER_FILE_NAME || "").replace(/[^a-zA-Z0-9-_]/g, "_")
-		if (envFileName && envFileName.trim().length > 0) {
-			return `${LOG_FILE_PREFIX}_${envFileName}.json`
-		}
-
-		const timestamp = new Date().toISOString().replace(/[:.]/g, "-")
-		return `${LOG_FILE_PREFIX}_${timestamp}.json`
-	}
-
-	public async initialize(initialData: GrpcSessionLog): Promise<void> {
-		await fs.mkdir(path.dirname(this.logFilePath), { recursive: true })
-		await writeFile(this.logFilePath, JSON.stringify(initialData, null, 2), "utf8")
-	}
-
-	public async write(sessionLog: GrpcSessionLog): Promise<void> {
-		await writeFile(this.logFilePath, JSON.stringify(sessionLog, null, 2), "utf8")
-	}
-}
@@ -1,69 +0,0 @@
-import { afterEach, beforeEach, describe, it } from "mocha"
-import "should"
-import * as sinon from "sinon"
-import { Controller } from ".."
-import { IRecorder } from "./grpc-recorder"
-import { GrpcRecorderBuilder } from "./grpc-recorder.builder"
-import { testHooks } from "./test-hooks"
-import { GrpcLogEntry } from "./types"
-
-describe("test-hooks", () => {
-	let cleanupSyntheticEntriesStub: sinon.SinonStub
-	let recordRequestStub: sinon.SinonStub
-	let recordResponseStub: sinon.SinonStub
-	let getRecorderStub: sinon.SinonStub
-
-	beforeEach(() => {
-		cleanupSyntheticEntriesStub = sinon.stub()
-		recordRequestStub = sinon.stub()
-		recordResponseStub = sinon.stub()
-
-		const mockRecorder: IRecorder = {
-			cleanupSyntheticEntries: cleanupSyntheticEntriesStub,
-			recordRequest: recordRequestStub,
-			recordResponse: recordResponseStub,
-			recordError: sinon.stub(),
-			getSessionLog: sinon.stub().returns({ startTime: "", entries: [] }),
-		}
-
-		getRecorderStub = sinon.stub(GrpcRecorderBuilder, "getRecorder").returns(mockRecorder)
-	})
-
-	afterEach(() => {
-		sinon.restore()
-	})
-
-	it("should return an array of post-record hooks", () => {
-		const mockController = {} as Controller
-		const hooks = testHooks(mockController)
-
-		hooks.should.be.an.Array()
-		hooks.should.have.length(1)
-		hooks[0].should.be.a.Function()
-	})
-
-	it("should execute hook and call recorder methods", async () => {
-		const mockController = {
-			getStateToPostToWebview: sinon.stub().returns({}),
-		} as any as Controller
-
-		const hooks = testHooks(mockController)
-
-		const mockEntry: GrpcLogEntry = {
-			requestId: "test-request-id",
-			service: "TestService",
-			method: "testMethod",
-			isStreaming: false,
-			request: { message: {} },
-			status: "pending",
-		}
-
-		await hooks[0](mockEntry)
-
-		// Validate sinon stub calls
-		sinon.assert.calledWith(getRecorderStub, mockController)
-		sinon.assert.calledOnce(cleanupSyntheticEntriesStub)
-		sinon.assert.calledOnce(recordRequestStub)
-		sinon.assert.calledOnce(recordResponseStub)
-	})
-})
@@ -1,38 +0,0 @@
-import { Controller } from "@/core/controller"
-import { GrpcRecorderBuilder } from "@/core/controller/grpc-recorder/grpc-recorder.builder"
-import { GrpcPostRecordHook } from "@/core/controller/grpc-recorder/types"
-import { getLatestState } from "@/core/controller/state/getLatestState"
-
-// Add 50ms delay by default to ensure we get the latest state
-const TEST_HOOK_LATEST_STATE_DELAY = 50
-
-export function testHooks(controller: Controller): GrpcPostRecordHook[] {
-	return [
-		async (entry) => {
-			GrpcRecorderBuilder.getRecorder(controller).cleanupSyntheticEntries()
-
-			await new Promise((resolve) => setTimeout(resolve, TEST_HOOK_LATEST_STATE_DELAY))
-
-			const requestId = entry.requestId
-
-			// Record synthetic "getLatestState" request
-			GrpcRecorderBuilder.getRecorder(controller).recordRequest(
-				{
-					service: "cline.StateService",
-					method: "getLatestState",
-					message: {},
-					request_id: requestId,
-					is_streaming: false,
-				},
-				true,
-			)
-
-			const state = await getLatestState(controller, {})
-
-			GrpcRecorderBuilder.getRecorder(controller).recordResponse(requestId, {
-				request_id: requestId,
-				message: state,
-			})
-		},
-	]
-}
@@ -1,37 +0,0 @@
-import { GrpcRequest } from "@/shared/WebviewMessage"
-
-export type GrpcPostRecordHook = (entry: GrpcLogEntry, controller?: any) => Promise<void> | void
-
-export type GrpcRequestFilter = (request: GrpcRequest) => boolean
-
-export interface GrpcLogEntry {
-	requestId: string
-	service: string
-	method: string
-	isStreaming: boolean
-	request: {
-		message: any
-	}
-	response?: {
-		message?: any
-		error?: string
-		isStreaming?: boolean
-		sequenceNumber?: number
-	}
-	duration?: number
-	status: "pending" | "completed" | "error"
-	meta?: { synthetic?: boolean }
-}
-
-export interface SessionStats {
-	totalRequests: number
-	pendingRequests: number
-	completedRequests: number
-	errorRequests: number
-}
-
-export interface GrpcSessionLog {
-	startTime: string
-	stats?: SessionStats
-	entries: GrpcLogEntry[]
-}
@@ -1,8 +1,5 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { buildApiHandler } from "@core/api"
-import { detectWorkspaceRoots } from "@core/workspace/detection"
-import { setupWorkspaceManager } from "@core/workspace/setup"
-import { WorkspaceRootManager } from "@core/workspace/WorkspaceRootManager"
 import { cleanupLegacyCheckpoints } from "@integrations/checkpoints/CheckpointMigration"
 import { downloadTask } from "@integrations/misc/export-markdown"
 import { ClineAccountService } from "@services/account/ClineAccountService"
@@ -24,12 +21,10 @@ import * as vscode from "vscode"
 import { clineEnvConfig } from "@/config"
 import { HostProvider } from "@/hosts/host-provider"
 import { AuthService } from "@/services/auth/AuthService"
-import { getDistinctId } from "@/services/logging/distinctId"
-import { telemetryService } from "@/services/telemetry"
+import { PostHogClientProvider, telemetryService } from "@/services/posthog/PostHogClientProvider"
 import { ShowMessageType } from "@/shared/proto/host/window"
 import { getLatestAnnouncementId } from "@/utils/announcements"
 import { getCwd, getDesktopDir } from "@/utils/path"
-import { PromptRegistry } from "../prompts/system-prompt"
 import { ensureMcpServersDirectoryExists, ensureSettingsDirectoryExists, GlobalFileNames } from "../storage/disk"
 import { PersistenceErrorEvent, StateManager } from "../storage/StateManager"
 import { Task } from "../task"
@@ -44,6 +39,7 @@ https://github.com/KumarVariable/vscode-extension-sidebar-html/blob/master/src/c

 export class Controller {
 	readonly id: string
+	private disposables: vscode.Disposable[] = []
 	task?: Task

 	mcpHub: McpHub
@@ -51,15 +47,12 @@ export class Controller {
 	authService: AuthService
 	readonly stateManager: StateManager

-	// NEW: Add workspace manager (optional initially)
-	private workspaceManager?: WorkspaceRootManager
-
 	constructor(
 		readonly context: vscode.ExtensionContext,
 		id: string,
 	) {
 		this.id = id
-		PromptRegistry.getInstance() // Ensure prompts and tools are registered
+
 		HostProvider.get().logToChannel("ClineProvider instantiated")
 		this.accountService = ClineAccountService.getInstance()
 		this.stateManager = new StateManager(context)
@@ -72,19 +65,12 @@ export class Controller {
 				this.authService.restoreRefreshTokenAndRetrieveAuthInfo()
 			})
 			.catch((error) => {
-				console.error(
-					"[Controller] CRITICAL: Failed to initialize StateManager - extension may not function properly:",
-					error,
-				)
-				HostProvider.window.showMessage({
-					type: ShowMessageType.ERROR,
-					message: "Failed to initialize Cline's application state. Please restart the extension.",
-				})
+				console.error("CRITICAL: Failed to initialize StateManager - extension may not function properly:", error)
 			})

 		// Set up persistence error recovery
 		this.stateManager.onPersistenceError = async ({ error }: PersistenceErrorEvent) => {
-			console.error("[Controller] Cache persistence failed, recovering:", error)
+			console.error("Cache persistence failed, recovering:", error)
 			try {
 				await this.stateManager.reInitialize()
 				await this.postStateToWebview()
@@ -93,7 +79,7 @@ export class Controller {
 					message: "Saving settings to storage failed.",
 				})
 			} catch (recoveryError) {
-				console.error("[Controller] Cache recovery failed:", recoveryError)
+				console.error("Cache recovery failed:", recoveryError)
 				HostProvider.window.showMessage({
 					type: ShowMessageType.ERROR,
 					message: "Failed to save settings. Please restart the extension.",
@@ -101,10 +87,6 @@ export class Controller {
 			}
 		}

-		this.stateManager.onSyncExternalChange = async () => {
-			await this.postStateToWebview()
-		}
-
 		this.mcpHub = new McpHub(
 			() => ensureMcpServersDirectoryExists(),
 			() => ensureSettingsDirectoryExists(this.context),
@@ -129,6 +111,12 @@ export class Controller {
 	*/
 	async dispose() {
 		await this.clearTask()
+		while (this.disposables.length) {
+			const x = this.disposables.pop()
+			if (x) {
+				x.dispose()
+			}
+		}
 		this.mcpHub.dispose()

 		console.error("Controller disposed")
@@ -174,6 +162,7 @@ export class Controller {
 		const autoApprovalSettings = this.stateManager.getGlobalStateKey("autoApprovalSettings")
 		const browserSettings = this.stateManager.getGlobalStateKey("browserSettings")
 		const focusChainSettings = this.stateManager.getGlobalStateKey("focusChainSettings")
+		const focusChainFeatureFlagEnabled = this.stateManager.getGlobalStateKey("focusChainFeatureFlagEnabled")
 		const preferredLanguage = this.stateManager.getGlobalStateKey("preferredLanguage")
 		const openaiReasoningEffort = this.stateManager.getGlobalStateKey("openaiReasoningEffort")
 		const mode = this.stateManager.getGlobalStateKey("mode")
@@ -202,27 +191,12 @@ export class Controller {
 			}
 			this.stateManager.setGlobalState("autoApprovalSettings", updatedAutoApprovalSettings)
 		}
-		// Apply remote feature flag gate to focus chain settings. Respect if user has disabled it.
-		let focusChainEnabled: boolean
-		if (focusChainSettings?.enabled === false) {
-			focusChainEnabled = false
-		} else {
-			focusChainEnabled = Boolean(focusChainSettings?.enabled)
-		}
-
+		// Apply remote feature flag gate to focus chain settings
 		const effectiveFocusChainSettings = {
 			...(focusChainSettings || { enabled: true, remindClineInterval: 6 }),
-			enabled: focusChainEnabled,
+			enabled: Boolean(focusChainSettings?.enabled) && Boolean(focusChainFeatureFlagEnabled),
 		}

-		// Initialize and persist the workspace manager (multi-root or single-root) with telemetry + fallback
-		this.workspaceManager = await setupWorkspaceManager({
-			stateManager: this.stateManager,
-			detectRoots: detectWorkspaceRoots,
-		})
-
-		const cwd = this.workspaceManager?.getPrimaryRoot()?.path || (await getCwd(getDesktopDir()))
-
 		this.task = new Task(
 			this,
 			this.mcpHub,
@@ -244,9 +218,8 @@ export class Controller {
 			terminalOutputLineLimit ?? 500,
 			defaultTerminalProfile ?? "default",
 			enableCheckpointsSetting ?? true,
-			cwd,
+			await getCwd(getDesktopDir()),
 			this.stateManager,
-			this.workspaceManager,
 			task,
 			images,
 			files,
@@ -621,7 +594,9 @@ export class Controller {
 		const taskHistory = this.stateManager.getGlobalStateKey("taskHistory")
 		const autoApprovalSettings = this.stateManager.getGlobalStateKey("autoApprovalSettings")
 		const browserSettings = this.stateManager.getGlobalStateKey("browserSettings")
+		const dictationSettings = this.stateManager.getGlobalStateKey("dictationSettings")
 		const focusChainSettings = this.stateManager.getGlobalStateKey("focusChainSettings")
+		const focusChainFeatureFlagEnabled = this.stateManager.getGlobalStateKey("focusChainFeatureFlagEnabled")
 		const preferredLanguage = this.stateManager.getGlobalStateKey("preferredLanguage")
 		const openaiReasoningEffort = this.stateManager.getGlobalStateKey("openaiReasoningEffort")
 		const mode = this.stateManager.getGlobalStateKey("mode")
@@ -651,8 +626,8 @@ export class Controller {
 		const workflowToggles = this.stateManager.getWorkspaceStateKey("workflowToggles")

 		const currentTaskItem = this.task?.taskId ? (taskHistory || []).find((item) => item.id === this.task?.taskId) : undefined
+		const checkpointTrackerErrorMessage = this.task?.taskState.checkpointTrackerErrorMessage
 		const clineMessages = this.task?.messageStateHandler.getClineMessages() || []
-		const checkpointManagerErrorMessage = this.task?.taskState.checkpointManagerErrorMessage

 		const processedTaskHistory = (taskHistory || [])
 			.filter((item) => item.ts && item.task)
@@ -662,25 +637,26 @@ export class Controller {
 		const latestAnnouncementId = getLatestAnnouncementId(this.context)
 		const shouldShowAnnouncement = lastShownAnnouncementId !== latestAnnouncementId
 		const platform = process.platform as Platform
-		const distinctId = getDistinctId()
+		const distinctId = PostHogClientProvider.getInstance().distinctId
 		const version = this.context.extension?.packageJSON?.version ?? ""
 		const uriScheme = vscode.env.uriScheme
-		const extensionInfo = {
-			name: this.context.extension?.packageJSON?.name,
-			publisher: this.context.extension?.packageJSON?.publisher,
-		}

 		return {
 			version,
 			apiConfiguration,
 			uriScheme,
 			currentTaskItem,
+			checkpointTrackerErrorMessage,
 			clineMessages,
 			currentFocusChainChecklist: this.task?.taskState.currentFocusChainChecklist || null,
-			checkpointManagerErrorMessage,
+			taskHistory: processedTaskHistory,
+			shouldShowAnnouncement,
+			platform,
 			autoApprovalSettings,
 			browserSettings,
+			dictationSettings,
 			focusChainSettings,
+			focusChainFeatureFlagEnabled,
 			preferredLanguage,
 			openaiReasoningEffort,
 			mode,
@@ -707,14 +683,6 @@ export class Controller {
 			mcpResponsesCollapsed,
 			terminalOutputLineLimit,
 			customPrompt,
-			taskHistory: processedTaskHistory,
-			platform,
-			shouldShowAnnouncement,
-			extensionInfo,
-			// NEW: Add workspace information
-			workspaceRoots: this.workspaceManager?.getRoots() ?? [],
-			primaryRootIndex: this.workspaceManager?.getPrimaryIndex() ?? 0,
-			isMultiRootWorkspace: (this.workspaceManager?.getRoots().length ?? 0) > 1,
 		}
 	}

@@ -1,5 +1,5 @@
 import axios from "axios"
-import { SapAiCoreModelDeployment, SapAiCoreModelsRequest, SapAiCoreModelsResponse } from "@/shared/proto/cline/models"
+import { SapAiCoreModelsRequest, SapAiCoreModelsResponse } from "@/shared/proto/cline/models"
 import { Controller } from ".."

 interface Token {
@@ -11,11 +11,6 @@ interface Token {
 	expires_at: number
 }

-interface Deployment {
-	id: string
-	name: string
-}
-
 /**
 * Authenticates with SAP AI Core and returns an access token
 * @param clientId SAP AI Core client ID
@@ -40,19 +35,19 @@ async function getToken(clientId: string, clientSecret: string, tokenUrl: string
 }

 /**
- * Fetches deployments and orchestration availability from SAP AI Core deployments
+ * Fetches model names and orchestration availability from SAP AI Core deployments
 * @param accessToken Access token for authentication
 * @param baseUrl SAP AI Core base URL
 * @param resourceGroup SAP AI Core resource group
- * @returns Promise<{deployments: Deployment[], orchestrationAvailable: boolean}> Deployments and orchestration availability
+ * @returns Promise<{modelNames: string[], orchestrationAvailable: boolean}> Model names and orchestration availability
 */
-async function fetchAiCoreDeploymentsAndOrchestration(
+async function fetchAiCoreModelsAndOrchestration(
 	accessToken: string,
 	baseUrl: string,
 	resourceGroup: string,
-): Promise<{ deployments: Deployment[]; orchestrationAvailable: boolean }> {
+): Promise<{ modelNames: string[]; orchestrationAvailable: boolean }> {
 	if (!accessToken) {
-		return { deployments: [], orchestrationAvailable: false }
+		return { modelNames: ["ai-core-not-configured"], orchestrationAvailable: false }
 	}

 	const headers = {
@@ -66,29 +61,26 @@ async function fetchAiCoreDeploymentsAndOrchestration(

 	try {
 		const response = await axios.get(url, { headers })
-		const allDeployments = response.data.resources
+		const deployments = response.data.resources

 		// Filter running deployments
-		const runningDeployments = allDeployments.filter((deployment: any) => deployment.targetStatus === "RUNNING")
+		const runningDeployments = deployments.filter((deployment: any) => deployment.targetStatus === "RUNNING")

 		// Check for orchestration deployment
 		const orchestrationAvailable = runningDeployments.some((deployment: any) => deployment.scenarioId === "orchestration")

-		// Extract deployments with model names and IDs
-		const deployments = runningDeployments
+		// Extract model names from deployments
+		const modelNames = runningDeployments
 			.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}`,
-				}
+				return `${model.name}:${model.version}`
 			})
-			.filter((deployment: any) => deployment !== null)
+			.filter((modelName: string | null) => modelName !== null)

-		return { deployments, orchestrationAvailable }
+		return { modelNames, orchestrationAvailable }
 	} catch (error) {
 		console.error("Error fetching deployments:", error)
 		throw new Error("Failed to fetch deployments")
@@ -99,7 +91,7 @@ async function fetchAiCoreDeploymentsAndOrchestration(
 * Fetches available models from SAP AI Core deployments and orchestration availability
 * @param controller The controller instance
 * @param request The request containing SAP AI Core configuration
- * @returns SapAiCoreModelsResponse with deployments and orchestration availability
+ * @returns SapAiCoreModelsResponse with model names and orchestration availability
 */
 export async function getSapAiCoreModels(
 	controller: Controller,
@@ -110,38 +102,30 @@ export async function getSapAiCoreModels(
 		if (!request.clientId || !request.clientSecret || !request.baseUrl) {
 			// Return empty response if configuration is incomplete
 			return SapAiCoreModelsResponse.create({
-				deployments: [],
+				modelNames: [],
 				orchestrationAvailable: false,
 			})
 		}

-		// Direct authentication and deployment/orchestration fetching
+		// Direct authentication and model/orchestration fetching
 		const token = await getToken(request.clientId, request.clientSecret, request.tokenUrl)
-		const { deployments, orchestrationAvailable } = await fetchAiCoreDeploymentsAndOrchestration(
+		const { modelNames, orchestrationAvailable } = await fetchAiCoreModelsAndOrchestration(
 			token.access_token,
 			request.baseUrl,
 			request.resourceGroup,
 		)

-		// Create model-deployment pairs
-		const modelDeployments = deployments
-			.map((deployment) => {
-				const modelName = deployment.name.split(":")[0].toLowerCase()
-				return SapAiCoreModelDeployment.create({
-					modelName: modelName,
-					deploymentId: deployment.id,
-				})
-			})
-			.sort((a, b) => a.modelName.localeCompare(b.modelName))
+		// Extract base model names (without version) and sort
+		const baseModelNames = modelNames.map((modelName: string) => modelName.split(":")[0].toLowerCase()).sort()

 		return SapAiCoreModelsResponse.create({
-			deployments: modelDeployments,
+			modelNames: baseModelNames,
 			orchestrationAvailable,
 		})
 	} catch (error) {
 		console.error("Error fetching SAP AI Core models:", error)
 		return SapAiCoreModelsResponse.create({
-			deployments: [],
+			modelNames: [],
 			orchestrationAvailable: false,
 		})
 	}
@@ -5,7 +5,7 @@ import { fileExistsAtPath } from "@utils/fs"
 import axios from "axios"
 import fs from "fs/promises"
 import path from "path"
-import { telemetryService } from "@/services/telemetry"
+import { telemetryService } from "@/services/posthog/PostHogClientProvider"
 import { groqModels } from "../../../shared/api"
 import { Controller } from ".."

@@ -110,12 +110,6 @@ export async function refreshOpenRouterModels(

 				switch (rawModel.id) {
 					case "anthropic/claude-sonnet-4":
-						// NOTE: we artificially restrict the context window to 200k to keep costs low for users, and have a :1m model variant created below for users that want to use the full 1m.
-						modelInfo.contextWindow = 200_000
-						modelInfo.supportsPromptCache = true
-						modelInfo.cacheWritesPrice = 3.75
-						modelInfo.cacheReadsPrice = 0.3
-						break
 					case "anthropic/claude-3-7-sonnet":
 					case "anthropic/claude-3-7-sonnet:beta":
 					case "anthropic/claude-3.7-sonnet":
@@ -189,10 +183,6 @@ export async function refreshOpenRouterModels(
 						modelInfo.maxTokens = 8_192 // 128000 breaks context window truncation
 						modelInfo.contextWindow = 272_000 // openrouter reports 400k but the input limit is actually 400k-128k
 						break
-					case "x-ai/grok-code-fast-1":
-						modelInfo.supportsPromptCache = true
-						modelInfo.cacheReadsPrice = 0.02
-						break
 					default:
 						if (rawModel.id.startsWith("openai/")) {
 							modelInfo.cacheReadsPrice = parsePrice(rawModel.pricing?.input_cache_read)
@@ -1,7 +1,6 @@
 import { EmptyRequest } from "@shared/proto/cline/common"
 import { OpenRouterCompatibleModelInfo, OpenRouterModelInfo } from "@shared/proto/cline/models"
 import axios from "axios"
-import { toRequestyServiceUrl } from "@/shared/providers/requesty"
 import { Controller } from ".."

 /**
@@ -21,15 +20,10 @@ export async function refreshRequestyModels(controller: Controller, _: EmptyRequ
 	const models: Record<string, OpenRouterModelInfo> = {}
 	try {
 		const apiKey = controller.stateManager.getSecretKey("requestyApiKey")
-		const baseUrl = controller.stateManager.getGlobalStateKey("requestyBaseUrl")
-
-		const resolvedUrl = toRequestyServiceUrl(baseUrl)
-		const url = new URL(`${resolvedUrl.pathname}/models`, resolvedUrl).toString()
-
 		const headers = {
 			Authorization: `Bearer ${apiKey}`,
 		}
-		const response = await axios.get(url, { headers })
+		const response = await axios.get("https://router.requesty.ai/v1/models", { headers })
 		if (response.data?.data) {
 			for (const model of response.data.data) {
 				const modelInfo: OpenRouterModelInfo = OpenRouterModelInfo.create({
--- a/Show More
+++ b/Show More