clean up

> claude-dev@3.30.3 fix:all
> biome check --no-errors-on-unmatched --files-ignore-unknown=true --write --diagnostic-level=error --unsafe

Checked 873 files in 2s. Fixed 551 files.

.changeset/chatty-mails-sip.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Screen readers now properly announce buttons in history preview and history view screens.

.changeset/dull-beds-confess.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Checkpoints multiroot pt.1: Accept array of workspaces when initializting checkpoints

.changeset/heavy-llamas-smile.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Run Testing platform within Test workflow

.changeset/hot-dancers-unite.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Adding Workspace path adapter and workspace hints logic for tools

.changeset/proud-cougars-kick.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+remove temperature settings in z.ai models

.changeset/seven-pumas-worry.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Screen readers properly announce buttons in the MCP servers / Cline rules / workflows screens. Reflects the current selection of Cline rules / workflows tab to screen readers.

.changeset/sixty-taxis-doubt.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add environment variable injection to esbuild config

.github/workflows/test.yml

@@ -90,8 +90,14 @@ jobs:
             - name: Build Tests and Extension
               run: npm run pretest
 
-            - name: Unit Tests
-              run: npm run test:unit
+            - name: Unit Tests (with coverage on Linux)
+              run: |
+                if [ "${{ runner.os }}" = "Linux" ]; then
+                  npm install --no-save nyc
+                  npx nyc --nycrc-path .nycrc.unit.json --reporter=lcov npm run test:unit
+                else
+                  npm run test:unit
+                fi
 
             # Run extension tests with coverage
             - name: Extension Integration Tests with Coverage
@@ -125,6 +131,8 @@ jobs:
                   path: |
                       extension_coverage.txt
                       webview-ui/webview_coverage.txt
+                      coverage-unit/lcov.info
+                      webview-ui/coverage/lcov.info
 
             # Set the check as failed if any of the tests failed
             - name: Check for test failures
@@ -141,6 +149,63 @@ jobs:
                       exit 1
                   fi
 
+    test-platform-integration:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+
+            - name: Setup Node.js environment
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22
+
+            - name: Cache root dependencies
+              uses: actions/cache@v4
+              id: root-cache
+              with:
+                  path: node_modules
+                  key: ${{ runner.os }}-npm-${{ hashFiles('package-lock.json') }}
+
+            - 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') }}
+
+            # Cache testing-platform dependencies
+            - name: Cache testing-platform dependencies
+              uses: actions/cache@v4
+              id: testing-platform-cache
+              with:
+                path: testing-platform/node_modules
+                key: ${{ runner.os }}-npm-testing-platform-${{ hashFiles('testing-platform/package-lock.json') }}
+
+            - name: Install root dependencies
+              if: steps.root-cache.outputs.cache-hit != 'true'
+              run: npm ci
+
+            - name: Install webview-ui dependencies
+              if: steps.webview-cache.outputs.cache-hit != 'true'
+              run: cd webview-ui && npm ci
+
+            - name: Compile standalone
+              run: npm run compile-standalone
+
+            - name: Install testing platform dependencies
+              if: steps.testing-platform-cache.outputs.cache-hit != 'true'
+              run: cd testing-platform && npm ci
+
+            - name: Running testing platform integration spec tests
+              continue-on-error: true
+              timeout-minutes: 5
+              # Temporarily wrapping the test command to always return a neutral exit code.
+              # This prevents the job from showing as failed and avoids distracting developers
+              # until the integration tests are ready to be enforced.
+              run: |
+                npm run test:tp-orchestrator -- tests/specs/ --count=1 || true
+
     coverage:
         needs: test
         runs-on: ubuntu-latest
@@ -219,3 +284,39 @@ jobs:
                     --verbose
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    qlty:
+        needs: test
+        runs-on: ubuntu-latest
+        # Run on PRs to main, pushes to main, and manual dispatches
+        if: always() && needs.test.result == 'success'
+        steps:
+            - name: Checkout code
+              uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0 # Fetch all history for accurate comparison
+
+            - name: Download Coverage Reports
+              uses: actions/download-artifact@v4
+              with:
+                  name: pr-coverage-reports
+                  path: .
+
+            - name: Upload core unit tests coverage to Qlty
+              uses: qltysh/qlty-action/coverage@v2
+              with:
+                  token: ${{ secrets.QLTY_COVERAGE_TOKEN }}
+                  # we can merge multiple files if necessary
+                  files: |
+                    coverage-unit/lcov.info
+                  tag: unit:core
+
+            - name: Upload webview-ui unit tests coverage to Qlty
+              uses: qltysh/qlty-action/coverage@v2
+              with:
+                  token: ${{ secrets.QLTY_COVERAGE_TOKEN }}
+                  # we can merge multiple files if necessary
+                  files: |
+                    webview-ui/coverage/lcov.info
+                  tag: unit:webview-ui
+                  add-prefix: webview-ui/

.gitignore

@@ -20,6 +20,8 @@ webview-ui/src/**/*.js.map
 
 # Ignore coverage directories and files
 coverage
+coverage-unit
+.nyc_output
 # But don't ignore the coverage scripts in .github/scripts/
 !.github/scripts/coverage/
 

.nycrc.unit.json

@@ -0,0 +1,48 @@
+{
+	"all": true,
+	"check-coverage": false,
+	"reporter": [
+		"text",
+		"lcov"
+	],
+	"include": [
+		"src/**/*.ts"
+	],
+	"exclude": [
+		"**/*.d.ts",
+
+		"**/*.{test,spec}.{js,jsx,ts,tsx,mjs,cjs}",
+		"**/__tests__/**",
+		"**/test/**",
+		"**/tests/**",
+		"**/.nyc_output/**",
+		"**/.vscode-test/**",
+		"**/tests-results/**",
+		"src/test/**",
+
+		"src/generated/**",
+
+		"**/node_modules/**",
+		"**/dist/**",
+		"**/out/**",
+		"**/build/**",
+		"**/coverage/**",
+		"**/coverage-unit/**",
+		"**/proto/**",
+
+		"**/*.{config,setup}.{js,ts,mjs,cjs}",
+		"**/vite-env.d.ts",
+
+		"**/*.{css,scss,sass,less,styl}",
+		"**/*.{svg,png,jpg,jpeg,gif,ico}",
+		"**/*.{json,yaml,yml}"
+	],
+	"extension": [
+		".ts",
+		".js"
+	],
+	"cache": true,
+	"sourceMap": true,
+	"instrument": true,
+	"report-dir": "./coverage-unit"
+}

.vscode-test.mjs

@@ -1,5 +1,5 @@
+import path from "node:path"
 import { defineConfig } from "@vscode/test-cli"
-import path from "path"
 
 export default defineConfig({
 	files: "{out/**/*.test.js,src/**/*.test.js,!src/test/e2e/**/*.test.js,!out/src/test/e2e/**/*.test.js}",

.vscodeignore

@@ -64,3 +64,9 @@ old_docs/**
 e2e-build.mjs
 e2e.vsix
 test-results/
+
+# Ignore Storybook files
+**/*.stories.tsx
+*storybook.log
+storybook-static
+**/StorybookDecorator.tsx

CHANGELOG.md

@@ -1,5 +1,39 @@
 # Changelog
 
+## [3.30.3]
+
+- Add Oracle Code Assist provider
+
+## [3.30.2]
+
+- Fix UI tests
+
+## [3.30.1]
+
+- Fix model list not being updated in time for user to use shortcut button to update model to stealth model
+- Fix flicker issue when switching modes
+- Fix Sticky header in settings view overlaping with content on scroll
+- Add experimental yolo mode feature that disables all user approvals and automatically executes a task and navigates through plan to act mode until the task is complete
+
+## [3.30.0]
+
+- Add code-supernova stealth model
+
+## [3.29.2]
+
+- Fix: Reverted change that caused formatting issues
+- Fix: Moonshot - Pass max_tokens value to provider
+
+## [3.29.1]
+
+- Changeset bump + Announcement banner update
+
+## [3.29.0]
+
+- Updated Baseten provider to fetch models from server
+- Fix: Updated insufficient balance URL for easy Cline balance top-ups
+- Accessibility: Improvements to screen readers in MCP, Cline Rules, workflows, and history views.
+
 ## [3.28.4]
 
 - Fix bug where some Windows machines had API request hanging

CONTRIBUTING.md

@@ -157,6 +157,36 @@ Anyone can contribute code to Cline, but we ask that you follow these guidelines
     - Update existing tests if your changes affect them
     - Include both unit tests and integration tests where appropriate
 
+    **End-to-End (E2E) Testing**
+    
+    Cline includes comprehensive E2E tests using Playwright that simulate real user interactions with the extension in VS Code:
+    
+    - **Running E2E tests:**
+      ```bash
+      npm run test:e2e        # Build and run all E2E tests
+      npm run e2e             # Run tests without rebuilding
+      npm run test:e2e -- --debug  # Run with interactive debugger
+      ```
+    
+    - **Writing E2E tests:**
+      - Tests are located in `src/test/e2e/`
+      - Use the `e2e` fixture for single-root workspace tests
+      - Use `e2eMultiRoot` fixture for multi-root workspace tests
+      - Follow existing patterns in `auth.test.ts`, `chat.test.ts`, `diff.test.ts`, and `editor.test.ts`
+      - See `src/test/e2e/README.md` for detailed documentation
+    
+    - **Debug mode features:**
+      - Interactive Playwright Inspector for step-by-step debugging
+      - Record new interactions and generate test code automatically
+      - Visual VS Code instance for manual testing
+      - Element inspection and selector validation
+    
+    - **Test environment:**
+      - Automated VS Code setup with Cline extension loaded
+      - Mock API server for backend testing
+      - Temporary workspaces with test fixtures
+      - Video recording for failed tests
+
 4. **Version Management with Changesets**
 
     - Create a changeset for any user-facing changes using `npm run changeset`

biome.jsonc

@@ -42,8 +42,8 @@
 			},
 			"a11y": "off",
 			"style": {
-				"useNodejsImportProtocol": "off",
-				"useImportType": "off",
+				"useNodejsImportProtocol": "info",
+				"useImportType": "info",
 				"useBlockStatements": "warn",
 				"useNamingConvention": "off",
 				"useThrowOnlyError": "info",
@@ -57,8 +57,8 @@
 				"useSingleVarDeclarator": "off",
 				"useNumberNamespace": "off",
 				"noInferrableTypes": "off",
-				"useTemplate": "off",
-				"noUselessElse": "off"
+				"useTemplate": "info",
+				"noUselessElse": "warn"
 			},
 			"suspicious": {
 				"noDoubleEquals": "warn",

docs/docs.json

@@ -183,7 +183,8 @@
 					"provider-config/openrouter",
 					"provider-config/sap-aicore",
 					"provider-config/vercel-ai-gateway",
-					"provider-config/requesty"
+					"provider-config/requesty",
+					"provider-config/baseten"
 				]
 			},
 			{

docs/getting-started/installing-cline-jetbrains.mdx

@@ -1,6 +1,6 @@
 ---
-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."
+title: "Installing Cline for JetBrains"
+description: "Install Cline in your favorite JetBrains IDE with the same powerful AI assistance you know from VSCode."
 ---
 
 <Frame>
@@ -20,109 +20,103 @@ Cline for JetBrains works almost identically to Cline in VSCode. All the core fe
 	/>
 </Frame>
 
-<Note>Cline for JetBrains is in early access. All core features are functional, with ongoing improvements based on user feedback.</Note>
+Cline is now available on the [JetBrains Marketplace](https://plugins.jetbrains.com/plugin/28247-cline). Works in IntelliJ IDEA, PyCharm, WebStorm, DataSpell, PhpStorm, and all other JetBrains IDEs.
 
 ## 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:
+**Method 1: Direct from your IDE**
 
-### 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
+1. Open your JetBrains IDE
+2. Press `Ctrl+Alt+S` (Windows/Linux) or `Cmd+,` (macOS) 
+3. Go to Plugins → Marketplace tab
+4. Search "Cline" and click Install
+5. Restart your IDE
 
 <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"
+		src="https://storage.googleapis.com/cline_public_images/docs/assets/cline-jetbrains-marketplace-search.png"
+		alt="JetBrains marketplace showing Cline plugin search results"
 	/>
 </Frame>
 
-2. **Install from Disk:**
-   - Open your JetBrains IDE
-   - Go to **IntelliJ IDEA** (or whichever IDE you are in) → **Settings**
+**Method 2: Browser install**
 
-<Frame>
-	<img
-		src="https://storage.googleapis.com/cline_public_images/docs/assets/cline-jetbrains-settings.png"
-		alt="JetBrains IDE settings dialog"
-	/>
-</Frame>
+Visit [plugins.jetbrains.com/plugin/28247-cline](https://plugins.jetbrains.com/plugin/28247-cline) and click the "Install to IDE" button. Your IDE will open and prompt you to install.
 
-   - Select **Plugins** from the left sidebar
-   - Click the gear icon ⚙️ and select **Install Plugin from Disk...**
+<details>
+<summary>Method 3: Manual installation</summary>
 
-<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>
+Download the plugin from the [marketplace page](https://plugins.jetbrains.com/plugin/28247-cline), then:
 
-   - Select the downloaded `.zip` file
+1. Go to Settings → Plugins
+2. Click the gear icon → Install Plugin from Disk
+3. Select the downloaded `.zip` file
+4. Restart your IDE
 
-<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
+</details>
 
 ## Getting Started with Cline
 
-After installation, you'll find Cline in your IDE:
+After installation, you'll find Cline in your IDE. Look for the Cline tool window (usually on the right side) or go to **View** → **Tool Windows** → **Cline**.
 
-1. **Open Cline:**
-   - Look for the Cline tool window (usually on the right side)
-   - Or go to **View** → **Tool Windows** → **Cline**
+Sign in is optional - you can also bring your own API key. If you want to sign in, 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.
 
-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?"
+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
+The terminal integration works differently in JetBrains. Unlike VSCode where terminal output streams directly to the chat, JetBrains shows command output in a collapsible section. Commands still execute successfully - you just need to expand the **Command Output** section to see results.
 
 ## What Works
 
-Everything else works exactly like VSCode:
+Everything else works exactly like VSCode. Cline can read, write, and edit files with the same precision. All his tools work identically - file operations, web browsing, you name it. 
 
-- **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
+You get full support for:
+- API providers (Anthropic, OpenAI, local models)
+- MCP servers and custom tools
+- Cline rules and workflows
+- @ mentions for files, folders, and problems
+- Drag & drop for files and images
 
 ## 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
+Cline automatically understands your project structure, just like in VSCode. He works with any language your JetBrains IDE supports - Java, Python, JavaScript, Go, whatever you're building.
+
+I find it helpful to share error messages and stack traces directly in the chat when debugging. You can also ask him to review your code changes before committing.
 
 ## Troubleshooting
 
+### Plugin Installation Issues
+
+If you can't find Cline in the marketplace:
+- Make sure you're searching in the **Marketplace** tab (not Installed)
+- Try searching for "Cline AI" or just "Cline"
+- Check that your IDE version is compatible (2023.1 or later recommended)
+
+If installation fails:
+- Restart your IDE and try again
+- Check your internet connection
+- Try installing from disk as an alternative
+
+### Plugin Not Appearing
+
 If you don't see the Cline tool window after installation:
-- Restart your IDE completely
+- Restart your IDE completely (File → Exit and reopen)
 - Check **View** → **Tool Windows** → **Cline**
-- Ensure the plugin is enabled in **Settings** → **Plugins**
+- Verify the plugin is enabled in **Settings** → **Plugins** → **Installed** tab
+- Look for the Cline icon in your IDE's tool window bar (usually on the right side)
+
+### Common Issues
+
+**Plugin appears to be installed but doesn't work:**
+- Ensure you've restarted your IDE after installation
+- Check if there are any error messages in the IDE's event log
+- Try disabling and re-enabling the plugin in Settings
+
+**Performance or compatibility issues:**
+- Make sure you're using a supported JetBrains IDE version
+- Check for IDE updates that might improve compatibility
+- Consider allocating more memory to your IDE if needed
 
 Having other issues? Join our [Discord community](https://discord.gg/cline) for help from the team and other users.
 

docs/getting-started/installing-cline.mdx

@@ -1,13 +1,17 @@
 ---
 title: "Installing Cline"
-description: "Cline is a VS Code extension that brings AI-powered coding assistance directly
-    to your editor. Install using one of these methods:"
+description: "Cline brings AI-powered coding assistance to your editor. Available for VS Code and JetBrains IDEs."
 ---
 
-### Installation Options
+## Choose Your Editor
 
--   **VS Code Marketplace (Recommended):** Fastest method for standard VS Code and Cursor users.
--   **Open VSX Registry:** For VS Code-compatible editors like VSCodium.
+Cline works across multiple development environments:
+
+-   **VS Code/Cursor:** Install from VS Code Marketplace (most popular)
+-   **JetBrains IDEs:** Install from JetBrains Marketplace - works in IntelliJ IDEA, PyCharm, WebStorm, and more
+-   **VSCodium/Windsurf:** Install from Open VSX Registry
+
+## VS Code Installation
 
 ### VS Code Marketplace: Step-by-Step Setup
 
@@ -46,6 +50,18 @@ For VS Code-compatible editors without Marketplace access (like VSCodium and Win
 4. Select "Cline" by saoudrizwan and click **Install**.
 5. Reload if prompted.
 
+## JetBrains Installation
+
+For IntelliJ IDEA, PyCharm, WebStorm, DataSpell, and other JetBrains IDEs:
+
+1. Open your JetBrains IDE
+2. Press `Ctrl+Alt+S` (Windows/Linux) or `Cmd+,` (macOS) to open Settings
+3. Go to Plugins → Marketplace tab
+4. Search "Cline" and click Install
+5. Restart your IDE
+
+**Need more help?** See our [complete JetBrains installation guide](/getting-started/installing-cline-jetbrains) for screenshots and troubleshooting.
+
 ### Creating Your Cline Account
 
 Now that you have Cline installed, let's get you set up with your account:

docs/provider-config/baseten.mdx

@@ -0,0 +1,115 @@
+---
+title: "Baseten"
+description: "Learn how to configure and use Baseten's Model APIs with Cline. Access frontier open-source models with enterprise-grade performance, reliability, and competitive pricing."
+---
+
+Baseten provides on-demand frontier model APIs designed for production applications, not just experimentation. Built on the Baseten Inference Stack, these APIs deliver enterprise-grade performance and reliability with optimized inference for leading open-source models from OpenAI, DeepSeek, Meta, Moonshot AI, and Alibaba Cloud.
+
+**Website:** [https://www.baseten.co/products/model-apis/](https://www.baseten.co/products/model-apis/)
+
+### Getting an API Key
+
+1.  **Sign Up/Sign In:** Go to [Baseten](https://www.baseten.co/) and create an account or sign in.
+2.  **Navigate to API Keys:** Access your dashboard and go to the API Keys section.
+3.  **Create a Key:** Generate a new API key. Give it a descriptive name (e.g., "Cline").
+4.  **Copy the Key:** Copy the API key immediately and store it securely.
+
+### Supported Models
+
+Cline supports all current models under Baseten Model APIs, including:
+For the most updated pricing, please visit: https://www.baseten.co/products/model-apis/
+
+**Reasoning Models:**
+-   `deepseek-ai/DeepSeek-R1` - DeepSeek's first-generation reasoning model (163K context) - \$2.55/\$5.95 per 1M tokens
+-   `deepseek-ai/DeepSeek-R1-0528` - Latest revision of DeepSeek's reasoning model (163K context) - \$2.55/\$5.95 per 1M tokens
+-   `deepseek-ai/DeepSeek-V3.1` - Hybrid reasoning with advanced tool calling (163K context) - \$0.50/\$1.50 per 1M tokens
+-   `deepseek-ai/DeepSeek-V3-0324` - Fast general-purpose with enhanced reasoning (163K context) - \$0.77/\$0.77 per 1M tokens
+
+**Flagship Models:**
+-   `openai/gpt-oss-120b` (OpenAI) - 120B MoE with strong reasoning capabilities (128K context) - \$0.10/\$0.50 per 1M tokens
+-   `moonshotai/Kimi-K2-Instruct` (Moonshot AI) - 1 trillion parameter model for agentic tasks (131K context) - \$0.60/\$2.50 per 1M tokens
+-   `moonshotai/Kimi-K2-Instruct-0905` (Moonshot AI) - September update with enhanced capabilities (262K context) - \$0.60/\$2.50 per 1M tokens
+
+**Meta Llama 4 Series:**
+-   `meta-llama/Llama-4-Maverick-17B-128E-Instruct` - High-efficiency processing (1M context!) - \$0.19/\$0.72 per 1M tokens
+-   `meta-llama/Llama-4-Scout-17B-16E-Instruct` - Precise context understanding (1M context!) - \$0.13/\$0.50 per 1M tokens
+
+**Coding Specialists:**
+-   `Qwen/Qwen3-Coder-480B-A35B-Instruct`- Advanced coding and reasoning (262K context) - \$0.38/\$1.53 per 1M tokens
+-   `Qwen/Qwen3-235B-A22B-Instruct-2507` - Math and reasoning expert (262K context) - \$0.22/\$0.80 per 1M tokens
+
+### Configuration in Cline
+
+1.  **Open Cline Settings:** Click the settings icon (⚙️) in the Cline panel.
+2.  **Select Provider:** Choose "Baseten" from the "API Provider" dropdown.
+3.  **Enter API Key:** Paste your Baseten API key into the "Baseten API Key" field.
+4.  **Select Model:** Choose your desired model from the "Model" dropdown.
+
+### Production-First Architecture
+
+Baseten's Model APIs are built for production environments with several key advantages:
+
+#### Enterprise-Grade Reliability
+- **Four nines of uptime** (99.99%) through active-active redundancy
+- **Cloud-agnostic, multi-cluster autoscaling** for consistent availability
+- **SOC 2 Type II certified** and **HIPAA compliant** for security requirements
+
+#### Optimized Performance
+- **Pre-optimized models** shipped with the Baseten Inference Stack
+- **Latest-generation GPUs** with multi-cloud infrastructure
+- **Ultra-fast inference** optimized from the bottom up for production workloads
+
+#### Cost Efficiency
+- **5-10x less expensive** than closed alternatives
+- **Optimized multi-cloud infrastructure** for efficient resource utilization
+- **Transparent pricing** with no hidden costs or rate limit surprises
+
+#### Developer Experience
+- **OpenAI compatible API** - migrate by swapping a single URL
+- **Drop-in replacement** for closed models with comprehensive observability
+- **Seamless scaling** from Model APIs to dedicated deployments
+
+### Special Features
+
+#### Function Calling & Tool Use
+All Baseten models support structured outputs, function calling, and tool use as part of the Baseten Inference Stack, making them ideal for agentic applications.
+
+#### Reasoning Capabilities
+DeepSeek models offer enhanced reasoning with step-by-step thought processes, while maintaining production-ready performance.
+
+#### Long Context Support
+- **Up to 1 million tokens** for Llama 4 models (Maverick and Scout)
+- **262K tokens** for Qwen3 models
+- **163K tokens** for DeepSeek models
+- **Perfect for code repositories** and complex multi-turn conversations
+
+#### Quantization Optimizations
+Models are deployed with advanced quantization techniques (fp4, fp8, fp16) for optimal performance while maintaining quality.
+
+### Migration from Other Providers
+
+Baseten's OpenAI compatibility makes migration straightforward:
+
+**From OpenAI:**
+- Swap `api.openai.com` with `inference.baseten.co/v1`
+- Keep existing request/response formats
+- Benefit from significant cost savings
+
+**From Other Providers:**
+- Use standard OpenAI SDK format
+- Maintain existing prompting strategies
+- Access to newer open-source models
+
+### Tips and Notes
+
+-   **Model Selection:** Choose models based on your specific use case - reasoning models for complex tasks, coding models for development work, and flagship models for general applications.
+-   **Cost Optimization:** Baseten offers some of the most competitive pricing in the market, especially for open-source models.
+-   **Context Windows:** Take advantage of large context windows (up to 1M tokens) for including substantial codebases and documentation.
+-   **Enterprise Ready:** Baseten is designed for production use with enterprise-grade security, compliance, and reliability.
+-   **Dynamic Model Updates:** Cline automatically fetches the latest model list from Baseten, ensuring access to new models as they're released.
+-   **Multi-Cloud Capacity Management (MCM):** Baseten's multi-cloud infrastructure ensures high availability and low latency globally.
+-   **Support:** Baseten provides dedicated support for production deployments and can work with you on dedicated resources as you scale.
+
+### Pricing Information
+
+Current pricing is highly competitive and transparent. For the most up-to-date pricing, visit the [Baseten Model APIs page](https://www.baseten.co/products/model-apis/). Prices typically range from \$0.10-\$6.00 per million tokens, making Baseten significantly more cost-effective than many closed-model alternatives while providing access to state-of-the-art open-source models.

esbuild.mjs

@@ -6,7 +6,7 @@ import * as esbuild from "esbuild"
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)
 
-const production = process.argv.includes("--production")
+const production = process.argv.includes("--production") || process.env["IS_DEBUG_BUILD"] === "false"
 const watch = process.argv.includes("--watch")
 const standalone = process.argv.includes("--standalone")
 const e2eBuild = process.argv.includes("--e2e-build")
@@ -123,21 +123,29 @@ const copyWasmFiles = {
 	},
 }
 
+const buildEnvVars = { "import.meta.url": "_importMetaUrl" }
+if (production) {
+	// IS_DEV is always disable in production builds.
+	buildEnvVars["process.env.IS_DEV"] = "false"
+}
+// Set the environment and telemetry env vars. The API key env vars need to be populated in the GitHub
+// workflows from the secrets.
+if (process.env.CLINE_ENVIRONMENT) {
+	buildEnvVars["process.env.CLINE_ENVIRONMENT"] = JSON.stringify(process.env.CLINE_ENVIRONMENT)
+}
+if (process.env.TELEMETRY_SERVICE_API_KEY) {
+	buildEnvVars["process.env.TELEMETRY_SERVICE_API_KEY"] = JSON.stringify(process.env.TELEMETRY_SERVICE_API_KEY)
+}
+if (process.env.ERROR_SERVICE_API_KEY) {
+	buildEnvVars["process.env.ERROR_SERVICE_API_KEY"] = JSON.stringify(process.env.ERROR_SERVICE_API_KEY)
+}
 // Base configuration shared between extension and standalone builds
 const baseConfig = {
 	bundle: true,
 	minify: production,
 	sourcemap: !production,
 	logLevel: "silent",
-	define: production
-		? {
-				"import.meta.url": "_importMetaUrl",
-				"process.env.IS_DEV": JSON.stringify(!production),
-				"process.env.TELEMETRY_SERVICE_API_KEY": JSON.stringify(process.env.TELEMETRY_SERVICE_API_KEY || ""),
-				"process.env.ERROR_SERVICE_API_KEY": JSON.stringify(process.env.ERROR_SERVICE_API_KEY || ""),
-			}
-		: { "import.meta.url": "_importMetaUrl" },
-
+	define: buildEnvVars,
 	tsconfig: path.resolve(__dirname, "tsconfig.json"),
 	plugins: [
 		copyWasmFiles,

evals/package-lock.json

@@ -11,7 +11,7 @@
       "dependencies": {
         "axios": "^1.8.2",
         "better-sqlite3": "^11.10.0",
-        "chalk": "^4.1.2",
+        "chalk": "5.6.2",
         "commander": "^9.4.1",
         "dotenv": "^16.5.0",
         "execa": "^5.1.1",
@@ -292,15 +292,12 @@
       }
     },
     "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": "^12.17.0 || ^14.13 || >=16.0.0"
       },
       "funding": {
         "url": "https://github.com/chalk/chalk?sponsor=1"
@@ -607,9 +604,10 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
-      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -708,6 +706,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -843,6 +842,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/make-error": {
       "version": "1.3.6",
       "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
@@ -1003,6 +1018,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ora/node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
     "node_modules/path-key": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
@@ -1251,6 +1282,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -1695,13 +1727,9 @@
       }
     },
     "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
+      "version": "5.6.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+      "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA=="
     },
     "chownr": {
       "version": "1.1.4",
@@ -1909,9 +1937,9 @@
       "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ=="
     },
     "form-data": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.3.tgz",
-      "integrity": "sha512-qsITQPfmvMOSAdeyZ+12I1c+CKSstAFAwu+97zrnWAbIr5u8wfsExUzCesVLC8NgHuRUqNN4Zy6UPWUTRGslcA==",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "requires": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -2054,6 +2082,17 @@
       "requires": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
       }
     },
     "make-error": {
@@ -2164,6 +2203,17 @@
         "log-symbols": "^4.1.0",
         "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "4.1.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+          "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        }
       }
     },
     "path-key": {

evals/package.json

@@ -21,7 +21,7 @@
   "dependencies": {
     "axios": "^1.8.2",
     "better-sqlite3": "^11.10.0",
-    "chalk": "^4.1.2",
+    "chalk": "5.6.2",
     "dotenv": "^16.5.0",
     "commander": "^9.4.1",
     "execa": "^5.1.1",

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.28.3",
+	"version": "3.30.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.28.3",
+			"version": "3.30.3",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.37.0",
@@ -50,6 +50,7 @@
 				"get-folder-size": "^5.0.0",
 				"globby": "^14.0.2",
 				"grpc-health-check": "^2.0.2",
+				"https-proxy-agent": "^7.0.6",
 				"iconv-lite": "^0.6.3",
 				"ignore": "^7.0.3",
 				"image-size": "^2.0.2",
@@ -72,7 +73,7 @@
 				"reconnecting-eventsource": "^1.6.4",
 				"serialize-error": "^11.0.3",
 				"simple-git": "^3.27.0",
-				"strip-ansi": "^7.1.0",
+				"strip-ansi": "^7.1.2",
 				"tree-sitter-wasms": "^0.1.11",
 				"ts-morph": "^25.0.1",
 				"turndown": "^7.2.0",
@@ -103,7 +104,7 @@
 				"@vscode/test-electron": "^2.5.2",
 				"@vscode/vsce": "^3.6.0",
 				"chai": "^4.3.10",
-				"chalk": "^5.3.0",
+				"chalk": "5.6.2",
 				"esbuild": "^0.25.0",
 				"grpc-tools": "^1.13.0",
 				"husky": "^9.1.7",
@@ -116,6 +117,7 @@
 				"rimraf": "^6.0.1",
 				"should": "^13.2.3",
 				"sinon": "^19.0.2",
+				"tree-kill": "^1.2.2",
 				"ts-node": "^10.9.2",
 				"ts-proto": "^2.6.1",
 				"tsconfig-paths": "^4.2.0",
@@ -1277,12 +1279,11 @@
 			}
 		},
 		"node_modules/@babel/runtime": {
-			"version": "7.26.7",
+			"version": "7.28.4",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+			"integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
 			"dev": true,
 			"license": "MIT",
-			"dependencies": {
-				"regenerator-runtime": "^0.14.0"
-			},
 			"engines": {
 				"node": ">=6.9.0"
 			}
@@ -1518,15 +1519,17 @@
 			}
 		},
 		"node_modules/@changesets/apply-release-plan": {
-			"version": "7.0.8",
+			"version": "7.0.12",
+			"resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.12.tgz",
+			"integrity": "sha512-EaET7As5CeuhTzvXTQCRZeBUcisoYPDDcXvgTE/2jmmypKp0RC7LxKj/yzqeh/1qFTZI7oDGFcL1PHRuQuketQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/config": "^3.0.5",
+				"@changesets/config": "^3.1.1",
 				"@changesets/get-version-range-type": "^0.4.0",
-				"@changesets/git": "^3.0.2",
-				"@changesets/should-skip-package": "^0.1.1",
-				"@changesets/types": "^6.0.0",
+				"@changesets/git": "^3.0.4",
+				"@changesets/should-skip-package": "^0.1.2",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3",
 				"detect-indent": "^6.0.0",
 				"fs-extra": "^7.0.1",
@@ -1537,73 +1540,57 @@
 				"semver": "^7.5.3"
 			}
 		},
-		"node_modules/@changesets/apply-release-plan/node_modules/prettier": {
-			"version": "2.8.8",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"prettier": "bin-prettier.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
-		"node_modules/@changesets/apply-release-plan/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@changesets/assemble-release-plan": {
-			"version": "6.0.5",
+			"version": "6.0.9",
+			"resolved": "https://registry.npmjs.org/@changesets/assemble-release-plan/-/assemble-release-plan-6.0.9.tgz",
+			"integrity": "sha512-tPgeeqCHIwNo8sypKlS3gOPmsS3wP0zHt67JDuL20P4QcXiw/O4Hl7oXiuLnP9yg+rXLQ2sScdV1Kkzde61iSQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@changesets/errors": "^0.2.0",
-				"@changesets/get-dependents-graph": "^2.1.2",
-				"@changesets/should-skip-package": "^0.1.1",
-				"@changesets/types": "^6.0.0",
+				"@changesets/get-dependents-graph": "^2.1.3",
+				"@changesets/should-skip-package": "^0.1.2",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3",
 				"semver": "^7.5.3"
 			}
 		},
 		"node_modules/@changesets/changelog-git": {
-			"version": "0.2.0",
+			"version": "0.2.1",
+			"resolved": "https://registry.npmjs.org/@changesets/changelog-git/-/changelog-git-0.2.1.tgz",
+			"integrity": "sha512-x/xEleCFLH28c3bQeQIyeZf8lFXyDFVn1SgcBiR2Tw/r4IAWlk1fzxCEZ6NxQAjF2Nwtczoen3OA2qR+UawQ8Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/types": "^6.0.0"
+				"@changesets/types": "^6.1.0"
 			}
 		},
 		"node_modules/@changesets/cli": {
-			"version": "2.27.12",
+			"version": "2.29.6",
+			"resolved": "https://registry.npmjs.org/@changesets/cli/-/cli-2.29.6.tgz",
+			"integrity": "sha512-6qCcVsIG1KQLhpQ5zE8N0PckIx4+9QlHK3z6/lwKnw7Tir71Bjw8BeOZaxA/4Jt00pcgCnCSWZnyuZf5Il05QQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/apply-release-plan": "^7.0.8",
-				"@changesets/assemble-release-plan": "^6.0.5",
-				"@changesets/changelog-git": "^0.2.0",
-				"@changesets/config": "^3.0.5",
+				"@changesets/apply-release-plan": "^7.0.12",
+				"@changesets/assemble-release-plan": "^6.0.9",
+				"@changesets/changelog-git": "^0.2.1",
+				"@changesets/config": "^3.1.1",
 				"@changesets/errors": "^0.2.0",
-				"@changesets/get-dependents-graph": "^2.1.2",
-				"@changesets/get-release-plan": "^4.0.6",
-				"@changesets/git": "^3.0.2",
+				"@changesets/get-dependents-graph": "^2.1.3",
+				"@changesets/get-release-plan": "^4.0.13",
+				"@changesets/git": "^3.0.4",
 				"@changesets/logger": "^0.1.1",
-				"@changesets/pre": "^2.0.1",
-				"@changesets/read": "^0.6.2",
-				"@changesets/should-skip-package": "^0.1.1",
-				"@changesets/types": "^6.0.0",
-				"@changesets/write": "^0.3.2",
+				"@changesets/pre": "^2.0.2",
+				"@changesets/read": "^0.6.5",
+				"@changesets/should-skip-package": "^0.1.2",
+				"@changesets/types": "^6.1.0",
+				"@changesets/write": "^0.4.0",
+				"@inquirer/external-editor": "^1.0.0",
 				"@manypkg/get-packages": "^1.1.3",
 				"ansi-colors": "^4.1.3",
 				"ci-info": "^3.7.0",
 				"enquirer": "^2.4.1",
-				"external-editor": "^3.1.0",
 				"fs-extra": "^7.0.1",
 				"mri": "^1.2.0",
 				"p-limit": "^2.2.0",
@@ -1632,23 +1619,17 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/@changesets/cli/node_modules/resolve-from": {
-			"version": "5.0.0",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/@changesets/config": {
-			"version": "3.0.5",
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/@changesets/config/-/config-3.1.1.tgz",
+			"integrity": "sha512-bd+3Ap2TKXxljCggI0mKPfzCQKeV/TU4yO2h2C6vAihIo8tzseAn2e7klSuiyYYXvgu53zMN1OeYMIQkaQoWnA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@changesets/errors": "^0.2.0",
-				"@changesets/get-dependents-graph": "^2.1.2",
+				"@changesets/get-dependents-graph": "^2.1.3",
 				"@changesets/logger": "^0.1.1",
-				"@changesets/types": "^6.0.0",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3",
 				"fs-extra": "^7.0.1",
 				"micromatch": "^4.0.8"
@@ -1656,6 +1637,8 @@
 		},
 		"node_modules/@changesets/errors": {
 			"version": "0.2.0",
+			"resolved": "https://registry.npmjs.org/@changesets/errors/-/errors-0.2.0.tgz",
+			"integrity": "sha512-6BLOQUscTpZeGljvyQXlWOItQyU71kCdGz7Pi8H8zdw6BI0g3m43iL4xKUVPWtG+qrrL9DTjpdn8eYuCQSRpow==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1663,36 +1646,44 @@
 			}
 		},
 		"node_modules/@changesets/get-dependents-graph": {
-			"version": "2.1.2",
+			"version": "2.1.3",
+			"resolved": "https://registry.npmjs.org/@changesets/get-dependents-graph/-/get-dependents-graph-2.1.3.tgz",
+			"integrity": "sha512-gphr+v0mv2I3Oxt19VdWRRUxq3sseyUpX9DaHpTUmLj92Y10AGy+XOtV+kbM6L/fDcpx7/ISDFK6T8A/P3lOdQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/types": "^6.0.0",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3",
 				"picocolors": "^1.1.0",
 				"semver": "^7.5.3"
 			}
 		},
 		"node_modules/@changesets/get-release-plan": {
-			"version": "4.0.6",
+			"version": "4.0.13",
+			"resolved": "https://registry.npmjs.org/@changesets/get-release-plan/-/get-release-plan-4.0.13.tgz",
+			"integrity": "sha512-DWG1pus72FcNeXkM12tx+xtExyH/c9I1z+2aXlObH3i9YA7+WZEVaiHzHl03thpvAgWTRaH64MpfHxozfF7Dvg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/assemble-release-plan": "^6.0.5",
-				"@changesets/config": "^3.0.5",
-				"@changesets/pre": "^2.0.1",
-				"@changesets/read": "^0.6.2",
-				"@changesets/types": "^6.0.0",
+				"@changesets/assemble-release-plan": "^6.0.9",
+				"@changesets/config": "^3.1.1",
+				"@changesets/pre": "^2.0.2",
+				"@changesets/read": "^0.6.5",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3"
 			}
 		},
 		"node_modules/@changesets/get-version-range-type": {
 			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/@changesets/get-version-range-type/-/get-version-range-type-0.4.0.tgz",
+			"integrity": "sha512-hwawtob9DryoGTpixy1D3ZXbGgJu1Rhr+ySH2PvTLHvkZuQ7sRT4oQwMh0hbqZH1weAooedEjRsbrWcGLCeyVQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@changesets/git": {
-			"version": "3.0.2",
+			"version": "3.0.4",
+			"resolved": "https://registry.npmjs.org/@changesets/git/-/git-3.0.4.tgz",
+			"integrity": "sha512-BXANzRFkX+XcC1q/d27NKvlJ1yf7PSAgi8JG6dt8EfbHFHi4neau7mufcSca5zRhwOL8j9s6EqsxmT+s+/E6Sw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1705,6 +1696,8 @@
 		},
 		"node_modules/@changesets/logger": {
 			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/@changesets/logger/-/logger-0.1.1.tgz",
+			"integrity": "sha512-OQtR36ZlnuTxKqoW4Sv6x5YIhOmClRd5pWsjZsddYxpWs517R0HkyiefQPIytCVh4ZcC5x9XaG8KTdd5iRQUfg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1712,16 +1705,20 @@
 			}
 		},
 		"node_modules/@changesets/parse": {
-			"version": "0.4.0",
+			"version": "0.4.1",
+			"resolved": "https://registry.npmjs.org/@changesets/parse/-/parse-0.4.1.tgz",
+			"integrity": "sha512-iwksMs5Bf/wUItfcg+OXrEpravm5rEd9Bf4oyIPL4kVTmJQ7PNDSd6MDYkpSJR1pn7tz/k8Zf2DhTCqX08Ou+Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/types": "^6.0.0",
+				"@changesets/types": "^6.1.0",
 				"js-yaml": "^3.13.1"
 			}
 		},
 		"node_modules/@changesets/parse/node_modules/argparse": {
 			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1730,6 +1727,8 @@
 		},
 		"node_modules/@changesets/parse/node_modules/js-yaml": {
 			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -1741,69 +1740,65 @@
 			}
 		},
 		"node_modules/@changesets/pre": {
-			"version": "2.0.1",
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/@changesets/pre/-/pre-2.0.2.tgz",
+			"integrity": "sha512-HaL/gEyFVvkf9KFg6484wR9s0qjAXlZ8qWPDkTyKF6+zqjBe/I2mygg3MbpZ++hdi0ToqNUF8cjj7fBy0dg8Ug==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
 				"@changesets/errors": "^0.2.0",
-				"@changesets/types": "^6.0.0",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3",
 				"fs-extra": "^7.0.1"
 			}
 		},
 		"node_modules/@changesets/read": {
-			"version": "0.6.2",
+			"version": "0.6.5",
+			"resolved": "https://registry.npmjs.org/@changesets/read/-/read-0.6.5.tgz",
+			"integrity": "sha512-UPzNGhsSjHD3Veb0xO/MwvasGe8eMyNrR/sT9gR8Q3DhOQZirgKhhXv/8hVsI0QpPjR004Z9iFxoJU6in3uGMg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/git": "^3.0.2",
+				"@changesets/git": "^3.0.4",
 				"@changesets/logger": "^0.1.1",
-				"@changesets/parse": "^0.4.0",
-				"@changesets/types": "^6.0.0",
+				"@changesets/parse": "^0.4.1",
+				"@changesets/types": "^6.1.0",
 				"fs-extra": "^7.0.1",
 				"p-filter": "^2.1.0",
 				"picocolors": "^1.1.0"
 			}
 		},
 		"node_modules/@changesets/should-skip-package": {
-			"version": "0.1.1",
+			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/@changesets/should-skip-package/-/should-skip-package-0.1.2.tgz",
+			"integrity": "sha512-qAK/WrqWLNCP22UDdBTMPH5f41elVDlsNyat180A33dWxuUDyNpg6fPi/FyTZwRriVjg0L8gnjJn2F9XAoF0qw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/types": "^6.0.0",
+				"@changesets/types": "^6.1.0",
 				"@manypkg/get-packages": "^1.1.3"
 			}
 		},
 		"node_modules/@changesets/types": {
-			"version": "6.0.0",
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/@changesets/types/-/types-6.1.0.tgz",
+			"integrity": "sha512-rKQcJ+o1nKNgeoYRHKOS07tAMNd3YSN0uHaJOZYjBAgxfV7TUE7JE+z4BzZdQwb5hKaYbayKN5KrYV7ODb2rAA==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@changesets/write": {
-			"version": "0.3.2",
+			"version": "0.4.0",
+			"resolved": "https://registry.npmjs.org/@changesets/write/-/write-0.4.0.tgz",
+			"integrity": "sha512-CdTLvIOPiCNuH71pyDu3rA+Q0n65cmAbXnwWH84rKGiFumFzkmHNT8KHTMEchcxN+Kl8I54xGUhJ7l3E7X396Q==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
-				"@changesets/types": "^6.0.0",
+				"@changesets/types": "^6.1.0",
 				"fs-extra": "^7.0.1",
-				"human-id": "^1.0.2",
+				"human-id": "^4.1.1",
 				"prettier": "^2.7.1"
 			}
 		},
-		"node_modules/@changesets/write/node_modules/prettier": {
-			"version": "2.8.8",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"prettier": "bin-prettier.js"
-			},
-			"engines": {
-				"node": ">=10.13.0"
-			},
-			"funding": {
-				"url": "https://github.com/prettier/prettier?sponsor=1"
-			}
-		},
 		"node_modules/@colors/colors": {
 			"version": "1.6.0",
 			"license": "MIT",
@@ -2591,6 +2586,28 @@
 				"@grpc/grpc-js": "^1.8.21"
 			}
 		},
+		"node_modules/@inquirer/external-editor": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@inquirer/external-editor/-/external-editor-1.0.1.tgz",
+			"integrity": "sha512-Oau4yL24d2B5IL4ma4UpbQigkVhzPDXLoqy1ggK4gnHg/stmkffJE4oOXHXF3uz0UEpywG68KcyXsyYpA1Re/Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"chardet": "^2.1.0",
+				"iconv-lite": "^0.6.3"
+			},
+			"engines": {
+				"node": ">=18"
+			},
+			"peerDependencies": {
+				"@types/node": ">=18"
+			},
+			"peerDependenciesMeta": {
+				"@types/node": {
+					"optional": true
+				}
+			}
+		},
 		"node_modules/@isaacs/balanced-match": {
 			"version": "4.0.1",
 			"dev": true,
@@ -2676,6 +2693,8 @@
 		},
 		"node_modules/@manypkg/find-root": {
 			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@manypkg/find-root/-/find-root-1.1.0.tgz",
+			"integrity": "sha512-mki5uBvhHzO8kYYix/WRy2WX8S3B5wdVSc9D6KcU5lQNglP2yt58/VfLuAK49glRXChosY8ap2oJ1qgma3GUVA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2687,11 +2706,15 @@
 		},
 		"node_modules/@manypkg/find-root/node_modules/@types/node": {
 			"version": "12.20.55",
+			"resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz",
+			"integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@manypkg/find-root/node_modules/find-up": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+			"integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2704,6 +2727,8 @@
 		},
 		"node_modules/@manypkg/find-root/node_modules/fs-extra": {
 			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2717,6 +2742,8 @@
 		},
 		"node_modules/@manypkg/find-root/node_modules/locate-path": {
 			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+			"integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2728,6 +2755,8 @@
 		},
 		"node_modules/@manypkg/find-root/node_modules/p-limit": {
 			"version": "2.3.0",
+			"resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+			"integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2742,6 +2771,8 @@
 		},
 		"node_modules/@manypkg/find-root/node_modules/p-locate": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+			"integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2753,6 +2784,8 @@
 		},
 		"node_modules/@manypkg/get-packages": {
 			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/@manypkg/get-packages/-/get-packages-1.1.3.tgz",
+			"integrity": "sha512-fo+QhuU3qE/2TQMQmbVMqaQ6EWbMhi4ABWP+O4AM1NqPBuy0OrApV5LO6BrrgnhtAHS2NH6RrVk9OL181tTi8A==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2766,11 +2799,15 @@
 		},
 		"node_modules/@manypkg/get-packages/node_modules/@changesets/types": {
 			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/@changesets/types/-/types-4.1.0.tgz",
+			"integrity": "sha512-LDQvVDv5Kb50ny2s25Fhm3d9QSZimsoUGBsUioj6MC3qbMUCuC8GPIvk/M6IvXx3lYhAs0lwWUQLb+VIEUCECw==",
 			"dev": true,
 			"license": "MIT"
 		},
 		"node_modules/@manypkg/get-packages/node_modules/fs-extra": {
 			"version": "8.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+			"integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2784,6 +2821,8 @@
 		},
 		"node_modules/@manypkg/get-packages/node_modules/globby": {
 			"version": "11.1.0",
+			"resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+			"integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -2803,6 +2842,8 @@
 		},
 		"node_modules/@manypkg/get-packages/node_modules/ignore": {
 			"version": "5.3.2",
+			"resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+			"integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -2811,6 +2852,8 @@
 		},
 		"node_modules/@manypkg/get-packages/node_modules/slash": {
 			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+			"integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -5545,14 +5588,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/@vscode/vsce/node_modules/tmp": {
-			"version": "0.2.3",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.14"
-			}
-		},
 		"node_modules/@vscode/vsce/node_modules/xml2js": {
 			"version": "0.5.0",
 			"dev": true,
@@ -5650,11 +5685,10 @@
 			}
 		},
 		"node_modules/agent-base": {
-			"version": "7.1.1",
+			"version": "7.1.4",
+			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz",
+			"integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==",
 			"license": "MIT",
-			"dependencies": {
-				"debug": "^4.3.4"
-			},
 			"engines": {
 				"node": ">= 14"
 			}
@@ -5913,6 +5947,8 @@
 		},
 		"node_modules/array-union": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+			"integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6014,7 +6050,9 @@
 			}
 		},
 		"node_modules/axios": {
-			"version": "1.11.0",
+			"version": "1.12.2",
+			"resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz",
+			"integrity": "sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==",
 			"license": "MIT",
 			"dependencies": {
 				"follow-redirects": "^1.15.6",
@@ -6128,6 +6166,8 @@
 		},
 		"node_modules/better-path-resolve": {
 			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/better-path-resolve/-/better-path-resolve-1.0.0.tgz",
+			"integrity": "sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -6455,7 +6495,9 @@
 			}
 		},
 		"node_modules/chalk": {
-			"version": "5.4.1",
+			"version": "5.6.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz",
+			"integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -6466,8 +6508,9 @@
 			}
 		},
 		"node_modules/chardet": {
-			"version": "0.7.0",
-			"dev": true,
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.0.tgz",
+			"integrity": "sha512-bNFETTG/pM5ryzQ9Ad0lJOTa6HWD/YsScAR3EnCPZRPlQh77JocYktSHOUHelyhm8IARL+o4c4F1bP5KVOjiRA==",
 			"license": "MIT"
 		},
 		"node_modules/check-error": {
@@ -7282,6 +7325,8 @@
 		},
 		"node_modules/detect-indent": {
 			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz",
+			"integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7316,6 +7361,8 @@
 		},
 		"node_modules/dir-glob": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+			"integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -7327,6 +7374,8 @@
 		},
 		"node_modules/dir-glob/node_modules/path-type": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+			"integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -7983,13 +8032,6 @@
 				"node": ">=6"
 			}
 		},
-		"node_modules/exceljs/node_modules/tmp": {
-			"version": "0.2.3",
-			"license": "MIT",
-			"engines": {
-				"node": ">=14.14"
-			}
-		},
 		"node_modules/exceljs/node_modules/uuid": {
 			"version": "8.3.2",
 			"license": "MIT",
@@ -8232,33 +8274,11 @@
 		},
 		"node_modules/extendable-error": {
 			"version": "0.1.7",
+			"resolved": "https://registry.npmjs.org/extendable-error/-/extendable-error-0.1.7.tgz",
+			"integrity": "sha512-UOiS2in6/Q0FK0R0q6UY9vYpQ21mr/Qn1KOnte7vsACuNJf514WvCCUHSRCPcgjPT2bAhNIJdlE6bVap1GKmeg==",
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/external-editor": {
-			"version": "3.1.0",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"chardet": "^0.7.0",
-				"iconv-lite": "^0.4.24",
-				"tmp": "^0.0.33"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
-		"node_modules/external-editor/node_modules/iconv-lite": {
-			"version": "0.4.24",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"safer-buffer": ">= 2.1.2 < 3"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/extract-zip": {
 			"version": "2.0.1",
 			"license": "BSD-2-Clause",
@@ -8611,6 +8631,8 @@
 		},
 		"node_modules/fs-extra": {
 			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
+			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -9279,10 +9301,12 @@
 			}
 		},
 		"node_modules/https-proxy-agent": {
-			"version": "7.0.5",
+			"version": "7.0.6",
+			"resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+			"integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
 			"license": "MIT",
 			"dependencies": {
-				"agent-base": "^7.0.2",
+				"agent-base": "^7.1.2",
 				"debug": "4"
 			},
 			"engines": {
@@ -9290,9 +9314,14 @@
 			}
 		},
 		"node_modules/human-id": {
-			"version": "1.0.2",
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/human-id/-/human-id-4.1.1.tgz",
+			"integrity": "sha512-3gKm/gCSUipeLsRYZbbdA1BD83lBoWUkZ7G9VFrhWPAU76KwYo5KR8V28bpoPm/ygy0x5/GCbpRQdY7VLYCoIg==",
 			"dev": true,
-			"license": "MIT"
+			"license": "MIT",
+			"bin": {
+				"human-id": "dist/cli.js"
+			}
 		},
 		"node_modules/human-signals": {
 			"version": "8.0.0",
@@ -9823,6 +9852,8 @@
 		},
 		"node_modules/is-subdir": {
 			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/is-subdir/-/is-subdir-1.2.0.tgz",
+			"integrity": "sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -9915,6 +9946,8 @@
 		},
 		"node_modules/is-windows": {
 			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -10105,6 +10138,8 @@
 		},
 		"node_modules/jsonfile": {
 			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+			"integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
 			"dev": true,
 			"license": "MIT",
 			"optionalDependencies": {
@@ -10488,6 +10523,8 @@
 		},
 		"node_modules/lodash.startcase": {
 			"version": "4.4.0",
+			"resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz",
+			"integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -11773,10 +11810,6 @@
 				"node": ">=18.0.0"
 			}
 		},
-		"node_modules/open-graph-scraper/node_modules/chardet": {
-			"version": "2.1.0",
-			"license": "MIT"
-		},
 		"node_modules/open/node_modules/is-wsl": {
 			"version": "3.1.0",
 			"license": "MIT",
@@ -11991,16 +12024,10 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/os-tmpdir": {
-			"version": "1.0.2",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
 		"node_modules/outdent": {
 			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/outdent/-/outdent-0.5.0.tgz",
+			"integrity": "sha512-/jHxFIzoMXdqPzTaCpFzAAWhpkSjZPF4Vsn6jAfNpmbH/ymsmd7Qc6VE9BGn0L6YMj6uwpQLxCECpus4ukKS9Q==",
 			"dev": true,
 			"license": "MIT"
 		},
@@ -12022,6 +12049,8 @@
 		},
 		"node_modules/p-filter": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/p-filter/-/p-filter-2.1.0.tgz",
+			"integrity": "sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -12061,6 +12090,8 @@
 		},
 		"node_modules/p-map": {
 			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+			"integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -12524,6 +12555,22 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/prettier": {
+			"version": "2.8.8",
+			"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+			"integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"prettier": "bin-prettier.js"
+			},
+			"engines": {
+				"node": ">=10.13.0"
+			},
+			"funding": {
+				"url": "https://github.com/prettier/prettier?sponsor=1"
+			}
+		},
 		"node_modules/pretty-ms": {
 			"version": "9.2.0",
 			"license": "MIT",
@@ -12808,6 +12855,8 @@
 		},
 		"node_modules/read-yaml-file": {
 			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/read-yaml-file/-/read-yaml-file-1.1.0.tgz",
+			"integrity": "sha512-VIMnQi/Z4HT2Fxuwg5KrY174U1VdUIASQVWXXyqtNRtxSr9IYkn1rsI6Tb6HsrHCmB7gVpNwX6JxPTHcH6IoTA==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -12822,6 +12871,8 @@
 		},
 		"node_modules/read-yaml-file/node_modules/argparse": {
 			"version": "1.0.10",
+			"resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+			"integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -12830,6 +12881,8 @@
 		},
 		"node_modules/read-yaml-file/node_modules/js-yaml": {
 			"version": "3.14.1",
+			"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+			"integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -12842,6 +12895,8 @@
 		},
 		"node_modules/read-yaml-file/node_modules/pify": {
 			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+			"integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {
@@ -12922,11 +12977,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/regenerator-runtime": {
-			"version": "0.14.1",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/regexp.prototype.flags": {
 			"version": "1.5.4",
 			"dev": true,
@@ -12988,6 +13038,16 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
+		"node_modules/resolve-from": {
+			"version": "5.0.0",
+			"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+			"integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/retry": {
 			"version": "0.13.1",
 			"license": "MIT",
@@ -13822,6 +13882,8 @@
 		},
 		"node_modules/spawndamnit": {
 			"version": "3.0.1",
+			"resolved": "https://registry.npmjs.org/spawndamnit/-/spawndamnit-3.0.1.tgz",
+			"integrity": "sha512-MmnduQUuHCoFckZoWnXsTg7JaiLBJrKFj9UI2MbRPGaJeVpsLcVBu6P/IGZovziM/YBsellCmsprgNA+w0CzVg==",
 			"dev": true,
 			"license": "SEE LICENSE IN LICENSE",
 			"dependencies": {
@@ -14029,7 +14091,9 @@
 			}
 		},
 		"node_modules/strip-ansi": {
-			"version": "7.1.0",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+			"integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
 			"license": "MIT",
 			"dependencies": {
 				"ansi-regex": "^6.0.1"
@@ -14397,14 +14461,12 @@
 			"license": "MIT"
 		},
 		"node_modules/tmp": {
-			"version": "0.0.33",
-			"dev": true,
+			"version": "0.2.5",
+			"resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.5.tgz",
+			"integrity": "sha512-voyz6MApa1rQGUxT3E+BK7/ROe8itEx7vD8/HEvt4xwXucvQ5G5oeEiHkmHZJuBO21RpOf+YYm9MOivj709jow==",
 			"license": "MIT",
-			"dependencies": {
-				"os-tmpdir": "~1.0.2"
-			},
 			"engines": {
-				"node": ">=0.6.0"
+				"node": ">=14.14"
 			}
 		},
 		"node_modules/to-regex-range": {
@@ -14432,6 +14494,16 @@
 			"version": "0.3.9",
 			"license": "MIT/X11"
 		},
+		"node_modules/tree-kill": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+			"integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+			"dev": true,
+			"license": "MIT",
+			"bin": {
+				"tree-kill": "cli.js"
+			}
+		},
 		"node_modules/tree-sitter-wasms": {
 			"version": "0.1.11",
 			"license": "Unlicense"
@@ -14793,6 +14865,8 @@
 		},
 		"node_modules/universalify": {
 			"version": "0.1.2",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
+			"integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
 			"dev": true,
 			"license": "MIT",
 			"engines": {

package.json

@@ -2,7 +2,7 @@
 	"name": "claude-dev",
 	"displayName": "Cline",
 	"description": "Autonomous coding agent right in your IDE, capable of creating/editing files, running commands, using the browser, and more with your permission every step of the way.",
-	"version": "3.28.4",
+	"version": "3.30.3",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -360,8 +360,10 @@
 		"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:build": "vsce package --allow-package-secrets sendgrid --out dist/e2e.vsix",
+		"test:e2e": "playwright install && npm run test:e2e:build && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e:optimal": "npm run test:e2e:build && node src/test/e2e/utils/build.mjs && playwright test",
+		"test:e2e:ui": "npx tsx scripts/interactive-playwright.ts",
 		"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",
@@ -403,7 +405,7 @@
 		"@vscode/test-electron": "^2.5.2",
 		"@vscode/vsce": "^3.6.0",
 		"chai": "^4.3.10",
-		"chalk": "^5.3.0",
+		"chalk": "5.6.2",
 		"esbuild": "^0.25.0",
 		"grpc-tools": "^1.13.0",
 		"husky": "^9.1.7",
@@ -416,6 +418,7 @@
 		"rimraf": "^6.0.1",
 		"should": "^13.2.3",
 		"sinon": "^19.0.2",
+		"tree-kill": "^1.2.2",
 		"ts-node": "^10.9.2",
 		"ts-proto": "^2.6.1",
 		"tsconfig-paths": "^4.2.0",
@@ -463,6 +466,7 @@
 		"get-folder-size": "^5.0.0",
 		"globby": "^14.0.2",
 		"grpc-health-check": "^2.0.2",
+		"https-proxy-agent": "^7.0.6",
 		"iconv-lite": "^0.6.3",
 		"ignore": "^7.0.3",
 		"image-size": "^2.0.2",
@@ -485,7 +489,7 @@
 		"reconnecting-eventsource": "^1.6.4",
 		"serialize-error": "^11.0.3",
 		"simple-git": "^3.27.0",
-		"strip-ansi": "^7.1.0",
+		"strip-ansi": "^7.1.2",
 		"tree-sitter-wasms": "^0.1.11",
 		"ts-morph": "^25.0.1",
 		"turndown": "^7.2.0",

proto/cline/models.proto

@@ -33,6 +33,8 @@ service ModelsService {
   rpc refreshBasetenModels(EmptyRequest) returns (OpenRouterCompatibleModelInfo);
   // Fetches available models from SAP AI Core
   rpc getSapAiCoreModels(SapAiCoreModelsRequest) returns (SapAiCoreModelsResponse);
+  // Fetches available models from OCA
+  rpc refreshOcaModels(StringRequest) returns (OcaCompatibleModelInfo);
 }
 
 // List of VS Code LM models
@@ -127,6 +129,48 @@ message UpdateApiConfigurationRequest {
   ModelsApiConfiguration api_configuration = 2;
 }
 
+ // Model info for OCA (OpenAI-compatible) models exposed by the OCA provider
+message OcaModelInfo {
+  // Maximum completion tokens per request supported by this model
+  optional int64 max_tokens = 1;
+  // Total context window in tokens (input + output)
+  optional int64 context_window = 2;
+  // Whether the model supports image inputs
+  optional bool supports_images = 3;
+  // Whether prompt caching is supported for this model
+  bool supports_prompt_cache = 4;
+  // Price per million input tokens (USD unless otherwise specified by provider)
+  optional double input_price = 5;
+  // Price per million output tokens (USD unless otherwise specified by provider)
+  optional double output_price = 6;
+  // Thinking/reasoning configuration if the model supports it
+  optional ThinkingConfig thinking_config = 7;
+  // Price per million tokens for prompt cache writes
+  optional double cache_writes_price = 9;
+  // Price per million tokens for prompt cache reads
+  optional double cache_reads_price = 10;
+  // Human-readable model description
+  optional string description = 11;
+  // Recommended default temperature for this model
+  optional double temperature = 13;
+  // Optional survey content to display in the UI
+  optional string survey_content = 14;
+  // Identifier for the survey associated with this model
+  optional string survey_id = 15;
+  // Optional banner content (e.g., deprecation or promotion notes)
+  optional string banner = 16;
+  // Canonical model identifier as reported by OCA
+  string model_name = 17;
+}
+
+ // Aggregated OCA model catalog keyed by model identifier
+message OcaCompatibleModelInfo {
+  // key: canonical model id as reported by OCA (e.g., "openai/gpt-4o-mini")
+  // value: OcaModelInfo describing that model
+  map<string, OcaModelInfo> models = 1;
+  optional string error = 2;
+}
+
 // API Provider enumeration
 enum ApiProvider {
   ANTHROPIC = 0;
@@ -164,6 +208,7 @@ enum ApiProvider {
   VERCEL_AI_GATEWAY = 32;
   QWEN_CODE = 33;
   DIFY = 34;
+  OCA = 35;
 }
 
 // Model info for OpenAI-compatible models
@@ -276,6 +321,9 @@ message ModelsApiConfiguration {
   optional string qwen_code_oauth_path = 70;
   optional string dify_api_key = 71;
   optional string dify_base_url = 72;
+  optional string oca_base_url = 73;
+  optional string oca_api_key = 74;
+  optional string oca_refresh_token = 75;
 
   // Plan mode configurations
   optional ApiProvider plan_mode_api_provider = 100;
@@ -309,6 +357,8 @@ message ModelsApiConfiguration {
   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_oca_model_id = 131;
+  optional OcaModelInfo plan_mode_oca_model_info = 132;
 
 
   // Act mode configurations
@@ -343,7 +393,6 @@ message ModelsApiConfiguration {
   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;
-
-
-  repeated string favorited_model_ids = 300;
+  optional string act_mode_oca_model_id = 231;
+  optional OcaModelInfo act_mode_oca_model_info = 232;
 }

proto/cline/oca_account.proto

@@ -0,0 +1,36 @@
+syntax = "proto3";
+
+package cline;
+import "cline/common.proto";
+option java_package = "bot.cline.proto";
+option java_multiple_files = true;
+
+// Service for account-related operations
+service OcaAccountService {
+  // Handles the user clicking the login link in the UI.
+  // Generates a secure nonce for state validation, stores it in secrets,
+  // and opens the authentication URL in the external browser.
+  rpc ocaAccountLoginClicked(EmptyRequest) returns (String);
+    
+  // Handles the user clicking the logout button in the UI.
+  // Clears API keys and user state.
+  rpc ocaAccountLogoutClicked(EmptyRequest) returns (Empty);
+
+  // Subscribe to auth status update events (when authentication state changes)
+  rpc ocaSubscribeToAuthStatusUpdate(EmptyRequest) 
+      returns (stream OcaAuthState);
+
+}
+
+
+message OcaAuthState {
+  optional OcaUserInfo user = 1;
+  optional string api_key = 2;
+}
+
+// User's information
+message OcaUserInfo {
+  string uid = 1;
+  optional string display_name = 2;
+  optional string email = 3;
+}

proto/cline/state.proto

@@ -1,6 +1,7 @@
 syntax = "proto3";
 package cline;
 import "cline/common.proto";
+import "cline/models.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
@@ -150,10 +151,10 @@ message ApiConfiguration {
   optional string lite_llm_base_url = 4;
   optional string lite_llm_api_key = 5;
   optional bool lite_llm_use_prompt_cache = 6;
-  optional string openai_headers = 7; // JSON string
+  map<string, string> open_ai_headers = 7;
   optional string anthropic_base_url = 8;
-  optional string openrouter_api_key = 9;
-  optional string openrouter_provider_sorting = 10;
+  optional string open_router_api_key = 9;
+  optional string open_router_provider_sorting = 10;
   optional string aws_access_key = 11;
   optional string aws_secret_key = 12;
   optional string aws_session_token = 13;
@@ -166,14 +167,14 @@ message ApiConfiguration {
   optional string claude_code_path = 20;
   optional string vertex_project_id = 21;
   optional string vertex_region = 22;
-  optional string openai_base_url = 23;
-  optional string openai_api_key = 24;
+  optional string open_ai_base_url = 23;
+  optional string open_ai_api_key = 24;
   optional string ollama_base_url = 25;
   optional string ollama_api_options_ctx_num = 26;
   optional string lm_studio_base_url = 27;
   optional string gemini_api_key = 28;
   optional string gemini_base_url = 29;
-  optional string openai_native_api_key = 30;
+  optional string open_ai_native_api_key = 30;
   optional string deep_seek_api_key = 31;
   optional string requesty_api_key = 32;
   optional string requesty_base_url = 33;
@@ -209,61 +210,65 @@ message ApiConfiguration {
   optional string qwen_code_oauth_path = 63;
   optional string dify_api_key = 64;
   optional string dify_base_url = 65;
+  optional string oca_base_url = 66;
+  optional string oca_api_key = 67;
+  optional string oca_refresh_token = 68;
   
   // Plan mode configurations
-  optional string plan_mode_api_provider = 100;
+  optional ApiProvider plan_mode_api_provider = 100;
   optional string plan_mode_api_model_id = 101;
   optional int32 plan_mode_thinking_budget_tokens = 102;
   optional string plan_mode_reasoning_effort = 103;
-  optional string plan_mode_vscode_lm_model_selector = 104; // JSON string
+  optional LanguageModelChatSelector plan_mode_vs_code_lm_model_selector = 104;
   optional bool plan_mode_aws_bedrock_custom_selected = 105;
   optional string plan_mode_aws_bedrock_custom_model_base_id = 106;
-  optional string plan_mode_openrouter_model_id = 107;
-  optional string plan_mode_openrouter_model_info = 108; // JSON string
-  optional string plan_mode_openai_model_id = 109;
-  optional string plan_mode_openai_model_info = 110; // JSON string
+  optional string plan_mode_open_router_model_id = 107;
+  optional OpenRouterModelInfo plan_mode_open_router_model_info = 108;
+  optional string plan_mode_open_ai_model_id = 109;
+  optional OpenAiCompatibleModelInfo plan_mode_open_ai_model_info = 110;
   optional string plan_mode_ollama_model_id = 111;
   optional string plan_mode_lm_studio_model_id = 112;
   optional string plan_mode_lite_llm_model_id = 113;
-  optional string plan_mode_lite_llm_model_info = 114; // JSON string
+  optional LiteLLMModelInfo plan_mode_lite_llm_model_info = 114;
   optional string plan_mode_requesty_model_id = 115;
-  optional string plan_mode_requesty_model_info = 116; // JSON string
+  optional OpenRouterModelInfo plan_mode_requesty_model_info = 116;
   optional string plan_mode_together_model_id = 117;
   optional string plan_mode_fireworks_model_id = 118;
   optional string plan_mode_sap_ai_core_model_id = 119;
   optional string plan_mode_huawei_cloud_maas_model_id = 120;
-  optional string plan_mode_huawei_cloud_maas_model_info = 121;
+  optional OpenRouterModelInfo plan_mode_huawei_cloud_maas_model_info = 121;
   optional string plan_mode_vercel_ai_gateway_model_id = 122;
-  optional string plan_mode_vercel_ai_gateway_model_info = 123;
+  optional OpenRouterModelInfo plan_mode_vercel_ai_gateway_model_info = 123;
+  optional string plan_mode_oca_model_id = 124;
+  optional OcaModelInfo plan_mode_oca_model_info = 125;
   
   // Act mode configurations
-  optional string act_mode_api_provider = 200;
+  optional ApiProvider act_mode_api_provider = 200;
   optional string act_mode_api_model_id = 201;
   optional int32 act_mode_thinking_budget_tokens = 202;
   optional string act_mode_reasoning_effort = 203;
-  optional string act_mode_vscode_lm_model_selector = 204; // JSON string
+  optional LanguageModelChatSelector act_mode_vs_code_lm_model_selector = 204;
   optional bool act_mode_aws_bedrock_custom_selected = 205;
   optional string act_mode_aws_bedrock_custom_model_base_id = 206;
-  optional string act_mode_openrouter_model_id = 207;
-  optional string act_mode_openrouter_model_info = 208; // JSON string
-  optional string act_mode_openai_model_id = 209;
-  optional string act_mode_openai_model_info = 210; // JSON string
+  optional string act_mode_open_router_model_id = 207;
+  optional OpenRouterModelInfo act_mode_open_router_model_info = 208;
+  optional string act_mode_open_ai_model_id = 209;
+  optional OpenAiCompatibleModelInfo act_mode_open_ai_model_info = 210;
   optional string act_mode_ollama_model_id = 211;
   optional string act_mode_lm_studio_model_id = 212;
   optional string act_mode_lite_llm_model_id = 213;
-  optional string act_mode_lite_llm_model_info = 214; // JSON string
+  optional LiteLLMModelInfo act_mode_lite_llm_model_info = 214;
   optional string act_mode_requesty_model_id = 215;
-  optional string act_mode_requesty_model_info = 216; // JSON string
+  optional OpenRouterModelInfo act_mode_requesty_model_info = 216;
   optional string act_mode_together_model_id = 217;
   optional string act_mode_fireworks_model_id = 218;
   optional string act_mode_sap_ai_core_model_id = 219;
   optional string act_mode_huawei_cloud_maas_model_id = 220;
-  optional string act_mode_huawei_cloud_maas_model_info = 221;
+  optional OpenRouterModelInfo act_mode_huawei_cloud_maas_model_info = 221;
   optional string act_mode_vercel_ai_gateway_model_id = 222;
-  optional string act_mode_vercel_ai_gateway_model_info = 223;
-  
-  // Favorited model IDs
-  repeated string favorited_model_ids = 300;
+  optional OpenRouterModelInfo act_mode_vercel_ai_gateway_model_info = 223;
+  optional string act_mode_oca_model_id = 224;
+  optional OcaModelInfo act_mode_oca_model_info = 225;
 
   // Extension fields for Bedrock Api Keys
   optional string aws_authentication = 301;

scripts/build-proto.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 
+import { execSync } from "node:child_process"
+import * as fs from "node:fs/promises"
+import { createRequire } from "node:module"
+import os from "node:os"
+import * as path from "node:path"
 import chalk from "chalk"
-import { execSync } from "child_process"
-import * as fs from "fs/promises"
 import { globby } from "globby"
-import { createRequire } from "module"
-import os from "os"
-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"

scripts/build-tests.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-const { execSync } = require("child_process")
+const { execSync } = require("node:child_process")
 const esbuild = require("esbuild")
 
 const watch = process.argv.includes("--watch")

scripts/file-utils.mjs

@@ -1,5 +1,5 @@
-import * as fs from "fs/promises"
-import * as path from "path"
+import * as fs from "node:fs/promises"
+import * as path from "node:path"
 /**
  * Write `contents` to `filePath`, creating any necessary directories in `filePath`.
  */

scripts/generate-host-bridge-client.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
+import * as path from "node:path"
 import chalk from "chalk"
-import * as path from "path"
 import { writeFileWithMkdirs } from "./file-utils.mjs"
 import { getFqn, loadServicesFromProtoDescriptor } from "./proto-utils.mjs"
 
@@ -125,9 +125,9 @@ function generateExternalClientSetup(serviceName, serviceDefinition) {
 				return `    ${methodName}(request: ${requestType}): Promise<${responseType}> {
       return this.makeRequest((client) => client.${methodName}(request))
     }`
-			} else {
-				// Generate streaming method
-				return `  ${methodName}(
+			}
+			// Generate streaming method
+			return `  ${methodName}(
 		request: ${requestType},
 		callbacks: StreamingCallbacks<${responseType}>,
 	): () => void {
@@ -150,7 +150,6 @@ function generateExternalClientSetup(serviceName, serviceDefinition) {
 			abortController.abort()
 		}
 	}\n`
-			}
 		})
 		.join("\n")
 
@@ -222,9 +221,8 @@ function generateVscodeClientImplementation(serviceName, serviceDefinition) {
 			const isStreamingResponse = methodDef.responseStream
 			if (!isStreamingResponse) {
 				return `${name}ServiceRegistry.registerMethod("${methodName}", ${methodName})`
-			} else {
-				return `${name}ServiceRegistry.registerMethod("${methodName}", ${methodName}, { isStreaming: true })`
 			}
+			return `${name}ServiceRegistry.registerMethod("${methodName}", ${methodName}, { isStreaming: true })`
 		})
 		.join("\n")
 

scripts/generate-protobus-setup.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import path from "path"
-import { fileURLToPath } from "url"
+import path from "node:path"
+import { fileURLToPath } from "node:url"
 import { writeFileWithMkdirs } from "./file-utils.mjs"
 import { getFqn, loadServicesFromProtoDescriptor } from "./proto-utils.mjs"
 
@@ -157,8 +157,8 @@ async function generateStandaloneProtobusServiceSetup(protobusServices) {
 		handlerSetup.push(`    server.addService(cline.${name}Service, {`)
 		for (const [rpcName, rpc] of Object.entries(def.service)) {
 			imports.push(`import { ${rpcName} } from "@core/controller/${dir}/${rpcName}"`)
-			const requestType = "cline." + rpc.requestType.type.name
-			const responseType = "cline." + rpc.responseType.type.name
+			const requestType = `cline.${rpc.requestType.type.name}`
+			const responseType = `cline.${rpc.responseType.type.name}`
 			if (rpc.requestStream) {
 				throw new Error("Request streaming is not supported")
 			}

scripts/generate-stubs.js

@@ -1,5 +1,5 @@
-const fs = require("fs")
-const path = require("path")
+const fs = require("node:fs")
+const path = require("node:path")
 const { Project, SyntaxKind } = require("ts-morph")
 
 function traverse(container, output, prefix = "") {

scripts/interactive-playwright.ts

@@ -0,0 +1,112 @@
+#!/usr/bin/env npx tsx
+
+/**
+ * Interactive Playwright launcher for the Cline VS Code extension.
+ *
+ * Overview:
+ *  - Starts the mock Cline API server (from the e2e test fixtures).
+ *  - Downloads a stable build of VS Code (via @vscode/test-electron).
+ *  - Creates a temporary VS Code user profile directory.
+ *  - Installs and links the Cline extension (from dist/e2e.vsix and the dev path).
+ *  - Opens a test workspace and automatically reveals the Cline sidebar.
+ *  - Records **all gRPC calls** during the session for later inspection.
+ *  - Keeps VS Code running for manual interactive testing until the window is closed or Ctrl+C is pressed.
+ *  - Cleans up all resources (mock server, temp profile, Electron process) on exit.
+ *
+ * Usage:
+ *   1. (Optional) Build and install the e2e extension:
+ *        npm run test:e2e:build
+ *
+ *   2. From the repo root, start the interactive session:
+ *        npm run test:playwright:interactive
+ *
+ *   3. VS Code will launch with the Cline extension loaded and gRPC recording enabled.
+ *
+ *   4. Interact with the extension manually.
+ *
+ *   5. Close the VS Code window or press Ctrl+C to end the session and trigger cleanup.
+ */
+
+import { mkdtempSync } from "node:fs"
+import os from "node:os"
+import path from "node:path"
+import { downloadAndUnzipVSCode, SilentReporter } from "@vscode/test-electron"
+import { _electron } from "playwright"
+import { ClineApiServerMock } from "../src/test/e2e/fixtures/server"
+import { E2ETestHelper } from "../src/test/e2e/utils/helpers"
+
+async function main() {
+	await ClineApiServerMock.startGlobalServer()
+
+	const userDataDir = mkdtempSync(path.join(os.tmpdir(), "vsce-interactive"))
+	const executablePath = await downloadAndUnzipVSCode("stable", undefined, new SilentReporter())
+
+	// launch VSCode
+	const app = await _electron.launch({
+		executablePath,
+		env: {
+			...process.env,
+			TEMP_PROFILE: "true",
+			E2E_TEST: "true",
+			CLINE_ENVIRONMENT: "local",
+			GRPC_RECORDER_ENABLED: "true",
+			GRPC_RECORDER_TESTS_FILTERS_ENABLED: "true",
+		},
+		args: [
+			"--no-sandbox",
+			"--disable-updates",
+			"--disable-workspace-trust",
+			"--disable-extensions",
+			"--skip-welcome",
+			"--skip-release-notes",
+			`--user-data-dir=${userDataDir}`,
+			`--install-extension=${path.join(E2ETestHelper.CODEBASE_ROOT_DIR, "dist", "e2e.vsix")}`,
+			`--extensionDevelopmentPath=${E2ETestHelper.CODEBASE_ROOT_DIR}`,
+			path.join(E2ETestHelper.E2E_TESTS_DIR, "fixtures", "workspace"),
+		],
+	})
+
+	const page = await app.firstWindow()
+
+	await E2ETestHelper.openClineSidebar(page)
+
+	console.log("VSCode with Cline extension is now running!")
+	console.log(`Temporary data directory on: ${userDataDir}`)
+	console.log("You can manually interact with the extension.")
+	console.log("Press Ctrl+C to close when done.")
+
+	async function teardown() {
+		console.log("Cleaning up resources...")
+		try {
+			await app?.close()
+			await ClineApiServerMock.stopGlobalServer?.()
+			await E2ETestHelper.rmForRetries(userDataDir, { recursive: true })
+		} catch (e) {
+			console.log(`We could teardown interactive playwright properly, error:${e}`)
+		}
+		console.log("Finished cleaning up resources...")
+	}
+
+	process.on("SIGINT", async () => {
+		await teardown()
+		process.exit(0)
+	})
+
+	process.on("SIGTERM", async () => {
+		await teardown()
+		process.exit(0)
+	})
+
+	const win = await app.firstWindow()
+	win.on("close", async () => {
+		console.log("VS Code window closed.")
+		await teardown()
+		process.exit(0)
+	})
+	process.stdin.resume()
+}
+
+main().catch((err) => {
+	console.error("Failed to start:", err)
+	process.exit(1)
+})

scripts/package-standalone.mjs

@@ -1,13 +1,13 @@
 #!/usr/bin/env node
 
+import { execSync } from "node:child_process"
+import fs from "node:fs"
+import { cp } from "node:fs/promises"
+import os from "node:os"
+import path from "node:path"
 import archiver from "archiver"
-import { execSync } from "child_process"
-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"

scripts/proto-utils.mjs

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 
+import * as fs from "node:fs/promises"
+import * as path from "node:path"
 import * as grpc from "@grpc/grpc-js"
 import * as protoLoader from "@grpc/proto-loader"
-import * as fs from "fs/promises"
-import * as path from "path"
 
 const DESCRIPTOR_SET = path.resolve("dist-standalone/proto/descriptor_set.pb")
 

scripts/report-issue.js

@@ -1,6 +1,6 @@
-const { execSync } = require("child_process")
-const readline = require("readline")
-const os = require("os")
+const { execSync } = require("node:child_process")
+const readline = require("node:readline")
+const os = require("node:os")
 
 const rl = readline.createInterface({
 	input: process.stdin,

scripts/runclinecore.sh

@@ -9,7 +9,7 @@ if [[ "${1:-}" == "-h" ]]; then
 fi
 
 CORE_DIR=~/.cline/core
-INSTALL_DIR=$CORE_DIR/0.0.1
+INSTALL_DIR=$CORE_DIR/dev-instance/
 LOG_FILE=~/.cline/cline-core-service.log
 
 ZIP_FILE=standalone.zip
@@ -25,4 +25,6 @@ unp $ZIP_FILE > /dev/null
 
 pkill -f cline-core.js || true
 
+echo pwd: $(pwd)
+set -x
 NODE_PATH=./node_modules DEV_WORKSPACE_FOLDER=/tmp/ node cline-core.js 2>&1 | tee $LOG_FILE

scripts/test-ci.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-const { execSync } = require("child_process")
-const process = require("process")
+const { execSync } = require("node:child_process")
+const process = require("node:process")
 
 try {
 	if (process.platform === "linux") {

scripts/test-hostbridge-server.ts

@@ -1,8 +1,8 @@
 #!/usr/bin/env npx tsx
+import * as os from "node:os"
 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"
@@ -70,7 +70,7 @@ function createMockService<T extends grpc.UntypedServiceImplementation>(serviceN
 
 					case "getMachineId":
 						callback(null, {
-							value: "fake-machine-id-" + os.hostname(),
+							value: `fake-machine-id-${os.hostname()}`,
 						})
 						return
 
@@ -102,7 +102,7 @@ function createMockService<T extends grpc.UntypedServiceImplementation>(serviceN
 
 					case "openDiff":
 						callback(null, {
-							diff_id: "fake-diff-" + Date.now(),
+							diff_id: `fake-diff-${Date.now()}`,
 						})
 						return
 

scripts/test-standalone-core-api-server.ts

@@ -28,14 +28,13 @@
  * Ideal for local development, testing, or lightweight E2E scenarios.
  */
 
+import { type ChildProcess, execSync, spawn } from "node:child_process"
+import * as fs from "node:fs"
 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 * as path from "node: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()
@@ -48,6 +47,8 @@ const distDir = process.env.CLINE_DIST_DIR || path.join(projectRoot, "dist-stand
 const clineCoreFile = process.env.CLINE_CORE_FILE || "cline-core.js"
 const coreFile = path.join(distDir, clineCoreFile)
 
+const childProcesses: ChildProcess[] = []
+
 async function main(): Promise<void> {
 	console.log("Starting Simple Cline gRPC Server...")
 	console.log(`Workspace: ${WORKSPACE_DIR}`)
@@ -75,27 +76,24 @@ async function main(): Promise<void> {
 		process.exit(1)
 	}
 
-	// Create temporary directories like e2e tests
+	const extensionsDir = path.join(distDir, "vsce-extension")
 	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,
+			HOST_BRIDGE_ADDRESS: `127.0.0.1:${HOSTBRIDGE_PORT}`,
 		},
 	})
+	childProcesses.push(hostbridge)
 
 	console.log(`Temp user data dir: ${userDataDir}`)
 	console.log(`Temp extensions dir: ${extensionsDir}`)
-
-	// Extract standalone.zip to the extensions directory
+	// Extract standalone.zip if needed
 	const standaloneZipPath = path.join(distDir, "standalone.zip")
 	if (!fs.existsSync(standaloneZipPath)) {
 		console.error(`standalone.zip not found at: ${standaloneZipPath}`)
@@ -104,15 +102,15 @@ async function main(): Promise<void> {
 
 	console.log("Extracting standalone.zip to extensions directory...")
 	try {
-		execSync(`unzip -q "${standaloneZipPath}" -d "${extensionsDir}"`, { stdio: "inherit" })
+		if (!fs.existsSync(extensionsDir)) {
+			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,
@@ -122,29 +120,33 @@ async function main(): Promise<void> {
 			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,
+			E2E_TEST,
+			CLINE_ENVIRONMENT,
 			CLINE_DIR: userDataDir,
 			INSTALL_DIR: extensionsDir,
 		},
 		stdio: "inherit",
 	})
+	childProcesses.push(coreService)
+
+	const shutdown = async () => {
+		console.log("\nShutting down services...")
+
+		while (childProcesses.length > 0) {
+			const child = childProcesses.pop()
+			if (child && !child.killed) {
+				child.kill("SIGINT")
+			}
+		}
 
-	// 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)
+		} catch (err) {
+			console.warn("Failed to cleanup temp directories:", err)
 		}
 
 		process.exit(0)
@@ -155,24 +157,20 @@ async function main(): Promise<void> {
 
 	coreService.on("exit", (code) => {
 		console.log(`Core service exited with code ${code}`)
-		hostbridge.kill()
-		process.exit(code || 0)
+		shutdown()
 	})
-
 	hostbridge.on("exit", (code) => {
 		console.log(`HostBridge exited with code ${code}`)
-		coreService.kill()
-		process.exit(code || 0)
+		shutdown()
 	})
 
-	console.log("Cline gRPC Server is running!")
-	console.log(`Connect to: 127.0.0.1:${PROTOBUS_PORT}`)
+	console.log(`Cline gRPC Server is running on 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)
+	main().catch((err) => {
+		console.error("Failed to start simple Cline server:", err)
 		process.exit(1)
 	})
 }

scripts/testing-platform-orchestrator.ts

@@ -14,61 +14,88 @@
  * Flags:
  *   --server-logs        Show server logs (hidden by default)
  *   --count=<number>     Repeat execution N times (default: 1)
+ *   --fix     			  Automatically update spec files with actual responses
  *
  * Environment Variables:
- *   HOSTBRIDGE_PORT      gRPC server port (default: 26040)
- *   SERVER_BOOT_DELAY    Server startup delay in ms (default: 3000)
+ *   STANDALONE_GRPC_SERVER_PORT     	gRPC server port (default: 26040)
+ *   SERVER_BOOT_DELAY    				Server startup delay in ms (default: 1300)
  */
 
-import { ChildProcess, spawn } from "child_process"
-import fs from "fs"
+import { type ChildProcess, spawn } from "node:child_process"
+import fs from "node:fs"
+import net from "node:net"
+import path from "node:path"
 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
+import kill from "tree-kill"
 
 let showServerLogs = false
+let fix = 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",
-		})
+const STANDALONE_GRPC_SERVER_PORT = process.env.STANDALONE_GRPC_SERVER_PORT || "26040"
+const WAIT_SERVER_DEFAULT_TIMEOUT = 15000
 
-		server.once("error", reject)
+// Poll until port is accepting connections
+async function waitForPort(port: number, host = "127.0.0.1", timeout = 10000): Promise<void> {
+	const start = Date.now()
+	const waitForPortSleepMs = 100
+	while (Date.now() - start < timeout) {
+		await new Promise((res) => setTimeout(res, waitForPortSleepMs))
+		try {
+			await new Promise<void>((resolve, reject) => {
+				const socket = net.connect(port, host, () => {
+					socket.destroy()
+					resolve()
+				})
+				socket.on("error", reject)
+			})
+			return
+		} catch {
+			// try again
+		}
+	}
+	throw new Error(`Timeout waiting for ${host}:${port}`)
+}
 
-		setTimeout(() => {
-			if (server.killed) {
-				reject(new Error("Server died during startup"))
-			} else {
-				resolve(server)
-			}
-		}, SERVER_BOOT_DELAY)
+async function startServer(): Promise<{ server: ChildProcess; grpcPort: string }> {
+	const grpcPort = STANDALONE_GRPC_SERVER_PORT
+
+	const server = spawn("npx", ["tsx", "scripts/test-standalone-core-api-server.ts"], {
+		stdio: showServerLogs ? "inherit" : "pipe",
+		env: { ...process.env, STANDALONE_GRPC_SERVER_PORT: grpcPort },
 	})
+
+	// Wait for either the server to become ready or fail on spawn error
+	await Promise.race([
+		waitForPort(Number(grpcPort), "127.0.0.1", WAIT_SERVER_DEFAULT_TIMEOUT),
+		new Promise((_, reject) => server.once("error", reject)),
+	])
+
+	return { server, grpcPort }
 }
 
 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()
+		if (!server.pid) {
+			return resolve()
+		}
+
+		kill(server.pid, "SIGKILL", (err) => {
+			if (err) {
+				console.warn("Failed to kill server process:", err)
 			}
-		}, 5000)
+			server.once("exit", () => resolve())
+		})
 	})
 }
 
-function runTestingPlatform(specFile: string): Promise<void> {
+function runTestingPlatform(specFile: string, grpcPort: string): Promise<void> {
 	return new Promise((resolve, reject) => {
-		const testProcess = spawn("npx", ["ts-node", "index.ts", specFile], {
+		const testProcess = spawn("npx", ["ts-node", "index.ts", specFile, ...(fix ? ["--fix"] : [])], {
 			cwd: path.join(process.cwd(), "testing-platform"),
 			stdio: "inherit",
 			env: {
 				...process.env,
-				HOSTBRIDGE_PORT: STANDALONE_GRPC_SERVER_PORT,
+				STANDALONE_GRPC_SERVER_PORT: grpcPort,
 			},
 		})
 
@@ -80,9 +107,9 @@ function runTestingPlatform(specFile: string): Promise<void> {
 }
 
 async function runSpec(specFile: string): Promise<void> {
-	const server = await startServer()
+	const { server, grpcPort } = await startServer()
 	try {
-		await runTestingPlatform(specFile)
+		await runTestingPlatform(specFile, grpcPort)
 		console.log(`✅ ${path.basename(specFile)} passed`)
 	} finally {
 		await stopServer(server)
@@ -91,7 +118,9 @@ async function runSpec(specFile: string): Promise<void> {
 
 function collectSpecFiles(inputPath: string): string[] {
 	const fullPath = path.resolve(inputPath)
-	if (!fs.existsSync(fullPath)) throw new Error(`Path does not exist: ${fullPath}`)
+	if (!fs.existsSync(fullPath)) {
+		throw new Error(`Path does not exist: ${fullPath}`)
+	}
 
 	const stat = fs.statSync(fullPath)
 	if (stat.isDirectory()) {
@@ -100,7 +129,9 @@ function collectSpecFiles(inputPath: string): string[] {
 			.filter((f) => f.endsWith(".json"))
 			.map((f) => path.join(fullPath, f))
 	}
-	if (fullPath.endsWith(".json")) return [fullPath]
+	if (fullPath.endsWith(".json")) {
+		return [fullPath]
+	}
 	throw new Error("Spec path must be a JSON file or a folder containing JSON files")
 }
 
@@ -127,14 +158,17 @@ async function runAll(inputPath: string, count: number) {
 			}
 		}
 
-		if (failure > 0) process.exitCode = 1
+		if (failure > 0) {
+			process.exitCode = 1
+		}
 	}
 
 	console.log(`✅ Passed: ${success}`)
-	if (failure > 0) console.log(`❌ Failed: ${failure}`)
+	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`)
+	console.log(`🏁 All runs completed in ${((Date.now() - totalStart) / 1000).toFixed(2)}s`)
 }
 
 async function main() {
@@ -142,9 +176,12 @@ async function main() {
 	const inputPath = args._[0]
 	const count = Number(args.count)
 	showServerLogs = Boolean(args["server-logs"])
+	fix = Boolean(args["fix"])
 
 	if (!inputPath) {
-		console.error("Usage: npx tsx scripts/testing-platform-orchestrator.ts <spec-file-or-folder> [--count=N] [--server-logs]")
+		console.error(
+			"Usage: npx tsx scripts/testing-platform-orchestrator.ts <spec-file-or-folder> [--count=N] [--server-logs] [--fix]",
+		)
 		process.exit(1)
 	}
 

src/api/providers/dify.ts

@@ -1,15 +1,19 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandlerOptions, ModelInfo } from "@shared/api"
-import { ApiHandler } from "../../core/api/index"
-import { ApiStream } from "../../core/api/transform/stream"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { ModelInfo } from "@shared/api"
+import type { ApiHandler } from "../../core/api/index"
+import type { ApiStream } from "../../core/api/transform/stream"
+
+interface DifyHandlerOptions {
+	difyApiKey?: string
+	difyBaseUrl?: string
+}
 
 export class DifyHandler implements ApiHandler {
-	private options: ApiHandlerOptions
 	private baseUrl: string
 	private apiKey: string
 	private conversationId: string | null = null
 
-	constructor(options: ApiHandlerOptions) {
+	constructor(options: DifyHandlerOptions) {
 		this.options = options
 		this.apiKey = options.difyApiKey || ""
 		this.baseUrl = options.difyBaseUrl || ""
@@ -236,7 +240,7 @@ export class DifyHandler implements ApiHandler {
 								console.error("[DIFY DEBUG] Direct JSON Error event:", parsed)
 								throw new Error(`Dify API error: ${parsed.message || "Unknown error"}`)
 							}
-						} catch (e) {
+						} catch (_e) {
 							// Not JSON, continue
 							console.log("[DIFY DEBUG] Line is not direct JSON, continuing")
 						}

src/common.ts

@@ -1,4 +1,4 @@
-import * as vscode from "vscode"
+import type * as vscode from "vscode"
 import {
 	migrateCustomInstructionsToGlobalRules,
 	migrateTaskHistoryToFile,
@@ -12,6 +12,7 @@ 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 { ExtensionRegistryInfo } from "./registry"
 import { ErrorService } from "./services/error"
 import { featureFlagsService } from "./services/feature-flags"
 import { initializeDistinctId } from "./services/logging/distinctId"
@@ -62,7 +63,7 @@ export async function initialize(context: vscode.ExtensionContext): Promise<Webv
 
 async function showVersionUpdateAnnouncement(context: vscode.ExtensionContext) {
 	// Version checking for autoupdate notification
-	const currentVersion = context.extension.packageJSON.version
+	const currentVersion = ExtensionRegistryInfo.version
 	const previousVersion = context.globalState.get<string>("clineVersion")
 	// Perform post-update actions if necessary
 	try {
@@ -71,7 +72,7 @@ async function showVersionUpdateAnnouncement(context: vscode.ExtensionContext) {
 
 			// Use the same condition as announcements: focus when there's a new announcement to show
 			const lastShownAnnouncementId = context.globalState.get<string>("lastShownAnnouncementId")
-			const latestAnnouncementId = getLatestAnnouncementId(context)
+			const latestAnnouncementId = getLatestAnnouncementId()
 
 			if (lastShownAnnouncementId !== latestAnnouncementId) {
 				// Focus Cline when there's a new announcement to show (major/minor updates or fresh installs)

src/core/api/index.ts

@@ -1,6 +1,6 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiConfiguration, ModelInfo, QwenApiRegions } from "@shared/api"
-import { Mode } from "@shared/storage/types"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ApiConfiguration, type ModelInfo, QwenApiRegions } from "@shared/api"
+import type { Mode } from "@shared/storage/types"
 import { AnthropicHandler } from "./providers/anthropic"
 import { AskSageHandler } from "./providers/asksage"
 import { BasetenHandler } from "./providers/baseten"
@@ -21,6 +21,7 @@ import { LmStudioHandler } from "./providers/lmstudio"
 import { MistralHandler } from "./providers/mistral"
 import { MoonshotHandler } from "./providers/moonshot"
 import { NebiusHandler } from "./providers/nebius"
+import { OcaHandler } from "./providers/oca"
 import { OllamaHandler } from "./providers/ollama"
 import { OpenAiHandler } from "./providers/openai"
 import { OpenAiNativeHandler } from "./providers/openai-native"
@@ -36,7 +37,7 @@ import { VertexHandler } from "./providers/vertex"
 import { VsCodeLmHandler } from "./providers/vscode-lm"
 import { XAIHandler } from "./providers/xai"
 import { ZAiHandler } from "./providers/zai"
-import { ApiStream, ApiStreamUsageChunk } from "./transform/stream"
+import type { ApiStream, ApiStreamUsageChunk } from "./transform/stream"
 
 export type CommonApiHandlerOptions = {
 	onRetryAttempt?: ApiConfiguration["onRetryAttempt"]
@@ -352,10 +353,6 @@ function createHandlerForProvider(
 					mode === "plan" ? options.planModeHuaweiCloudMaasModelInfo : options.actModeHuaweiCloudMaasModelInfo,
 			})
 		case "dify": // Add Dify.ai handler
-			console.log("[DIFY DEBUG] Instantiating DifyHandler with options:", {
-				difyApiKeyPresent: !!options.difyApiKey,
-				difyBaseUrl: options.difyBaseUrl,
-			})
 			return new DifyHandler({
 				difyApiKey: options.difyApiKey,
 				difyBaseUrl: options.difyBaseUrl,
@@ -376,6 +373,19 @@ function createHandlerForProvider(
 				zaiApiKey: options.zaiApiKey,
 				apiModelId: mode === "plan" ? options.planModeApiModelId : options.actModeApiModelId,
 			})
+		case "oca":
+			return new OcaHandler({
+				ocaBaseUrl: options.ocaBaseUrl,
+				ocaModelId: mode === "plan" ? options.planModeOcaModelId : options.actModeOcaModelId,
+				ocaModelInfo: mode === "plan" ? options.planModeOcaModelInfo : options.actModeOcaModelInfo,
+				thinkingBudgetTokens:
+					mode === "plan" ? options.planModeThinkingBudgetTokens : options.actModeThinkingBudgetTokens,
+				ocaUsePromptCache:
+					mode === "plan"
+						? options.planModeOcaModelInfo?.supportsPromptCache
+						: options.actModeOcaModelInfo?.supportsPromptCache,
+				taskId: options.ulid,
+			})
 		default:
 			return new AnthropicHandler({
 				onRetryAttempt: options.onRetryAttempt,

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

@@ -1,7 +1,7 @@
 import "should"
+import { Readable } from "node:stream"
 import { ConverseStreamCommand } from "@aws-sdk/client-bedrock-runtime"
-import { ApiHandlerOptions } from "@shared/api"
-import { Readable } from "stream"
+import type { AwsBedrockHandlerOptions } from "../bedrock"
 import { AwsBedrockHandler } from "../bedrock"
 
 describe("AwsBedrockHandler", () => {
@@ -202,8 +202,8 @@ describe("AwsBedrockHandler", () => {
 		})
 	})
 
-	const mockOptions: ApiHandlerOptions = {
-		actModeApiModelId: "anthropic.claude-3-7-sonnet-20250219-v1:0",
+	const mockOptions: AwsBedrockHandlerOptions = {
+		apiModelId: "anthropic.claude-3-7-sonnet-20250219-v1:0",
 		awsRegion: "us-east-1",
 		awsAccessKey: "test-key",
 		awsSecretKey: "test-secret",
@@ -214,9 +214,9 @@ describe("AwsBedrockHandler", () => {
 		awsBedrockUsePromptCache: false,
 		awsUseCrossRegionInference: false,
 		awsBedrockEndpoint: "",
-		actModeAwsBedrockCustomSelected: false,
-		actModeAwsBedrockCustomModelBaseId: undefined,
-		actModeThinkingBudgetTokens: 1600,
+		awsBedrockCustomSelected: false,
+		awsBedrockCustomModelBaseId: undefined,
+		thinkingBudgetTokens: 1600,
 	}
 
 	const mockModelInfo = {

src/core/api/providers/__tests__/claude-code.test.ts

@@ -1,4 +1,4 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import { afterEach, beforeEach, describe, it } from "mocha"
 import sinon from "sinon"
 import "should"

src/core/api/providers/__tests__/litellm.test.ts

@@ -1,4 +1,4 @@
-import Anthropic from "@anthropic-ai/sdk"
+import type Anthropic from "@anthropic-ai/sdk"
 import { LiteLlmHandler, type LiteLlmModelInfoResponse } from "@core/api/providers/litellm"
 import { convertToOpenAiMessages } from "@core/api/transform/openai-format"
 import { expect } from "chai"

src/core/api/providers/__tests__/ollama.test.ts

@@ -1,7 +1,7 @@
 import { afterEach, before, beforeEach, describe, it } from "mocha"
 import "should"
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandlerOptions } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { ApiHandlerOptions } from "@shared/api"
 import axios from "axios"
 import sinon from "sinon"
 import { OllamaHandler } from "../ollama"

src/core/api/providers/__tests__/sapaicore.test.ts

@@ -1,5 +1,5 @@
 import "should"
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import { SapAiCoreHandler } from "../sapaicore"
 
 describe("SapAiCoreHandler", () => {

src/core/api/providers/anthropic.ts

@@ -1,9 +1,15 @@
 import { Anthropic } from "@anthropic-ai/sdk"
-import { Stream as AnthropicStream } from "@anthropic-ai/sdk/streaming"
-import { AnthropicModelId, anthropicDefaultModelId, anthropicModels, CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo } from "@shared/api"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import type { Stream as AnthropicStream } from "@anthropic-ai/sdk/streaming"
+import {
+	type AnthropicModelId,
+	anthropicDefaultModelId,
+	anthropicModels,
+	CLAUDE_SONNET_4_1M_SUFFIX,
+	type ModelInfo,
+} from "@shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface AnthropicHandlerOptions extends CommonApiHandlerOptions {
 	apiKey?: string
@@ -128,9 +134,8 @@ export class AnthropicHandler implements ApiHandler {
 									"anthropic-beta": "context-1m-2025-08-07",
 								},
 							}
-						} else {
-							return undefined
 						}
+						return undefined
 					})(),
 				)
 				break

src/core/api/providers/asksage.ts

@@ -1,8 +1,8 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { AskSageModelId, askSageDefaultModelId, askSageDefaultURL, askSageModels, ModelInfo } from "@shared/api"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type AskSageModelId, askSageDefaultModelId, askSageDefaultURL, askSageModels, type ModelInfo } from "@shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface AskSageHandlerOptions extends CommonApiHandlerOptions {
 	asksageApiKey?: string

src/core/api/providers/baseten.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { BasetenModelId, basetenDefaultModelId, basetenModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type BasetenModelId, basetenDefaultModelId, basetenModels, type ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface BasetenHandlerOptions extends CommonApiHandlerOptions {
 	basetenApiKey?: string
@@ -146,20 +146,15 @@ export class BasetenHandler implements ApiHandler {
 		}
 	}
 
-	/**
-	 * Checks if the current model supports vision/images
-	 */
-	supportsImages(): boolean {
-		const model = this.getModel()
-		return model.info.supportsImages === true
-	}
-
 	/**
 	 * Checks if the current model supports tools
 	 */
 	supportsTools(): boolean {
-		const _model = this.getModel()
-		// Baseten models support tools via OpenAI-compatible API
-		return true
+		const model = this.getModel()
+		const modelInfo = model.info as any
+
+		// Use dynamic API data when available, fallback to true since all current Baseten models support tools
+		// (as of 2025-09-16 - could change if Baseten add non-tool models in future, currently no plans to do so)
+		return modelInfo.supportedFeatures ? modelInfo.supportedFeatures.includes("tools") : true
 	}
 }

src/core/api/providers/bedrock.ts

@@ -1,4 +1,4 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 // Import proper AWS SDK types
 import type { ContentBlock, Message } from "@aws-sdk/client-bedrock-runtime"
 import {
@@ -9,14 +9,14 @@ import {
 	InvokeModelWithResponseStreamCommand,
 } from "@aws-sdk/client-bedrock-runtime"
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
-import { BedrockModelId, bedrockDefaultModelId, bedrockModels, CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo } from "@shared/api"
+import { type BedrockModelId, bedrockDefaultModelId, bedrockModels, CLAUDE_SONNET_4_1M_SUFFIX, type ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
-interface AwsBedrockHandlerOptions extends CommonApiHandlerOptions {
+export interface AwsBedrockHandlerOptions extends CommonApiHandlerOptions {
 	apiModelId?: string
 	awsAccessKey?: string
 	awsSecretKey?: string
@@ -30,7 +30,7 @@ interface AwsBedrockHandlerOptions extends CommonApiHandlerOptions {
 	awsProfile?: string
 	awsBedrockEndpoint?: string
 	awsBedrockCustomSelected?: boolean
-	awsBedrockCustomModelBaseId?: BedrockModelId
+	awsBedrockCustomModelBaseId?: string
 	thinkingBudgetTokens?: number
 }
 
@@ -170,7 +170,7 @@ export class AwsBedrockHandler implements ApiHandler {
 			if (baseModel && baseModel in bedrockModels) {
 				return {
 					id: modelId,
-					info: bedrockModels[baseModel],
+					info: bedrockModels[baseModel as BedrockModelId],
 				}
 			}
 			// For custom models without valid base model in bedrock model list, use default model's capabilities
@@ -479,7 +479,7 @@ export class AwsBedrockHandler implements ApiHandler {
 				}
 			}
 
-			combinedContent += message.role === "user" ? "User: " + content + "\n" : "Assistant: " + content + "\n"
+			combinedContent += message.role === "user" ? `User: ${content}\n` : `Assistant: ${content}\n`
 		}
 
 		// Format according to DeepSeek R1's expected prompt format

src/core/api/providers/cerebras.ts

@@ -1,9 +1,9 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import Cerebras from "@cerebras/cerebras_cloud_sdk"
-import { CerebrasModelId, cerebrasDefaultModelId, cerebrasModels, ModelInfo } from "@shared/api"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import { type CerebrasModelId, cerebrasDefaultModelId, cerebrasModels, type ModelInfo } from "@shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface CerebrasHandlerOptions extends CommonApiHandlerOptions {
 	cerebrasApiKey?: string
@@ -70,7 +70,8 @@ export class CerebrasHandler implements ApiHandler {
 							.map((block) => {
 								if (block.type === "text") {
 									return block.text
-								} else if (block.type === "image") {
+								}
+								if (block.type === "image") {
 									return "[Image content not supported in Cerebras]"
 								}
 								return ""
@@ -180,14 +181,18 @@ export class CerebrasHandler implements ApiHandler {
 				// Rate limit error - will be handled by retry decorator with patient backoff
 				const _limits = this.getRateLimits()
 				throw new Error(`Cerebras API rate limit exceeded.`)
-			} else if (error?.status === 401) {
+			}
+			if (error?.status === 401) {
 				throw new Error("Cerebras API authentication failed. Please check your API key.")
-			} else if (error?.status === 403) {
+			}
+			if (error?.status === 403) {
 				throw new Error("Cerebras API access denied. Please check your API key permissions.")
-			} else if (error?.status >= 500) {
+			}
+			if (error?.status >= 500) {
 				// Server errors - retryable
 				throw new Error(`Cerebras API server error (${error.status}): ${error.message || "Unknown server error"}`)
-			} else if (error?.status === 400) {
+			}
+			if (error?.status === 400) {
 				// Client errors - not retryable
 				throw new Error(`Cerebras API bad request: ${error.message || "Invalid request parameters"}`)
 			}

src/core/api/providers/claude-code.ts

@@ -1,10 +1,10 @@
 import type { Anthropic } from "@anthropic-ai/sdk"
 import { filterMessagesForClaudeCode } from "@/integrations/claude-code/message-filter"
 import { runClaudeCode } from "@/integrations/claude-code/run"
-import { ClaudeCodeModelId, claudeCodeDefaultModelId, claudeCodeModels } from "@/shared/api"
-import { type ApiHandler, CommonApiHandlerOptions } from ".."
+import { type ClaudeCodeModelId, claudeCodeDefaultModelId, claudeCodeModels } from "@/shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
-import { type ApiStream, ApiStreamUsageChunk } from "../transform/stream"
+import type { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
 
 interface ClaudeCodeHandlerOptions extends CommonApiHandlerOptions {
 	claudeCodePath?: string

src/core/api/providers/cline.ts

@@ -1,5 +1,5 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
 import { shouldSkipReasoningForModel } from "@utils/model-utils"
 import axios from "axios"
 import OpenAI from "openai"
@@ -8,11 +8,11 @@ import { ClineAccountService } from "@/services/account/ClineAccountService"
 import { AuthService } from "@/services/auth/AuthService"
 import { CLINE_ACCOUNT_AUTH_ERROR_MESSAGE } from "@/shared/ClineAccount"
 import { version as extensionVersion } from "../../../../package.json"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { createOpenRouterStream } from "../transform/openrouter-stream"
-import { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
-import { OpenRouterErrorResponse } from "./types"
+import type { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
+import type { OpenRouterErrorResponse } from "./types"
 
 interface ClineHandlerOptions extends CommonApiHandlerOptions {
 	ulid?: string
@@ -133,11 +133,8 @@ export class ClineHandler implements ApiHandler {
 						const error = choiceWithError.error
 						console.error(`Cline Mid-Stream Error: ${error.code || error.type || "Unknown"} - ${error.message}`)
 						throw new Error(`Cline Mid-Stream Error: ${error.code || error.type || "Unknown"} - ${error.message}`)
-					} else {
-						throw new Error(
-							"Cline Mid-Stream Error: Stream terminated with error status but no error details provided",
-						)
 					}
+					throw new Error("Cline Mid-Stream Error: Stream terminated with error status but no error details provided")
 				}
 
 				const delta = choice?.delta
@@ -162,7 +159,7 @@ export class ClineHandler implements ApiHandler {
 					// @ts-ignore-next-line
 					let totalCost = (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0)
 
-					if (this.getModel().id === "cline/sonic") {
+					if (this.getModel().id === "cline/code-supernova") {
 						totalCost = 0
 					}
 

src/core/api/providers/deepseek.ts

@@ -1,12 +1,12 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { DeepSeekModelId, deepSeekDefaultModelId, deepSeekModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type DeepSeekModelId, deepSeekDefaultModelId, deepSeekModels, type ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface DeepSeekHandlerOptions extends CommonApiHandlerOptions {
 	deepSeekApiKey?: string

src/core/api/providers/dify.ts

@@ -1,7 +1,12 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandlerOptions, ModelInfo } from "../../../shared/api"
-import { ApiHandler } from "../index"
-import { ApiStream } from "../transform/stream"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { ModelInfo } from "../../../shared/api"
+import type { ApiHandler } from "../index"
+import type { ApiStream } from "../transform/stream"
+
+interface DifyHandlerOptions {
+	difyApiKey?: string
+	difyBaseUrl?: string
+}
 
 // Dify API Response Types
 export interface DifyFileResponse {
@@ -66,15 +71,11 @@ interface DifyConversationResponse {
 }
 
 export class DifyHandler implements ApiHandler {
-	private options: ApiHandlerOptions
 	private baseUrl: string
 	private apiKey: string
 	private conversationId: string | null = null
-	private currentTaskId: string | null = null
-	private abortController: AbortController | null = null
 
-	constructor(options: ApiHandlerOptions) {
-		this.options = options
+	constructor(options: DifyHandlerOptions) {
 		this.apiKey = options.difyApiKey || ""
 		this.baseUrl = options.difyBaseUrl || ""
 
@@ -336,7 +337,7 @@ export class DifyHandler implements ApiHandler {
 								}
 								hasYieldedContent = true
 							}
-						} catch (e) {
+						} catch (_e) {
 							// Not JSON, continue
 							console.log("[DIFY DEBUG] Line is not direct JSON, continuing")
 						}
@@ -650,6 +651,5 @@ export class DifyHandler implements ApiHandler {
 	 */
 	resetConversation(): void {
 		this.conversationId = null
-		this.currentTaskId = null
 	}
 }

src/core/api/providers/doubao.ts

@@ -1,10 +1,10 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { DoubaoModelId, doubaoDefaultModelId, doubaoModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type DoubaoModelId, doubaoDefaultModelId, doubaoModels, type ModelInfo } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface DoubaoHandlerOptions extends CommonApiHandlerOptions {
 	doubaoApiKey?: string

src/core/api/providers/fireworks.ts

@@ -1,10 +1,10 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { FireworksModelId, fireworksDefaultModelId, fireworksModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type FireworksModelId, fireworksDefaultModelId, fireworksModels, type ModelInfo } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface FireworksHandlerOptions extends CommonApiHandlerOptions {
 	fireworksApiKey?: string

src/core/api/providers/gemini.ts

@@ -1,12 +1,18 @@
 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 { GeminiModelId, geminiDefaultModelId, geminiModels, ModelInfo } from "@shared/api"
+import {
+	ApiError,
+	type GenerateContentConfig,
+	type GenerateContentResponseUsageMetadata,
+	GoogleGenAI,
+	type Part,
+} from "@google/genai"
+import { type GeminiModelId, geminiDefaultModelId, geminiModels, type ModelInfo } from "@shared/api"
 import { telemetryService } from "@/services/telemetry"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { RetriableError, withRetry } from "../retry"
 import { convertAnthropicMessageToGemini } from "../transform/gemini-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 // Define a default TTL for the cache (e.g., 15 minutes in seconds)
 const _DEFAULT_CACHE_TTL_SECONDS = 900
@@ -169,7 +175,7 @@ export class GeminiHandler implements ApiHandler {
 						if (thought && text) {
 							// Ensure part.text exists
 							// Handle the thought part
-							thoughts += text + "\n" // Append thought and a newline
+							thoughts += `${text}\n` // Append thought and a newline
 						}
 					}
 				}
@@ -423,7 +429,8 @@ export class GeminiHandler implements ApiHandler {
 		const totalChars = content.reduce((total, block) => {
 			if (typeof block === "string") {
 				return total + block.length
-			} else if (block && typeof block === "object") {
+			}
+			if (block && typeof block === "object") {
 				// Safely stringify the object
 				try {
 					const jsonStr = JSON.stringify(block)
@@ -453,9 +460,11 @@ export class GeminiHandler implements ApiHandler {
 
 		if (unit === "s") {
 			return value
-		} else if (unit === "m") {
+		}
+		if (unit === "m") {
 			return value * 60 // Convert minutes to seconds
-		} else if (unit === "h") {
+		}
+		if (unit === "h") {
 			return value * 60 * 60 // Convert hours to seconds
 		}
 

src/core/api/providers/groq.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { GroqModelId, groqDefaultModelId, groqModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type GroqModelId, groqDefaultModelId, groqModels, type ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface GroqHandlerOptions extends CommonApiHandlerOptions {
 	groqApiKey?: string

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

@@ -1,10 +1,10 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { HuaweiCloudMaasModelId, huaweiCloudMaasDefaultModelId, huaweiCloudMaasModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type HuaweiCloudMaasModelId, huaweiCloudMaasDefaultModelId, huaweiCloudMaasModels, type ModelInfo } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface HuaweiCloudMaaSHandlerOptions extends CommonApiHandlerOptions {
 	huaweiCloudMaasApiKey?: string

src/core/api/providers/huggingface.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { HuggingFaceModelId, huggingFaceDefaultModelId, huggingFaceModels, ModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type HuggingFaceModelId, huggingFaceDefaultModelId, huggingFaceModels, type ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface HuggingFaceHandlerOptions extends CommonApiHandlerOptions {
 	huggingFaceApiKey?: string

src/core/api/providers/litellm.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { LiteLLMModelInfo, liteLlmDefaultModelId, liteLlmModelInfoSaneDefaults } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type LiteLLMModelInfo, liteLlmDefaultModelId, liteLlmModelInfoSaneDefaults } from "@shared/api"
 import OpenAI from "openai"
 import { isAnthropicModelId } from "@/utils/model-utils"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface LiteLlmHandlerOptions extends CommonApiHandlerOptions {
 	liteLlmApiKey?: string
@@ -99,27 +99,25 @@ export class LiteLlmHandler implements ApiHandler {
 				this.modelInfoCache = data
 				this.modelInfoCacheTimestamp = now
 				return data
-			} else {
-				console.warn("Failed to fetch LiteLLM model info:", response.statusText)
-				// Try with Authorization header instead
-				const retryResponse = await fetch(url, {
-					method: "GET",
-					headers: {
-						accept: "application/json",
-						Authorization: `Bearer ${this.options.liteLlmApiKey || ""}`,
-					},
-				})
-
-				if (retryResponse.ok) {
-					const data: LiteLlmModelInfoResponse = await retryResponse.json()
-					this.modelInfoCache = data
-					this.modelInfoCacheTimestamp = now
-					return data
-				} else {
-					console.warn("Failed to fetch LiteLLM model info with Authorization header:", retryResponse.statusText)
-					return undefined
-				}
 			}
+			console.warn("Failed to fetch LiteLLM model info:", response.statusText)
+			// Try with Authorization header instead
+			const retryResponse = await fetch(url, {
+				method: "GET",
+				headers: {
+					accept: "application/json",
+					Authorization: `Bearer ${this.options.liteLlmApiKey || ""}`,
+				},
+			})
+
+			if (retryResponse.ok) {
+				const data: LiteLlmModelInfoResponse = await retryResponse.json()
+				this.modelInfoCache = data
+				this.modelInfoCacheTimestamp = now
+				return data
+			}
+			console.warn("Failed to fetch LiteLLM model info with Authorization header:", retryResponse.statusText)
+			return undefined
 		} catch (error) {
 			console.warn("Error fetching LiteLLM model info:", error)
 			return undefined
@@ -245,7 +243,8 @@ export class LiteLlmHandler implements ApiHandler {
 								},
 							] as any,
 						}
-					} else if (Array.isArray(message.content)) {
+					}
+					if (Array.isArray(message.content)) {
 						// Apply cache control to the last content item in the array
 						return {
 							...message,

src/core/api/providers/mistral.ts

@@ -1,10 +1,10 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import { Mistral } from "@mistralai/mistralai"
-import { MistralModelId, ModelInfo, mistralDefaultModelId, mistralModels } from "@shared/api"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import { type MistralModelId, type ModelInfo, mistralDefaultModelId, mistralModels } from "@shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToMistralMessages } from "../transform/mistral-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface MistralHandlerOptions extends CommonApiHandlerOptions {
 	mistralApiKey?: string

src/core/api/providers/moonshot.ts

@@ -1,10 +1,10 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
-import { ModelInfo, MoonshotModelId, moonshotDefaultModelId, moonshotModels } from "@/shared/api"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import { type ModelInfo, type MoonshotModelId, moonshotDefaultModelId, moonshotModels } from "@/shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface MoonshotHandlerOptions extends CommonApiHandlerOptions {
 	moonshotApiKey?: string
@@ -49,6 +49,7 @@ export class MoonshotHandler implements ApiHandler {
 			model: model.id,
 			messages: openAiMessages,
 			temperature: 0,
+			max_tokens: model.info.maxTokens,
 			stream: true,
 			stream_options: { include_usage: true },
 		})

src/core/api/providers/nebius.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import { type ModelInfo, type NebiusModelId, nebiusDefaultModelId, nebiusModels } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface NebiusHandlerOptions extends CommonApiHandlerOptions {
 	nebiusApiKey?: string

src/core/api/providers/oca.ts

@@ -0,0 +1,260 @@
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type LiteLLMModelInfo, liteLlmDefaultModelId, liteLlmModelInfoSaneDefaults } from "@shared/api"
+import OpenAI, { type APIError, OpenAIError } from "openai"
+import type { FinalRequestOptions, Headers as OpenAIHeaders } from "openai/core"
+import { OcaAuthService } from "@/services/auth/oca/OcaAuthService"
+import { DEFAULT_OCA_BASE_URL, OCI_HEADER_OPC_REQUEST_ID } from "@/services/auth/oca/utils/constants"
+import { createOcaHeaders } from "@/services/auth/oca/utils/utils"
+import { Logger } from "@/services/logging/Logger"
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
+import { withRetry } from "../retry"
+import { convertToOpenAiMessages } from "../transform/openai-format"
+import type { ApiStream } from "../transform/stream"
+
+export interface OcaHandlerOptions extends CommonApiHandlerOptions {
+	ocaBaseUrl?: string
+	ocaModelId?: string
+	ocaModelInfo?: LiteLLMModelInfo
+	thinkingBudgetTokens?: number
+	ocaUsePromptCache?: boolean
+	taskId?: string
+}
+
+export class OcaHandler implements ApiHandler {
+	protected options: OcaHandlerOptions
+	protected client: OpenAI | undefined
+
+	constructor(options: OcaHandlerOptions) {
+		this.options = options
+	}
+
+	protected initializeClient(options: OcaHandlerOptions) {
+		return new (class OCIOpenAI extends OpenAI {
+			protected override async prepareOptions(opts: FinalRequestOptions<unknown>): Promise<void> {
+				const token = await OcaAuthService.getInstance().getAuthToken()
+				if (!token) {
+					throw new OpenAIError("Unable to handle auth, Oracle Code Assist (OCA) access token is not available")
+				}
+				opts.headers ??= {}
+				// OCA Headers
+				const ociHeaders = await createOcaHeaders(token, options.taskId!)
+				opts.headers = { ...opts.headers, ...ociHeaders }
+				Logger.log(`Making request with customer opc-request-id: ${opts.headers?.["opc-request-id"]}`)
+				return super.prepareOptions(opts)
+			}
+
+			protected override makeStatusError(
+				status: number | undefined,
+				error: Object | undefined,
+				message: string | undefined,
+				headers: OpenAIHeaders | undefined,
+			): APIError {
+				interface OciError {
+					code?: string
+					message?: string
+				}
+				let ociErrorMessage = message
+				if (typeof error === "object" && error !== null) {
+					try {
+						ociErrorMessage = JSON.stringify(error)
+						const ociErr = error as OciError
+						if (ociErr.code !== undefined && ociErr.message !== undefined) {
+							ociErrorMessage = `${ociErr.code}: ${ociErr.message}`
+						}
+					} catch {}
+				}
+				const opcRequestId = headers?.[OCI_HEADER_OPC_REQUEST_ID]
+				if (opcRequestId) {
+					ociErrorMessage += `\n(${OCI_HEADER_OPC_REQUEST_ID}: ${opcRequestId})`
+				}
+				return super.makeStatusError(status, error, ociErrorMessage, headers)
+			}
+		})({
+			baseURL: options.ocaBaseUrl || DEFAULT_OCA_BASE_URL,
+			apiKey: "noop",
+		})
+	}
+
+	protected ensureClient(): OpenAI {
+		if (!this.client) {
+			if (!this.options.ocaModelId) {
+				throw new Error("Oracle Code Assist (OCA) model is not selected")
+			}
+			try {
+				this.client = this.initializeClient(this.options)
+			} catch (error) {
+				throw new Error(`Error creating Oracle Code Assist (OCA) client: ${error.message}`)
+			}
+		}
+		return this.client
+	}
+
+	async calculateCost(prompt_tokens: number, completion_tokens: number): Promise<number | undefined> {
+		// Reference: https://github.com/BerriAI/litellm/blob/122ee634f434014267af104814022af1d9a0882f/litellm/proxy/spend_tracking/spend_management_endpoints.py#L1473
+		const client = this.ensureClient()
+		const modelId = this.options.ocaModelId || liteLlmDefaultModelId
+		const token = await OcaAuthService.getInstance().getAuthToken()
+		if (!token) {
+			throw new OpenAIError("Unable to handle auth, Oracle Code Assist (OCA) access token is not available")
+		}
+		const ociHeaders = await createOcaHeaders(token, this.options.taskId!)
+		Logger.log(`Making calculate cost request with customer opc-request-id: ${ociHeaders["opc-request-id"]}`)
+		try {
+			const response = await fetch(`${client.baseURL}/spend/calculate`, {
+				method: "POST",
+				headers: ociHeaders,
+				body: JSON.stringify({
+					completion_response: {
+						model: modelId,
+						usage: {
+							prompt_tokens,
+							completion_tokens,
+						},
+					},
+				}),
+			})
+
+			if (response.ok) {
+				const data: { cost: number } = await response.json()
+				return data.cost
+			}
+			console.error("Error calculating spend:", response.statusText)
+			return undefined
+		} catch (error) {
+			console.error("Error calculating spend:", error)
+			return undefined
+		}
+	}
+
+	@withRetry()
+	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
+		const client = this.ensureClient()
+		const formattedMessages = convertToOpenAiMessages(messages)
+		const systemMessage: OpenAI.Chat.ChatCompletionSystemMessageParam = {
+			role: "system",
+			content: systemPrompt,
+		}
+		const modelId = this.options.ocaModelId || liteLlmDefaultModelId
+		const isOminiModel = modelId.includes("o1-mini") || modelId.includes("o3-mini") || modelId.includes("o4-mini")
+
+		// Configuration for extended thinking
+		const budgetTokens = this.options.thinkingBudgetTokens || 0
+		const reasoningOn = budgetTokens !== 0
+		const thinkingConfig = reasoningOn ? { type: "enabled", budget_tokens: budgetTokens } : undefined
+
+		let temperature: number | undefined = this.options.ocaModelInfo?.temperature ?? 0
+		const maxTokens: number | undefined = this.options.ocaModelInfo?.maxTokens
+
+		if (isOminiModel && reasoningOn) {
+			temperature = undefined // Thinking mode doesn't support temperature
+		}
+
+		// Define cache control object if prompt caching is enabled
+		const cacheControl = this.options.ocaUsePromptCache ? { cache_control: { type: "ephemeral" } } : undefined
+
+		// Add cache_control to system message if enabled
+		const enhancedSystemMessage = {
+			...systemMessage,
+			...(cacheControl && cacheControl),
+		}
+
+		// Find the last two user messages to apply caching
+		const userMsgIndices = formattedMessages.reduce((acc, msg, index) => {
+			if (msg.role === "user") {
+				acc.push(index)
+			}
+			return acc
+		}, [] as number[])
+		const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1
+		const secondLastUserMsgIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1
+
+		// Apply cache_control to the last two user messages if enabled
+		const enhancedMessages = formattedMessages.map((message, index) => {
+			if ((index === lastUserMsgIndex || index === secondLastUserMsgIndex) && cacheControl) {
+				return {
+					...message,
+					...cacheControl,
+				}
+			}
+			return message
+		})
+
+		const stream = await client.chat.completions.create({
+			model: this.options.ocaModelId || liteLlmDefaultModelId,
+			messages: [enhancedSystemMessage, ...enhancedMessages],
+			temperature,
+			stream: true,
+			max_completion_tokens: maxTokens,
+			max_tokens: maxTokens,
+			stream_options: { include_usage: true },
+			...(thinkingConfig && { thinking: thinkingConfig }), // Add thinking configuration when applicable
+			...(this.options.taskId && {
+				litellm_session_id: `cline-${this.options.taskId}`,
+			}), // Add session ID for LiteLLM tracking
+		})
+
+		const inputCost = (await this.calculateCost(1e6, 0)) || 0
+		const outputCost = (await this.calculateCost(0, 1e6)) || 0
+
+		for await (const chunk of stream) {
+			const delta = chunk.choices[0]?.delta
+
+			// Handle normal text content
+			if (delta?.content) {
+				yield {
+					type: "text",
+					text: delta.content,
+				}
+			}
+
+			// Handle reasoning events (thinking)
+			// Thinking is not in the standard types but may be in the response
+			interface ThinkingDelta {
+				thinking?: string
+			}
+
+			if ((delta as ThinkingDelta)?.thinking) {
+				yield {
+					type: "reasoning",
+					reasoning: (delta as ThinkingDelta).thinking || "",
+				}
+			}
+
+			// Handle token usage information
+			if (chunk.usage) {
+				const totalCost =
+					(inputCost * chunk.usage.prompt_tokens) / 1e6 + (outputCost * chunk.usage.completion_tokens) / 1e6
+
+				// Extract cache-related information if available
+				// Need to use type assertion since these properties are not in the standard OpenAI types
+				const usage = chunk.usage as {
+					prompt_tokens: number
+					completion_tokens: number
+					cache_creation_input_tokens?: number
+					prompt_cache_miss_tokens?: number
+					cache_read_input_tokens?: number
+					prompt_cache_hit_tokens?: number
+				}
+
+				const cacheWriteTokens = usage.cache_creation_input_tokens || usage.prompt_cache_miss_tokens || 0
+				const cacheReadTokens = usage.cache_read_input_tokens || usage.prompt_cache_hit_tokens || 0
+
+				yield {
+					type: "usage",
+					inputTokens: usage.prompt_tokens || 0,
+					outputTokens: usage.completion_tokens || 0,
+					cacheWriteTokens: cacheWriteTokens > 0 ? cacheWriteTokens : undefined,
+					cacheReadTokens: cacheReadTokens > 0 ? cacheReadTokens : undefined,
+					totalCost,
+				}
+			}
+		}
+	}
+
+	getModel() {
+		return {
+			id: this.options.ocaModelId || liteLlmDefaultModelId,
+			info: this.options.ocaModelInfo || liteLlmModelInfoSaneDefaults,
+		}
+	}
+}

src/core/api/providers/openai-native.ts

@@ -1,12 +1,12 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, OpenAiNativeModelId, openAiNativeDefaultModelId, openAiNativeModels } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, type OpenAiNativeModelId, openAiNativeDefaultModelId, openAiNativeModels } from "@shared/api"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import OpenAI from "openai"
 import type { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface OpenAiNativeHandlerOptions extends CommonApiHandlerOptions {
 	openAiNativeApiKey?: string

src/core/api/providers/openai.ts

@@ -1,12 +1,17 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { azureOpenAiDefaultApiVersion, ModelInfo, OpenAiCompatibleModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import {
+	azureOpenAiDefaultApiVersion,
+	type ModelInfo,
+	type OpenAiCompatibleModelInfo,
+	openAiModelInfoSaneDefaults,
+} from "@shared/api"
 import OpenAI, { AzureOpenAI } from "openai"
 import type { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface OpenAiHandlerOptions extends CommonApiHandlerOptions {
 	openAiApiKey?: string

src/core/api/providers/openrouter.ts

@@ -1,14 +1,14 @@
 import { setTimeout as setTimeoutPromise } from "node:timers/promises"
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
 import { shouldSkipReasoningForModel } from "@utils/model-utils"
 import axios from "axios"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { createOpenRouterStream } from "../transform/openrouter-stream"
-import { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
-import { OpenRouterErrorResponse } from "./types"
+import type { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
+import type { OpenRouterErrorResponse } from "./types"
 
 interface OpenRouterHandlerOptions extends CommonApiHandlerOptions {
 	openRouterApiKey?: string
@@ -92,12 +92,9 @@ export class OpenRouterHandler implements ApiHandler {
 					// Format error details
 					const errorDetails = typeof error === "object" ? JSON.stringify(error, null, 2) : String(error)
 					throw new Error(`OpenRouter Mid-Stream Error: ${errorDetails}`)
-				} else {
-					// Fallback if error details are not available
-					throw new Error(
-						`OpenRouter Mid-Stream Error: Stream terminated with error status but no error details provided`,
-					)
 				}
+				// Fallback if error details are not available
+				throw new Error(`OpenRouter Mid-Stream Error: Stream terminated with error status but no error details provided`)
 			}
 
 			if (!this.lastGenerationId && chunk.id) {

src/core/api/providers/qwen-code.ts

@@ -1,13 +1,13 @@
 import { promises as fs } from "node:fs"
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, QwenCodeModelId, qwenCodeDefaultModelId, qwenCodeModels } from "@shared/api"
+import * as os from "node:os"
+import * as path from "node:path"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, type QwenCodeModelId, qwenCodeDefaultModelId, qwenCodeModels } from "@shared/api"
 import OpenAI from "openai"
-import * as os from "os"
-import * as path from "path"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 // --- Constants for Qwen OAuth2 ---
 const QWEN_OAUTH_BASE_URL = "https://chat.qwen.ai"
@@ -167,9 +167,8 @@ export class QwenCodeHandler implements ApiHandler {
 				client.apiKey = this.credentials.access_token
 				client.baseURL = this.getBaseUrl(this.credentials)
 				return await apiCall()
-			} else {
-				throw error
 			}
+			throw error
 		}
 	}
 

src/core/api/providers/qwen.ts

@@ -1,20 +1,20 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import {
-	InternationalQwenModelId,
+	type InternationalQwenModelId,
 	internationalQwenDefaultModelId,
 	internationalQwenModels,
-	MainlandQwenModelId,
-	ModelInfo,
+	type MainlandQwenModelId,
+	type ModelInfo,
 	mainlandQwenDefaultModelId,
 	mainlandQwenModels,
 	QwenApiRegions,
 } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface QwenHandlerOptions extends CommonApiHandlerOptions {
 	qwenApiKey?: string
@@ -66,13 +66,12 @@ export class QwenHandler implements ApiHandler {
 				id: (modelId as MainlandQwenModelId) ?? mainlandQwenDefaultModelId,
 				info: mainlandQwenModels[modelId as MainlandQwenModelId] ?? mainlandQwenModels[mainlandQwenDefaultModelId],
 			}
-		} else {
-			return {
-				id: (modelId as InternationalQwenModelId) ?? internationalQwenDefaultModelId,
-				info:
-					internationalQwenModels[modelId as InternationalQwenModelId] ??
-					internationalQwenModels[internationalQwenDefaultModelId],
-			}
+		}
+		return {
+			id: (modelId as InternationalQwenModelId) ?? internationalQwenDefaultModelId,
+			info:
+				internationalQwenModels[modelId as InternationalQwenModelId] ??
+				internationalQwenModels[internationalQwenDefaultModelId],
 		}
 	}
 

src/core/api/providers/requesty.ts

@@ -1,12 +1,12 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, requestyDefaultModelId, requestyDefaultModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type 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 type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface RequestyHandlerOptions extends CommonApiHandlerOptions {
 	requestyBaseUrl?: string

src/core/api/providers/sambanova.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, SambanovaModelId, sambanovaDefaultModelId, sambanovaModels } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, type SambanovaModelId, sambanovaDefaultModelId, sambanovaModels } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface SambanovaHandlerOptions extends CommonApiHandlerOptions {
 	sambanovaApiKey?: string

src/core/api/providers/sapaicore.ts

@@ -1,16 +1,21 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import {
 	type ContentBlock as BedrockContentBlock,
 	ConversationRole as BedrockConversationRole,
 	type Message as BedrockMessage,
 } from "@aws-sdk/client-bedrock-runtime"
-import { ChatMessages, LlmModuleConfig, OrchestrationClient, TemplatingModuleConfig } from "@sap-ai-sdk/orchestration"
-import { ModelInfo, SapAiCoreModelId, sapAiCoreDefaultModelId, sapAiCoreModels } from "@shared/api"
+import {
+	type ChatMessages,
+	type LlmModuleConfig,
+	OrchestrationClient,
+	type TemplatingModuleConfig,
+} from "@sap-ai-sdk/orchestration"
+import { type ModelInfo, type SapAiCoreModelId, sapAiCoreDefaultModelId, sapAiCoreModels } from "@shared/api"
 import axios from "axios"
-import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type OpenAI from "openai"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface SapAiCoreHandlerOptions extends CommonApiHandlerOptions {
 	sapAiCoreClientId?: string
@@ -244,7 +249,7 @@ namespace Gemini {
 			for (const part of partsForThoughts) {
 				const { thought, text } = part
 				if (thought && text) {
-					thoughts += text + "\n"
+					thoughts += `${text}\n`
 				}
 			}
 		}
@@ -380,7 +385,7 @@ export class SapAiCoreHandler implements ApiHandler {
 			client_secret: this.options.sapAiCoreClientSecret,
 		}
 
-		const tokenUrl = this.options.sapAiCoreTokenUrl!.replace(/\/+$/, "") + "/oauth/token"
+		const tokenUrl = `${this.options.sapAiCoreTokenUrl!.replace(/\/+$/, "")}/oauth/token`
 		const response = await axios.post(tokenUrl, payload, {
 			headers: { "Content-Type": "application/x-www-form-urlencoded" },
 		})
@@ -455,7 +460,7 @@ export class SapAiCoreHandler implements ApiHandler {
 	}
 
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		if (this.options.sapAiCoreUseOrchestrationMode ?? true) {
+		if (this.options.sapAiCoreUseOrchestrationMode) {
 			yield* this.createMessageWithOrchestration(systemPrompt, messages)
 		} else {
 			yield* this.createMessageWithDeployments(systemPrompt, messages)
@@ -802,7 +807,7 @@ export class SapAiCoreHandler implements ApiHandler {
 	): AsyncGenerator<any, void, unknown> {
 		function toStrictJson(str: string): string {
 			// Wrap it in parentheses so JS will treat it as an expression
-			const obj = new Function("return " + str)()
+			const obj = new Function(`return ${str}`)()
 			return JSON.stringify(obj)
 		}
 

src/core/api/providers/together.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { convertToR1Format } from "../transform/r1-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface TogetherHandlerOptions extends CommonApiHandlerOptions {
 	togetherApiKey?: string

src/core/api/providers/vercel-ai-gateway.ts

@@ -1,9 +1,9 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, vercelAiGatewayDefaultModelId, vercelAiGatewayDefaultModelInfo } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, vercelAiGatewayDefaultModelId, vercelAiGatewayDefaultModelInfo } from "@shared/api"
 import OpenAI from "openai"
-import { ApiHandler, CommonApiHandlerOptions } from "../index"
+import type { ApiHandler, CommonApiHandlerOptions } from "../index"
 import { withRetry } from "../retry"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 import { createVercelAIGatewayStream } from "../transform/vercel-ai-gateway-stream"
 
 interface VercelAIGatewayHandlerOptions extends CommonApiHandlerOptions {

src/core/api/providers/vertex.ts

@@ -1,9 +1,9 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import { AnthropicVertex } from "@anthropic-ai/vertex-sdk"
-import { ModelInfo, VertexModelId, vertexDefaultModelId, vertexModels } from "@shared/api"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import { type ModelInfo, type VertexModelId, vertexDefaultModelId, vertexModels } from "@shared/api"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 import { GeminiHandler } from "./gemini"
 
 interface VertexHandlerOptions extends CommonApiHandlerOptions {

src/core/api/providers/vscode-lm.ts

@@ -1,11 +1,11 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
 import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "@shared/vsCodeSelectorUtils"
 import { calculateApiCostAnthropic } from "@utils/cost"
 import * as vscode from "vscode"
-import { ApiHandler, CommonApiHandlerOptions, SingleCompletionHandler } from "../"
+import type { ApiHandler, CommonApiHandlerOptions, SingleCompletionHandler } from "../"
 import { withRetry } from "../retry"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 import { convertToVsCodeLmMessages } from "../transform/vscode-lm-format"
 import type { LanguageModelChatSelector as LanguageModelChatSelectorFromTypes } from "./types"
 
@@ -497,17 +497,17 @@ export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
 
 				// Return original error if it's already an Error instance
 				throw error
-			} else if (typeof error === "object" && error !== null) {
+			}
+			if (typeof error === "object" && error !== null) {
 				// Handle error-like objects
 				const errorDetails = JSON.stringify(error, null, 2)
 				console.error("Cline <Language Model API>: Stream error object:", errorDetails)
 				throw new Error(`Cline <Language Model API>: Response stream error: ${errorDetails}`)
-			} else {
-				// Fallback for unknown error types
-				const errorMessage = String(error)
-				console.error("Cline <Language Model API>: Unknown stream error:", errorMessage)
-				throw new Error(`Cline <Language Model API>: Response stream error: ${errorMessage}`)
 			}
+			// Fallback for unknown error types
+			const errorMessage = String(error)
+			console.error("Cline <Language Model API>: Unknown stream error:", errorMessage)
+			throw new Error(`Cline <Language Model API>: Response stream error: ${errorMessage}`)
 		}
 	}
 

src/core/api/providers/xai.ts

@@ -1,12 +1,12 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo, XAIModelId, xaiDefaultModelId, xaiModels } from "@shared/api"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { type ModelInfo, type XAIModelId, xaiDefaultModelId, xaiModels } from "@shared/api"
 import { shouldSkipReasoningForModel } from "@utils/model-utils"
 import OpenAI from "openai"
-import { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
-import { ApiHandler, CommonApiHandlerOptions } from "../"
+import type { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
+import type { ApiHandler, CommonApiHandlerOptions } from "../"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface XAIHandlerOptions extends CommonApiHandlerOptions {
 	xaiApiKey?: string

src/core/api/providers/zai.ts

@@ -1,19 +1,19 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import {
 	internationalZAiDefaultModelId,
-	internationalZAiModelId,
+	type internationalZAiModelId,
 	internationalZAiModels,
-	ModelInfo,
+	type ModelInfo,
 	mainlandZAiDefaultModelId,
-	mainlandZAiModelId,
+	type mainlandZAiModelId,
 	mainlandZAiModels,
 } from "@shared/api"
 import OpenAI from "openai"
 import { version as extensionVersion } from "../../../../package.json"
-import { ApiHandler, CommonApiHandlerOptions } from ".."
+import type { ApiHandler, CommonApiHandlerOptions } from ".."
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { ApiStream } from "../transform/stream"
+import type { ApiStream } from "../transform/stream"
 
 interface ZAiHandlerOptions extends CommonApiHandlerOptions {
 	zaiApiLine?: string
@@ -61,13 +61,12 @@ export class ZAiHandler implements ApiHandler {
 				id: (modelId as mainlandZAiModelId) ?? mainlandZAiDefaultModelId,
 				info: mainlandZAiModels[modelId as mainlandZAiModelId] ?? mainlandZAiModels[mainlandZAiDefaultModelId],
 			}
-		} else {
-			return {
-				id: (modelId as internationalZAiModelId) ?? internationalZAiDefaultModelId,
-				info:
-					internationalZAiModels[modelId as internationalZAiModelId] ??
-					internationalZAiModels[internationalZAiDefaultModelId],
-			}
+		}
+		return {
+			id: (modelId as internationalZAiModelId) ?? internationalZAiDefaultModelId,
+			info:
+				internationalZAiModels[modelId as internationalZAiModelId] ??
+				internationalZAiModels[internationalZAiDefaultModelId],
 		}
 	}
 
@@ -85,7 +84,6 @@ export class ZAiHandler implements ApiHandler {
 			messages: openAiMessages,
 			stream: true,
 			stream_options: { include_usage: true },
-			temperature: 0,
 		})
 
 		for await (const chunk of stream) {

src/core/api/transform/gemini-format.ts

@@ -1,5 +1,5 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { Content, GenerateContentResponse, Part } from "@google/genai"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { Content, GenerateContentResponse, Part } from "@google/genai"
 
 export function convertAnthropicContentToGemini(content: string | Anthropic.ContentBlockParam[]): Part[] {
 	if (typeof content === "string") {

src/core/api/transform/mistral-format.ts

@@ -1,8 +1,8 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { AssistantMessage } from "@mistralai/mistralai/models/components/assistantmessage"
-import { SystemMessage } from "@mistralai/mistralai/models/components/systemmessage"
-import { ToolMessage } from "@mistralai/mistralai/models/components/toolmessage"
-import { UserMessage } from "@mistralai/mistralai/models/components/usermessage"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { AssistantMessage } from "@mistralai/mistralai/models/components/assistantmessage"
+import type { SystemMessage } from "@mistralai/mistralai/models/components/systemmessage"
+import type { ToolMessage } from "@mistralai/mistralai/models/components/toolmessage"
+import type { UserMessage } from "@mistralai/mistralai/models/components/usermessage"
 
 export type MistralMessage =
 	| (SystemMessage & { role: "system" })

src/core/api/transform/o1-format.ts

@@ -1,5 +1,5 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import OpenAI from "openai"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type OpenAI from "openai"
 
 const o1SystemPrompt = (systemPrompt: string) => `
 # System Prompt

src/core/api/transform/ollama-format.ts

@@ -1,5 +1,5 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { Message } from "ollama"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { Message } from "ollama"
 
 export function convertToOllamaMessages(anthropicMessages: Anthropic.Messages.MessageParam[]): Message[] {
 	const ollamaMessages: Message[] = []

src/core/api/transform/openai-format.ts

@@ -1,5 +1,5 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import OpenAI from "openai"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type OpenAI from "openai"
 
 export function convertToOpenAiMessages(
 	anthropicMessages: Anthropic.Messages.MessageParam[],

src/core/api/transform/openrouter-stream.ts

@@ -1,6 +1,6 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { CLAUDE_SONNET_4_1M_SUFFIX, ModelInfo, openRouterClaudeSonnet41mModelId } from "@shared/api"
-import OpenAI from "openai"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { CLAUDE_SONNET_4_1M_SUFFIX, type ModelInfo, openRouterClaudeSonnet41mModelId } from "@shared/api"
+import type OpenAI from "openai"
 import { convertToOpenAiMessages } from "./openai-format"
 import { convertToR1Format } from "./r1-format"
 
@@ -139,10 +139,6 @@ export async function createOpenRouterStream(
 				reasoning = { max_tokens: budget_tokens }
 			}
 			break
-		case "cline/sonic":
-			temperature = 0.7
-			topP = 0.95
-			break
 		default:
 			if (thinkingBudgetTokens && model.info?.thinkingConfig && thinkingBudgetTokens > 0) {
 				temperature = undefined // extended thinking does not support non-1 temperature

src/core/api/transform/r1-format.ts

@@ -1,5 +1,5 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import OpenAI from "openai"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type OpenAI from "openai"
 
 /**
  * Converts Anthropic messages to OpenAI format and merges consecutive messages with the same role.

src/core/api/transform/vercel-ai-gateway-stream.ts

@@ -1,6 +1,6 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ModelInfo } from "@shared/api"
-import OpenAI from "openai"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { ModelInfo } from "@shared/api"
+import type OpenAI from "openai"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 
 export async function createVercelAIGatewayStream(

src/core/api/transform/vscode-lm-format.test.ts

@@ -2,7 +2,7 @@
 import "../providers/vscode-lm"
 import { describe, it } from "mocha"
 import "should"
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import * as vscode from "vscode"
 import { asObjectSafe, convertToAnthropicMessage, convertToAnthropicRole, convertToVsCodeLmMessages } from "./vscode-lm-format"
 

src/core/api/transform/vscode-lm-format.ts

@@ -1,4 +1,4 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import * as vscode from "vscode"
 
 /**

src/core/assistant-message/diff.ts

@@ -412,12 +412,12 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 		// (We artificially add a linebreak since we split on \n at the beginning. In order to not include a trailing linebreak in the final search/result blocks we need to remove it before using them. This allows for partial line matches to be correctly identified.)
 		// NOTE: search/replace blocks must be arranged in the order they appear in the file due to how we build the content using lastProcessedIndex. We also cannot strip the trailing newline since for non-partial lines it would remove the linebreak from the original content. (If we remove end linebreak from search, then we'd also have to remove it from replace but we can't know if it's a partial line or not since the model may be using the line break to indicate the end of the block rather than as part of the search content.) We require the model to output full lines in order for our fallbacks to work as well.
 		if (inSearch) {
-			currentSearchContent += line + "\n"
+			currentSearchContent += `${line}\n`
 		} else if (inReplace) {
-			currentReplaceContent += line + "\n"
+			currentReplaceContent += `${line}\n`
 			// Only output replacement lines immediately for in-order replacements
 			if (searchMatchIndex !== -1 && !pendingOutOfOrderReplacement) {
-				result += line + "\n"
+				result += `${line}\n`
 			}
 		}
 	}
@@ -616,10 +616,10 @@ class NewFileContentConstructor {
 			if (this.isReplacingActive()) {
 				// Output replacement lines immediately if we know the insertion point
 				if (this.searchMatchIndex !== -1) {
-					this.result += line + "\n"
+					this.result += `${line}\n`
 				}
 			} else if (this.isSearchingActive()) {
-				this.currentSearchContent += line + "\n"
+				this.currentSearchContent += `${line}\n`
 			} else {
 				const appendToPendingNonStandardLines = canWritependingNonStandardLines
 				if (appendToPendingNonStandardLines) {

src/core/assistant-message/index.ts

@@ -1,4 +1,4 @@
-import { ClineDefaultTool } from "@shared/tools"
+import type { ClineDefaultTool } from "@shared/tools"
 export type AssistantMessageContent = TextContent | ToolUse
 
 export { parseAssistantMessageV2 } from "./parse-assistant-message"

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

@@ -1,5 +1,5 @@
-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 { type ClineDefaultTool, toolUseNames } from "@shared/tools"
+import { type AssistantMessageContent, type TextContent, type ToolParamName, type ToolUse, toolParamNames } from "." // Assuming types are defined in index.ts or a similar file
 
 // parseAssistantmessageV1 removed in https://github.com/cline/cline/pull/5425
 

src/core/context/context-management/ContextManager-legacy.ts

@@ -1,6 +1,6 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandler } from "@core/api"
-import { ClineApiReqInfo, ClineMessage } from "@shared/ExtensionMessage"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { ApiHandler } from "@core/api"
+import type { ClineApiReqInfo, ClineMessage } from "@shared/ExtensionMessage"
 import { getContextWindowInfo } from "./context-window-utils"
 
 class ContextManager {

src/core/context/context-management/ContextManager.ts

@@ -1,12 +1,12 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ApiHandler } from "@core/api"
+import fs from "node:fs/promises"
+import * as path from "node:path"
+import type { Anthropic } from "@anthropic-ai/sdk"
+import type { ApiHandler } from "@core/api"
 import { formatResponse } from "@core/prompts/responses"
 import { GlobalFileNames } from "@core/storage/disk"
-import { ClineApiReqInfo, ClineMessage } from "@shared/ExtensionMessage"
+import type { ClineApiReqInfo, ClineMessage } from "@shared/ExtensionMessage"
 import { fileExistsAtPath } from "@utils/fs"
 import cloneDeep from "clone-deep"
-import fs from "fs/promises"
-import * as path from "path"
 import { getContextWindowInfo } from "./context-window-utils"
 
 enum EditType {
@@ -582,9 +582,8 @@ export class ContextManager {
 							}
 							// otherwise there are still file reads here we can overwrite, so still need to process this text chunk
 							// to do so we need to keep track of which files we've already replaced so we don't replace them again
-							else {
-								thisExistingFileReads = blockUpdates[blockUpdates.length - 1][3][0]
-							}
+
+							thisExistingFileReads = blockUpdates[blockUpdates.length - 1][3][0]
 						}
 					} else {
 						// for all other cases we can assume that we dont need to check this again

src/core/context/context-management/__tests__/ContextManager.test.ts

@@ -1,4 +1,4 @@
-import { Anthropic } from "@anthropic-ai/sdk"
+import type { Anthropic } from "@anthropic-ai/sdk"
 import { expect } from "chai"
 import { ContextManager } from "../ContextManager"