more info

Co-authored-by: chi.cat <git@chi.cat>

.changeset/brave-humans-marry.md

@@ -0,0 +1,12 @@
+---
+"claude-dev": patch
+---
+
+Adding Gemini CLI Provider
+
+ * This implementation provides access to Google's Gemini models through OAuth authentication,
+ * leveraging the same authentication mechanism as the official Gemini CLI tool.
+ * 
+ * Attribution: This implementation is inspired by and uses concepts from the Google Gemini CLI,
+ * which is licensed under the Apache License 2.0.
+ * Original project: https://github.com/google-gemini/gemini-cli

.changeset/eighty-timers-camp.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Optimizing cline to work for gemini 2.5 family of models

.changeset/nine-dolphins-judge.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": patch
+---
+
+Modified diff regex to account for trailing > in search & replace blocks

.changeset/six-walls-doubt.md

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

.changeset/sixty-toys-look.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Optimized Cline for Claude 4

.changeset/spicy-carpets-begin.md

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

.changeset/wet-parrots-fold.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Updating default and recommended model to claude 4 sonnet

.eslintrc.json

@@ -22,7 +22,6 @@
 		"react-hooks/exhaustive-deps": "off",
 		"eslint-rules/no-protobuf-object-literals": "error",
 		"eslint-rules/no-grpc-client-object-literals": "error",
-		"eslint-rules/no-direct-vscode-api": "warn",
 		"no-restricted-syntax": [
 			"error",
 			{

.gitignore

@@ -7,7 +7,6 @@ tmp
 *.vsix
 
 .DS_Store
-.idea
 
 pnpm-lock.yaml
 
@@ -38,4 +37,4 @@ src/hosts/vscode/*/methods.ts
 src/hosts/vscode/*/index.ts
 src/hosts/vscode/client/host-grpc-client.ts
 src/hosts/vscode/host-grpc-service-config.ts
-src/standalone/server-setup.ts
+src/standalone/server-setup.ts

.vscode/launch.json

@@ -23,20 +23,19 @@
 			"request": "launch",
 			"runtimeExecutable": "${execPath}",
 			"args": [
-				"--user-data-dir=${workspaceFolder}/dist/tmp/user",
 				"--profile-temp",
-				"--sync=off",
+				"--sync",
+				"off",
 				"--disable-extensions",
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"${workspaceFolder}"
 			],
 			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"preLaunchTask": "clean-tmp-user",
+			"preLaunchTask": "clean-sandbox",
 			"internalConsoleOptions": "openOnSessionStart",
 			"postDebugTask": "stop",
 			"env": {
 				"IS_DEV": "true",
-				"TEMP_PROFILE": "true",
 				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}"
 			}
 		},

.vscode/tasks.json

@@ -233,10 +233,10 @@
 			"type": "shell"
 		},
 		{
-			"label": "clean-tmp-user",
+			"label": "clean-sandbox",
 			"type": "shell",
 			"dependsOn": ["watch"],
-			"command": "rm -rf ${workspaceFolder}/dist/tmp/user && mkdir -p ${workspaceFolder}/dist/tmp/user"
+			"command": "rm -rf .vscode-dev"
 		}
 	],
 	"inputs": [

.vscodeignore

@@ -2,10 +2,8 @@
 .vscode/**
 .vscode-test/**
 out/**
-dist-standalone/**
 node_modules/**
 src/**
-standalone/**
 .gitignore
 .yarnrc
 esbuild.js
@@ -15,7 +13,6 @@ vsc-extension-quickstart.md
 **/*.map
 **/*.ts
 **/.vscode-test.*
-eslint-rules/**
 
 # Custom
 demo.gif
@@ -35,12 +32,15 @@ webview-ui/node_modules/**
 
 # Ignore docs
 docs/**
-old_docs/**
 
 # Fix issue where codicons don't get packaged (https://github.com/microsoft/vscode-extension-samples/issues/692)
 !node_modules/@vscode/codicons/dist/codicon.css
 !node_modules/@vscode/codicons/dist/codicon.ttf
 
+# Include KaTeX CSS and fonts for LaTeX rendering
+!webview-ui/node_modules/katex/dist/katex.min.css
+!webview-ui/node_modules/katex/dist/fonts/**
+
 # Include default themes JSON files used in getTheme
 !src/integrations/theme/default-themes/**
 

CHANGELOG.md

@@ -1,70 +1,5 @@
 # Changelog
 
-## [3.18.10]
-
--   Update recommended fast & cheap model to Grok 4 in OpenRouter model picker
--   Fix Gemini 2.5 Pro thinking budget slider and add support for Gemini 2.5 Flash Lite Preview model (Thanks @arafatkatze!)
-
-## [3.18.9]
-
--   Fix streaming reliability issues with Cline provider that could cause connection problems during long conversations
--   Fix authentication error handling for Cline provider to show clearer error messages when not signed in and prevent recursive failed requests
--   Remove incorrect pricing display for SAP AI Core provider since it uses non-USD "Capacity Units" that cannot be directly converted (Thanks @ncryptedV1!)
-
-## [3.18.8]
-
--   Update pricing for Grok 3 model because the promotion ended
-
-## [3.18.7]
-
--   Remove promotional "free" messaging for Grok 3 model in UI
-
-## [3.18.6]
-
--   Update request header to include `"ai-client-type": "Cline"` to SAP Api Provider
--   Add organization organization accounts
-
-## [3.18.5]
-
--   Fix Plan/Act mode persistence across sessions and multi-workspace conflicts
--   Improve provider switching performance by 18x (from 550ms to 30ms) with batched storage operations
--   Improve SAP AI Core provider model organization and fix exception handling (Thanks @schardosin!)
-
-## [3.18.4]
-
--   Add support for Gemini 2.5 Pro and Flash to SAP AI Core Provider
--   Fix logging in with Cline account not getting past welcome screen
-
-## [3.18.3]
-
--   Improve Cerebras Qwen model performance by removing thinking tokens from model input (Thanks @kevint-cerebras!)
--   Improve Claude Code provider with better error handling and performance optimizations (Thanks @BarreiroT!)
-
-## [3.18.2]
-
--   Fix issue where terminal output would not be captured if shell integration fails by falling back to capturing the terminal content.
--   Add confirmation popup when deleting tasks
--   Add support for Claude Sonnet 4 and Opus 4 model in SAP AI Core provider (Thanks @lizzzcai!)
--   Add support for `litellm_session_id` to group requests in a single session (Thanks @jorgegarciarey!)
--   Add "Thinking Budget" customization for Claude Code (Thanks @BarreiroT!)
--   Fix issue where the extension would use the user's environment variables for authentication when using Claude Code (Thanks @BarreiroT!)
-
-## [3.18.1]
-
--   Add support for Claude 4 Sonnet in SAP AI Core provider (Thanks @GTxx!)
--   Fix ENAMETOOLONG error when using Claude Code provider with long conversation histories (Thanks @BarreiroT!)
--   Remove Gemini CLI provider because Google asked us to
--   Fix bug with "Delete All Tasks" functionality
-
-## [3.18.0]
-
--   Optimized Cline to work with the Claude 4 family of models, resulting in improved performance, reliability, and new capabilities
--   Added a new Gemini CLI provider that allows you to use your local Gemini CLI authentication to access Gemini models for free (Thanks @google-gemini!)
--   Optimized Cline to work with the Gemini 2.5 family of models
--   Updated the default and recommended model to Claude 4 Sonnet for the best performance
--   Fix race condition in Plan/Act mode switching
--   Improve robustness of search and replace parsing
-
 ## [3.17.16]
 
 -   Fix Claude Code provider error handling for incomplete messages during long-running tasks (Thanks @BarreiroT!)

README.md

@@ -30,7 +30,7 @@ English | <a href="https://github.com/cline/cline/blob/main/locales/es/README.md
 </table>
 </div>
 
-Meet Cline (pronounced /klaɪn/, like "Klein"), an AI assistant that can use your **CLI** a**N**d **E**ditor.
+Meet Cline, an AI assistant that can use your **CLI** a**N**d **E**ditor.
 
 Thanks to [Claude 3.7 Sonnet's agentic coding capabilities](https://www.anthropic.com/claude/sonnet), Cline can handle complex software development tasks step-by-step. With tools that let him create & edit files, explore large projects, use the browser, and execute terminal commands (after you grant permission), he can assist you in ways that go beyond code completion or tech support. Cline can even use the Model Context Protocol (MCP) to create new tools and extend his own capabilities. While autonomous AI scripts traditionally run in sandboxed environments, this extension provides a human-in-the-loop GUI to approve every file change and terminal command, providing a safe and accessible way to explore the potential of agentic AI.
 

docs/docs.json

@@ -170,10 +170,6 @@
 					"running-models-locally/ollama"
 				]
 			},
-			{
-				"group": "Troubleshooting",
-				"pages": ["troubleshooting/terminal-quick-fixes", "troubleshooting/terminal-integration-guide"]
-			},
 			{
 				"group": "More Info",
 				"pages": ["more-info/telemetry"]

docs/features/at-mentions/terminal-mentions.mdx

@@ -58,16 +58,3 @@ When you use the terminal mention in your message, here's what happens behind th
 6. The AI can now "see" the complete terminal output with all formatting preserved
 
 This process happens automatically whenever you use the terminal mention, giving the AI access to your command results, error messages, and other terminal output without you having to copy it manually.
-
-## Troubleshooting Terminal Issues
-
-If you're experiencing issues with terminal mentions or terminal integration in general (such as "Shell Integration Unavailable" or commands not showing output), please refer to our comprehensive [Terminal Integration Troubleshooting Guide](/troubleshooting/terminal-integration-guide).
-
-Common issues include:
-
--   Terminal mentions not capturing output
--   "Shell Integration Unavailable" messages in Cline chat
--   Commands executing but output not visible to Cline
--   Terminal integration working inconsistently
-
-The troubleshooting guide provides platform-specific solutions and detailed configuration steps to resolve these issues.

docs/features/commands-and-shortcuts/terminal-integration.mdx

@@ -74,25 +74,8 @@ This approach ensures that all terminal output, including colors and formatting,
 
 -   **Select specific output when needed**: By default, the integration captures all terminal content, but you can also select specific lines before right-clicking to focus on just the relevant output.
 
--   **Combine terminal outputs with file mentions**: After sending terminal output to Cline, you can enhance your question by mentioning relevant files using the @ mentions feature.
+-   **Combine with file mentions**: After sending terminal output to Cline, you can enhance your question by mentioning relevant files using the @ mentions feature.
 
--   **Contextualize build & test outputs with the terminal**: Terminal integration is particularly useful for understanding complex build errors or test failures that span multiple lines.
+-   **Use for build and test output**: Terminal integration is particularly useful for understanding complex build errors or test failures that span multiple lines.
 
 Next time you're staring at a cryptic error message in your terminal, try using Cline's terminal integration instead of copying and pasting. You'll get more accurate help because Cline can see the complete terminal context with proper formatting.
-
-## Troubleshooting Terminal Issues
-
-If you're experiencing issues with terminal integration, such as "Shell Integration Unavailable" or commands not showing output, please refer to our comprehensive [Terminal Integration Troubleshooting Guide](/troubleshooting/terminal-integration-guide).
-
-The troubleshooting guide covers:
-
--   Common terminal integration issues and quick fixes
--   Platform-specific solutions for Windows, macOS, and Linux
--   Shell-specific configurations for zsh, bash, PowerShell, and more
--   Advanced debugging techniques
--   Terminal settings optimization
-
-<Tip>
-	**Quick Fix**: Most terminal issues can be resolved by switching to bash in the Cline settings and increasing the shell
-	integration timeout to 10 seconds.
-</Tip>

docs/more-info/telemetry.mdx

@@ -6,7 +6,7 @@ title: "Telemetry"
 
 To help make Cline better for everyone, we collect anonymous usage data that helps us understand how developers are using our open-source AI coding agent. This feedback loop is crucial for improving Cline's capabilities and user experience.
 
-We use PostHog, an open-source analytics platform, for data collection and analysis. Our telemetry implementation is fully transparent - you can review the [source code](https://github.com/cline/cline/blob/main/src/services/posthog/telemetry/TelemetryService.ts) to see exactly what we track.
+We use PostHog, an open-source analytics platform, for data collection and analysis. Our telemetry implementation is fully transparent - you can review the [source code](https://github.com/cline/cline/blob/main/src/services/telemetry/TelemetryService.ts) to see exactly what we track.
 
 ### Tracking Policy
 
@@ -22,7 +22,7 @@ We collect basic anonymous usage data including:
 **System Context:** OS type and VS Code environment details\
 **UI Activity:** Navigation patterns and feature usage
 
-For complete transparency, you can inspect our [telemetry implementation](https://github.com/cline/cline/blob/main/src/services/posthog/telemetry/TelemetryService.ts) to see the exact events we track.
+For complete transparency, you can inspect our [telemetry implementation](https://github.com/cline/cline/blob/main/src/services/telemetry/TelemetryService.ts) to see the exact events we track.
 
 ### How to Opt Out
 

docs/troubleshooting/terminal-integration-guide.mdx

@@ -1,399 +0,0 @@
----
-title: "Terminal Integration Troubleshooting Guide"
-sidebarTitle: "Terminal Troubleshooting"
-description: "Complete guide to resolving terminal integration issues in Cline"
----
-
-This guide helps you resolve terminal integration issues in Cline. Terminal integration is crucial for Cline to execute commands and read their output, enabling it to understand errors, test results, and command responses.
-
-<Tip>
-	If you're experiencing terminal issues, try switching to a simpler shell like `bash` in the Cline settings, under "Terminal Settings"
-
-    This resolves most terminal integration problems.
-
-</Tip>
-
-## Quick Diagnosis Flowchart
-
-Follow this flowchart to quickly identify your issue:
-
-```mermaid
-graph TD
-    A[Terminal Issue] --> B{Can Cline execute commands?}
-    B -->|No| C[Shell Integration Unavailable]
-    B -->|Yes| D{Can Cline see the output?}
-    D -->|No| E[Output Capture Failed]
-    D -->|Yes| F{Is the output corrupted?}
-    F -->|Yes| G[Character Filtering Issue]
-    F -->|No| H{Does the command hang?}
-    H -->|Yes| I[Long-Running Command Issue]
-    H -->|No| J[Check Terminal Settings]
-
-    C --> K[Try Solution 1]
-    E --> L[Try Solution 2]
-    G --> M[Try Solution 3]
-    I --> N[Try Solution 4]
-
-    style A fill:#f9f,stroke:#333,stroke-width:2px
-    style K fill:#9f9,stroke:#333,stroke-width:2px
-    style L fill:#9f9,stroke:#333,stroke-width:2px
-    style M fill:#9f9,stroke:#333,stroke-width:2px
-    style N fill:#9f9,stroke:#333,stroke-width:2px
-```
-
-## Common Issues & Quick Solutions
-
-### 1. Shell Integration Unavailable
-
-**Symptoms:**
-
--   Message: "Shell Integration Unavailable"
--   Commands execute but Cline can't read output
--   Terminal works fine manually but not with Cline
-
-**Quick Solutions:**
-
-#### macOS
-
--   **Switch to bash**
-
-    1. Go to Cline Settings
-    2. Left-Click the **"Terminal Settings"** tab
-    3. Navigate to **"Default Terminal Profile"** and select **"bash"** from the drop-down menu
-
--   **Disable Oh-My-Zsh temporarily**:
-
-    1. If using zsh, enter `mv ~/.zshrc ~/.zshrc.backup` into the terminal
-    2. Restart VSCode
-
--   **Set environment**:
-    1.a For Zsh users, use one of the following Zsh commands to edit your shell profile:
-
-          - `nano ~/.zshrc`
-          - `vim ~/.zshrc`
-          - `code ~/.zshrc`
-
-    1.b For Bash users
-
-          - nano ~/.bash_profile
-
-    2. Add the following to your shell config: `export TERM=xterm-256color`
-    3. Save your configuration
-
-#### Windows
-
--   **Use PowerShell 7**
-
-    1. Install from Microsoft Store
-    2. Go to Cline Settings
-    3. Left-Click the **"Terminal Settings"** tab
-    4. Navigate to **"Default Terminal Profile"** and select **"PowerShell 7"** from the drop-down menu
-
--   **Disable Windows ConPTY**
-
-    1. Navigate to your VSCode Settings
-    2. Enter "Integrated: Windows Enable Conpty" into the Settings searchbar
-    3. Uncheck the option
-
--   **Try Command Prompt**
-    1. Go to Cline Settings
-    2. Left-Click the **"Terminal Settings"** tab
-    3. Navigate to **"Default Terminal Profile"** and select **"Command Prompt"** from the drop-down menu
-
-#### Linux
-
--   **Use bash**
-
-    1. Go to Cline Settings
-    2. Left-Click the **"Terminal Settings"** tab
-    3. Navigate to **"Default Terminal Profile"** and select **"bash"** from the drop-down menu
-
--   **Check permissions**
-
-    1. Ensure VSCode has terminal access permissions
-
--   **Disable custom prompts**
-    1. Comment out prompt customizations in `.bashrc`
-
-### 2. Command Output Not Visible
-
-**Symptoms:**
-
--   Cline states in chat: "[Command is running but producing no output]"
--   Commands complete but Cline doesn't see results
--   Commands work sometimes but not consistently
-
-**Solutions:**
-
--   **Increase Shell Integration Timeout**
-
-    1. Within Cline, left-click the **Settings** button in the top right-hand corner of the chat window
-    2. Once in the **Settings** window, left-click the **"Terminal Settings"** tab from the left-hand column
-    3. Navigate to "Shell integration timeout (seconds)" and enter **"10"** into the text field
-
--   **Disable Terminal Reuse**
-
-    1. Within Cline, left-click the **Settings** button in the top right-hand corner of the chat window
-    2. Once in the **Settings** window, left-click the **"Terminal Settings"** tab from the left-hand column
-    3. Look for **"Enable aggressive terminal reuse"**, and **uncheck** this option
-
--   **Check for interfering extensions**
-    1. Disable other terminal-related VSCode extensions
-
-### 3. Character Filtering Issues
-
-**Symptoms:**
-
--   Commas missing from output (JSON appears corrupted)
--   Special characters stripped from terminal output
--   Syntax errors that don't appear when running manually
-
-**Solution:**
-This is a known bug in output processing. Workarounds:
-
--   Recommend AI to use file output instead
-    1. Tell Cline in chat or Cline rules, to use `command > output.txt` before reading the file/s
-
-<Tip>
-	This family of issues is only partially solved in the latest Cline versions, so if you still face this, create a GitHub issue
-	if it is a persistent problem.
-</Tip>
-
-### 4. Long-Running Commands & Progress Bars
-
-**Symptoms:**
-
--   Docker builds never complete in Cline
--   Progress bars consume thousands of tokens
--   The Cline button "Proceed while running" doesn't work properly in chat
-
-<Tip>
-	This family of issues has been solved in latest Cline versions but if you still face any issues, then create a GitHub issue
-	for this.
-</Tip>
-
-## Terminal Settings Explained
-
-Access these in Cline by clicking the settings icon, and navigating to the "Terminal Settings" section:
-
-### Default Terminal Profile
-
--   **What it does**: Selects which shell Cline uses for commands
--   **When to change**: If experiencing shell integration issues with your default shell
--   **Recommended**: - macOS: bash (if zsh has issues) - Windows: PowerShell 7 - Linux: bash
-
-### Shell Integration Timeout
-
--   **What it does**: How long Cline waits for the terminal to be ready
--   **Default**: 4 seconds
--   **When to increase**:
-    -   Slow shell startup (heavy .zshrc/.bashrc)
-    -   WSL environments
-    -   SSH connections
--   **Recommended**: - Start with 10 seconds if having issues
-
-### Enable Aggressive Terminal Reuse
-
--   **What it does**: Reuses existing terminals even if not in the correct directory
--   **When to disable**:
-    -   Commands execute in wrong directory
-    -   Virtual environment issues
-    -   Terminal state corruption
--   **Trade-off**: - Disabling creates more terminals but ensures clean state
-
-### Terminal Output Line Limit
-
--   **What it does**: Limits how many lines Cline reads from terminal output
--   **Default**: 500 lines
--   **When to adjust**:
-    -   Increase for verbose build outputs
-    -   Decrease if hitting token limits
-    -   Set to 100 for commands with progress bars
-
-## Platform-Specific Solutions
-
-### macOS Issues
-
-#### Oh-My-Zsh Conflicts
-
-Oh-My-Zsh often interferes with shell integration. Solutions:
-
-1. Create a minimal `.zshrc` for VSCode:
-    ```bash
-    # ~/.zshrc-vscode
-    export TERM=xterm-256color
-    export PAGER=cat
-    # Minimal PATH and environment setup
-    ```
-2. Configure VSCode to use it:
-    ```json
-    {
-    	"terminal.integrated.env.osx": {
-    		"ZDOTDIR": "~/.zshrc-vscode"
-    	}
-    }
-    ```
-
-#### macOS 15+ Issues
-
-Recent macOS versions have stricter terminal permissions:
-
-1. System Preferences → Privacy & Security → Developer Tools
-2. Add Visual Studio Code
-3. Restart VSCode completely
-
-### Windows Issues
-
-#### PowerShell Execution Policy
-
-If commands fail silently:
-
-```powershell
-Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-```
-
-#### WSL Integration
-
-For WSL issues:
-
-1. Use WSL extension for VSCode
-2. Open folder in WSL: `code .` from WSL terminal
-3. Select "WSL Bash" as terminal profile in Cline
-
-#### Path Issues
-
-Windows path problems:
-
-1. Use forward slashes in Cline: `C:/Users/...`
-2. Quote paths with spaces: `"C:/Program Files/..."`
-3. Avoid `~` - use full paths
-
-### Linux/SSH/Container Issues
-
-#### SSH Connections
-
-For remote development:
-
-1. Install Cline on the remote machine, not locally
-2. Use SSH extension's integrated terminal
-3. Increase timeout to 15+ seconds
-
-#### Docker Containers
-
-When developing in containers:
-
-1. Install Cline in the container
-2. Use Dev Containers extension
-3. Ensure shell integration scripts are available
-
-## Shell-Specific Fixes
-
-### Zsh
-
-```bash
-# Add to ~/.zshrc
-export TERM=xterm-256color
-export PAGER=cat
-# Disable fancy prompts for VSCode
-if [[ "$TERM_PROGRAM" == "vscode" ]]; then
-    PS1="%n@%m %1~ %# "
-fi
-```
-
-### Bash
-
-```bash
-# Add to ~/.bashrc
-export TERM=xterm-256color
-export PAGER=cat
-# Simple prompt for VSCode
-if [[ "$TERM_PROGRAM" == "vscode" ]]; then
-    PS1='\u@\h:\w\$ '
-fi
-```
-
-### Fish
-
-```fish
-# Add to ~/.config/fish/config.fish
-set -x TERM xterm-256color
-set -x PAGER cat
-# Disable fancy features in VSCode
-if test "$TERM_PROGRAM" = "vscode"
-    function fish_prompt
-        echo (whoami)'@'(hostname)':'(pwd)'> '
-    end
-end
-```
-
-### PowerShell
-
-```powershell
-# Add to $PROFILE
-$env:PAGER = "cat"
-# Disable progress bars
-$ProgressPreference = 'SilentlyContinue'
-```
-
-## Advanced Troubleshooting
-
-### Debug Mode
-
-Enable terminal debugging to see what's happening:
-
-1. Open VSCode Command Palette (Cmd/Ctrl+Shift+P)
-2. Run: "Developer: Set Log Level..."
-3. Choose "Trace"
-4. Check Output panel → "Cline" for terminal logs
-
-### Manual Shell Integration Test
-
-Test if shell integration works at all:
-
-```bash
-# In VSCode terminal
-echo $TERM_PROGRAM  # Should show "vscode"
-echo $VSCODE_SHELL_INTEGRATION  # Should be "1"
-```
-
-## FAQ
-
-### Why does Cline create so many terminals?
-
-When shell integration fails, Cline can't reuse terminals safely (they might be running long processes). Enable shell integration or adjust the terminal reuse setting.
-
-### Can I use my custom shell (nushell, xonsh, etc.)?
-
-Cline officially supports bash, zsh, fish, and PowerShell. Custom shells may work but aren't guaranteed. Use bash as a fallback.
-
-### Why do some commands work but others don't?
-
-Commands that use interactive features (pagers, progress bars, curses) often fail. Set `PAGER=cat` and use non-interactive flags.
-
-### How do I know if shell integration is working?
-
-Working integration shows command output in Cline's chat. Failed integration shows "Shell Integration Unavailable" or "[Command is running but producing no output]".
-
-## Still Having Issues?
-
-If you've tried everything:
-
-1. **Collect Debug Info**:
-
-    ```bash
-    echo "Shell: $SHELL"
-    echo "Term: $TERM"
-    echo "VSCode: $TERM_PROGRAM"
-    which bash
-    bash --version
-    ```
-
-2. **Report the Issue**:
-    - Use `/reportbug` in Cline github issues
-    - Include your debug info
-    - Mention which solutions you tried
-
-<Tip>
-	Remember: Most terminal issues are resolved by switching to bash and increasing the timeout. Start there before trying complex
-	solutions.
-</Tip>

docs/troubleshooting/terminal-quick-fixes.mdx

@@ -1,51 +0,0 @@
----
-title: "Terminal Quick Fixes"
-sidebarTitle: "Terminal Quick Fixes"
-description: "Quick solutions for common terminal issues"
----
-
-**Here is a list of common fixes, starting with the most applicable:**
-
--   **Switch to bash** (solves most instances)
-
-    1. Within Cline, left-click the **Settings** button in the top right-hand corner of the chat window
-    2. Once in the **Settings** window, left-click the **"Terminal Settings"** tab from the left-hand column
-    3. Navigate to **"Default Terminal Profile"** and select **"bash"** from the drop-down
-
--   **Increase timeout**
-
-    1. Within Cline, left-click the **Settings** button in the top right-hand corner of the chat window
-    2. Once in the **Settings** window, left-click the **"Terminal Settings"** tab from the left-hand column
-    3. Navigate to "Shell integration timeout (seconds)" and enter **"10"** into the text field
-
--   **Disable terminal reuse**
-    1. Within Cline, left-click the **Settings** button in the top right-hand corner of the chat window
-    2. Once in the **Settings** window, left-click the **"Terminal Settings"** tab from the left-hand column
-    3. Look for **"Enable aggressive terminal reuse"**, and **uncheck** this option
-
-## Platform-Specific Fixes
-
-### macOS + Oh-My-Zsh
-
-```bash
-# Create minimal config for VSCode
-echo 'export TERM=xterm-256color' > ~/.zshrc-vscode
-echo 'export PAGER=cat' >> ~/.zshrc-vscode
-```
-
-### Windows PowerShell
-
-```powershell
-# Run as Administrator
-Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser
-```
-
-### WSL
-
--   Open folder from WSL: `code .`
--   Select **"WSL Bash"** in Cline settings, under **"Terminal Settings"**
--   Increase **"Shell integration timeout (seconds)"** to **15**
-
-## Full Guide
-
-For detailed troubleshooting, see the [Complete Terminal Troubleshooting Guide](/troubleshooting/terminal-integration-guide).

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

@@ -1,123 +0,0 @@
-const { RuleTester: DirectApiRuleTester } = require("eslint")
-const noDirectVscodeApiRule = require("../no-direct-vscode-api")
-
-const directApiRuleTester = new DirectApiRuleTester({
-	parser: require.resolve("@typescript-eslint/parser"),
-	parserOptions: {
-		ecmaVersion: 2020,
-		sourceType: "module",
-		ecmaFeatures: {
-			jsx: true,
-		},
-	},
-})
-
-directApiRuleTester.run("no-direct-vscode-api", noDirectVscodeApiRule, {
-	valid: [
-		// Should allow vscode.postMessage in grpc-client-base.ts
-		{
-			code: `vscode.postMessage({ type: "grpc_request", data: {} })`,
-			filename: "grpc-client-base.ts",
-		},
-		{
-			code: `vscode.postMessage({ type: "grpc_request_cancel" })`,
-			filename: "/path/to/grpc-client-base.ts",
-		},
-		// Should allow in exception directories
-		{
-			code: `vscode.workspace.workspaceFolders`,
-			filename: "/src/hosts/vscode/host-bridge.ts",
-		},
-		{
-			code: `vscode.workspace.fs.stat(uri)`,
-			filename: "/standalone/runtime-files/helpers.ts",
-		},
-		// Should allow other vscode API calls
-		{
-			code: `vscode.window.showInformationMessage("Hello")`,
-			filename: "test.ts",
-		},
-		// Should allow postMessage calls on other objects
-		{
-			code: `window.postMessage({ type: "test" }, "*")`,
-			filename: "test.ts",
-		},
-		// Should allow variables named vscode but not calling postMessage
-		{
-			code: `const vscode = { other: "method" }; vscode.other()`,
-			filename: "test.ts",
-		},
-	],
-	invalid: [
-		// Should disallow vscode.postMessage in regular files
-		{
-			code: `vscode.postMessage({ type: "test", data: {} })`,
-			filename: "test.ts",
-			errors: [
-				{
-					messageId: "useGrpcClient",
-				},
-			],
-		},
-		// Should disallow vscode.postMessage in components
-		{
-			code: `vscode.postMessage({ type: "apiConfiguration", apiConfiguration })`,
-			filename: "ApiOptions.tsx",
-			errors: [
-				{
-					messageId: "useGrpcClient",
-				},
-			],
-		},
-		// Should disallow vscode.postMessage in test files
-		{
-			code: `vscode.postMessage({ type: "newTask", text: message.text })`,
-			filename: "test.test.ts",
-			errors: [
-				{
-					messageId: "useGrpcClient",
-				},
-			],
-		},
-		// Should disallow property access for disallowed APIs
-		{
-			code: `const folders = vscode.workspace.workspaceFolders;`,
-			filename: "workspace.ts",
-			errors: [
-				{
-					messageId: "useHostBridge",
-				},
-			],
-		},
-		// Should disallow method calls for disallowed APIs
-		{
-			code: `const relativePath = vscode.workspace.asRelativePath(filePath);`,
-			filename: "path-utils.ts",
-			errors: [
-				{
-					messageId: "usePathUtils",
-				},
-			],
-		},
-		// Should disallow nested property access
-		{
-			code: `const stats = await vscode.workspace.fs.stat(uri);`,
-			filename: "file-utils.ts",
-			errors: [
-				{
-					messageId: "useFsUtils",
-				},
-			],
-		},
-		// Should disallow getting a workspace folder
-		{
-			code: `const folder = vscode.workspace.getWorkspaceFolder(uri);`,
-			filename: "path-helper.ts",
-			errors: [
-				{
-					messageId: "usePathUtils",
-				},
-			],
-		},
-	],
-})

eslint-rules/__tests__/no-vscode-postmessage.test.ts

@@ -0,0 +1,74 @@
+const { RuleTester: VscodeRuleTester } = require("eslint")
+const vscodePostmessageRule = require("../no-vscode-postmessage")
+
+const vscodeRuleTester = new VscodeRuleTester({
+	parser: require.resolve("@typescript-eslint/parser"),
+	parserOptions: {
+		ecmaVersion: 2020,
+		sourceType: "module",
+		ecmaFeatures: {
+			jsx: true,
+		},
+	},
+})
+
+vscodeRuleTester.run("no-vscode-postmessage", vscodePostmessageRule, {
+	valid: [
+		// Should allow vscode.postMessage in grpc-client-base.ts
+		{
+			code: `vscode.postMessage({ type: "grpc_request", data: {} })`,
+			filename: "grpc-client-base.ts",
+		},
+		{
+			code: `vscode.postMessage({ type: "grpc_request_cancel" })`,
+			filename: "/path/to/grpc-client-base.ts",
+		},
+		// Should allow other vscode API calls
+		{
+			code: `vscode.window.showInformationMessage("Hello")`,
+			filename: "test.ts",
+		},
+		// Should allow postMessage calls on other objects
+		{
+			code: `window.postMessage({ type: "test" }, "*")`,
+			filename: "test.ts",
+		},
+		// Should allow variables named vscode but not calling postMessage
+		{
+			code: `const vscode = { other: "method" }; vscode.other()`,
+			filename: "test.ts",
+		},
+	],
+	invalid: [
+		// Should ban vscode.postMessage in regular files
+		{
+			code: `vscode.postMessage({ type: "test", data: {} })`,
+			filename: "test.ts",
+			errors: [
+				{
+					messageId: "useGrpcClient",
+				},
+			],
+		},
+		// Should ban vscode.postMessage in components
+		{
+			code: `vscode.postMessage({ type: "apiConfiguration", apiConfiguration })`,
+			filename: "ApiOptions.tsx",
+			errors: [
+				{
+					messageId: "useGrpcClient",
+				},
+			],
+		},
+		// Should ban vscode.postMessage in test files
+		{
+			code: `vscode.postMessage({ type: "newTask", text: message.text })`,
+			filename: "test.test.ts",
+			errors: [
+				{
+					messageId: "useGrpcClient",
+				},
+			],
+		},
+	],
+})

eslint-rules/index.js

@@ -1,13 +1,13 @@
 // eslint-rules/index.js
 const noProtobufObjectLiterals = require("./no-protobuf-object-literals")
 const noGrpcClientObjectLiterals = require("./no-grpc-client-object-literals")
-const noDirectVscodeApi = require("./no-direct-vscode-api")
+const noVscodePostmessage = require("./no-vscode-postmessage")
 
 module.exports = {
 	rules: {
 		"no-protobuf-object-literals": noProtobufObjectLiterals,
 		"no-grpc-client-object-literals": noGrpcClientObjectLiterals,
-		"no-direct-vscode-api": noDirectVscodeApi,
+		"no-vscode-postmessage": noVscodePostmessage,
 	},
 	configs: {
 		recommended: {
@@ -15,7 +15,7 @@ module.exports = {
 			rules: {
 				"local/no-protobuf-object-literals": "error",
 				"local/no-grpc-client-object-literals": "error",
-				"local/no-direct-vscode-api": "warn",
+				"local/no-vscode-postmessage": "error",
 			},
 		},
 	},

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

@@ -1,164 +0,0 @@
-const { ESLintUtils } = require("@typescript-eslint/utils")
-const path = require("path")
-
-const createRule = ESLintUtils.RuleCreator((name) => `https://cline.bot/eslint-rules/${name}`)
-
-// Configuration of disallowed VSCode APIs and their recommended alternatives
-const disallowedApis = {
-	"vscode.postMessage": {
-		messageId: "useGrpcClient",
-	},
-	"vscode.workspace.fs.stat": {
-		messageId: "useFsUtils",
-	},
-	"vscode.workspace.workspaceFolders": {
-		messageId: "useHostBridge",
-	},
-	"vscode.workspace.asRelativePath": {
-		messageId: "usePathUtils",
-	},
-	"vscode.workspace.getWorkspaceFolder": {
-		messageId: "usePathUtils",
-	},
-}
-
-module.exports = createRule({
-	name: "no-direct-vscode-api",
-	meta: {
-		type: "problem",
-		docs: {
-			description:
-				"Disallow direct VSCode API usage in favor of Cline's abstraction layers, except in src/hosts/vscode and standalone/runtime-files directories",
-			recommended: "error",
-		},
-		messages: {
-			useGrpcClient:
-				"Use gRPC service clients instead of vscode.postMessage().\n" +
-				"Example: AccountServiceClient.methodName(RequestType.create({...})) instead of vscode.postMessage({type: '...'}).\n" +
-				"Found: {{code}}",
-			useFsUtils:
-				"Use utilities in @/utils/fs instead of vscode.workspace.fs.stat.\n" +
-				"Example: import { isDirectory } from '@/utils/fs' or use the file system methods from the host bridge provider.\n" +
-				"Found: {{code}}",
-			useHostBridge:
-				"Use getHostBridgeProvider().workspaceClient.getWorkspacePaths({}) instead of vscode.workspace.workspaceFolders.\n" +
-				"This provides a consistent abstraction across VSCode and standalone environments.\n" +
-				"Found: {{code}}",
-			usePathUtils:
-				"Use path utilities from @/utils/path instead of direct VSCode workspace path methods.\n" +
-				"This provides consistent path handling across different environments.\n" +
-				"Found: {{code}}",
-		},
-		schema: [],
-	},
-	defaultOptions: [],
-
-	create(context) {
-		// Check if current file is in an exception directory or is grpc-client-base.ts
-		const filename = context.filename
-		const isGrpcClientBase = path.basename(filename) === "grpc-client-base.ts"
-
-		// Skip checking files in src/hosts/vscode or standalone/runtime-files
-		const isExceptionDirectory = filename.includes("/src/hosts/vscode/") || filename.includes("/standalone/runtime-files/")
-
-		// Pattern for checking memberExpressions like vscode.workspace.fs.stat
-		function checkMemberExpression(node) {
-			// Skip if this file is in an exception directory or is grpc-client-base.ts
-			if (isGrpcClientBase || isExceptionDirectory) {
-				return
-			}
-
-			// For handling nested properties like vscode.workspace.fs.stat
-			function getFullPropertyPath(node) {
-				if (node.type !== "MemberExpression") {
-					return node.name || ""
-				}
-
-				const objectPart = getFullPropertyPath(node.object)
-				const propertyPart = node.property.name || ""
-
-				return objectPart ? `${objectPart}.${propertyPart}` : propertyPart
-			}
-
-			// Check if the expression matches one of our disallowed patterns
-			if (node.object && node.object.type === "Identifier" && node.object.name === "vscode") {
-				const fullPath = `vscode.${node.property.name}`
-				checkDisallowedApi(fullPath, node)
-			}
-			// Handle nested expressions like vscode.workspace.fs.stat
-			else if (node.object && node.object.type === "MemberExpression") {
-				const fullPath = getFullPropertyPath(node)
-
-				// Only proceed if it starts with vscode
-				if (fullPath.startsWith("vscode.")) {
-					checkDisallowedApi(fullPath, node)
-				}
-			}
-		}
-
-		// Check if an expression matches a disallowed API and report if it does
-		function checkDisallowedApi(expressionPath, node) {
-			// Check exact matches
-			if (disallowedApis[expressionPath]) {
-				reportViolation(expressionPath, node)
-				return
-			}
-
-			// Check prefix matches (for nested properties)
-			for (const disallowedApi in disallowedApis) {
-				// For direct property access like vscode.workspace.workspaceFolders
-				if (expressionPath === disallowedApi) {
-					reportViolation(disallowedApi, node)
-					return
-				}
-
-				// For method calls like vscode.workspace.asRelativePath(...)
-				if (expressionPath.startsWith(`${disallowedApi}.`) || expressionPath.startsWith(`${disallowedApi}(`)) {
-					reportViolation(disallowedApi, node)
-					return
-				}
-			}
-		}
-
-		// Report a violation with the appropriate message
-		function reportViolation(disallowedApi, node) {
-			const sourceCode = context.sourceCode
-			const config = disallowedApis[disallowedApi]
-
-			// For method calls, get the whole call expression
-			let reportNode = node
-			let parentNode = sourceCode.getAncestors(node).pop()
-			if (parentNode && parentNode.type === "CallExpression" && parentNode.callee === node) {
-				reportNode = parentNode
-			}
-
-			const callText = sourceCode.getText(reportNode).trim()
-
-			context.report({
-				node: reportNode,
-				messageId: config.messageId,
-				data: {
-					code: callText,
-				},
-			})
-		}
-
-		return {
-			// Detect basic member expressions (e.g., vscode.postMessage)
-			MemberExpression(node) {
-				checkMemberExpression(node)
-			},
-
-			// Detect property access through destructuring
-			VariableDeclarator(node) {
-				// Skip if this file is in an exception directory or is grpc-client-base.ts
-				if (isGrpcClientBase || isExceptionDirectory) {
-					return
-				}
-
-				// Destructuring pattern checks removed as developers don't use the API this way
-				// They always use direct imports: import * as vscode from "vscode" and direct access: vscode.thing.foo
-			},
-		}
-	},
-})

eslint-rules/no-vscode-postmessage.js

@@ -0,0 +1,61 @@
+const { ESLintUtils } = require("@typescript-eslint/utils")
+const path = require("path")
+
+const createRule = ESLintUtils.RuleCreator((name) => `https://cline.bot/eslint-rules/${name}`)
+
+module.exports = createRule({
+	name: "no-vscode-postmessage",
+	meta: {
+		type: "problem",
+		docs: {
+			description: "Ban vscode.postMessage() calls in favor of gRPC service clients, except in grpc-client-base.ts",
+			recommended: "error",
+		},
+		messages: {
+			useGrpcClient:
+				"Use gRPC service clients instead of vscode.postMessage().\n" +
+				"Example: AccountServiceClient.methodName(RequestType.create({...})) instead of vscode.postMessage({type: '...'}).\n" +
+				"Found: {{code}}",
+		},
+		schema: [],
+	},
+	defaultOptions: [],
+
+	create(context) {
+		// Check if current file is grpc-client-base.ts (exception case)
+		const filename = context.filename
+		const isGrpcClientBase = path.basename(filename) === "grpc-client-base.ts"
+
+		return {
+			// Detect vscode.postMessage calls
+			"CallExpression[callee.type='MemberExpression']"(node) {
+				// Skip if this is grpc-client-base.ts
+				if (isGrpcClientBase) {
+					return
+				}
+
+				const callee = node.callee
+
+				// Check for vscode.postMessage pattern
+				if (
+					callee.object &&
+					callee.object.type === "Identifier" &&
+					callee.object.name === "vscode" &&
+					callee.property &&
+					callee.property.name === "postMessage"
+				) {
+					const sourceCode = context.sourceCode
+					const callText = sourceCode.getText(node).trim()
+
+					context.report({
+						node,
+						messageId: "useGrpcClient",
+						data: {
+							code: callText,
+						},
+					})
+				}
+			},
+		}
+	},
+})

evals/cli/src/commands/runDiffEval.ts

@@ -6,7 +6,6 @@ interface RunDiffEvalOptions {
 	modelIds: string
 	systemPromptName: string
 	validAttemptsPerCase: number
-	maxAttemptsPerCase?: number
 	parsingFunction: string
 	diffEditFunction: string
 	thinkingBudget: number
@@ -72,10 +71,6 @@ export async function runDiffEvalHandler(options: RunDiffEvalOptions) {
 		args.push("--verbose")
 	}
 
-	if (options.maxAttemptsPerCase) {
-		args.push("--max-attempts-per-case", String(options.maxAttemptsPerCase))
-	}
-
 	if (options.maxCases) {
 		args.push("--max-cases", String(options.maxCases))
 	}

evals/cli/src/index.ts

@@ -87,7 +87,6 @@ program
 	.option("--model-ids <model_ids>", "Comma-separated list of model IDs to test")
 	.option("--system-prompt-name <name>", "The name of the system prompt to use", "basicSystemPrompt")
 	.option("-n, --valid-attempts-per-case <number>", "Number of valid attempts per test case per model (will retry until this many valid attempts are collected)", "1")
-	.option("--max-attempts-per-case <number>", "Maximum total attempts per test case (default: 10x valid attempts)")
 	.option("--max-cases <number>", "Maximum number of test cases to run (limits total cases loaded)")
 	.option("--parsing-function <name>", "The parsing function to use", "parseAssistantMessageV2")
 	.option("--diff-edit-function <name>", "The diff editing function to use", "constructNewFileContentV2")
@@ -103,7 +102,6 @@ program
 			const fullOptions = {
 				...options,
 				validAttemptsPerCase: parseInt(options.validAttemptsPerCase, 10),
-				maxAttemptsPerCase: options.maxAttemptsPerCase ? parseInt(options.maxAttemptsPerCase, 10) : undefined,
 				thinkingBudget: parseInt(options.thinkingBudget, 10),
 				maxCases: options.maxCases ? parseInt(options.maxCases, 10) : undefined,
 			}

evals/diff-edits/ClineWrapper.ts

@@ -30,7 +30,6 @@ const diffEditingFunctions: Record<string, ConstructNewFileContentFn> = {
 }
 
 import { TestInput, TestResult, ExtractedToolCall } from "./types"
-import { log } from "./helpers"
 export { TestInput, TestResult, ExtractedToolCall }
 
 interface StreamResult {
@@ -285,21 +284,21 @@ export async function runSingleEvaluation(input: TestInput): Promise<TestResult>
 		}
 
 		// check that we are editing the correct file path
-		log(input.isVerbose, `Expected file path: "${originalFilePath}"`)
-		log(input.isVerbose, `Actual file path used: "${diffToolPath}"`)
+		console.log(`Expected file path: "${originalFilePath}"`);
+		console.log(`Actual file path used: "${diffToolPath}"`);
 		if (diffToolPath !== originalFilePath) {
-			log(input.isVerbose, `❌ File path mismatch detected!`)
+			console.log(`❌ File path mismatch detected!`);
 			// Enhanced logging:
 			if (streamResult?.assistantMessage) {
-				log(input.isVerbose, `   Full model output (assistantMessage):`)
-				log(input.isVerbose, `   -----------------------------------------`)
-				log(input.isVerbose, `   ${streamResult.assistantMessage}`)
-				log(input.isVerbose, `   -----------------------------------------`)
+				console.log(`   Full model output (assistantMessage):`);
+				console.log(`   -----------------------------------------`);
+				console.log(`   ${streamResult.assistantMessage}`);
+				console.log(`   -----------------------------------------`);
 			}
 			if (toolCall) {
-				log(input.isVerbose, `   Parsed tool call that caused mismatch:`)
-				log(input.isVerbose, `   ${JSON.stringify(toolCall, null, 2)}`)
-				log(input.isVerbose, `   -----------------------------------------`)
+				console.log(`   Parsed tool call that caused mismatch:`);
+				console.log(`   ${JSON.stringify(toolCall, null, 2)}`);
+				console.log(`   -----------------------------------------`);
 			}
 			return {
 				success: false,
@@ -322,7 +321,7 @@ export async function runSingleEvaluation(input: TestInput): Promise<TestResult>
 			// If it's just a string, diffSuccess stays true and replacementData stays undefined
 		} catch (error: any) {
 			diffSuccess = false
-			log(input.isVerbose, `ERROR: ${error}`)
+			console.log("ERROR:",error)
 		}
 
 		return {

evals/diff-edits/TestRunner.ts

@@ -7,7 +7,7 @@ import { constructNewFileContent as constructNewFileContent_06_26_25 } from "./d
 import { constructNewFileContent as constructNewFileContentV3 } from "../../src/core/assistant-message/diff"
 import { basicSystemPrompt } from "./prompts/basicSystemPrompt-06-06-25"
 import { claude4SystemPrompt } from "./prompts/claude4SystemPrompt-06-06-25"
-import { formatResponse, log } from "./helpers"
+import { formatResponse } from "./helpers"
 import { Anthropic } from "@anthropic-ai/sdk"
 import * as fs from "fs"
 import * as path from "path"
@@ -40,6 +40,12 @@ const encoding = get_encoding("cl100k_base");
 
 let openRouterModelDataGlobal: Record<string, EvalOpenRouterModelInfo> = {}; // Global to store fetched data
 
+function log(isVerbose: boolean, message: string) {
+	if (isVerbose) {
+		console.log(message)
+	}
+}
+
 const systemPromptGeneratorLookup: Record<string, ConstructSystemPromptFn> = {
 	basicSystemPrompt: basicSystemPrompt,
 	claude4SystemPrompt: claude4SystemPrompt,
@@ -635,7 +641,6 @@ class NodeTestRunner {
 			thinkingBudgetTokens: testConfig.thinking_tokens_budget,
 			originalDiffEditToolCallMessage: testConfig.replay ? testCase.original_diff_edit_tool_call_message : undefined,
 			diffApplyFile: testConfig.diff_apply_file,
-			isVerbose: isVerbose,
 		}
 
 		if (isVerbose) {
@@ -802,8 +807,8 @@ class NodeTestRunner {
 					log(isVerbose, `Warning: Failed to store result in database: ${error}`);
 				}
 				
-				// Safety check to prevent infinite loops - use configurable max attempts limit
-				if (totalAttempts >= testConfig.max_attempts_per_case) {
+				// Safety check to prevent infinite loops - limit to 10 attempts per valid attempt requested
+				if (totalAttempts >= testConfig.number_of_runs * 10) {
 					log(isVerbose, `  ⚠️ Reached maximum attempts (${totalAttempts}) for test case ${testCase.test_id}. Only got ${validAttempts}/${testConfig.number_of_runs} valid attempts.`);
 					break;
 				}
@@ -922,7 +927,6 @@ async function main() {
 		.option("--model-ids <model_ids>", "Comma-separated list of model IDs to test")
 		.option("--system-prompt-name <name>", "The name of the system prompt to use", "basicSystemPrompt")
 		.option("-n, --valid-attempts-per-case <number>", "Number of valid attempts per test case per model (will retry until this many valid attempts are collected)", "1")
-		.option("--max-attempts-per-case <number>", "Maximum total attempts per test case (default: 10x valid attempts)")
 		.option("--max-cases <number>", "Maximum number of test cases to run (limits total cases loaded)")
 		.option("--parsing-function <name>", "The parsing function to use", "parseAssistantMessageV2")
 		.option("--diff-edit-function <name>", "The diff editing function to use", "diff-06-25-25")
@@ -953,11 +957,6 @@ async function main() {
 	}
 
 	const validAttemptsPerCase = parseInt(options.validAttemptsPerCase, 10);
-	
-	// Compute dynamic default for max attempts: 10x valid attempts if not specified
-	const maxAttemptsPerCase = options.maxAttemptsPerCase 
-		? parseInt(options.maxAttemptsPerCase, 10)
-		: validAttemptsPerCase * 10;
 
 	const runner = new NodeTestRunner(options.replay || !!options.replayRunId)
 
@@ -1063,7 +1062,6 @@ async function main() {
 					model_id: modelId,
 					system_prompt_name: options.systemPromptName,
 					number_of_runs: validAttemptsPerCase,
-					max_attempts_per_case: maxAttemptsPerCase,
 					parsing_function: options.parsingFunction,
 					diff_edit_function: options.diffEditFunction,
 					thinking_tokens_budget: parseInt(options.thinkingBudget, 10),
@@ -1131,7 +1129,7 @@ async function main() {
 
 			remainingTasks = remainingTasks.filter(task => {
 				const taskId = `${task.modelId}-${task.testCase.test_id}`;
-				if (taskStates[taskId].total >= task.testConfig.max_attempts_per_case) {
+				if (taskStates[taskId].total >= validAttemptsPerCase * 10) {
 					log(isVerbose, `  ⚠️ Reached maximum attempts for ${task.testCase.test_id} with ${task.modelId}.`);
 					return false;
 				}

evals/diff-edits/diff-apply/diff-06-26-25.ts

@@ -492,12 +492,6 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 		if (isReplaceBlockEnd(line)) {
 			// Finished one replace block
 
-			if (searchMatchIndex === -1) {
-				throw new Error(
-					`The SEARCH block:\n${currentSearchContent.trimEnd()}\n...is malformatted.`,
-				)
-			}
-
 			// Store this replacement
 			replacements.push({
 				start: searchMatchIndex,

evals/diff-edits/helpers.ts

@@ -23,9 +23,3 @@ export const formatResponse = {
 		return formatImagesIntoBlocks(images)
 	},
 }
-
-export function log(isVerbose: boolean, message: string) {
-	if (isVerbose) {
-		console.log(message)
-	}
-}

evals/diff-edits/types.ts

@@ -29,7 +29,6 @@ export interface TestConfig {
 	model_id: string
 	system_prompt_name: string
 	number_of_runs: number
-	max_attempts_per_case: number
 	parsing_function: string
 	diff_edit_function: string
 	thinking_tokens_budget: number
@@ -104,5 +103,4 @@ export interface TestInput {
 	thinkingBudgetTokens: number
 	originalDiffEditToolCallMessage?: string
 	diffApplyFile?: string
-	isVerbose: boolean
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
 	"name": "claude-dev",
-	"version": "3.18.10",
+	"version": "3.17.16",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.18.10",
+			"version": "3.17.16",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.37.0",
@@ -45,6 +45,7 @@
 				"fzf": "^0.5.2",
 				"get-folder-size": "^5.0.0",
 				"globby": "^14.0.2",
+				"google-auth-library": "^10.1.0",
 				"grpc-health-check": "^2.0.2",
 				"iconv-lite": "^0.6.3",
 				"ignore": "^7.0.3",
@@ -201,6 +202,75 @@
 				"undici-types": "~5.26.4"
 			}
 		},
+		"node_modules/@anthropic-ai/vertex-sdk/node_modules/gaxios": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+			"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"extend": "^3.0.2",
+				"https-proxy-agent": "^7.0.1",
+				"is-stream": "^2.0.0",
+				"node-fetch": "^2.6.9",
+				"uuid": "^9.0.1"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@anthropic-ai/vertex-sdk/node_modules/gcp-metadata": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
+			"integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"gaxios": "^6.1.1",
+				"google-logging-utils": "^0.0.2",
+				"json-bigint": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@anthropic-ai/vertex-sdk/node_modules/google-auth-library": {
+			"version": "9.15.1",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
+			"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"base64-js": "^1.3.0",
+				"ecdsa-sig-formatter": "^1.0.11",
+				"gaxios": "^6.1.1",
+				"gcp-metadata": "^6.1.0",
+				"gtoken": "^7.0.0",
+				"jws": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@anthropic-ai/vertex-sdk/node_modules/google-logging-utils": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
+			"integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@anthropic-ai/vertex-sdk/node_modules/gtoken": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+			"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+			"license": "MIT",
+			"dependencies": {
+				"gaxios": "^6.0.0",
+				"jws": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
 		"node_modules/@asyncapi/parser": {
 			"version": "3.4.0",
 			"resolved": "https://registry.npmjs.org/@asyncapi/parser/-/parser-3.4.0.tgz",
@@ -2868,6 +2938,75 @@
 				"node": ">=18.0.0"
 			}
 		},
+		"node_modules/@google-cloud/vertexai/node_modules/gaxios": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+			"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"extend": "^3.0.2",
+				"https-proxy-agent": "^7.0.1",
+				"is-stream": "^2.0.0",
+				"node-fetch": "^2.6.9",
+				"uuid": "^9.0.1"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google-cloud/vertexai/node_modules/gcp-metadata": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
+			"integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"gaxios": "^6.1.1",
+				"google-logging-utils": "^0.0.2",
+				"json-bigint": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google-cloud/vertexai/node_modules/google-auth-library": {
+			"version": "9.15.1",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
+			"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"base64-js": "^1.3.0",
+				"ecdsa-sig-formatter": "^1.0.11",
+				"gaxios": "^6.1.1",
+				"gcp-metadata": "^6.1.0",
+				"gtoken": "^7.0.0",
+				"jws": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google-cloud/vertexai/node_modules/google-logging-utils": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
+			"integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google-cloud/vertexai/node_modules/gtoken": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+			"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+			"license": "MIT",
+			"dependencies": {
+				"gaxios": "^6.0.0",
+				"jws": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
 		"node_modules/@google/genai": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/@google/genai/-/genai-1.0.0.tgz",
@@ -2886,6 +3025,75 @@
 				"@modelcontextprotocol/sdk": "^1.11.0"
 			}
 		},
+		"node_modules/@google/genai/node_modules/gaxios": {
+			"version": "6.7.1",
+			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+			"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"extend": "^3.0.2",
+				"https-proxy-agent": "^7.0.1",
+				"is-stream": "^2.0.0",
+				"node-fetch": "^2.6.9",
+				"uuid": "^9.0.1"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google/genai/node_modules/gcp-metadata": {
+			"version": "6.1.1",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
+			"integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"gaxios": "^6.1.1",
+				"google-logging-utils": "^0.0.2",
+				"json-bigint": "^1.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google/genai/node_modules/google-auth-library": {
+			"version": "9.15.1",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
+			"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+			"license": "Apache-2.0",
+			"dependencies": {
+				"base64-js": "^1.3.0",
+				"ecdsa-sig-formatter": "^1.0.11",
+				"gaxios": "^6.1.1",
+				"gcp-metadata": "^6.1.0",
+				"gtoken": "^7.0.0",
+				"jws": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google/genai/node_modules/google-logging-utils": {
+			"version": "0.0.2",
+			"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
+			"integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==",
+			"license": "Apache-2.0",
+			"engines": {
+				"node": ">=14"
+			}
+		},
+		"node_modules/@google/genai/node_modules/gtoken": {
+			"version": "7.1.0",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+			"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+			"license": "MIT",
+			"dependencies": {
+				"gaxios": "^6.0.0",
+				"jws": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=14.0.0"
+			}
+		},
 		"node_modules/@grpc/grpc-js": {
 			"version": "1.9.15",
 			"resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
@@ -9602,9 +9810,10 @@
 			}
 		},
 		"node_modules/bignumber.js": {
-			"version": "9.1.2",
-			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
-			"integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug==",
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz",
+			"integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA==",
+			"license": "MIT",
 			"engines": {
 				"node": "*"
 			}
@@ -9790,7 +9999,8 @@
 		"node_modules/buffer-equal-constant-time": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz",
-			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="
+			"integrity": "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==",
+			"license": "BSD-3-Clause"
 		},
 		"node_modules/buffer-indexof-polyfill": {
 			"version": "1.0.2",
@@ -11448,6 +11658,7 @@
 			"version": "1.0.11",
 			"resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz",
 			"integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==",
+			"license": "Apache-2.0",
 			"dependencies": {
 				"safe-buffer": "^5.0.1"
 			}
@@ -13086,6 +13297,29 @@
 				"pend": "~1.2.0"
 			}
 		},
+		"node_modules/fetch-blob": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+			"integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+			"funding": [
+				{
+					"type": "github",
+					"url": "https://github.com/sponsors/jimmywarting"
+				},
+				{
+					"type": "paypal",
+					"url": "https://paypal.me/jimmywarting"
+				}
+			],
+			"license": "MIT",
+			"dependencies": {
+				"node-domexception": "^1.0.0",
+				"web-streams-polyfill": "^3.0.3"
+			},
+			"engines": {
+				"node": "^12.20 || >= 14.13"
+			}
+		},
 		"node_modules/figures": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
@@ -13422,6 +13656,18 @@
 				"node": ">= 14"
 			}
 		},
+		"node_modules/formdata-polyfill": {
+			"version": "4.0.10",
+			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+			"license": "MIT",
+			"dependencies": {
+				"fetch-blob": "^3.1.2"
+			},
+			"engines": {
+				"node": ">=12.20.0"
+			}
+		},
 		"node_modules/forwarded": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -13688,18 +13934,44 @@
 			}
 		},
 		"node_modules/gaxios": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
-			"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.1.tgz",
+			"integrity": "sha512-Odju3uBUJyVCkW64nLD4wKLhbh93bh6vIg/ZIXkWiLPBrdgtc65+tls/qml+un3pr6JqYVFDZbbmLDQT68rTOQ==",
+			"license": "Apache-2.0",
 			"dependencies": {
 				"extend": "^3.0.2",
 				"https-proxy-agent": "^7.0.1",
-				"is-stream": "^2.0.0",
-				"node-fetch": "^2.6.9",
-				"uuid": "^9.0.1"
+				"node-fetch": "^3.3.2"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
+			}
+		},
+		"node_modules/gaxios/node_modules/data-uri-to-buffer": {
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+			"integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 12"
+			}
+		},
+		"node_modules/gaxios/node_modules/node-fetch": {
+			"version": "3.3.2",
+			"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+			"integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+			"license": "MIT",
+			"dependencies": {
+				"data-uri-to-buffer": "^4.0.0",
+				"fetch-blob": "^3.1.4",
+				"formdata-polyfill": "^4.0.10"
+			},
+			"engines": {
+				"node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/node-fetch"
 			}
 		},
 		"node_modules/gcd": {
@@ -13709,15 +13981,17 @@
 			"dev": true
 		},
 		"node_modules/gcp-metadata": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
-			"integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.1.tgz",
+			"integrity": "sha512-UcO3kefx6dCcZkgcTGgVOTFb7b1LlQ02hY1omMjjrrBzkajRMCFgYOjs7J71WqnuG1k2b+9ppGL7FsOfhZMQKQ==",
+			"license": "Apache-2.0",
 			"dependencies": {
-				"gaxios": "^6.0.0",
+				"gaxios": "^7.0.0",
+				"google-logging-utils": "^1.0.0",
 				"json-bigint": "^1.0.0"
 			},
 			"engines": {
-				"node": ">=14"
+				"node": ">=18"
 			}
 		},
 		"node_modules/get-caller-file": {
@@ -13990,18 +14264,28 @@
 			}
 		},
 		"node_modules/google-auth-library": {
-			"version": "9.15.1",
-			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
-			"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.1.0.tgz",
+			"integrity": "sha512-GspVjZj1RbyRWpQ9FbAXMKjFGzZwDKnUHi66JJ+tcjcu5/xYAP1pdlWotCuIkMwjfVsxxDvsGZXGLzRt72D0sQ==",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"base64-js": "^1.3.0",
 				"ecdsa-sig-formatter": "^1.0.11",
-				"gaxios": "^6.1.1",
-				"gcp-metadata": "^6.1.0",
-				"gtoken": "^7.0.0",
+				"gaxios": "^7.0.0",
+				"gcp-metadata": "^7.0.0",
+				"google-logging-utils": "^1.0.0",
+				"gtoken": "^8.0.0",
 				"jws": "^4.0.0"
 			},
+			"engines": {
+				"node": ">=18"
+			}
+		},
+		"node_modules/google-logging-utils": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz",
+			"integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A==",
+			"license": "Apache-2.0",
 			"engines": {
 				"node": ">=14"
 			}
@@ -14138,15 +14422,16 @@
 			}
 		},
 		"node_modules/gtoken": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
-			"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz",
+			"integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==",
+			"license": "MIT",
 			"dependencies": {
-				"gaxios": "^6.0.0",
+				"gaxios": "^7.0.0",
 				"jws": "^4.0.0"
 			},
 			"engines": {
-				"node": ">=14.0.0"
+				"node": ">=18"
 			}
 		},
 		"node_modules/has-bigints": {
@@ -15745,6 +16030,7 @@
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz",
 			"integrity": "sha512-SiPv/8VpZuWbvLSMtTDU8hEfrZWg/mH/nV/b4o0CYbSxu1UIQPLdwKOCIyLQX+VIPO5vrLX3i8qtqFyhdPSUSQ==",
+			"license": "MIT",
 			"dependencies": {
 				"bignumber.js": "^9.0.0"
 			}
@@ -15858,11 +16144,12 @@
 			"license": "MIT"
 		},
 		"node_modules/jwa": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-			"integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+			"integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
+			"license": "MIT",
 			"dependencies": {
-				"buffer-equal-constant-time": "1.0.1",
+				"buffer-equal-constant-time": "^1.0.1",
 				"ecdsa-sig-formatter": "1.0.11",
 				"safe-buffer": "^5.0.1"
 			}
@@ -15871,6 +16158,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz",
 			"integrity": "sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==",
+			"license": "MIT",
 			"dependencies": {
 				"jwa": "^2.0.0",
 				"safe-buffer": "^5.0.1"
@@ -23400,6 +23688,15 @@
 				"url": "https://github.com/sponsors/wooorm"
 			}
 		},
+		"node_modules/web-streams-polyfill": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+			"integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==",
+			"license": "MIT",
+			"engines": {
+				"node": ">= 8"
+			}
+		},
 		"node_modules/web-tree-sitter": {
 			"version": "0.22.6",
 			"resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.22.6.tgz",
@@ -24160,6 +24457,55 @@
 					"requires": {
 						"undici-types": "~5.26.4"
 					}
+				},
+				"gaxios": {
+					"version": "6.7.1",
+					"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+					"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+					"requires": {
+						"extend": "^3.0.2",
+						"https-proxy-agent": "^7.0.1",
+						"is-stream": "^2.0.0",
+						"node-fetch": "^2.6.9",
+						"uuid": "^9.0.1"
+					}
+				},
+				"gcp-metadata": {
+					"version": "6.1.1",
+					"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
+					"integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+					"requires": {
+						"gaxios": "^6.1.1",
+						"google-logging-utils": "^0.0.2",
+						"json-bigint": "^1.0.0"
+					}
+				},
+				"google-auth-library": {
+					"version": "9.15.1",
+					"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
+					"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+					"requires": {
+						"base64-js": "^1.3.0",
+						"ecdsa-sig-formatter": "^1.0.11",
+						"gaxios": "^6.1.1",
+						"gcp-metadata": "^6.1.0",
+						"gtoken": "^7.0.0",
+						"jws": "^4.0.0"
+					}
+				},
+				"google-logging-utils": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
+					"integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ=="
+				},
+				"gtoken": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+					"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+					"requires": {
+						"gaxios": "^6.0.0",
+						"jws": "^4.0.0"
+					}
 				}
 			}
 		},
@@ -26416,6 +26762,57 @@
 			"integrity": "sha512-35o5tIEMLW3JeFJOaaMNR2e5sq+6rpnhrF97PuAxeOm0GlqVTESKhkGj7a5B5mmJSSSU3hUfIhcQCRRsw4Ipzg==",
 			"requires": {
 				"google-auth-library": "^9.1.0"
+			},
+			"dependencies": {
+				"gaxios": {
+					"version": "6.7.1",
+					"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+					"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+					"requires": {
+						"extend": "^3.0.2",
+						"https-proxy-agent": "^7.0.1",
+						"is-stream": "^2.0.0",
+						"node-fetch": "^2.6.9",
+						"uuid": "^9.0.1"
+					}
+				},
+				"gcp-metadata": {
+					"version": "6.1.1",
+					"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
+					"integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+					"requires": {
+						"gaxios": "^6.1.1",
+						"google-logging-utils": "^0.0.2",
+						"json-bigint": "^1.0.0"
+					}
+				},
+				"google-auth-library": {
+					"version": "9.15.1",
+					"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
+					"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+					"requires": {
+						"base64-js": "^1.3.0",
+						"ecdsa-sig-formatter": "^1.0.11",
+						"gaxios": "^6.1.1",
+						"gcp-metadata": "^6.1.0",
+						"gtoken": "^7.0.0",
+						"jws": "^4.0.0"
+					}
+				},
+				"google-logging-utils": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
+					"integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ=="
+				},
+				"gtoken": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+					"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+					"requires": {
+						"gaxios": "^6.0.0",
+						"jws": "^4.0.0"
+					}
+				}
 			}
 		},
 		"@google/genai": {
@@ -26427,6 +26824,57 @@
 				"ws": "^8.18.0",
 				"zod": "^3.22.4",
 				"zod-to-json-schema": "^3.22.4"
+			},
+			"dependencies": {
+				"gaxios": {
+					"version": "6.7.1",
+					"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
+					"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+					"requires": {
+						"extend": "^3.0.2",
+						"https-proxy-agent": "^7.0.1",
+						"is-stream": "^2.0.0",
+						"node-fetch": "^2.6.9",
+						"uuid": "^9.0.1"
+					}
+				},
+				"gcp-metadata": {
+					"version": "6.1.1",
+					"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz",
+					"integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==",
+					"requires": {
+						"gaxios": "^6.1.1",
+						"google-logging-utils": "^0.0.2",
+						"json-bigint": "^1.0.0"
+					}
+				},
+				"google-auth-library": {
+					"version": "9.15.1",
+					"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
+					"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+					"requires": {
+						"base64-js": "^1.3.0",
+						"ecdsa-sig-formatter": "^1.0.11",
+						"gaxios": "^6.1.1",
+						"gcp-metadata": "^6.1.0",
+						"gtoken": "^7.0.0",
+						"jws": "^4.0.0"
+					}
+				},
+				"google-logging-utils": {
+					"version": "0.0.2",
+					"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz",
+					"integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ=="
+				},
+				"gtoken": {
+					"version": "7.1.0",
+					"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
+					"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+					"requires": {
+						"gaxios": "^6.0.0",
+						"jws": "^4.0.0"
+					}
+				}
 			}
 		},
 		"@grpc/grpc-js": {
@@ -31210,9 +31658,9 @@
 			"integrity": "sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg=="
 		},
 		"bignumber.js": {
-			"version": "9.1.2",
-			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.1.2.tgz",
-			"integrity": "sha512-2/mKyZH9K85bzOEfhXDBFZTGd1CTs+5IHpeFQo9luiBG7hghdC851Pj2WAhb6E3R6b9tZj/XKhbg4fum+Kepug=="
+			"version": "9.3.0",
+			"resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.0.tgz",
+			"integrity": "sha512-EM7aMFTXbptt/wZdMlBv2t8IViwQL+h6SLHosp8Yf0dqJMTnY6iL32opnAB6kAdL0SZPuvcAzFr31o0c/R3/RA=="
 		},
 		"binary": {
 			"version": "0.3.0",
@@ -33564,6 +34012,15 @@
 				"pend": "~1.2.0"
 			}
 		},
+		"fetch-blob": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz",
+			"integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==",
+			"requires": {
+				"node-domexception": "^1.0.0",
+				"web-streams-polyfill": "^3.0.3"
+			}
+		},
 		"figures": {
 			"version": "6.1.0",
 			"resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz",
@@ -33799,6 +34256,14 @@
 				}
 			}
 		},
+		"formdata-polyfill": {
+			"version": "4.0.10",
+			"resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz",
+			"integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==",
+			"requires": {
+				"fetch-blob": "^3.1.2"
+			}
+		},
 		"forwarded": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
@@ -33984,15 +34449,30 @@
 			}
 		},
 		"gaxios": {
-			"version": "6.7.1",
-			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz",
-			"integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==",
+			"version": "7.1.1",
+			"resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.1.tgz",
+			"integrity": "sha512-Odju3uBUJyVCkW64nLD4wKLhbh93bh6vIg/ZIXkWiLPBrdgtc65+tls/qml+un3pr6JqYVFDZbbmLDQT68rTOQ==",
 			"requires": {
 				"extend": "^3.0.2",
 				"https-proxy-agent": "^7.0.1",
-				"is-stream": "^2.0.0",
-				"node-fetch": "^2.6.9",
-				"uuid": "^9.0.1"
+				"node-fetch": "^3.3.2"
+			},
+			"dependencies": {
+				"data-uri-to-buffer": {
+					"version": "4.0.1",
+					"resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz",
+					"integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A=="
+				},
+				"node-fetch": {
+					"version": "3.3.2",
+					"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz",
+					"integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==",
+					"requires": {
+						"data-uri-to-buffer": "^4.0.0",
+						"fetch-blob": "^3.1.4",
+						"formdata-polyfill": "^4.0.10"
+					}
+				}
 			}
 		},
 		"gcd": {
@@ -34002,11 +34482,12 @@
 			"dev": true
 		},
 		"gcp-metadata": {
-			"version": "6.1.0",
-			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.0.tgz",
-			"integrity": "sha512-Jh/AIwwgaxan+7ZUUmRLCjtchyDiqh4KjBJ5tW3plBZb5iL/BPcso8A5DlzeD9qlw0duCamnNdpFjxwaT0KyKg==",
+			"version": "7.0.1",
+			"resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.1.tgz",
+			"integrity": "sha512-UcO3kefx6dCcZkgcTGgVOTFb7b1LlQ02hY1omMjjrrBzkajRMCFgYOjs7J71WqnuG1k2b+9ppGL7FsOfhZMQKQ==",
 			"requires": {
-				"gaxios": "^6.0.0",
+				"gaxios": "^7.0.0",
+				"google-logging-utils": "^1.0.0",
 				"json-bigint": "^1.0.0"
 			}
 		},
@@ -34180,18 +34661,24 @@
 			}
 		},
 		"google-auth-library": {
-			"version": "9.15.1",
-			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz",
-			"integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==",
+			"version": "10.1.0",
+			"resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.1.0.tgz",
+			"integrity": "sha512-GspVjZj1RbyRWpQ9FbAXMKjFGzZwDKnUHi66JJ+tcjcu5/xYAP1pdlWotCuIkMwjfVsxxDvsGZXGLzRt72D0sQ==",
 			"requires": {
 				"base64-js": "^1.3.0",
 				"ecdsa-sig-formatter": "^1.0.11",
-				"gaxios": "^6.1.1",
-				"gcp-metadata": "^6.1.0",
-				"gtoken": "^7.0.0",
+				"gaxios": "^7.0.0",
+				"gcp-metadata": "^7.0.0",
+				"google-logging-utils": "^1.0.0",
+				"gtoken": "^8.0.0",
 				"jws": "^4.0.0"
 			}
 		},
+		"google-logging-utils": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz",
+			"integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A=="
+		},
 		"gopd": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
@@ -34292,11 +34779,11 @@
 			}
 		},
 		"gtoken": {
-			"version": "7.1.0",
-			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz",
-			"integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz",
+			"integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==",
 			"requires": {
-				"gaxios": "^6.0.0",
+				"gaxios": "^7.0.0",
 				"jws": "^4.0.0"
 			}
 		},
@@ -35436,11 +35923,11 @@
 			"dev": true
 		},
 		"jwa": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz",
-			"integrity": "sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz",
+			"integrity": "sha512-hRF04fqJIP8Abbkq5NKGN0Bbr3JxlQ+qhZufXVr0DvujKy93ZCbXZMHDL4EOtodSbCWxOqR8MS1tXA5hwqCXDg==",
 			"requires": {
-				"buffer-equal-constant-time": "1.0.1",
+				"buffer-equal-constant-time": "^1.0.1",
 				"ecdsa-sig-formatter": "1.0.11",
 				"safe-buffer": "^5.0.1"
 			}
@@ -40631,6 +41118,11 @@
 			"integrity": "sha512-bKr1DkiNa2krS7qxNtdrtHAmzuYGFQLiQ13TsorsdT6ULTkPLKuu5+GsFpDlg6JFjUTwX2DyhMPG2be8uPrqsQ==",
 			"dev": true
 		},
+		"web-streams-polyfill": {
+			"version": "3.3.3",
+			"resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
+			"integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw=="
+		},
 		"web-tree-sitter": {
 			"version": "0.22.6",
 			"resolved": "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.22.6.tgz",

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.18.10",
+	"version": "3.17.16",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -332,14 +332,14 @@
 		"package": "npm run check-types && npm run build:webview && npm run lint && node esbuild.js --production",
 		"protos": "node proto/build-proto.js && node scripts/generate-server-setup.mjs && node scripts/generate-host-bridge-client.mjs",
 		"postprotos": "prettier src/shared/proto src/core/controller src/hosts/ webview-ui/src/services src/generated --write --log-level warn",
-		"clean": "rimraf dist dist-standalone webview-ui/build src/generated out/",
+		"clean": "rimraf dist dist-standalone webview-ui/build src/generated",
 		"compile-tests": "node ./scripts/build-tests.js",
 		"watch-tests": "tsc -p . -w --outDir out",
+		"pretest": "npm run compile-tests && npm run compile && npm run compile-standalone && npm run lint",
 		"check-types": "npm run protos && tsc --noEmit",
 		"lint": "eslint src --ext ts && eslint webview-ui/src --ext ts && buf lint && cd webview-ui && npm run lint",
 		"format": "prettier . --check",
 		"format:fix": "prettier . --write",
-		"pretest": "npm run compile && npm run compile-tests && npm run compile-standalone && npm run lint",
 		"test": "npm-run-all test:unit test:integration",
 		"test:ci": "node scripts/test-ci.js",
 		"test:integration": "vscode-test",
@@ -442,6 +442,7 @@
 		"fzf": "^0.5.2",
 		"get-folder-size": "^5.0.0",
 		"globby": "^14.0.2",
+		"google-auth-library": "^10.1.0",
 		"grpc-health-check": "^2.0.2",
 		"iconv-lite": "^0.6.3",
 		"ignore": "^7.0.3",

proto/account.proto

@@ -1,129 +1,76 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 // Service for account-related operations
 service AccountService {
-  // 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 accountLoginClicked(EmptyRequest) returns (String);
+    // 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 accountLoginClicked(EmptyRequest) returns (String);
     
-  // Handles the user clicking the logout button in the UI.
-  // Clears API keys and user state.
-  rpc accountLogoutClicked(EmptyRequest) returns (Empty);
+    // Handles the user clicking the logout button in the UI.
+    // Clears API keys and user state.
+    rpc accountLogoutClicked(EmptyRequest) returns (Empty);
 
-  // Subscribe to auth status update events (when authentication state changes)
-  rpc subscribeToAuthStatusUpdate(EmptyRequest) 
-      returns (stream AuthState);
+    // Subscribe to auth callback events (when authentication tokens are received)
+    rpc subscribeToAuthCallback(EmptyRequest) returns (stream String);
     
-  // Handles authentication state changes from the Firebase context.
-  // Updates the user info in global state and returns the updated value.
-  rpc authStateChanged(AuthStateChangedRequest) 
-      returns (AuthState);
+    // Handles authentication state changes from the Firebase context.
+    // Updates the user info in global state and returns the updated value.
+    rpc authStateChanged(AuthStateChangedRequest) returns (AuthStateChanged);
     
-  // Fetches all user credits data
-  // (balance, usage transactions, payment transactions)
-  rpc getUserCredits(EmptyRequest) returns (UserCreditsData);
-
-  rpc getOrganizationCredits(GetOrganizationCreditsRequest) returns (OrganizationCreditsData);
-
-  // Fetches all user organizations data
-  // Returns a list of UserOrganization objects
-  rpc getUserOrganizations(EmptyRequest) returns (UserOrganizationsResponse);
-
-  rpc setUserOrganization(UserOrganizationUpdateRequest) returns (Empty);
+    // Fetches all user credits data (balance, usage transactions, payment transactions)
+    rpc fetchUserCreditsData(EmptyRequest) returns (UserCreditsData);
 }
 
 message AuthStateChangedRequest {
-  Metadata metadata = 1;
-  UserInfo user = 2;
+    Metadata metadata = 1;
+    UserInfo user = 2;
 }
 
-message AuthState {
-  optional UserInfo user = 1;
+message AuthStateChanged {
+    optional UserInfo user = 1;
 }
 
-// User's information
 message UserInfo {
-  string uid = 1;
-  optional string display_name = 2;
-  optional string email = 3;
-  optional string photo_url = 4;
-}
-
-message UserOrganization {
-  bool active = 1;
-  string member_id = 2;
-  string name = 3;
-  string organization_id = 4;
-  repeated string roles = 5; // ["admin", "member", "owner"]
-}
-
-message UserOrganizationsResponse {
-  repeated UserOrganization organizations = 1;
-}
-
-message UserOrganizationUpdateRequest {
-  optional string organization_id = 1;
+    optional string display_name = 1;
+    optional string email = 2;
+    optional string photo_url = 3;
 }
 
+// Response containing all user credits data
 message UserCreditsData {
-  UserCreditsBalance balance = 1;
-  repeated UsageTransaction usage_transactions = 2;
-  repeated PaymentTransaction payment_transactions = 3;
-}
-
-message GetOrganizationCreditsRequest {
-  string organization_id = 1;
-}
-
-message OrganizationCreditsData {
-  UserCreditsBalance balance = 1;
-  string organization_id = 2;
-  repeated OrganizationUsageTransaction usage_transactions = 3;
+    UserCreditsBalance balance = 1;
+    repeated UsageTransaction usage_transactions = 2;
+    repeated PaymentTransaction payment_transactions = 3;
 }
 
+// User's current credit balance
 message UserCreditsBalance {
-  double current_balance = 1;
+    double current_balance = 1;
 }
 
+// Usage transaction record
 message UsageTransaction {
-  string ai_inference_provider_name = 1;
-  string ai_model_name = 2;
-  string ai_model_type_name = 3;
-  int32 completion_tokens = 4;
-  double cost_usd = 5;
-  string created_at = 6;
-  double credits_used = 7;
-  string generation_id = 8;
-  string organization_id = 9;
-  int32 prompt_tokens = 10;
-  int32 total_tokens = 11;
-  string user_id = 12;
+    string spent_at = 1;
+    string creator_id = 2;
+    double credits = 3;
+    string model_provider = 4;
+    string model = 5;
+    int32 prompt_tokens = 6;
+    int32 completion_tokens = 7;
+    int32 total_tokens = 8;
 }
 
+// Payment transaction record
 message PaymentTransaction {
-  string paid_at = 1;
-  string creator_id = 2;
-  int32 amount_cents = 3;
-  double credits = 4;
+    string paid_at = 1;
+    string creator_id = 2;
+    int32 amount_cents = 3;
+    double credits = 4;
 }
-
-message OrganizationUsageTransaction {
-  string ai_inference_provider_name = 1;
-  string ai_model_name = 2;
-  string ai_model_type_name = 3;
-  int32 completion_tokens = 4;
-  double cost_usd = 5;
-  string created_at = 6;
-  double credits_used = 7;
-  string generation_id = 8;
-  string organization_id = 9;
-  int32 prompt_tokens = 10;
-  int32 total_tokens = 11;
-  string user_id = 12;
-}

proto/browser.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 service BrowserService {
   rpc getBrowserConnectionInfo(EmptyRequest) returns (BrowserConnectionInfo);
   rpc testBrowserConnection(StringRequest) returns (BrowserConnection);

proto/build-proto-config.js

@@ -1,31 +0,0 @@
-// Configuration file for protocol buffer build scripts
-// Contains service name mappings used by both build-proto.js and build-go-proto.js
-
-// List of gRPC services
-// To add a new service, simply add it to this map and run the build scripts
-// The service handler will be automatically discovered and used by grpc-handler.ts
-export const serviceNameMap = {
-	account: "cline.AccountService",
-	browser: "cline.BrowserService",
-	checkpoints: "cline.CheckpointsService",
-	file: "cline.FileService",
-	mcp: "cline.McpService",
-	state: "cline.StateService",
-	task: "cline.TaskService",
-	web: "cline.WebService",
-	models: "cline.ModelsService",
-	slash: "cline.SlashService",
-	ui: "cline.UiService",
-	// Add new services here - no other code changes needed!
-}
-
-// List of host gRPC services (IDE API bridge)
-// These services are implemented in the IDE extension and called by the standalone Cline Core
-export const hostServiceNameMap = {
-	uri: "host.UriService",
-	watch: "host.WatchService",
-	workspace: "host.WorkspaceService",
-	env: "host.EnvService",
-	window: "host.WindowService",
-	// Add new host services here
-}

proto/build-proto.js

@@ -9,18 +9,16 @@ import chalk from "chalk"
 import os from "os"
 
 import { createRequire } from "module"
-import { serviceNameMap, hostServiceNameMap } from "./build-proto-config.js"
-
 const require = createRequire(import.meta.url)
 const PROTOC = path.join(require.resolve("grpc-tools"), "../bin/protoc")
 
 const SCRIPT_DIR = path.dirname(fileURLToPath(import.meta.url))
 const ROOT_DIR = path.resolve(SCRIPT_DIR, "..")
 
-const TS_OUT_DIR = path.join(ROOT_DIR, "src", "shared", "proto")
-const GRPC_JS_OUT_DIR = path.join(ROOT_DIR, "src", "generated", "grpc-js")
-const NICE_JS_OUT_DIR = path.join(ROOT_DIR, "src", "generated", "nice-grpc")
-const DESCRIPTOR_OUT_DIR = path.join(ROOT_DIR, "dist-standalone", "proto")
+const TS_OUT_DIR = path.join(ROOT_DIR, "src/shared/proto")
+const GRPC_JS_OUT_DIR = path.join(ROOT_DIR, "src/generated/grpc-js")
+const NICE_JS_OUT_DIR = path.join(ROOT_DIR, "src/generated/nice-grpc")
+const DESCRIPTOR_OUT_DIR = path.join(ROOT_DIR, "dist-standalone/proto")
 
 const isWindows = process.platform === "win32"
 const TS_PROTO_PLUGIN = isWindows
@@ -36,13 +34,34 @@ const TS_PROTO_OPTIONS = [
 	"useDate=false", // Timestamp fields will not be automatically converted to Date.
 ]
 
-// Service directories derived from imported serviceNameMap
-const serviceDirs = Object.keys(serviceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src", "core", "controller", serviceKey))
+// List of gRPC services
+// To add a new service, simply add it to this map and run this script
+// The service handler will be automatically discovered and used by grpc-handler.ts
+const serviceNameMap = {
+	account: "cline.AccountService",
+	browser: "cline.BrowserService",
+	checkpoints: "cline.CheckpointsService",
+	file: "cline.FileService",
+	mcp: "cline.McpService",
+	state: "cline.StateService",
+	task: "cline.TaskService",
+	web: "cline.WebService",
+	models: "cline.ModelsService",
+	slash: "cline.SlashService",
+	ui: "cline.UiService",
+	// Add new services here - no other code changes needed!
+}
+const serviceDirs = Object.keys(serviceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src/core/controller", serviceKey))
 
-// Host service directories derived from imported hostServiceNameMap
-const hostServiceDirs = Object.keys(hostServiceNameMap).map((serviceKey) =>
-	path.join(ROOT_DIR, "src", "hosts", "vscode", serviceKey),
-)
+// List of host gRPC services (IDE API bridge)
+// These services are implemented in the IDE extension and called by the standalone Cline Core
+const hostServiceNameMap = {
+	uri: "host.UriService",
+	watch: "host.WatchService",
+	workspace: "host.WorkspaceService",
+	// Add new host services here
+}
+const hostServiceDirs = Object.keys(hostServiceNameMap).map((serviceKey) => path.join(ROOT_DIR, "src/hosts/vscode", serviceKey))
 
 async function main() {
 	console.log(chalk.bold.blue("Starting Protocol Buffer code generation..."))
@@ -158,7 +177,7 @@ export {
 	${serviceExports.join(",\n\t")}
 }`
 
-	const filePath = path.join(ROOT_DIR, "webview-ui", "src", "services", "grpc-client.ts")
+	const filePath = path.join(ROOT_DIR, "webview-ui/src/services/grpc-client.ts")
 	await writeFileWithMkdirs(filePath, content)
 	log_verbose(chalk.green(`Generated gRPC client at ${filePath}`))
 }
@@ -367,7 +386,7 @@ export interface ServiceHandlerConfig {
 export const serviceHandlers: Record<string, ServiceHandlerConfig> = {${serviceConfigs.join(",")}
 };`
 
-	const configPath = path.join(ROOT_DIR, "src", "core", "controller", "grpc-service-config.ts")
+	const configPath = path.join(ROOT_DIR, "src/core/controller/grpc-service-config.ts")
 	await writeFileWithMkdirs(configPath, content)
 	log_verbose(chalk.green(`Generated service configuration at ${configPath}`))
 }
@@ -583,12 +602,13 @@ async function cleanup() {
 	for (const file of existingFiles) {
 		await fs.unlink(path.join(TS_OUT_DIR, file))
 	}
-	await rmdir(path.join(ROOT_DIR, "src", "generated"))
+	await rmdir(path.join(ROOT_DIR, "src/generated"))
 
 	// Clean up generated files that were moved.
-	await fs.rm(path.join(ROOT_DIR, "src", "standalone", "services", "host-grpc-client.ts"), { force: true })
-	await rmdir(path.join(ROOT_DIR, "src", "standalone", "services"))
-	await fs.rm(path.join(ROOT_DIR, "hosts", "vscode"), { force: true, recursive: true })
+	await fs.rm(path.join(ROOT_DIR, "src/standalone/services/host-grpc-client.ts"), { force: true })
+	await rmdir(path.join(ROOT_DIR, "src/standalone/services"))
+
+	await fs.rm(path.join(ROOT_DIR, "hosts/vscode"), { force: true, recursive: true })
 	await rmdir(path.join(ROOT_DIR, "hosts"))
 
 	await fs.rm(path.join(ROOT_DIR, "src/standalone/server-setup.ts"), { force: true })
@@ -616,6 +636,13 @@ async function rmdir(path) {
 	}
 }
 
+function serviceNameWithoutPackage(fullServiceName) {
+	return fullServiceName.replace(/.*\./, "")
+}
+function lowercaseFirstChar(str) {
+	return str.charAt(0).toLowerCase() + str.slice(1)
+}
+
 // Check for Apple Silicon compatibility
 function checkAppleSiliconCompatibility() {
 	// Only run check on macOS

proto/checkpoints.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 service CheckpointsService {
   rpc checkpointDiff(Int64Request) returns (Empty);
   rpc checkpointRestore(CheckpointRestoreRequest) returns (Empty);

proto/file.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 // Service for file-related operations
 service FileService {
   // Copies text to clipboard

proto/host/env.proto

@@ -1,19 +0,0 @@
-syntax = "proto3";
-
-package host;
-option java_package = "bot.cline.host.proto";
-option java_multiple_files = true;
-
-import "common.proto";
-
-// Provides methods for working with the user's environment.
-service EnvService {
-  // Writes text to the system clipboard.
-  rpc clipboardWriteText(cline.StringRequest) returns (cline.Empty);
-
-  // Reads text from the system clipboard.
-  rpc clipboardReadText(cline.EmptyRequest) returns (cline.String);
-
-  // Opens a URL in the user's default browser or application.
-  rpc openExternal(cline.StringRequest) returns (cline.Empty);
-}

proto/host/uri.proto

@@ -0,0 +1,36 @@
+syntax = "proto3";
+
+package host;
+option java_package = "bot.cline.host.proto";
+option java_multiple_files = true;
+
+import "common.proto";
+
+// UriService provides methods for working with URIs in the IDE
+service UriService {
+  // Create a new file URI from a file path
+  rpc file(cline.StringRequest) returns (Uri);
+  
+  // Join a URI with additional path segments
+  rpc joinPath(JoinPathRequest) returns (Uri);
+  
+  // Parse a string URI into a Uri object
+  rpc parse(cline.StringRequest) returns (Uri);
+}
+
+// Uri represents a URI in the IDE
+message Uri {
+  string scheme = 1;
+  string authority = 2;
+  string path = 3;
+  string query = 4;
+  string fragment = 5;
+  string fs_path = 6;
+}
+
+// Request for joining path segments to a URI
+message JoinPathRequest {
+  cline.Metadata metadata = 1;
+  Uri base = 2;
+  repeated string path_segments = 3;
+}

proto/host/window.proto

@@ -1,48 +0,0 @@
-syntax = "proto3";
-
-package host;
-option java_package = "bot.cline.host.proto";
-option java_multiple_files = true;
-
-import "common.proto";
-
-// Provides methods for working with IDE windows and editors.
-service WindowService {
-  // Opens a text document in the editor and returns editor information.
-  rpc showTextDocument(ShowTextDocumentRequest) returns (TextEditorInfo);
-  rpc showOpenDialogue(ShowOpenDialogueRequest) returns (SelectedResources);
-}
-
-message ShowTextDocumentRequest {
-  cline.Metadata metadata = 1;
-  string path = 2;
-  optional ShowTextDocumentOptions options = 3;
-}
-
-// See https://code.visualstudio.com/api/references/vscode-api#TextDocumentShowOptions
-message ShowTextDocumentOptions {
-  optional bool preview = 1;
-  optional bool preserve_focus = 2;
-  optional int32 view_column = 3;
-}
-
-message TextEditorInfo {
-  string document_path = 1;
-  optional int32 view_column = 2;
-  bool is_active = 3;
-}
-
-message ShowOpenDialogueRequest {
-  cline.Metadata metadata = 1;
-  optional bool can_select_many = 2;
-  optional string open_label = 3;
-  optional ShowOpenDialogueFilterOption filters = 4;
-}
-
-message ShowOpenDialogueFilterOption {
-  repeated string files = 1;
-}
-
-message SelectedResources {
-  repeated string paths = 1;
-}

proto/mcp.proto

@@ -1,15 +1,16 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 service McpService {
   rpc toggleMcpServer(ToggleMcpServerRequest) returns (McpServers);
   rpc updateMcpTimeout(UpdateMcpTimeoutRequest) returns (McpServers);
   rpc addRemoteMcpServer(AddRemoteMcpServerRequest) returns (McpServers);
-  rpc downloadMcp(StringRequest) returns (McpDownloadResponse);
+  rpc downloadMcp(StringRequest) returns (Empty);
   rpc restartMcpServer(StringRequest) returns (McpServers);
   rpc deleteMcpServer(StringRequest) returns (McpServers);
   rpc toggleToolAutoApprove(ToggleToolAutoApproveRequest) returns (McpServers);
@@ -118,15 +119,3 @@ message McpMarketplaceItem {
 message McpMarketplaceCatalog {
   repeated McpMarketplaceItem items = 1;
 }
-
-message McpDownloadResponse {
-  string mcp_id = 1;
-  string github_url = 2;
-  string name = 3;
-  string author = 4;
-  string description = 5;
-  string readme_content = 6;
-  string llms_installation_content = 7;
-  bool requires_api_key = 8;
-  optional string error = 9;
-}

proto/models.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 // Service for model-related operations
 service ModelsService {
   // Fetches available models from Ollama
@@ -104,24 +105,25 @@ enum ApiProvider {
   OLLAMA = 5;
   LMSTUDIO = 6;
   GEMINI = 7;
-  OPENAI_NATIVE = 8;
-  REQUESTY = 9;
-  TOGETHER = 10;
-  DEEPSEEK = 11;
-  QWEN = 12;
-  DOUBAO = 13;
-  MISTRAL = 14;
-  VSCODE_LM = 15;
-  CLINE = 16;
-  LITELLM = 17;
-  NEBIUS = 18;
-  FIREWORKS = 19;
-  ASKSAGE = 20;
-  XAI = 21;
-  SAMBANOVA = 22;
-  CEREBRAS = 23;
-  SAPAICORE = 24;
-  CLAUDE_CODE = 25;
+  GEMINI_CLI = 8;
+  OPENAI_NATIVE = 9;
+  REQUESTY = 10;
+  TOGETHER = 11;
+  DEEPSEEK = 12;
+  QWEN = 13;
+  DOUBAO = 14;
+  MISTRAL = 15;
+  VSCODE_LM = 16;
+  CLINE = 17;
+  LITELLM = 18;
+  NEBIUS = 19;
+  FIREWORKS = 20;
+  ASKSAGE = 21;
+  XAI = 22;
+  SAMBANOVA = 23;
+  CEREBRAS = 24;
+  SAPAICORE = 25;
+  CLAUDE_CODE = 26;
 }
 
 // Model info for OpenAI-compatible models
@@ -164,7 +166,7 @@ message ModelsApiConfiguration {
   // From ApiHandlerOptions (excluding onRetryAttempt function)
   optional string api_model_id = 1;
   optional string api_key = 2;
-  optional string cline_account_id = 3;
+  optional string cline_api_key = 3;
   optional string task_id = 4;
   optional string lite_llm_base_url = 5;
   optional string lite_llm_model_id = 6;
@@ -235,4 +237,6 @@ message ModelsApiConfiguration {
   optional string sap_ai_core_token_url = 71;
   optional string sap_ai_core_base_url = 72;
   optional string claude_code_path = 73;
-}
+  optional string gemini_cli_oauth_path = 74;
+  optional string gemini_cli_project_id = 75;
+}

proto/slash.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 // SlashService provides methods for managing slash
 service SlashService {
   // Sends button click message

proto/state.proto

@@ -1,9 +1,10 @@
 syntax = "proto3";
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 service StateService {
   rpc getLatestState(EmptyRequest) returns (State);
   rpc updateTerminalConnectionTimeout(Int64Request) returns (Int64);
@@ -17,7 +18,6 @@ service StateService {
   rpc updateAutoApprovalSettings(AutoApprovalSettingsRequest) returns (Empty);
   rpc updateSettings(UpdateSettingsRequest) returns (Empty);
   rpc updateTelemetrySetting(TelemetrySettingRequest) returns (Empty);
-  rpc setWelcomeViewCompleted(BooleanRequest) returns (Empty);
 }
 
 message State {
@@ -125,7 +125,7 @@ message ApiConfiguration {
   optional string api_base_url = 4;
   
   // Provider-specific API keys
-  optional string cline_account_id = 5;
+  optional string cline_api_key = 5;
   optional string openrouter_api_key = 6;
   optional string anthropic_base_url = 7;
   optional string openai_api_key = 8;

proto/task.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 service TaskService {
   // Cancels the currently running task
   rpc cancelTask(EmptyRequest) returns (Empty);
@@ -22,6 +23,8 @@ service TaskService {
   rpc exportTaskWithId(StringRequest) returns (Empty);
   // Toggles the favorite status of a task
   rpc toggleTaskFavorite(TaskFavoriteRequest) returns (Empty);
+  // Deletes all non-favorited tasks
+  rpc deleteNonFavoritedTasks(EmptyRequest) returns (DeleteNonFavoritedTasksResults);
   // Gets filtered task history
   rpc getTaskHistory(GetTaskHistoryRequest) returns (TaskHistoryArray);
   // Sends a response to a previous ask operation
@@ -33,7 +36,7 @@ service TaskService {
   // Executes a quick win task with command and title
   rpc executeQuickWin(ExecuteQuickWinRequest) returns (Empty);
   // Deletes all task history
-  rpc deleteAllTaskHistory(EmptyRequest) returns (DeleteAllTaskHistoryCount);
+  rpc deleteAllTaskHistory(BooleanRequest) returns (DeleteAllTaskHistoryCount);
 }
 
 // Request message for creating a new task
@@ -65,6 +68,12 @@ message TaskResponse {
   int32 cache_reads = 10;
 }
 
+// Results returned when deleting non-favorited tasks
+message DeleteNonFavoritedTasksResults {
+  int32 tasks_preserved = 1;
+  int32 tasks_deleted = 2;
+}
+
 // Request for getting task history with filtering
 message GetTaskHistoryRequest {
   Metadata metadata = 1;

proto/ui.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 // Enum for webview provider types
 enum WebviewProviderType {
   SIDEBAR = 0;

proto/web.proto

@@ -1,10 +1,11 @@
 syntax = "proto3";
 
 package cline;
-import "common.proto";
 option java_package = "bot.cline.proto";
 option java_multiple_files = true;
 
+import "common.proto";
+
 service WebService {
   rpc checkIsImageUrl(StringRequest) returns (IsImageUrl);
   rpc fetchOpenGraphData(StringRequest) returns (OpenGraphData);

scripts/package-standalone.mjs

@@ -1,100 +1,83 @@
-import archiver from "archiver"
-import { execSync } from "child_process"
 import fs from "fs"
-import { cp } from "fs/promises"
-import { glob } from "glob"
-import ignore from "ignore"
 import path from "path"
+import { glob } from "glob"
+import archiver from "archiver"
+import { cp } from "fs/promises"
+import { execSync } from "child_process"
+
 const BUILD_DIR = "dist-standalone"
-const RUNTIME_DEPS_DIR = "standalone/runtime-files"
+const SOURCE_DIR = "standalone/runtime-files"
 
-async function main() {
-	await installNodeDependencies()
-	await zipDistribution()
+await cp(SOURCE_DIR, BUILD_DIR, { recursive: true })
+
+// Run npm install in the distribution directory
+console.log("Running npm install in distribution directory...")
+const cwd = process.cwd()
+process.chdir(BUILD_DIR)
+try {
+	execSync("npm install", { stdio: "inherit" })
+	// Move the vscode directory into node_modules.
+	// It can't be installed using npm because it will create a symlink which is not portable.
+	fs.renameSync("vscode", path.join("node_modules", "vscode"))
+} catch (error) {
+	console.error("Error during setup:", error)
+	process.exit(1)
+} finally {
+	process.chdir(cwd)
 }
 
-async function installNodeDependencies() {
-	await cpr(RUNTIME_DEPS_DIR, BUILD_DIR)
-
-	console.log("Running npm install in distribution directory...")
-	const cwd = process.cwd()
-	process.chdir(BUILD_DIR)
-
-	try {
-		execSync("npm install", { stdio: "inherit" })
-		// Move the vscode directory into node_modules.
-		// It can't be installed using npm because it will create a symlink which cannot be unzipped correctly on windows.
-		fs.renameSync("vscode", path.join("node_modules", "vscode"))
-	} catch (error) {
-		console.error("Error during setup:", error)
-		process.exit(1)
-	} finally {
-		process.chdir(cwd)
-	}
-
-	// Check for native .node modules.
-	const nativeModules = await glob("**/*.node", { cwd: BUILD_DIR, nodir: true })
-	if (nativeModules.length > 0) {
-		console.error("Native node modules cannot be included in the standalone distribution:\n", nativeModules.join("\n"))
-		process.exit(1)
-	}
+// Check for native .node modules.
+const nativeModules = await glob("**/*.node", { cwd: BUILD_DIR, nodir: true })
+if (nativeModules.length > 0) {
+	console.error("Native node modules cannot be included in the standalone distribution:\n", nativeModules.join("\n"))
+	process.exit(1)
 }
 
-async function zipDistribution() {
-	// Zip the build directory (excluding any pre-existing output zip).
-	const zipPath = path.join(BUILD_DIR, "standalone.zip")
-	const output = fs.createWriteStream(zipPath)
-	const archive = archiver("zip", { zlib: { level: 3 } })
-	// Use the same ignore file that vscode uses when packaging the extension.
-	const vscodeignore = ignore().add(fs.readFileSync(".vscodeignore", "utf8"))
+// Zip the build directory (excluding any pre-existing output zip).
+const zipPath = path.join(BUILD_DIR, "standalone.zip")
+const output = fs.createWriteStream(zipPath)
+const archive = archiver("zip", { zlib: { level: 3 } })
 
-	output.on("close", () => {
-		console.log(`Created ${zipPath} (${(archive.pointer() / 1024 / 1024).toFixed(1)} MB)`)
-	})
-	archive.on("warning", (err) => {
-		console.warn(`Warning: ${err}`)
-	})
-	archive.on("error", (err) => {
-		throw err
-	})
+output.on("close", () => {
+	console.log(`Created ${zipPath} (${(archive.pointer() / 1024 / 1024).toFixed(1)} MB)`)
+})
+archive.on("warning", (err) => {
+	console.warn(`Warning: ${err}`)
+})
+archive.on("error", (err) => {
+	throw err
+})
 
-	archive.pipe(output)
-	// Add all the files from the standalone build dir.
-	archive.glob("**/*", {
-		cwd: BUILD_DIR,
-		ignore: ["standalone.zip"],
-	})
+archive.pipe(output)
+archive.glob("**/*", {
+	cwd: BUILD_DIR,
+	ignore: ["standalone.zip"],
+})
 
-	// Add the whole cline directory under "extension"
-	archive.directory(process.cwd(), "extension", (entry) => {
-		if (entry.name.startsWith(".git")) {
-			return false
-		}
-		if (entry.name.endsWith(".DS_Store")) {
-			return false
-		}
-		if (entry.name === "dist" || entry.name.startsWith("dist" + path.sep)) {
-			// Don't include the vscode extension build dir.
-			return false
-		}
-		if (vscodeignore.ignores(entry.name)) {
-			// Exclude entries also ignored by the vscode packager.
-			return false
-		}
+// Add the whole cline directory under "extension"
+archive.directory(process.cwd(), "extension", (entry) => {
+	// Skip certain directories.
+	const exclude = [
+		BUILD_DIR + "/",
+		"node_modules/", // node_modules nearly 1GB.
+		"webview-ui/node_modules/", // node_modules nearly 1GB.
+	]
+	// These node modules are used at runtime as assets, they need to be included.
+	const include = ["node_modules/@vscode/", "webview-ui/node_modules/katex"]
+	const name = entry.name
+
+	if (include.some((prefix) => name.startsWith(prefix))) {
 		return entry
-	})
+	}
+	if (exclude.some((prefix) => name.startsWith(prefix))) {
+		return false
+	}
+	if (name.match(/(^|\/)\./)) {
+		// exclude dot directories
+		return false
+	}
+	return entry
+})
 
-	console.log("Zipping package...")
-	await archive.finalize()
-}
-
-/* cp -r */
-async function cpr(source, dest) {
-	await cp(source, dest, {
-		recursive: true,
-		preserveTimestamps: true,
-		dereference: false, // preserve symlinks instead of following them
-	})
-}
-
-await main()
+console.log("Zipping package...")
+await archive.finalize()

src/api/index.ts

@@ -8,6 +8,7 @@ import { OpenAiHandler } from "./providers/openai"
 import { OllamaHandler } from "./providers/ollama"
 import { LmStudioHandler } from "./providers/lmstudio"
 import { GeminiHandler } from "./providers/gemini"
+import { GeminiCliHandler } from "./providers/gemini-cli"
 import { OpenAiNativeHandler } from "./providers/openai-native"
 import { ApiStream, ApiStreamUsageChunk } from "./transform/stream"
 import { DeepSeekHandler } from "./providers/deepseek"
@@ -38,202 +39,64 @@ export interface SingleCompletionHandler {
 	completePrompt(prompt: string): Promise<string>
 }
 
-function createHandlerForProvider(apiProvider: string | undefined, options: Omit<ApiConfiguration, "apiProvider">): ApiHandler {
+function createHandlerForProvider(apiProvider: string | undefined, options: any): ApiHandler {
 	switch (apiProvider) {
 		case "anthropic":
-			return new AnthropicHandler({
-				apiKey: options.apiKey,
-				anthropicBaseUrl: options.anthropicBaseUrl,
-				apiModelId: options.apiModelId,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-			})
+			return new AnthropicHandler(options)
 		case "openrouter":
-			return new OpenRouterHandler({
-				openRouterApiKey: options.openRouterApiKey,
-				openRouterModelId: options.openRouterModelId,
-				openRouterModelInfo: options.openRouterModelInfo,
-				openRouterProviderSorting: options.openRouterProviderSorting,
-				reasoningEffort: options.reasoningEffort,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-			})
+			return new OpenRouterHandler(options)
 		case "bedrock":
-			return new AwsBedrockHandler({
-				apiModelId: options.apiModelId,
-				awsAccessKey: options.awsAccessKey,
-				awsSecretKey: options.awsSecretKey,
-				awsSessionToken: options.awsSessionToken,
-				awsRegion: options.awsRegion,
-				awsUseCrossRegionInference: options.awsUseCrossRegionInference,
-				awsBedrockUsePromptCache: options.awsBedrockUsePromptCache,
-				awsUseProfile: options.awsUseProfile,
-				awsProfile: options.awsProfile,
-				awsBedrockEndpoint: options.awsBedrockEndpoint,
-				awsBedrockCustomSelected: options.awsBedrockCustomSelected,
-				awsBedrockCustomModelBaseId: options.awsBedrockCustomModelBaseId,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-			})
+			return new AwsBedrockHandler(options)
 		case "vertex":
-			return new VertexHandler({
-				vertexProjectId: options.vertexProjectId,
-				vertexRegion: options.vertexRegion,
-				apiModelId: options.apiModelId,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-				geminiApiKey: options.geminiApiKey,
-				geminiBaseUrl: options.geminiBaseUrl,
-				taskId: options.taskId,
-			})
+			return new VertexHandler(options)
 		case "openai":
-			return new OpenAiHandler({
-				openAiApiKey: options.openAiApiKey,
-				openAiBaseUrl: options.openAiBaseUrl,
-				azureApiVersion: options.azureApiVersion,
-				openAiHeaders: options.openAiHeaders,
-				openAiModelId: options.openAiModelId,
-				openAiModelInfo: options.openAiModelInfo,
-				reasoningEffort: options.reasoningEffort,
-			})
+			return new OpenAiHandler(options)
 		case "ollama":
-			return new OllamaHandler({
-				ollamaBaseUrl: options.ollamaBaseUrl,
-				ollamaModelId: options.ollamaModelId,
-				ollamaApiOptionsCtxNum: options.ollamaApiOptionsCtxNum,
-				requestTimeoutMs: options.requestTimeoutMs,
-			})
+			return new OllamaHandler(options)
 		case "lmstudio":
-			return new LmStudioHandler({
-				lmStudioBaseUrl: options.lmStudioBaseUrl,
-				lmStudioModelId: options.lmStudioModelId,
-			})
+			return new LmStudioHandler(options)
 		case "gemini":
-			return new GeminiHandler({
-				vertexProjectId: options.vertexProjectId,
-				vertexRegion: options.vertexRegion,
-				geminiApiKey: options.geminiApiKey,
-				geminiBaseUrl: options.geminiBaseUrl,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-				apiModelId: options.apiModelId,
-				taskId: options.taskId,
-			})
+			return new GeminiHandler(options)
+		case "gemini-cli":
+			return new GeminiCliHandler(options)
 		case "openai-native":
-			return new OpenAiNativeHandler({
-				openAiNativeApiKey: options.openAiNativeApiKey,
-				reasoningEffort: options.reasoningEffort,
-				apiModelId: options.apiModelId,
-			})
+			return new OpenAiNativeHandler(options)
 		case "deepseek":
-			return new DeepSeekHandler({
-				deepSeekApiKey: options.deepSeekApiKey,
-				apiModelId: options.apiModelId,
-			})
+			return new DeepSeekHandler(options)
 		case "requesty":
-			return new RequestyHandler({
-				requestyApiKey: options.requestyApiKey,
-				reasoningEffort: options.reasoningEffort,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-				requestyModelId: options.requestyModelId,
-				requestyModelInfo: options.requestyModelInfo,
-			})
+			return new RequestyHandler(options)
 		case "fireworks":
-			return new FireworksHandler({
-				fireworksApiKey: options.fireworksApiKey,
-				fireworksModelId: options.fireworksModelId,
-				fireworksModelMaxCompletionTokens: options.fireworksModelMaxCompletionTokens,
-				fireworksModelMaxTokens: options.fireworksModelMaxTokens,
-			})
+			return new FireworksHandler(options)
 		case "together":
-			return new TogetherHandler({
-				togetherApiKey: options.togetherApiKey,
-				togetherModelId: options.togetherModelId,
-			})
+			return new TogetherHandler(options)
 		case "qwen":
-			return new QwenHandler({
-				qwenApiKey: options.qwenApiKey,
-				qwenApiLine: options.qwenApiLine,
-				apiModelId: options.apiModelId,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-			})
+			return new QwenHandler(options)
 		case "doubao":
-			return new DoubaoHandler({
-				doubaoApiKey: options.doubaoApiKey,
-				apiModelId: options.apiModelId,
-			})
+			return new DoubaoHandler(options)
 		case "mistral":
-			return new MistralHandler({
-				mistralApiKey: options.mistralApiKey,
-				apiModelId: options.apiModelId,
-			})
+			return new MistralHandler(options)
 		case "vscode-lm":
-			return new VsCodeLmHandler({
-				vsCodeLmModelSelector: options.vsCodeLmModelSelector,
-			})
+			return new VsCodeLmHandler(options)
 		case "cline":
-			return new ClineHandler({
-				taskId: options.taskId,
-				reasoningEffort: options.reasoningEffort,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-				openRouterProviderSorting: options.openRouterProviderSorting,
-				openRouterModelId: options.openRouterModelId,
-				openRouterModelInfo: options.openRouterModelInfo,
-			})
+			return new ClineHandler(options)
 		case "litellm":
-			return new LiteLlmHandler({
-				liteLlmApiKey: options.liteLlmApiKey,
-				liteLlmBaseUrl: options.liteLlmBaseUrl,
-				liteLlmModelId: options.liteLlmModelId,
-				liteLlmModelInfo: options.liteLlmModelInfo,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-				liteLlmUsePromptCache: options.liteLlmUsePromptCache,
-				taskId: options.taskId,
-			})
+			return new LiteLlmHandler(options)
 		case "nebius":
-			return new NebiusHandler({
-				nebiusApiKey: options.nebiusApiKey,
-				apiModelId: options.apiModelId,
-			})
+			return new NebiusHandler(options)
 		case "asksage":
-			return new AskSageHandler({
-				asksageApiKey: options.asksageApiKey,
-				asksageApiUrl: options.asksageApiUrl,
-				apiModelId: options.apiModelId,
-			})
+			return new AskSageHandler(options)
 		case "xai":
-			return new XAIHandler({
-				xaiApiKey: options.xaiApiKey,
-				reasoningEffort: options.reasoningEffort,
-				apiModelId: options.apiModelId,
-			})
+			return new XAIHandler(options)
 		case "sambanova":
-			return new SambanovaHandler({
-				sambanovaApiKey: options.sambanovaApiKey,
-				apiModelId: options.apiModelId,
-			})
+			return new SambanovaHandler(options)
 		case "cerebras":
-			return new CerebrasHandler({
-				cerebrasApiKey: options.cerebrasApiKey,
-				apiModelId: options.apiModelId,
-			})
+			return new CerebrasHandler(options)
 		case "sapaicore":
-			return new SapAiCoreHandler({
-				sapAiCoreClientId: options.sapAiCoreClientId,
-				sapAiCoreClientSecret: options.sapAiCoreClientSecret,
-				sapAiCoreTokenUrl: options.sapAiCoreTokenUrl,
-				sapAiResourceGroup: options.sapAiResourceGroup,
-				sapAiCoreBaseUrl: options.sapAiCoreBaseUrl,
-				apiModelId: options.apiModelId,
-			})
+			return new SapAiCoreHandler(options)
 		case "claude-code":
-			return new ClaudeCodeHandler({
-				claudeCodePath: options.claudeCodePath,
-				apiModelId: options.apiModelId,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-			})
+			return new ClaudeCodeHandler(options)
 		default:
-			return new AnthropicHandler({
-				apiKey: options.apiKey,
-				anthropicBaseUrl: options.anthropicBaseUrl,
-				apiModelId: options.apiModelId,
-				thinkingBudgetTokens: options.thinkingBudgetTokens,
-			})
+			return new AnthropicHandler(options)
 	}
 }
 

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

@@ -45,10 +45,8 @@ describe("OllamaHandler", () => {
 				this.skip()
 			}
 			this.timeout(5000)
-			// Ensure client is initialized
-			const client = (handler as any).ensureClient()
 			// Mock the Ollama client's chat method
-			const chatStub = sinon.stub(client, "chat").resolves({
+			const chatStub = sinon.stub(handler["client"], "chat").resolves({
 				[Symbol.asyncIterator]: async function* () {
 					yield {
 						message: { content: "Hello, world!" },
@@ -141,9 +139,8 @@ describe("OllamaHandler", () => {
 			// Restore real timers for this test
 			clock.restore()
 
-			// Ensure client is initialized and mock the Ollama client's chat method to fail on first call and succeed on second
-			const client = (handler as any).ensureClient()
-			const chatStub = sinon.stub(client, "chat")
+			// Mock the Ollama client's chat method to fail on first call and succeed on second
+			const chatStub = sinon.stub(handler["client"], "chat")
 
 			// First call throws an error
 			chatStub.onFirstCall().rejects(new Error("API Error"))

src/api/providers/anthropic.ts

@@ -5,42 +5,20 @@ import { anthropicDefaultModelId, AnthropicModelId, anthropicModels, ApiHandlerO
 import { ApiHandler } from "../index"
 import { ApiStream } from "../transform/stream"
 
-interface AnthropicHandlerOptions {
-	apiKey?: string
-	anthropicBaseUrl?: string
-	apiModelId?: string
-	thinkingBudgetTokens?: number
-}
-
 export class AnthropicHandler implements ApiHandler {
 	private options: ApiHandlerOptions
-	private client: Anthropic | undefined
+	private client: Anthropic
 
-	constructor(options: AnthropicHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): Anthropic {
-		if (!this.client) {
-			if (!this.options.apiKey) {
-				throw new Error("Anthropic API key is required")
-			}
-			try {
-				this.client = new Anthropic({
-					apiKey: this.options.apiKey,
-					baseURL: this.options.anthropicBaseUrl || undefined,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Anthropic client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new Anthropic({
+			apiKey: this.options.apiKey,
+			baseURL: this.options.anthropicBaseUrl || undefined,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
-
 		const model = this.getModel()
 		let stream: AnthropicStream<Anthropic.RawMessageStreamEvent>
 		const modelId = model.id
@@ -66,7 +44,7 @@ export class AnthropicHandler implements ApiHandler {
 				)
 				const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1
 				const secondLastMsgUserIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1
-				stream = await client.messages.create(
+				stream = await this.client.messages.create(
 					{
 						model: modelId,
 						thinking: reasoningOn ? { type: "enabled", budget_tokens: budget_tokens } : undefined,
@@ -140,7 +118,7 @@ export class AnthropicHandler implements ApiHandler {
 				break
 			}
 			default: {
-				stream = await client.messages.create({
+				stream = await this.client.messages.create({
 					model: modelId,
 					max_tokens: model.info.maxTokens || 8192,
 					temperature: 0,

src/api/providers/asksage.ts

@@ -1,15 +1,16 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import { ApiHandler } from ".."
-import { ModelInfo, AskSageModelId, askSageModels, askSageDefaultModelId, askSageDefaultURL } from "@shared/api"
+import {
+	ApiHandlerOptions,
+	ModelInfo,
+	AskSageModelId,
+	askSageModels,
+	askSageDefaultModelId,
+	askSageDefaultURL,
+} from "@shared/api"
 import { ApiStream } from "../transform/stream"
 import { withRetry } from "../retry"
 
-interface AskSageHandlerOptions {
-	asksageApiKey?: string
-	asksageApiUrl?: string
-	apiModelId?: string
-}
-
 type AskSageRequest = {
 	system_prompt: string
 	message: {
@@ -30,11 +31,11 @@ type AskSageResponse = {
 }
 
 export class AskSageHandler implements ApiHandler {
-	private options: AskSageHandlerOptions
+	private options: ApiHandlerOptions
 	private apiUrl: string
 	private apiKey: string
 
-	constructor(options: AskSageHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		console.log("init api url", options.asksageApiUrl, askSageDefaultURL)
 		this.options = options
 		this.apiKey = options.asksageApiKey || ""

src/api/providers/bedrock.ts

@@ -2,7 +2,7 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { withRetry } from "../retry"
 import { ApiHandler } from "../"
 import { convertToR1Format } from "../transform/r1-format"
-import { bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "@shared/api"
+import { ApiHandlerOptions, bedrockDefaultModelId, BedrockModelId, bedrockModels, ModelInfo } from "@shared/api"
 import { calculateApiCostOpenAI } from "../../utils/cost"
 import { ApiStream } from "../transform/stream"
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
@@ -16,22 +16,6 @@ import {
 // Import proper AWS SDK types
 import type { Message, ContentBlock } from "@aws-sdk/client-bedrock-runtime"
 
-interface AwsBedrockHandlerOptions {
-	apiModelId?: string
-	awsAccessKey?: string
-	awsSecretKey?: string
-	awsSessionToken?: string
-	awsRegion?: string
-	awsUseCrossRegionInference?: boolean
-	awsBedrockUsePromptCache?: boolean
-	awsUseProfile?: boolean
-	awsProfile?: string
-	awsBedrockEndpoint?: string
-	awsBedrockCustomSelected?: boolean
-	awsBedrockCustomModelBaseId?: BedrockModelId
-	thinkingBudgetTokens?: number
-}
-
 // Extend AWS SDK types to include additionalModelResponseFields
 interface ExtendedMetadata {
 	usage?: {
@@ -106,9 +90,9 @@ interface ProviderChainOptions {
 
 // https://docs.anthropic.com/en/api/claude-on-amazon-bedrock
 export class AwsBedrockHandler implements ApiHandler {
-	private options: AwsBedrockHandlerOptions
+	private options: ApiHandlerOptions
 
-	constructor(options: AwsBedrockHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
 	}
 

src/api/providers/cerebras.ts

@@ -1,63 +1,38 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import Cerebras from "@cerebras/cerebras_cloud_sdk"
 import { withRetry } from "../retry"
-import { ModelInfo, CerebrasModelId, cerebrasDefaultModelId, cerebrasModels } from "@shared/api"
+import { ApiHandlerOptions, ModelInfo, CerebrasModelId, cerebrasDefaultModelId, cerebrasModels } from "@shared/api"
 import { ApiHandler } from "../index"
 import { ApiStream } from "@api/transform/stream"
 
-interface CerebrasHandlerOptions {
-	cerebrasApiKey?: string
-	apiModelId?: string
-}
-
 export class CerebrasHandler implements ApiHandler {
-	private options: CerebrasHandlerOptions
-	private client: Cerebras | undefined
+	private options: ApiHandlerOptions
+	private client: Cerebras
 
-	constructor(options: CerebrasHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
 
-	private ensureClient(): Cerebras {
-		if (!this.client) {
-			// Clean and validate the API key
-			const cleanApiKey = this.options.cerebrasApiKey?.trim()
+		// Clean and validate the API key
+		const cleanApiKey = this.options.cerebrasApiKey?.trim()
 
-			if (!cleanApiKey) {
-				throw new Error("Cerebras API key is required")
-			}
-
-			try {
-				this.client = new Cerebras({
-					apiKey: cleanApiKey,
-					timeout: 30000, // 30 second timeout
-				})
-			} catch (error) {
-				throw new Error(`Error creating Cerebras client: ${error.message}`)
-			}
+		if (!cleanApiKey) {
+			throw new Error("Cerebras API key is required")
 		}
-		return this.client
+
+		this.client = new Cerebras({
+			apiKey: cleanApiKey,
+			timeout: 30000, // 30 second timeout
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
-
 		// Convert Anthropic messages to Cerebras format
 		const cerebrasMessages: Array<{
 			role: "system" | "user" | "assistant"
 			content: string
 		}> = [{ role: "system", content: systemPrompt }]
 
-		// Helper function to strip thinking tags from content
-		const stripThinkingTags = (content: string): string => {
-			return content.replace(/<think>[\s\S]*?<\/think>/g, "").trim()
-		}
-
-		// Check if this is a reasoning model that uses thinking tags
-		const modelId = this.getModel().id
-		const isReasoningModel = modelId.includes("qwen") || modelId.includes("deepseek-r1-distill")
-
 		// Convert Anthropic messages to Cerebras format
 		for (const message of messages) {
 			if (message.role === "user") {
@@ -75,7 +50,7 @@ export class CerebrasHandler implements ApiHandler {
 					: message.content
 				cerebrasMessages.push({ role: "user", content })
 			} else if (message.role === "assistant") {
-				let content = Array.isArray(message.content)
+				const content = Array.isArray(message.content)
 					? message.content
 							.map((block) => {
 								if (block.type === "text") {
@@ -85,19 +60,12 @@ export class CerebrasHandler implements ApiHandler {
 							})
 							.join("\n")
 					: message.content || ""
-
-				// Strip thinking tags from assistant messages for reasoning models
-				// so the model doesn't see its own thinking in the conversation history
-				if (isReasoningModel) {
-					content = stripThinkingTags(content)
-				}
-
 				cerebrasMessages.push({ role: "assistant", content })
 			}
 		}
 
 		try {
-			const stream = await client.chat.completions.create({
+			const stream = await this.client.chat.completions.create({
 				model: this.getModel().id,
 				messages: cerebrasMessages,
 				temperature: 0,
@@ -106,6 +74,8 @@ export class CerebrasHandler implements ApiHandler {
 
 			// Handle streaming response
 			let reasoning: string | null = null // Track reasoning content for models that support thinking
+			const modelId = this.getModel().id
+			const isReasoningModel = modelId.includes("qwen") || modelId.includes("deepseek-r1-distill")
 
 			for await (const chunk of stream as any) {
 				// Type assertion for the streaming chunk

src/api/providers/claude-code.ts

@@ -1,21 +1,15 @@
 import type { Anthropic } from "@anthropic-ai/sdk"
-import { claudeCodeDefaultModelId, ClaudeCodeModelId, claudeCodeModels } from "@/shared/api"
+import { claudeCodeDefaultModelId, ClaudeCodeModelId, claudeCodeModels, type ApiHandlerOptions } from "@/shared/api"
 import { type ApiHandler } from ".."
 import { ApiStreamUsageChunk, type ApiStream } from "../transform/stream"
 import { withRetry } from "../retry"
 import { runClaudeCode } from "@/integrations/claude-code/run"
 import { filterMessagesForClaudeCode } from "@/integrations/claude-code/message-filter"
 
-interface ClaudeCodeHandlerOptions {
-	claudeCodePath?: string
-	apiModelId?: string
-	thinkingBudgetTokens?: number
-}
-
 export class ClaudeCodeHandler implements ApiHandler {
-	private options: ClaudeCodeHandlerOptions
+	private options: ApiHandlerOptions
 
-	constructor(options: ClaudeCodeHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
 	}
 
@@ -33,7 +27,6 @@ export class ClaudeCodeHandler implements ApiHandler {
 			messages: filteredMessages,
 			path: this.options.claudeCodePath,
 			modelId: this.getModel().id,
-			thinkingBudgetTokens: this.options.thinkingBudgetTokens,
 		})
 
 		// Usage is included with assistant messages,

src/api/providers/cline.ts

@@ -1,228 +1,143 @@
 import { Anthropic } from "@anthropic-ai/sdk"
+import OpenAI from "openai"
 import { ApiHandler } from "../"
-import { ClineAccountService } from "@/services/account/ClineAccountService"
-import { ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
+import { ApiHandlerOptions, ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
 import { createOpenRouterStream } from "../transform/openrouter-stream"
 import { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
-import axios, { AxiosRequestConfig, AxiosResponse } from "axios"
+import axios from "axios"
 import { OpenRouterErrorResponse } from "./types"
 import { withRetry } from "../retry"
-import { AuthService } from "@/services/auth/AuthService"
-import OpenAI from "openai"
-
-interface ClineHandlerOptions {
-	taskId?: string
-	reasoningEffort?: string
-	thinkingBudgetTokens?: number
-	openRouterProviderSorting?: string
-	openRouterModelId?: string
-	openRouterModelInfo?: ModelInfo
-	clineAccountId?: string
-}
 
 export class ClineHandler implements ApiHandler {
-	private options: ClineHandlerOptions
-	private clineAccountService = ClineAccountService.getInstance()
-	private _authService: AuthService
-	private client: OpenAI | undefined
-	// TODO: replace this with a global API Host
-	private readonly _baseUrl = "https://api.cline.bot"
-	// private readonly _baseUrl = "https://core-api.staging.int.cline.bot"
-	// private readonly _baseUrl = "http://localhost:7777"
+	private options: ApiHandlerOptions
+	private client: OpenAI
 	lastGenerationId?: string
-	private counter = 0
 
-	constructor(options: ClineHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-		this._authService = AuthService.getInstance()
-	}
-
-	private async ensureClient(): Promise<OpenAI> {
-		if (!this.client) {
-			const clineAccountAuthToken = await this._authService.getAuthToken()
-			if (!clineAccountAuthToken) {
-				throw new Error("Cline account authentication token is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: `${this._baseUrl}/api/v1`,
-					apiKey: clineAccountAuthToken,
-					defaultHeaders: {
-						"HTTP-Referer": "https://cline.bot",
-						"X-Title": "Cline",
-						"X-Task-ID": this.options.taskId || "",
-					},
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating Cline client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://api.cline.bot/v1",
+			apiKey: this.options.clineApiKey || "",
+			defaultHeaders: {
+				"HTTP-Referer": "https://cline.bot", // Optional, for including your app on cline.bot rankings.
+				"X-Title": "Cline", // Optional. Shows in rankings on cline.bot.
+				"X-Task-ID": this.options.taskId || "", // Include the task ID in the request headers
+			},
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = await this.ensureClient()
-		const clineAccountAuthToken = await this._authService.getAuthToken()
-		if (!clineAccountAuthToken) {
-			throw new Error("Unauthorized: Please sign in to Cline before trying again.")
-		}
-
 		this.lastGenerationId = undefined
 
-		const me = await this.clineAccountService.fetchMe()
-		console.log(
-			"SwitchAuthToken: Active Organization",
-			me?.organizations.filter((org) => org.active)[0]?.name || "No active organization",
+		const stream = await createOpenRouterStream(
+			this.client,
+			systemPrompt,
+			messages,
+			this.getModel(),
+			this.options.reasoningEffort,
+			this.options.thinkingBudgetTokens,
+			this.options.openRouterProviderSorting,
 		)
 
 		let didOutputUsage: boolean = false
 
-		try {
-			const stream = await createOpenRouterStream(
-				client,
-				systemPrompt,
-				messages,
-				this.getModel(),
-				this.options.reasoningEffort,
-				this.options.thinkingBudgetTokens,
-				this.options.openRouterProviderSorting,
-			)
+		for await (const chunk of stream) {
+			// openrouter returns an error object instead of the openai sdk throwing an error
+			if ("error" in chunk) {
+				const error = chunk.error as OpenRouterErrorResponse["error"]
+				console.error(`Cline API Error: ${error?.code} - ${error?.message}`)
+				// Include metadata in the error message if available
+				const metadataStr = error.metadata ? `\nMetadata: ${JSON.stringify(error.metadata, null, 2)}` : ""
+				throw new Error(`Cline API Error ${error.code}: ${error.message}${metadataStr}`)
+			}
 
-			for await (const chunk of stream) {
-				// openrouter returns an error object instead of the openai sdk throwing an error
-				if ("error" in chunk) {
-					const error = chunk.error as OpenRouterErrorResponse["error"]
-					console.error(`Cline API Error: ${error?.code} - ${error?.message}`)
-					// Include metadata in the error message if available
-					const metadataStr = error.metadata ? `\nMetadata: ${JSON.stringify(error.metadata, null, 2)}` : ""
-					throw new Error(`Cline API Error ${error.code}: ${error.message}${metadataStr}`)
-				}
-				if (!this.lastGenerationId && chunk.id) {
-					this.lastGenerationId = chunk.id
-				}
+			if (!this.lastGenerationId && chunk.id) {
+				this.lastGenerationId = chunk.id
+			}
 
-				// Check for mid-stream error via finish_reason
-				const choice = chunk.choices?.[0]
-				// OpenRouter may return finish_reason = "error" with error details
-				if ((choice?.finish_reason as string) === "error") {
-					const choiceWithError = choice as any
-					if (choiceWithError.error) {
-						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",
-						)
-					}
+			// Check for mid-stream error via finish_reason
+			const choice = chunk.choices?.[0]
+			// OpenRouter may return finish_reason = "error" with error details
+			if ((choice?.finish_reason as string) === "error") {
+				const choiceWithError = choice as any
+				if (choiceWithError.error) {
+					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")
 				}
+			}
 
-				const delta = choice?.delta
-				if (delta?.content) {
-					yield {
-						type: "text",
-						text: delta.content,
-					}
+			const delta = choice?.delta
+			if (delta?.content) {
+				yield {
+					type: "text",
+					text: delta.content,
 				}
+			}
 
-				// Reasoning tokens are returned separately from the content
-				if ("reasoning" in delta && delta.reasoning) {
-					yield {
-						type: "reasoning",
-						// @ts-ignore-next-line
-						reasoning: delta.reasoning,
-					}
-				}
-
-				if (!didOutputUsage && chunk.usage) {
+			// Reasoning tokens are returned separately from the content
+			if ("reasoning" in delta && delta.reasoning) {
+				yield {
+					type: "reasoning",
 					// @ts-ignore-next-line
-					let totalCost = (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0)
-					const modelId = this.getModel().id
-
-					// const provider = modelId.split("/")[0]
-					// // If provider is x-ai, set totalCost to 0 (we're doing a promo)
-					// if (provider === "x-ai") {
-					// 	totalCost = 0
-					// }
-
-					if (modelId.includes("gemini")) {
-						yield {
-							type: "usage",
-							cacheWriteTokens: 0,
-							cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
-							inputTokens:
-								(chunk.usage.prompt_tokens || 0) - (chunk.usage.prompt_tokens_details?.cached_tokens || 0),
-							outputTokens: chunk.usage.completion_tokens || 0,
-							// @ts-ignore-next-line
-							totalCost,
-						}
-					} else {
-						yield {
-							type: "usage",
-							cacheWriteTokens: 0,
-							cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
-							inputTokens: chunk.usage.prompt_tokens || 0,
-							outputTokens: chunk.usage.completion_tokens || 0,
-							// @ts-ignore-next-line
-							totalCost,
-						}
-					}
-					didOutputUsage = true
+					reasoning: delta.reasoning,
 				}
 			}
 
-			// Fallback to generation endpoint if usage chunk not returned
-			if (!didOutputUsage) {
-				console.warn("Cline API did not return usage chunk, fetching from generation endpoint")
-				const apiStreamUsage = await this.getApiStreamUsage()
-				if (apiStreamUsage) {
-					yield apiStreamUsage
+			if (!didOutputUsage && chunk.usage) {
+				// @ts-ignore-next-line
+				let totalCost = (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0)
+				const modelId = this.getModel().id
+				const provider = modelId.split("/")[0]
+
+				// If provider is x-ai, set totalCost to 0 (we're doing a promo)
+				if (provider === "x-ai") {
+					totalCost = 0
 				}
+
+				yield {
+					type: "usage",
+					cacheWriteTokens: 0,
+					cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
+					inputTokens: chunk.usage.prompt_tokens || 0,
+					outputTokens: chunk.usage.completion_tokens || 0,
+					// @ts-ignore-next-line
+					totalCost,
+				}
+				didOutputUsage = true
 			}
-		} catch (error) {
-			if (error.code === "ERR_BAD_REQUEST" || error.status === 401) {
-				throw new Error("Unauthorized: Please sign in to Cline before trying again.")
+		}
+
+		// Fallback to generation endpoint if usage chunk not returned
+		if (!didOutputUsage) {
+			const apiStreamUsage = await this.getApiStreamUsage()
+			if (apiStreamUsage) {
+				yield apiStreamUsage
 			}
-			console.error("Cline API Error:", error)
 		}
 	}
 
 	async getApiStreamUsage(): Promise<ApiStreamUsageChunk | undefined> {
 		if (this.lastGenerationId) {
 			try {
-				// TODO: replace this with firebase auth
-				// TODO: use global API Host
-
-				const response = await axios.get(`${this.clineAccountService.baseUrl}/generation?id=${this.lastGenerationId}`, {
+				const response = await axios.get(`https://api.cline.bot/v1/generation?id=${this.lastGenerationId}`, {
 					headers: {
-						Authorization: `Bearer ${this.options.clineAccountId}`,
+						Authorization: `Bearer ${this.options.clineApiKey}`,
 					},
 					timeout: 15_000, // this request hangs sometimes
 				})
 
 				const generation = response.data
-				let modelId = this.options.openRouterModelId
-				if (modelId && modelId.includes("gemini")) {
-					return {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: generation?.native_tokens_cached || 0,
-						// openrouter generation endpoint fails often
-						inputTokens: (generation?.native_tokens_prompt || 0) - (generation?.native_tokens_cached || 0),
-						outputTokens: generation?.native_tokens_completion || 0,
-						totalCost: generation?.total_cost || 0,
-					}
-				} else {
-					return {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: generation?.native_tokens_cached || 0,
-						// openrouter generation endpoint fails often
-						inputTokens: generation?.native_tokens_prompt || 0,
-						outputTokens: generation?.native_tokens_completion || 0,
-						totalCost: generation?.total_cost || 0,
-					}
+				return {
+					type: "usage",
+					cacheWriteTokens: 0,
+					cacheReadTokens: generation?.native_tokens_cached || 0,
+					inputTokens: generation?.native_tokens_prompt || 0,
+					outputTokens: generation?.native_tokens_completion || 0,
+					totalCost: generation?.total_cost || 0,
 				}
 			} catch (error) {
 				// ignore if fails
@@ -234,6 +149,9 @@ export class ClineHandler implements ApiHandler {
 
 	getModel(): { id: string; info: ModelInfo } {
 		let modelId = this.options.openRouterModelId
+		if (modelId === "x-ai/grok-3") {
+			modelId = "x-ai/grok-3-beta"
+		}
 		const modelInfo = this.options.openRouterModelInfo
 		if (modelId && modelInfo) {
 			return { id: modelId, info: modelInfo }

src/api/providers/deepseek.ts

@@ -8,34 +8,16 @@ import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 import { convertToR1Format } from "../transform/r1-format"
 
-interface DeepSeekHandlerOptions {
-	deepSeekApiKey?: string
-	apiModelId?: string
-}
-
 export class DeepSeekHandler implements ApiHandler {
-	private options: DeepSeekHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: DeepSeekHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.deepSeekApiKey) {
-				throw new Error("DeepSeek API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.deepseek.com/v1",
-					apiKey: this.options.deepSeekApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating DeepSeek client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://api.deepseek.com/v1",
+			apiKey: this.options.deepSeekApiKey,
+		})
 	}
 
 	private async *yieldUsage(info: ModelInfo, usage: OpenAI.Completions.CompletionUsage | undefined): ApiStream {
@@ -72,7 +54,6 @@ export class DeepSeekHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 
 		const isDeepseekReasoner = model.id.includes("deepseek-reasoner")
@@ -86,7 +67,7 @@ export class DeepSeekHandler implements ApiHandler {
 			openAiMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
 		}
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: model.id,
 			max_completion_tokens: model.info.maxTokens,
 			messages: openAiMessages,

src/api/providers/doubao.ts

@@ -1,38 +1,20 @@
 import { ApiHandler } from ".."
-import { doubaoDefaultModelId, DoubaoModelId, doubaoModels, ModelInfo } from "@shared/api"
+import { ApiHandlerOptions, doubaoDefaultModelId, DoubaoModelId, doubaoModels, ModelInfo } from "@shared/api"
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 import { withRetry } from "../retry"
 
-interface DoubaoHandlerOptions {
-	doubaoApiKey?: string
-	apiModelId?: string
-}
-
 export class DoubaoHandler implements ApiHandler {
-	private options: DoubaoHandlerOptions
-	private client: OpenAI | undefined
-	constructor(options: DoubaoHandlerOptions) {
+	private options: ApiHandlerOptions
+	private client: OpenAI
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.doubaoApiKey) {
-				throw new Error("Doubao API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://ark.cn-beijing.volces.com/api/v3/",
-					apiKey: this.options.doubaoApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Doubao client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://ark.cn-beijing.volces.com/api/v3/",
+			apiKey: this.options.doubaoApiKey,
+		})
 	}
 
 	getModel(): { id: DoubaoModelId; info: ModelInfo } {
@@ -49,13 +31,12 @@ export class DoubaoHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 		let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
 			{ role: "system", content: systemPrompt },
 			...convertToOpenAiMessages(messages),
 		]
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: model.id,
 			max_completion_tokens: model.info.maxTokens,
 			messages: openAiMessages,

src/api/providers/fireworks.ts

@@ -2,45 +2,31 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { withRetry } from "../retry"
 import { ApiHandler } from ".."
-import { ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
+import {
+	ApiHandlerOptions,
+	DeepSeekModelId,
+	ModelInfo,
+	deepSeekDefaultModelId,
+	deepSeekModels,
+	openAiModelInfoSaneDefaults,
+} from "../../shared/api"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 
-interface FireworksHandlerOptions {
-	fireworksApiKey?: string
-	fireworksModelId?: string
-	fireworksModelMaxCompletionTokens?: number
-	fireworksModelMaxTokens?: number
-}
-
 export class FireworksHandler implements ApiHandler {
-	private options: FireworksHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: FireworksHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.fireworksApiKey) {
-				throw new Error("Fireworks API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.fireworks.ai/inference/v1",
-					apiKey: this.options.fireworksApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Fireworks client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://api.fireworks.ai/inference/v1",
+			apiKey: this.options.fireworksApiKey,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const modelId = this.options.fireworksModelId ?? ""
 
 		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
@@ -48,7 +34,7 @@ export class FireworksHandler implements ApiHandler {
 			...convertToOpenAiMessages(messages),
 		]
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: modelId,
 			...(this.options.fireworksModelMaxCompletionTokens
 				? { max_completion_tokens: this.options.fireworksModelMaxCompletionTokens }

src/api/providers/gemini-cli.ts

@@ -0,0 +1,418 @@
+/**
+ * Gemini CLI Provider - OAuth-based API Handler
+ *
+ * This implementation provides access to Google's Gemini models through OAuth authentication,
+ * leveraging the same authentication mechanism as the official Gemini CLI tool.
+ *
+ * Attribution: This implementation is inspired by and uses concepts from the Google Gemini CLI,
+ * which is licensed under the Apache License 2.0.
+ * Original project: https://github.com/google-gemini/gemini-cli
+ *
+ * Copyright 2025 Google LLC
+ * Licensed under the Apache License, Version 2.0
+ *
+ * Key features:
+ * - OAuth2 authentication (no API keys required)
+ * - Auto-discovery of Google Cloud project IDs
+ * - Real-time streaming via Server-Sent Events
+ * - Free tier access through Google's Code Assist API
+ * - Compatible with personal Google accounts only
+ */
+
+import type { Anthropic } from "@anthropic-ai/sdk"
+import { OAuth2Client } from "google-auth-library"
+import fs from "fs/promises"
+import path from "path"
+import os from "os"
+import * as readline from "readline"
+import { Readable } from "stream"
+import { ApiHandler } from "../"
+import { ApiHandlerOptions, GeminiCliModelId, geminiCliModels, ModelInfo, geminiCliDefaultModelId } from "@shared/api"
+import { convertAnthropicMessageToGemini } from "../transform/gemini-format"
+import { ApiStream } from "../transform/stream"
+import { withRetry } from "../retry"
+
+const CODE_ASSIST_ENDPOINT = "https://cloudcode-pa.googleapis.com"
+const CODE_ASSIST_API_VERSION = "v1internal"
+
+// OAuth configuration
+const OAUTH_CLIENT_ID = "681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com"
+// Change this line in setup.js:
+const OAUTH_CLIENT_SECRET = "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"
+
+const OAUTH_REDIRECT_URI = "http://localhost:45289"
+
+interface OAuthCredentials {
+	access_token: string
+	refresh_token: string
+	scope: string
+	token_type: string
+	expiry_date: number
+}
+
+interface GeminiCliHandlerOptions extends ApiHandlerOptions {
+	geminiCliOAuthPath?: string
+	geminiCliProjectId?: string
+}
+
+/**
+ * Handler for Google's Gemini API via OAuth (Gemini CLI style).
+ *
+ * This provider uses OAuth authentication instead of API keys, making it suitable
+ * for users who have already authenticated with the Gemini CLI tool.
+ * It automatically discovers project IDs and works with the free tier.
+ */
+export class GeminiCliHandler implements ApiHandler {
+	private options: GeminiCliHandlerOptions
+	private authClient: OAuth2Client
+	private projectId: string | null = null
+	private authInitialized: boolean = false
+
+	constructor(options: GeminiCliHandlerOptions) {
+		this.options = options
+		this.authClient = new OAuth2Client(OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET, OAUTH_REDIRECT_URI)
+	}
+
+	/**
+	 * Load OAuth credentials from the file system
+	 */
+	private async loadOAuthCredentials(): Promise<OAuthCredentials> {
+		const credPath = this.options.geminiCliOAuthPath || path.join(os.homedir(), ".gemini", "oauth_creds.json")
+		try {
+			const data = await fs.readFile(credPath, "utf8")
+			return JSON.parse(data)
+		} catch (err) {
+			throw new Error(`Failed to load OAuth credentials from ${credPath}. Please authenticate with 'gemini auth' first.`)
+		}
+	}
+
+	/**
+	 * Call a Code Assist API endpoint
+	 */
+	private async callEndpoint(method: string, body: any, retryAuth: boolean = true): Promise<any> {
+		console.log(`[GeminiCLI] Calling endpoint: ${method}`)
+		console.log(`[GeminiCLI] Request body:`, JSON.stringify(body, null, 2))
+
+		try {
+			const res = await this.authClient.request({
+				url: `${CODE_ASSIST_ENDPOINT}/${CODE_ASSIST_API_VERSION}:${method}`,
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				responseType: "json",
+				body: JSON.stringify(body),
+			})
+			console.log(`[GeminiCLI] Response status:`, res.status)
+			console.log(`[GeminiCLI] Response data:`, JSON.stringify(res.data, null, 2))
+			return res.data
+		} catch (error: any) {
+			console.error(`[GeminiCLI] Error calling ${method}:`, error)
+			console.error(`[GeminiCLI] Error response:`, error.response?.data)
+			console.error(`[GeminiCLI] Error status:`, error.response?.status)
+			console.error(`[GeminiCLI] Error message:`, error.message)
+
+			// If we get a 401 and haven't retried yet, try refreshing auth
+			if (error.response?.status === 401 && retryAuth) {
+				console.log(`[GeminiCLI] Got 401, attempting to refresh authentication...`)
+				await this.initializeAuth(true) // Force refresh
+				return this.callEndpoint(method, body, false) // Retry without further auth retries
+			}
+
+			throw error
+		}
+	}
+
+	/**
+	 * Discover or retrieve the project ID
+	 */
+	private async discoverProjectId(): Promise<string> {
+		// If we already have a project ID, use it
+		if (this.options.geminiCliProjectId) {
+			return this.options.geminiCliProjectId
+		}
+
+		// If we've already discovered it, return it
+		if (this.projectId) {
+			return this.projectId
+		}
+
+		// Start with a default project ID (can be anything for personal OAuth)
+		const initialProjectId = "default"
+
+		// Prepare client metadata
+		const clientMetadata = {
+			ideType: "IDE_UNSPECIFIED",
+			platform: "PLATFORM_UNSPECIFIED",
+			pluginType: "GEMINI",
+			duetProject: initialProjectId,
+		}
+
+		try {
+			// Call loadCodeAssist to discover the actual project ID
+			const loadRequest = {
+				cloudaicompanionProject: initialProjectId,
+				metadata: clientMetadata,
+			}
+
+			const loadResponse = await this.callEndpoint("loadCodeAssist", loadRequest)
+
+			// Check if we already have a project ID from the response
+			if (loadResponse.cloudaicompanionProject) {
+				this.projectId = loadResponse.cloudaicompanionProject
+				return this.projectId as string
+			}
+
+			// If no existing project, we need to onboard
+			const defaultTier = loadResponse.allowedTiers?.find((tier: any) => tier.isDefault)
+			const tierId = defaultTier?.id || "free-tier"
+
+			const onboardRequest = {
+				tierId: tierId,
+				cloudaicompanionProject: initialProjectId,
+				metadata: clientMetadata,
+			}
+
+			let lroResponse = await this.callEndpoint("onboardUser", onboardRequest)
+
+			// Poll until operation is complete
+			while (!lroResponse.done) {
+				await new Promise((resolve) => setTimeout(resolve, 2000))
+				lroResponse = await this.callEndpoint("onboardUser", onboardRequest)
+			}
+
+			const discoveredProjectId = lroResponse.response?.cloudaicompanionProject?.id || initialProjectId
+			this.projectId = discoveredProjectId
+			return this.projectId as string
+		} catch (error: any) {
+			console.error("Failed to discover project ID:", error.response?.data || error.message)
+			throw new Error("Could not discover project ID. Make sure you're authenticated with 'gemini auth'.")
+		}
+	}
+
+	/**
+	 * Initialize the OAuth client with credentials
+	 */
+	private async initializeAuth(forceRefresh: boolean = false): Promise<void> {
+		// Check if we need to initialize or refresh
+		if (this.authInitialized && !forceRefresh) {
+			// Check if token is still valid
+			const credentials = this.authClient.credentials
+			if (credentials && credentials.expiry_date && Date.now() < credentials.expiry_date) {
+				console.log(`[GeminiCLI] Auth already initialized and token still valid`)
+				return
+			}
+		}
+
+		console.log(`[GeminiCLI] Initializing OAuth authentication...`)
+		const credentials = await this.loadOAuthCredentials()
+		const isExpired = credentials.expiry_date ? Date.now() > credentials.expiry_date : false
+
+		console.log(`[GeminiCLI] Loaded credentials:`, {
+			hasAccessToken: !!credentials.access_token,
+			hasRefreshToken: !!credentials.refresh_token,
+			tokenType: credentials.token_type,
+			expiryDate: credentials.expiry_date,
+			isExpired: isExpired,
+		})
+
+		this.authClient.setCredentials(credentials)
+
+		// If token is expired and we have a refresh token, try to refresh
+		if (isExpired && credentials.refresh_token) {
+			console.log(`[GeminiCLI] Token expired, attempting to refresh...`)
+			try {
+				const { credentials: newCredentials } = await this.authClient.refreshAccessToken()
+				console.log(`[GeminiCLI] Token refreshed successfully`)
+				// Note: In a real implementation, you'd want to save the new credentials back to the file
+				// For now, we'll just use them in memory
+			} catch (error) {
+				console.error(`[GeminiCLI] Failed to refresh token:`, error)
+				// Continue with the expired token - the API might still accept it
+			}
+		}
+
+		this.authInitialized = true
+		console.log(`[GeminiCLI] OAuth client configured`)
+	}
+
+	/**
+	 * Parse Server-Sent Events from a stream
+	 */
+	private async *parseSSEStream(stream: Readable): AsyncGenerator<any> {
+		const rl = readline.createInterface({
+			input: stream,
+			crlfDelay: Infinity,
+		})
+
+		let bufferedLines: string[] = []
+
+		for await (const line of rl) {
+			// Blank lines separate JSON objects in the stream
+			if (line === "") {
+				if (bufferedLines.length === 0) {
+					continue
+				}
+
+				try {
+					const jsonData = JSON.parse(bufferedLines.join("\n"))
+					yield jsonData
+				} catch (parseError) {
+					console.error("Error parsing JSON chunk:", parseError)
+				}
+
+				bufferedLines = []
+			} else if (line.startsWith("data: ")) {
+				bufferedLines.push(line.slice(6).trim())
+			}
+		}
+
+		// Process any remaining buffered content
+		if (bufferedLines.length > 0) {
+			try {
+				const jsonData = JSON.parse(bufferedLines.join("\n"))
+				yield jsonData
+			} catch (parseError) {
+				console.error("Error parsing final buffered content:", parseError)
+			}
+		}
+	}
+
+	/**
+	 * Create a message using the Gemini CLI OAuth API
+	 */
+	@withRetry({
+		maxRetries: 2,
+		baseDelay: 2000,
+		maxDelay: 10000,
+	})
+	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
+		// Initialize auth if not already done
+		await this.initializeAuth()
+		// Discover project ID if needed
+		const projectId = await this.discoverProjectId()
+
+		// Convert messages to Gemini format
+		const contents = messages.map(convertAnthropicMessageToGemini)
+
+		// Get the selected model
+		const { id: modelId, info: modelInfo } = this.getModel()
+
+		// Build the request
+		const streamRequest = {
+			model: modelId,
+			project: projectId,
+			request: {
+				contents: [
+					{
+						role: "user",
+						parts: [{ text: systemPrompt }],
+					},
+					...contents,
+				],
+				generationConfig: {
+					temperature: 0.7,
+					maxOutputTokens: modelInfo.maxTokens || 8192,
+				},
+			},
+		}
+
+		let totalContent = ""
+		let promptTokens = 0
+		let outputTokens = 0
+		let lastUsageMetadata: any = null
+
+		try {
+			// Make the streaming request
+			const response = await this.authClient.request({
+				url: `${CODE_ASSIST_ENDPOINT}/${CODE_ASSIST_API_VERSION}:streamGenerateContent`,
+				method: "POST",
+				params: { alt: "sse" },
+				headers: {
+					"Content-Type": "application/json",
+				},
+				responseType: "stream",
+				body: JSON.stringify(streamRequest),
+			})
+
+			// Process the SSE stream
+			for await (const jsonData of this.parseSSEStream(response.data as Readable)) {
+				// Extract content from the response
+				const candidate = jsonData.response?.candidates?.[0]
+				if (candidate?.content?.parts?.[0]?.text) {
+					const content = candidate.content.parts[0].text
+					totalContent += content
+
+					// Yield text chunk
+					yield {
+						type: "text",
+						text: content,
+					}
+				}
+
+				// Store usage metadata for final reporting
+				if (jsonData.response?.usageMetadata) {
+					lastUsageMetadata = jsonData.response.usageMetadata
+					promptTokens = lastUsageMetadata.promptTokenCount || promptTokens
+					outputTokens = lastUsageMetadata.candidatesTokenCount || outputTokens
+				}
+
+				// Check if this is the final chunk
+				if (candidate?.finishReason) {
+					break
+				}
+			}
+
+			// Yield usage information
+			if (lastUsageMetadata) {
+				yield {
+					type: "usage",
+					inputTokens: promptTokens,
+					outputTokens: outputTokens,
+					totalCost: 0, // Free tier
+				}
+			}
+		} catch (error) {
+			// Handle rate limit errors similar to the Gemini provider
+			if (error instanceof Error) {
+				// Check for rate limit patterns in the error message
+				const rateLimitPatterns = [
+					/got status: 429/i,
+					/429 Too Many Requests/i,
+					/rate limit exceeded/i,
+					/too many requests/i,
+					/quota exceeded/i,
+					/resource exhausted/i,
+					/code 429/i,
+				]
+
+				const isRateLimit = rateLimitPatterns.some((pattern) => pattern.test(error.message))
+
+				if (isRateLimit) {
+					const rateLimitError = Object.assign(new Error(error.message), {
+						...error,
+						status: 429,
+					})
+					throw rateLimitError
+				}
+			}
+
+			// Re-throw the original error if it's not a rate limit error
+			throw error
+		}
+	}
+
+	/**
+	 * Get the model ID and info
+	 */
+	getModel(): { id: GeminiCliModelId; info: ModelInfo } {
+		const modelId = this.options.apiModelId as GeminiCliModelId
+		if (modelId && modelId in geminiCliModels) {
+			return { id: modelId, info: geminiCliModels[modelId] }
+		}
+		return {
+			id: geminiCliDefaultModelId,
+			info: geminiCliModels[geminiCliDefaultModelId],
+		}
+	}
+}

src/api/providers/gemini.ts

@@ -12,15 +12,8 @@ import { telemetryService } from "@services/posthog/telemetry/TelemetryService"
 // Define a default TTL for the cache (e.g., 15 minutes in seconds)
 const DEFAULT_CACHE_TTL_SECONDS = 900
 
-interface GeminiHandlerOptions {
+interface GeminiHandlerOptions extends ApiHandlerOptions {
 	isVertex?: boolean
-	vertexProjectId?: string
-	vertexRegion?: string
-	geminiApiKey?: string
-	geminiBaseUrl?: string
-	thinkingBudgetTokens?: number
-	apiModelId?: string
-	taskId?: string
 }
 
 /**
@@ -45,45 +38,30 @@ interface GeminiHandlerOptions {
  */
 export class GeminiHandler implements ApiHandler {
 	private options: ApiHandlerOptions
-	private client: GoogleGenAI | undefined
+	private client: GoogleGenAI
 
 	constructor(options: GeminiHandlerOptions) {
 		// Store the options
 		this.options = options
-	}
 
-	private ensureClient(): GoogleGenAI {
-		if (!this.client) {
-			const options = this.options as GeminiHandlerOptions
+		if (options.isVertex) {
+			// Initialize with Vertex AI configuration
+			const project = this.options.vertexProjectId ?? "not-provided"
+			const location = this.options.vertexRegion ?? "not-provided"
 
-			if (options.isVertex) {
-				// Initialize with Vertex AI configuration
-				const project = this.options.vertexProjectId ?? "not-provided"
-				const location = this.options.vertexRegion ?? "not-provided"
-
-				try {
-					this.client = new GoogleGenAI({
-						vertexai: true,
-						project,
-						location,
-					})
-				} catch (error) {
-					throw new Error(`Error creating Gemini Vertex AI client: ${error.message}`)
-				}
-			} else {
-				// Initialize with standard API key
-				if (!options.geminiApiKey) {
-					throw new Error("API key is required for Google Gemini when not using Vertex AI")
-				}
-
-				try {
-					this.client = new GoogleGenAI({ apiKey: options.geminiApiKey })
-				} catch (error) {
-					throw new Error(`Error creating Gemini client: ${error.message}`)
-				}
+			this.client = new GoogleGenAI({
+				vertexai: true,
+				project,
+				location,
+			})
+		} else {
+			// Initialize with standard API key
+			if (!options.geminiApiKey) {
+				throw new Error("API key is required for Google Gemini when not using Vertex AI")
 			}
+
+			this.client = new GoogleGenAI({ apiKey: options.geminiApiKey })
 		}
-		return this.client
 	}
 
 	/**
@@ -102,7 +80,6 @@ export class GeminiHandler implements ApiHandler {
 		maxDelay: 15000,
 	})
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const { id: modelId, info } = this.getModel()
 		const contents = messages.map(convertAnthropicMessageToGemini)
 
@@ -140,7 +117,7 @@ export class GeminiHandler implements ApiHandler {
 		let lastUsageMetadata: GenerateContentResponseUsageMetadata | undefined
 
 		try {
-			const result = await client.models.generateContentStream({
+			const result = await this.client.models.generateContentStream({
 				model: modelId,
 				contents: contents,
 				config: {
@@ -374,7 +351,6 @@ export class GeminiHandler implements ApiHandler {
 	 */
 	async countTokens(content: Array<any>): Promise<number> {
 		try {
-			const client = this.ensureClient()
 			const { id: model } = this.getModel()
 
 			// Convert content to Gemini format
@@ -386,7 +362,7 @@ export class GeminiHandler implements ApiHandler {
 			})
 
 			// Use Gemini's token counting API
-			const response = await client.models.countTokens({
+			const response = await this.client.models.countTokens({
 				model,
 				contents: [{ parts: geminiContent }],
 			})

src/api/providers/litellm.ts

@@ -1,52 +1,28 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
-import { liteLlmDefaultModelId, liteLlmModelInfoSaneDefaults, LiteLLMModelInfo } from "@shared/api"
+import { ApiHandlerOptions, liteLlmDefaultModelId, liteLlmModelInfoSaneDefaults } from "@shared/api"
 import { ApiHandler } from ".."
 import { ApiStream } from "../transform/stream"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { withRetry } from "../retry"
 
-interface LiteLlmHandlerOptions {
-	liteLlmApiKey?: string
-	liteLlmBaseUrl?: string
-	liteLlmModelId?: string
-	liteLlmModelInfo?: LiteLLMModelInfo
-	thinkingBudgetTokens?: number
-	liteLlmUsePromptCache?: boolean
-	taskId?: string
-}
-
 export class LiteLlmHandler implements ApiHandler {
-	private options: LiteLlmHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: LiteLlmHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.liteLlmApiKey) {
-				throw new Error("LiteLLM API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: this.options.liteLlmBaseUrl || "http://localhost:4000",
-					apiKey: this.options.liteLlmApiKey || "noop",
-				})
-			} catch (error) {
-				throw new Error(`Error creating LiteLLM client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: this.options.liteLlmBaseUrl || "http://localhost:4000",
+			apiKey: this.options.liteLlmApiKey || "noop",
+		})
 	}
 
 	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.liteLlmModelId || liteLlmDefaultModelId
 		try {
-			const response = await fetch(`${client.baseURL}/spend/calculate`, {
+			const response = await fetch(`${this.client.baseURL}/spend/calculate`, {
 				method: "POST",
 				headers: {
 					"Content-Type": "application/json",
@@ -78,7 +54,6 @@ export class LiteLlmHandler implements ApiHandler {
 
 	@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",
@@ -126,15 +101,21 @@ export class LiteLlmHandler implements ApiHandler {
 			return message
 		})
 
-		const stream = await client.chat.completions.create({
+		const requestPayload: OpenAI.Chat.Completions.ChatCompletionCreateParamsStreaming & {
+			metadata?: { cline_task_id: string }
+		} = {
 			model: this.options.liteLlmModelId || liteLlmDefaultModelId,
 			messages: [enhancedSystemMessage, ...enhancedMessages],
 			temperature,
 			stream: true,
 			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
-		})
+			...(this.options.taskId && {
+				metadata: { cline_task_id: this.options.taskId },
+			}),
+		}
+
+		const stream = await this.client.chat.completions.create(requestPayload)
 
 		const inputCost = (await this.calculateCost(1e6, 0)) || 0
 		const outputCost = (await this.calculateCost(0, 1e6)) || 0

src/api/providers/lmstudio.ts

@@ -6,43 +6,27 @@ import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 import { withRetry } from "../retry"
 
-interface LmStudioHandlerOptions {
-	lmStudioBaseUrl?: string
-	lmStudioModelId?: string
-}
-
 export class LmStudioHandler implements ApiHandler {
-	private options: LmStudioHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: LmStudioHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			try {
-				this.client = new OpenAI({
-					baseURL: (this.options.lmStudioBaseUrl || "http://localhost:1234") + "/v1",
-					apiKey: "noop",
-				})
-			} catch (error) {
-				throw new Error(`Error creating LM Studio client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: (this.options.lmStudioBaseUrl || "http://localhost:1234") + "/v1",
+			apiKey: "noop",
+		})
 	}
 
 	@withRetry({ retryAllErrors: true })
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
 			{ role: "system", content: systemPrompt },
 			...convertToOpenAiMessages(messages),
 		]
 
 		try {
-			const stream = await client.chat.completions.create({
+			const stream = await this.client.chat.completions.create({
 				model: this.getModel().id,
 				messages: openAiMessages,
 				stream: true,

src/api/providers/mistral.ts

@@ -2,43 +2,24 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import { Mistral } from "@mistralai/mistralai"
 import { withRetry } from "../retry"
 import { ApiHandler } from "../"
-import { mistralDefaultModelId, MistralModelId, mistralModels, ModelInfo } from "@shared/api"
+import { ApiHandlerOptions, mistralDefaultModelId, MistralModelId, mistralModels, ModelInfo } from "@shared/api"
 import { convertToMistralMessages } from "../transform/mistral-format"
 import { ApiStream } from "../transform/stream"
 
-interface MistralHandlerOptions {
-	mistralApiKey?: string
-	apiModelId?: string
-}
-
 export class MistralHandler implements ApiHandler {
-	private options: MistralHandlerOptions
-	private client: Mistral | undefined
+	private options: ApiHandlerOptions
+	private client: Mistral
 
-	constructor(options: MistralHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): Mistral {
-		if (!this.client) {
-			if (!this.options.mistralApiKey) {
-				throw new Error("Mistral API key is required")
-			}
-			try {
-				this.client = new Mistral({
-					apiKey: this.options.mistralApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Mistral client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new Mistral({
+			apiKey: this.options.mistralApiKey,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
-		const stream = await client.chat
+		const stream = await this.client.chat
 			.stream({
 				model: this.getModel().id,
 				// max_completion_tokens: this.getModel().info.maxTokens,

src/api/providers/nebius.ts

@@ -5,45 +5,27 @@ import { ApiHandler } from "../index"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 import { convertToR1Format } from "../transform/r1-format"
-import { nebiusDefaultModelId, nebiusModels, type ModelInfo, type NebiusModelId } from "../../shared/api"
-
-interface NebiusHandlerOptions {
-	nebiusApiKey?: string
-	apiModelId?: string
-}
+import { nebiusDefaultModelId, nebiusModels, type ModelInfo, type ApiHandlerOptions, type NebiusModelId } from "../../shared/api"
 
 export class NebiusHandler implements ApiHandler {
-	private client: OpenAI | undefined
+	private client: OpenAI
 
-	constructor(private readonly options: NebiusHandlerOptions) {}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.nebiusApiKey) {
-				throw new Error("Nebius API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.studio.nebius.ai/v1",
-					apiKey: this.options.nebiusApiKey,
-				})
-			} catch (error) {
-				throw new Error(`Error creating Nebius client: ${error.message}`)
-			}
-		}
-		return this.client
+	constructor(private readonly options: ApiHandlerOptions) {
+		this.client = new OpenAI({
+			baseURL: "https://api.studio.nebius.ai/v1",
+			apiKey: this.options.nebiusApiKey,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 
 		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = model.id.includes("DeepSeek-R1")
 			? convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
 			: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)]
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: model.id,
 			messages: openAiMessages,
 			temperature: 0,

src/api/providers/ollama.ts

@@ -6,35 +6,17 @@ import { convertToOllamaMessages } from "../transform/ollama-format"
 import { ApiStream } from "../transform/stream"
 import { withRetry } from "../retry"
 
-interface OllamaHandlerOptions {
-	ollamaBaseUrl?: string
-	ollamaModelId?: string
-	ollamaApiOptionsCtxNum?: string
-	requestTimeoutMs?: number
-}
-
 export class OllamaHandler implements ApiHandler {
-	private options: OllamaHandlerOptions
-	private client: Ollama | undefined
+	private options: ApiHandlerOptions
+	private client: Ollama
 
-	constructor(options: OllamaHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): Ollama {
-		if (!this.client) {
-			try {
-				this.client = new Ollama({ host: this.options.ollamaBaseUrl || "http://localhost:11434" })
-			} catch (error) {
-				throw new Error(`Error creating Ollama client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new Ollama({ host: this.options.ollamaBaseUrl || "http://localhost:11434" })
 	}
 
 	@withRetry({ retryAllErrors: true })
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const ollamaMessages: Message[] = [{ role: "system", content: systemPrompt }, ...convertToOllamaMessages(messages)]
 
 		try {
@@ -45,7 +27,7 @@ export class OllamaHandler implements ApiHandler {
 			})
 
 			// Create the actual API request promise
-			const apiPromise = client.chat({
+			const apiPromise = this.client.chat({
 				model: this.getModel().id,
 				messages: ollamaMessages,
 				stream: true,

src/api/providers/openai-native.ts

@@ -8,34 +8,15 @@ import { calculateApiCostOpenAI } from "../../utils/cost"
 import { ApiStream } from "../transform/stream"
 import type { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
 
-interface OpenAiNativeHandlerOptions {
-	openAiNativeApiKey?: string
-	reasoningEffort?: string
-	apiModelId?: string
-}
-
 export class OpenAiNativeHandler implements ApiHandler {
-	private options: OpenAiNativeHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: OpenAiNativeHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.openAiNativeApiKey) {
-				throw new Error("OpenAI API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					apiKey: this.options.openAiNativeApiKey,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating OpenAI client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			apiKey: this.options.openAiNativeApiKey,
+		})
 	}
 
 	private async *yieldUsage(info: ModelInfo, usage: OpenAI.Completions.CompletionUsage | undefined): ApiStream {
@@ -57,7 +38,6 @@ export class OpenAiNativeHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 
 		switch (model.id) {
@@ -65,7 +45,7 @@ export class OpenAiNativeHandler implements ApiHandler {
 			case "o1-preview":
 			case "o1-mini": {
 				// o1 doesn't support streaming, non-1 temp, or system prompt
-				const response = await client.chat.completions.create({
+				const response = await this.client.chat.completions.create({
 					model: model.id,
 					messages: [{ role: "user", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
 				})
@@ -81,7 +61,7 @@ export class OpenAiNativeHandler implements ApiHandler {
 			case "o4-mini":
 			case "o3":
 			case "o3-mini": {
-				const stream = await client.chat.completions.create({
+				const stream = await this.client.chat.completions.create({
 					model: model.id,
 					messages: [{ role: "developer", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
 					stream: true,
@@ -105,7 +85,7 @@ export class OpenAiNativeHandler implements ApiHandler {
 				break
 			}
 			default: {
-				const stream = await client.chat.completions.create({
+				const stream = await this.client.chat.completions.create({
 					model: model.id,
 					// max_completion_tokens: this.getModel().info.maxTokens,
 					temperature: 0,

src/api/providers/openai.ts

@@ -1,68 +1,44 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI, { AzureOpenAI } from "openai"
 import { withRetry } from "../retry"
-import { azureOpenAiDefaultApiVersion, ModelInfo, openAiModelInfoSaneDefaults, OpenAiCompatibleModelInfo } from "@shared/api"
+import { ApiHandlerOptions, azureOpenAiDefaultApiVersion, ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
 import { ApiHandler } from "../index"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 import { convertToR1Format } from "../transform/r1-format"
 import type { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
 
-interface OpenAiHandlerOptions {
-	openAiApiKey?: string
-	openAiBaseUrl?: string
-	azureApiVersion?: string
-	openAiHeaders?: Record<string, string>
-	openAiModelId?: string
-	openAiModelInfo?: OpenAiCompatibleModelInfo
-	reasoningEffort?: string
-}
-
 export class OpenAiHandler implements ApiHandler {
-	private options: OpenAiHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: OpenAiHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.openAiApiKey) {
-				throw new Error("OpenAI API key is required")
-			}
-			try {
-				// Azure API shape slightly differs from the core API shape: https://github.com/openai/openai-node?tab=readme-ov-file#microsoft-azure-openai
-				// Use azureApiVersion to determine if this is an Azure endpoint, since the URL may not always contain 'azure.com'
-				if (
-					this.options.azureApiVersion ||
-					((this.options.openAiBaseUrl?.toLowerCase().includes("azure.com") ||
-						this.options.openAiBaseUrl?.toLowerCase().includes("azure.us")) &&
-						!this.options.openAiModelId?.toLowerCase().includes("deepseek"))
-				) {
-					this.client = new AzureOpenAI({
-						baseURL: this.options.openAiBaseUrl,
-						apiKey: this.options.openAiApiKey,
-						apiVersion: this.options.azureApiVersion || azureOpenAiDefaultApiVersion,
-						defaultHeaders: this.options.openAiHeaders,
-					})
-				} else {
-					this.client = new OpenAI({
-						baseURL: this.options.openAiBaseUrl,
-						apiKey: this.options.openAiApiKey,
-						defaultHeaders: this.options.openAiHeaders,
-					})
-				}
-			} catch (error: any) {
-				throw new Error(`Error creating OpenAI client: ${error.message}`)
-			}
+		// Azure API shape slightly differs from the core API shape: https://github.com/openai/openai-node?tab=readme-ov-file#microsoft-azure-openai
+		// Use azureApiVersion to determine if this is an Azure endpoint, since the URL may not always contain 'azure.com'
+		if (
+			this.options.azureApiVersion ||
+			((this.options.openAiBaseUrl?.toLowerCase().includes("azure.com") ||
+				this.options.openAiBaseUrl?.toLowerCase().includes("azure.us")) &&
+				!this.options.openAiModelId?.toLowerCase().includes("deepseek"))
+		) {
+			this.client = new AzureOpenAI({
+				baseURL: this.options.openAiBaseUrl,
+				apiKey: this.options.openAiApiKey,
+				apiVersion: this.options.azureApiVersion || azureOpenAiDefaultApiVersion,
+				defaultHeaders: this.options.openAiHeaders,
+			})
+		} else {
+			this.client = new OpenAI({
+				baseURL: this.options.openAiBaseUrl,
+				apiKey: this.options.openAiApiKey,
+				defaultHeaders: this.options.openAiHeaders,
+			})
 		}
-		return this.client
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const modelId = this.options.openAiModelId ?? ""
 		const isDeepseekReasoner = modelId.includes("deepseek-reasoner")
 		const isR1FormatRequired = this.options.openAiModelInfo?.isR1FormatRequired ?? false
@@ -92,7 +68,7 @@ export class OpenAiHandler implements ApiHandler {
 			reasoningEffort = (this.options.reasoningEffort as ChatCompletionReasoningEffort) || "medium"
 		}
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: modelId,
 			messages: openAiMessages,
 			temperature,

src/api/providers/openrouter.ts

@@ -3,58 +3,35 @@ import axios from "axios"
 import { setTimeout as setTimeoutPromise } from "node:timers/promises"
 import OpenAI from "openai"
 import { ApiHandler } from "../"
-import { ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
+import { ApiHandlerOptions, ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "@shared/api"
 import { withRetry } from "../retry"
 import { createOpenRouterStream } from "../transform/openrouter-stream"
 import { ApiStream, ApiStreamUsageChunk } from "../transform/stream"
 import { OpenRouterErrorResponse } from "./types"
 
-interface OpenRouterHandlerOptions {
-	openRouterApiKey?: string
-	openRouterModelId?: string
-	openRouterModelInfo?: ModelInfo
-	openRouterProviderSorting?: string
-	reasoningEffort?: string
-	thinkingBudgetTokens?: number
-}
-
 export class OpenRouterHandler implements ApiHandler {
-	private options: OpenRouterHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 	lastGenerationId?: string
 
-	constructor(options: OpenRouterHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.openRouterApiKey) {
-				throw new Error("OpenRouter API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://openrouter.ai/api/v1",
-					apiKey: this.options.openRouterApiKey,
-					defaultHeaders: {
-						"HTTP-Referer": "https://cline.bot", // Optional, for including your app on openrouter.ai rankings.
-						"X-Title": "Cline", // Optional. Shows in rankings on openrouter.ai.
-					},
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating OpenRouter client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://openrouter.ai/api/v1",
+			apiKey: this.options.openRouterApiKey,
+			defaultHeaders: {
+				"HTTP-Referer": "https://cline.bot", // Optional, for including your app on openrouter.ai rankings.
+				"X-Title": "Cline", // Optional. Shows in rankings on openrouter.ai.
+			},
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		this.lastGenerationId = undefined
 
 		const stream = await createOpenRouterStream(
-			client,
+			this.client,
 			systemPrompt,
 			messages,
 			this.getModel(),
@@ -121,27 +98,14 @@ export class OpenRouterHandler implements ApiHandler {
 			}
 
 			if (!didOutputUsage && chunk.usage) {
-				let modelId = this.options.openRouterModelId
-				if (modelId && modelId.includes("gemini")) {
-					yield {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
-						inputTokens: (chunk.usage.prompt_tokens || 0) - (chunk.usage.prompt_tokens_details?.cached_tokens || 0),
-						outputTokens: chunk.usage.completion_tokens || 0,
-						// @ts-ignore-next-line
-						totalCost: (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0),
-					}
-				} else {
-					yield {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
-						inputTokens: chunk.usage.prompt_tokens || 0,
-						outputTokens: chunk.usage.completion_tokens || 0,
-						// @ts-ignore-next-line
-						totalCost: (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0),
-					}
+				yield {
+					type: "usage",
+					cacheWriteTokens: 0,
+					cacheReadTokens: chunk.usage.prompt_tokens_details?.cached_tokens || 0,
+					inputTokens: chunk.usage.prompt_tokens || 0,
+					outputTokens: chunk.usage.completion_tokens || 0,
+					// @ts-ignore-next-line
+					totalCost: (chunk.usage.cost || 0) + (chunk.usage.cost_details?.upstream_inference_cost || 0),
 				}
 				didOutputUsage = true
 			}
@@ -163,27 +127,14 @@ export class OpenRouterHandler implements ApiHandler {
 				const generationIterator = this.fetchGenerationDetails(this.lastGenerationId)
 				const generation = (await generationIterator.next()).value
 				// console.log("OpenRouter generation details:", generation)
-				let modelId = this.options.openRouterModelId
-				if (modelId && modelId.includes("gemini")) {
-					return {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: generation?.native_tokens_cached || 0,
-						// openrouter generation endpoint fails often
-						inputTokens: (generation?.native_tokens_prompt || 0) - (generation?.native_tokens_cached || 0),
-						outputTokens: generation?.native_tokens_completion || 0,
-						totalCost: generation?.total_cost || 0,
-					}
-				} else {
-					return {
-						type: "usage",
-						cacheWriteTokens: 0,
-						cacheReadTokens: generation?.native_tokens_cached || 0,
-						// openrouter generation endpoint fails often
-						inputTokens: generation?.native_tokens_prompt || 0,
-						outputTokens: generation?.native_tokens_completion || 0,
-						totalCost: generation?.total_cost || 0,
-					}
+				return {
+					type: "usage",
+					cacheWriteTokens: 0,
+					cacheReadTokens: generation?.native_tokens_cached || 0,
+					// openrouter generation endpoint fails often
+					inputTokens: generation?.native_tokens_prompt || 0,
+					outputTokens: generation?.native_tokens_completion || 0,
+					totalCost: generation?.total_cost || 0,
 				}
 			} catch (error) {
 				// ignore if fails
@@ -213,6 +164,9 @@ export class OpenRouterHandler implements ApiHandler {
 
 	getModel(): { id: string; info: ModelInfo } {
 		let modelId = this.options.openRouterModelId
+		if (modelId === "x-ai/grok-3") {
+			modelId = "x-ai/grok-3-beta"
+		}
 		const modelInfo = this.options.openRouterModelInfo
 		if (modelId && modelInfo) {
 			return { id: modelId, info: modelInfo }

src/api/providers/qwen.ts

@@ -2,6 +2,7 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { ApiHandler } from "../"
 import {
+	ApiHandlerOptions,
 	ModelInfo,
 	mainlandQwenModels,
 	internationalQwenModels,
@@ -15,39 +16,19 @@ import { ApiStream } from "../transform/stream"
 import { convertToR1Format } from "../transform/r1-format"
 import { withRetry } from "../retry"
 
-interface QwenHandlerOptions {
-	qwenApiKey?: string
-	qwenApiLine?: string
-	apiModelId?: string
-	thinkingBudgetTokens?: number
-}
-
 export class QwenHandler implements ApiHandler {
-	private options: QwenHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: QwenHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.qwenApiKey) {
-				throw new Error("Alibaba API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL:
-						this.options.qwenApiLine === "china"
-							? "https://dashscope.aliyuncs.com/compatible-mode/v1"
-							: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
-					apiKey: this.options.qwenApiKey,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating Alibaba client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL:
+				this.options.qwenApiLine === "china"
+					? "https://dashscope.aliyuncs.com/compatible-mode/v1"
+					: "https://dashscope-intl.aliyuncs.com/compatible-mode/v1",
+			apiKey: this.options.qwenApiKey,
+		})
 	}
 
 	getModel(): { id: MainlandQwenModelId | InternationalQwenModelId; info: ModelInfo } {
@@ -70,7 +51,6 @@ export class QwenHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 		const isDeepseekReasoner = model.id.includes("deepseek-r1")
 		const isReasoningModelFamily = model.id.includes("qwen3") || ["qwen-plus-latest", "qwen-turbo-latest"].includes(model.id)
@@ -96,7 +76,7 @@ export class QwenHandler implements ApiHandler {
 			temperature = undefined
 		}
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: model.id,
 			max_completion_tokens: model.info.maxTokens,
 			messages: openAiMessages,

src/api/providers/requesty.ts

@@ -7,14 +7,6 @@ import { convertToOpenAiMessages } from "@api/transform/openai-format"
 import { calculateApiCostOpenAI } from "@utils/cost"
 import { ApiStream } from "@api/transform/stream"
 
-interface RequestyHandlerOptions {
-	requestyApiKey?: string
-	reasoningEffort?: string
-	thinkingBudgetTokens?: number
-	requestyModelId?: string
-	requestyModelInfo?: ModelInfo
-}
-
 // Requesty usage includes an extra field for Anthropic use cases.
 // Safely cast the prompt token details section to the appropriate structure.
 interface RequestyUsage extends OpenAI.CompletionUsage {
@@ -26,37 +18,23 @@ interface RequestyUsage extends OpenAI.CompletionUsage {
 }
 
 export class RequestyHandler implements ApiHandler {
-	private options: RequestyHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: RequestyHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.requestyApiKey) {
-				throw new Error("Requesty API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://router.requesty.ai/v1",
-					apiKey: this.options.requestyApiKey,
-					defaultHeaders: {
-						"HTTP-Referer": "https://cline.bot",
-						"X-Title": "Cline",
-					},
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating Requesty client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://router.requesty.ai/v1",
+			apiKey: this.options.requestyApiKey,
+			defaultHeaders: {
+				"HTTP-Referer": "https://cline.bot",
+				"X-Title": "Cline",
+			},
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 
 		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
@@ -79,7 +57,7 @@ export class RequestyHandler implements ApiHandler {
 				: {}
 
 		// @ts-ignore-next-line
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: model.id,
 			max_tokens: model.info.maxTokens || undefined,
 			messages: openAiMessages,

src/api/providers/sambanova.ts

@@ -1,45 +1,26 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { withRetry } from "../retry"
-import { ModelInfo, SambanovaModelId, sambanovaDefaultModelId, sambanovaModels } from "@shared/api"
+import { ApiHandlerOptions, ModelInfo, SambanovaModelId, sambanovaDefaultModelId, sambanovaModels } from "@shared/api"
 import { ApiHandler } from "../index"
 import { convertToOpenAiMessages } from "@/api/transform/openai-format"
 import { ApiStream } from "@api/transform/stream"
 import { convertToR1Format } from "@api/transform/r1-format"
 
-interface SambanovaHandlerOptions {
-	sambanovaApiKey?: string
-	apiModelId?: string
-}
-
 export class SambanovaHandler implements ApiHandler {
-	private options: SambanovaHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: SambanovaHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.sambanovaApiKey) {
-				throw new Error("SambaNova API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.sambanova.ai/v1",
-					apiKey: this.options.sambanovaApiKey,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating SambaNova client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://api.sambanova.ai/v1",
+			apiKey: this.options.sambanovaApiKey,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const model = this.getModel()
 
 		let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
@@ -53,7 +34,7 @@ export class SambanovaHandler implements ApiHandler {
 			openAiMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
 		}
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: this.getModel().id,
 			messages: openAiMessages,
 			temperature: 0,

src/api/providers/sapaicore.ts

@@ -2,19 +2,10 @@ import { Anthropic } from "@anthropic-ai/sdk"
 import axios from "axios"
 import OpenAI from "openai"
 import { ApiHandler } from "../"
-import { ModelInfo, sapAiCoreDefaultModelId, SapAiCoreModelId, sapAiCoreModels } from "../../shared/api"
+import { ApiHandlerOptions, ModelInfo, sapAiCoreDefaultModelId, SapAiCoreModelId, sapAiCoreModels } from "../../shared/api"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
 
-interface SapAiCoreHandlerOptions {
-	sapAiCoreClientId?: string
-	sapAiCoreClientSecret?: string
-	sapAiCoreTokenUrl?: string
-	sapAiResourceGroup?: string
-	sapAiCoreBaseUrl?: string
-	apiModelId?: string
-}
-
 interface Deployment {
 	id: string
 	name: string
@@ -28,11 +19,11 @@ interface Token {
 	expires_at: number
 }
 export class SapAiCoreHandler implements ApiHandler {
-	private options: SapAiCoreHandlerOptions
+	private options: ApiHandlerOptions
 	private token?: Token
 	private deployments?: Deployment[]
 
-	constructor(options: SapAiCoreHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
 	}
 
@@ -69,7 +60,6 @@ export class SapAiCoreHandler implements ApiHandler {
 			Authorization: `Bearer ${token}`,
 			"AI-Resource-Group": this.options.sapAiResourceGroup || "default",
 			"Content-Type": "application/json",
-			"AI-Client-Type": "Cline",
 		}
 
 		const url = `${this.options.sapAiCoreBaseUrl}/v2/lm/deployments?$top=10000&$skip=0`
@@ -126,15 +116,12 @@ export class SapAiCoreHandler implements ApiHandler {
 			Authorization: `Bearer ${token}`,
 			"AI-Resource-Group": this.options.sapAiResourceGroup || "default",
 			"Content-Type": "application/json",
-			"AI-Client-Type": "Cline",
 		}
 
 		const model = this.getModel()
 		const deploymentId = await this.getDeploymentForModel(model.id)
 
 		const anthropicModels = [
-			"anthropic--claude-4-sonnet",
-			"anthropic--claude-4-opus",
 			"anthropic--claude-3.7-sonnet",
 			"anthropic--claude-3.5-sonnet",
 			"anthropic--claude-3-sonnet",
@@ -144,18 +131,12 @@ export class SapAiCoreHandler implements ApiHandler {
 
 		const openAIModels = ["gpt-4o", "gpt-4", "gpt-4o-mini", "o1", "gpt-4.1", "gpt-4.1-nano", "o3-mini", "o3", "o4-mini"]
 
-		const geminiModels = ["gemini-2.5-flash", "gemini-2.5-pro"]
-
 		let url: string
 		let payload: any
 		if (anthropicModels.includes(model.id)) {
 			url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/invoke-with-response-stream`
 
-			if (
-				model.id === "anthropic--claude-4-sonnet" ||
-				model.id === "anthropic--claude-4-opus" ||
-				model.id === "anthropic--claude-3.7-sonnet"
-			) {
+			if (model.id === "anthropic--claude-3.7-sonnet") {
 				url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/converse-stream`
 				payload = {
 					inferenceConfig: {
@@ -200,9 +181,6 @@ export class SapAiCoreHandler implements ApiHandler {
 				delete payload.stream
 				delete payload.stream_options
 			}
-		} else if (geminiModels.includes(model.id)) {
-			url = `${this.options.sapAiCoreBaseUrl}/v2/inference/deployments/${deploymentId}/models/${model.id}:streamGenerateContent`
-			payload = this.convertToGeminiFormat(systemPrompt, messages)
 		} else {
 			throw new Error(`Unsupported model: ${model.id}`)
 		}
@@ -243,14 +221,8 @@ export class SapAiCoreHandler implements ApiHandler {
 				}
 			} else if (openAIModels.includes(model.id)) {
 				yield* this.streamCompletionGPT(response.data, model)
-			} else if (
-				model.id === "anthropic--claude-4-sonnet" ||
-				model.id === "anthropic--claude-4-opus" ||
-				model.id === "anthropic--claude-3.7-sonnet"
-			) {
+			} else if (model.id === "anthropic--claude-3.7-sonnet") {
 				yield* this.streamCompletionSonnet37(response.data, model)
-			} else if (geminiModels.includes(model.id)) {
-				yield* this.streamCompletionGemini(response.data, model)
 			} else {
 				yield* this.streamCompletion(response.data, model)
 			}
@@ -294,6 +266,7 @@ export class SapAiCoreHandler implements ApiHandler {
 						const jsonData = line.slice(6)
 						try {
 							const data = JSON.parse(jsonData)
+							console.log("Received data:", data)
 							if (data.type === "message_start") {
 								usage.input_tokens = data.message.usage.input_tokens
 								yield {
@@ -356,6 +329,7 @@ export class SapAiCoreHandler implements ApiHandler {
 						try {
 							// Parse the incoming JSON data from the stream
 							const data = JSON.parse(toStrictJson(jsonData))
+							console.log("Received data:", data)
 
 							// Handle metadata (token usage)
 							if (data.metadata?.usage) {
@@ -431,6 +405,7 @@ export class SapAiCoreHandler implements ApiHandler {
 						const jsonData = line.slice(6)
 						try {
 							const data = JSON.parse(jsonData)
+							console.log("Received GPT data:", data)
 
 							if (data.choices && data.choices.length > 0) {
 								const choice = data.choices[0]
@@ -454,7 +429,7 @@ export class SapAiCoreHandler implements ApiHandler {
 								}
 							}
 
-							if (data.choices?.[0]?.finish_reason === "stop") {
+							if (data.choices && data.choices[0].finish_reason === "stop") {
 								// Final usage yield, if not already provided
 								if (!data.usage) {
 									yield {
@@ -476,88 +451,6 @@ export class SapAiCoreHandler implements ApiHandler {
 		}
 	}
 
-	private async *streamCompletionGemini(
-		stream: any,
-		model: { id: SapAiCoreModelId; info: ModelInfo },
-	): AsyncGenerator<any, void, unknown> {
-		let promptTokens = 0
-		let outputTokens = 0
-		let cacheReadTokens = 0
-		let thoughtsTokenCount = 0
-
-		try {
-			for await (const chunk of stream) {
-				const lines = chunk.toString().split("\n").filter(Boolean)
-				for (const line of lines) {
-					if (line.startsWith("data: ")) {
-						const jsonData = line.slice(6)
-						try {
-							const data = JSON.parse(jsonData)
-							const candidateForThoughts = data?.candidates?.[0]
-							const partsForThoughts = candidateForThoughts?.content?.parts
-							let thoughts = ""
-
-							if (partsForThoughts) {
-								for (const part of partsForThoughts) {
-									const { thought, text } = part
-									if (thought && text) {
-										thoughts += text + "\n"
-									}
-								}
-							}
-
-							if (thoughts.trim() !== "") {
-								yield {
-									type: "reasoning",
-									reasoning: thoughts.trim(),
-								}
-							}
-
-							if (data.text) {
-								yield {
-									type: "text",
-									text: data.text,
-								}
-							}
-
-							if (data.candidates && data.candidates[0]?.content?.parts) {
-								for (const part of data.candidates[0].content.parts) {
-									if (part.text && !part.thought) {
-										// Only non-thought text
-										yield {
-											type: "text",
-											text: part.text,
-										}
-									}
-								}
-							}
-
-							if (data.usageMetadata) {
-								promptTokens = data.usageMetadata.promptTokenCount ?? promptTokens
-								outputTokens = data.usageMetadata.candidatesTokenCount ?? outputTokens
-								thoughtsTokenCount = data.usageMetadata.thoughtsTokenCount ?? thoughtsTokenCount
-								cacheReadTokens = data.usageMetadata.cachedContentTokenCount ?? cacheReadTokens
-
-								yield {
-									type: "usage",
-									inputTokens: promptTokens - cacheReadTokens,
-									outputTokens,
-									thoughtsTokenCount,
-									cacheReadTokens,
-								}
-							}
-						} catch (error) {
-							console.error("Failed to parse Gemini JSON data:", error)
-						}
-					}
-				}
-			}
-		} catch (error) {
-			console.error("Error streaming Gemini completion:", error)
-			throw error
-		}
-	}
-
 	createUserReadableRequest(
 		userContent: Array<
 			Anthropic.TextBlockParam | Anthropic.ImageBlockParam | Anthropic.ToolUseBlockParam | Anthropic.ToolResultBlockParam
@@ -592,50 +485,6 @@ export class SapAiCoreHandler implements ApiHandler {
 		throw new Error(`Unsupported image format: ${format}`)
 	}
 
-	private convertToGeminiFormat(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]) {
-		const contents = messages.map(this.convertAnthropicMessageToGemini)
-
-		const payload = {
-			contents,
-			systemInstruction: {
-				parts: [
-					{
-						text: systemPrompt,
-					},
-				],
-			},
-			generationConfig: {
-				maxOutputTokens: this.getModel().info.maxTokens,
-				temperature: 0.0,
-			},
-		}
-
-		return payload
-	}
-
-	private convertAnthropicMessageToGemini(message: Anthropic.Messages.MessageParam) {
-		const role = message.role === "assistant" ? "model" : "user"
-		const parts = []
-
-		if (typeof message.content === "string") {
-			parts.push({ text: message.content })
-		} else if (Array.isArray(message.content)) {
-			for (const block of message.content) {
-				if (block.type === "text") {
-					parts.push({ text: block.text })
-				} else if (block.type === "image") {
-					parts.push({
-						inlineData: {
-							mimeType: block.source.media_type,
-							data: block.source.data,
-						},
-					})
-				}
-			}
-		}
-
-		return { role, parts }
-	}
 	private formatAnthropicMessages(messages: Anthropic.Messages.MessageParam[]): any[] {
 		return messages.map((m) => {
 			const contentBlocks: any[] = []

src/api/providers/together.ts

@@ -1,45 +1,26 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { withRetry } from "../retry"
-import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
+import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
 import { ApiHandler } from "../index"
 import { convertToOpenAiMessages } from "@api/transform/openai-format"
 import { ApiStream } from "@api/transform/stream"
 import { convertToR1Format } from "@api/transform/r1-format"
 
-interface TogetherHandlerOptions {
-	togetherApiKey?: string
-	togetherModelId?: string
-}
-
 export class TogetherHandler implements ApiHandler {
-	private options: TogetherHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: TogetherHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.togetherApiKey) {
-				throw new Error("Together API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.together.xyz/v1",
-					apiKey: this.options.togetherApiKey,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating Together client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://api.together.xyz/v1",
+			apiKey: this.options.togetherApiKey,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const modelId = this.options.togetherModelId ?? ""
 		const isDeepseekReasoner = modelId.includes("deepseek-reasoner")
 
@@ -52,7 +33,7 @@ export class TogetherHandler implements ApiHandler {
 			openAiMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
 		}
 
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: modelId,
 			messages: openAiMessages,
 			temperature: 0,

src/api/providers/vertex.ts

@@ -6,60 +6,26 @@ import { ApiHandlerOptions, ModelInfo, vertexDefaultModelId, VertexModelId, vert
 import { ApiStream } from "@api/transform/stream"
 import { GeminiHandler } from "./gemini"
 
-interface VertexHandlerOptions {
-	vertexProjectId?: string
-	vertexRegion?: string
-	apiModelId?: string
-	thinkingBudgetTokens?: number
-	geminiApiKey?: string
-	geminiBaseUrl?: string
-	taskId?: string
-}
-
 export class VertexHandler implements ApiHandler {
-	private geminiHandler: GeminiHandler | undefined
-	private clientAnthropic: AnthropicVertex | undefined
-	private options: VertexHandlerOptions
+	private geminiHandler: GeminiHandler
+	private clientAnthropic: AnthropicVertex
+	private options: ApiHandlerOptions
 
-	constructor(options: VertexHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
 
-	private ensureGeminiHandler(): GeminiHandler {
-		if (!this.geminiHandler) {
-			try {
-				// Create a GeminiHandler with isVertex flag for Gemini models
-				this.geminiHandler = new GeminiHandler({
-					...this.options,
-					isVertex: true,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating Vertex AI Gemini handler: ${error.message}`)
-			}
-		}
-		return this.geminiHandler
-	}
+		// Create a GeminiHandler with isVertex flag for Gemini models
+		this.geminiHandler = new GeminiHandler({
+			...options,
+			isVertex: true,
+		})
 
-	private ensureAnthropicClient(): AnthropicVertex {
-		if (!this.clientAnthropic) {
-			if (!this.options.vertexProjectId) {
-				throw new Error("Vertex AI project ID is required")
-			}
-			if (!this.options.vertexRegion) {
-				throw new Error("Vertex AI region is required")
-			}
-			try {
-				// Initialize Anthropic client for Claude models
-				this.clientAnthropic = new AnthropicVertex({
-					projectId: this.options.vertexProjectId,
-					// https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/use-claude#regions
-					region: this.options.vertexRegion,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating Vertex AI Anthropic client: ${error.message}`)
-			}
-		}
-		return this.clientAnthropic
+		// Initialize Anthropic client for Claude models
+		this.clientAnthropic = new AnthropicVertex({
+			projectId: this.options.vertexProjectId,
+			// https://cloud.google.com/vertex-ai/generative-ai/docs/partner-models/use-claude#regions
+			region: this.options.vertexRegion,
+		})
 	}
 
 	@withRetry()
@@ -69,13 +35,10 @@ export class VertexHandler implements ApiHandler {
 
 		// For Gemini models, use the GeminiHandler
 		if (!modelId.includes("claude")) {
-			const geminiHandler = this.ensureGeminiHandler()
-			yield* geminiHandler.createMessage(systemPrompt, messages)
+			yield* this.geminiHandler.createMessage(systemPrompt, messages)
 			return
 		}
 
-		const clientAnthropic = this.ensureAnthropicClient()
-
 		// Claude implementation
 		let budget_tokens = this.options.thinkingBudgetTokens || 0
 		const reasoningOn =
@@ -100,7 +63,7 @@ export class VertexHandler implements ApiHandler {
 				)
 				const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1
 				const secondLastMsgUserIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1
-				stream = await clientAnthropic.beta.messages.create(
+				stream = await this.clientAnthropic.beta.messages.create(
 					{
 						model: modelId,
 						max_tokens: model.info.maxTokens || 8192,
@@ -162,7 +125,7 @@ export class VertexHandler implements ApiHandler {
 				break
 			}
 			default: {
-				stream = await clientAnthropic.beta.messages.create({
+				stream = await this.clientAnthropic.beta.messages.create({
 					model: modelId,
 					max_tokens: model.info.maxTokens || 8192,
 					temperature: 0,

src/api/providers/vscode-lm.ts

@@ -5,14 +5,10 @@ import { calculateApiCostAnthropic } from "@utils/cost"
 import { ApiStream } from "@api/transform/stream"
 import { convertToVsCodeLmMessages } from "@api/transform/vscode-lm-format"
 import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "@shared/vsCodeSelectorUtils"
-import { ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
+import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "@shared/api"
 import type { LanguageModelChatSelector as LanguageModelChatSelectorFromTypes } from "./types"
 import { withRetry } from "../retry"
 
-interface VsCodeLmHandlerOptions {
-	vsCodeLmModelSelector?: any
-}
-
 // Cline does not update VSCode type definitions or engine requirements to maintain compatibility.
 // This declaration (as seen in src/integrations/TerminalManager.ts) provides types for the Language Model API in newer versions of VSCode.
 // Extracted from https://github.com/microsoft/vscode/blob/131ee0ef660d600cd0a7e6058375b281553abe20/src/vscode-dts/vscode.d.ts
@@ -128,12 +124,12 @@ declare module "vscode" {
  * ```
  */
 export class VsCodeLmHandler implements ApiHandler, SingleCompletionHandler {
-	private options: VsCodeLmHandlerOptions
+	private options: ApiHandlerOptions
 	private client: vscode.LanguageModelChat | null
 	private disposable: vscode.Disposable | null
 	private currentRequestCancellation: vscode.CancellationTokenSource | null
 
-	constructor(options: VsCodeLmHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
 		this.client = null
 		this.disposable = null

src/api/providers/xai.ts

@@ -1,46 +1,26 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
 import { ApiHandler } from "../"
-import { XAIModelId, ModelInfo, xaiDefaultModelId, xaiModels } from "@shared/api"
+import { ApiHandlerOptions, XAIModelId, ModelInfo, xaiDefaultModelId, xaiModels } from "@shared/api"
 import { convertToOpenAiMessages } from "@api/transform/openai-format"
 import { ApiStream } from "@api/transform/stream"
 import { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
 import { withRetry } from "../retry"
 
-interface XAIHandlerOptions {
-	xaiApiKey?: string
-	reasoningEffort?: string
-	apiModelId?: string
-}
-
 export class XAIHandler implements ApiHandler {
-	private options: XAIHandlerOptions
-	private client: OpenAI | undefined
+	private options: ApiHandlerOptions
+	private client: OpenAI
 
-	constructor(options: XAIHandlerOptions) {
+	constructor(options: ApiHandlerOptions) {
 		this.options = options
-	}
-
-	private ensureClient(): OpenAI {
-		if (!this.client) {
-			if (!this.options.xaiApiKey) {
-				throw new Error("xAI API key is required")
-			}
-			try {
-				this.client = new OpenAI({
-					baseURL: "https://api.x.ai/v1",
-					apiKey: this.options.xaiApiKey,
-				})
-			} catch (error: any) {
-				throw new Error(`Error creating xAI client: ${error.message}`)
-			}
-		}
-		return this.client
+		this.client = new OpenAI({
+			baseURL: "https://api.x.ai/v1",
+			apiKey: this.options.xaiApiKey,
+		})
 	}
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const client = this.ensureClient()
 		const modelId = this.getModel().id
 		// ensure reasoning effort is either "low" or "high" for grok-3-mini
 		let reasoningEffort: ChatCompletionReasoningEffort | undefined
@@ -50,7 +30,7 @@ export class XAIHandler implements ApiHandler {
 				reasoningEffort = undefined
 			}
 		}
-		const stream = await client.chat.completions.create({
+		const stream = await this.client.chat.completions.create({
 			model: modelId,
 			max_completion_tokens: this.getModel().info.maxTokens,
 			temperature: 0,

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

@@ -156,45 +156,6 @@ replaced
 			expected: "line2\nreplaced\nline4",
 			isFinal: true,
 		},
-		{
-			name: "malformed diff - missing separator",
-			original: "line1\nline2\nline3",
-			diff: `------- SEARCH
-line2
-+++++++ REPLACE
-replaced`,
-			shouldThrow: true,
-		},
-		{
-			name: "malformed diff - trailing space on separator",
-			original: "line1\nline2\nline3",
-			diff: `------- SEARCH
-line2
-======= 
-replaced
-+++++++ REPLACE`,
-			shouldThrow: true,
-		},
-		{
-			name: "malformed diff - double replace markers",
-			original: "line1\nline2\nline3",
-			diff: `------- SEARCH
-line2
-+++++++ REPLACE
-first replacement
-+++++++ REPLACE`,
-			shouldThrow: true,
-		},
-		{
-			name: "malformed diff - malformed separator with dashes",
-			original: "line1\nline2\nline3",
-			diff: `------- SEARCH
-line2
-------- =======
-replaced
-+++++++ REPLACE`,
-			shouldThrow: true,
-		},
 	]
 	//.filter(({name}) => name === "multiple ordered replacements")
 	//.filter(({name}) => name === "delete then replace")

src/core/assistant-message/diff.ts

@@ -380,10 +380,6 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 		if (isReplaceBlockEnd(line)) {
 			// Finished one replace block
 
-			if (searchMatchIndex === -1) {
-				throw new Error(`The SEARCH block:\n${currentSearchContent.trimEnd()}\n...is malformatted.`)
-			}
-
 			// Store this replacement
 			replacements.push({
 				start: searchMatchIndex,

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

@@ -6,9 +6,6 @@ import * as path from "path"
 import { FileContextTracker } from "./FileContextTracker"
 import * as diskModule from "@core/storage/disk"
 import type { TaskMetadata, FileMetadataEntry } from "./ContextTrackerTypes"
-import type { WebviewProviderCreator } from "@/hosts/host-providers"
-import * as hostProviders from "@hosts/host-providers"
-import { vscodeHostBridgeClient } from "@/hosts/vscode/client/host-grpc-client"
 
 describe("FileContextTracker", () => {
 	let sandbox: sinon.SinonSandbox
@@ -40,6 +37,7 @@ describe("FileContextTracker", () => {
 		}
 
 		// Use a function replacement instead of a direct stub
+		const originalCreateFileSystemWatcher = vscode.workspace.createFileSystemWatcher
 		vscode.workspace.createFileSystemWatcher = function () {
 			return mockFileSystemWatcher
 		}
@@ -53,7 +51,6 @@ describe("FileContextTracker", () => {
 		mockTaskMetadata = { files_in_context: [], model_usage: [] }
 		getTaskMetadataStub = sandbox.stub(diskModule, "getTaskMetadata").resolves(mockTaskMetadata)
 		saveTaskMetadataStub = sandbox.stub(diskModule, "saveTaskMetadata").resolves()
-		hostProviders.initializeHostProviders(((_) => {}) as WebviewProviderCreator, vscodeHostBridgeClient)
 
 		// Create tracker instance
 		taskId = "test-task-id"

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

@@ -5,8 +5,6 @@ import { getWorkspaceState, updateWorkspaceState } from "@core/storage/state"
 import { getGlobalState } from "@core/storage/state"
 import type { FileMetadataEntry } from "./ContextTrackerTypes"
 import type { ClineMessage } from "@shared/ExtensionMessage"
-import { getHostBridgeProvider } from "@/hosts/host-providers"
-import { getCwd } from "@/utils/path"
 
 // This class is responsible for tracking file operations that may result in stale context.
 // If a user modifies a file outside of Cline, the context may become stale and need to be updated.
@@ -36,6 +34,17 @@ export class FileContextTracker {
 		this.taskId = taskId
 	}
 
+	/**
+	 * Gets the current working directory or returns undefined if it cannot be determined
+	 */
+	private getCwd(): string | undefined {
+		const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)
+		if (!cwd) {
+			console.info("No workspace folder available - cannot determine current working directory")
+		}
+		return cwd
+	}
+
 	/**
 	 * File watchers are set up for each file that is tracked in the task metadata.
 	 */
@@ -45,9 +54,8 @@ export class FileContextTracker {
 			return
 		}
 
-		const cwd = await getCwd()
+		const cwd = this.getCwd()
 		if (!cwd) {
-			console.info("No workspace folder available - cannot determine current working directory")
 			return
 		}
 
@@ -77,9 +85,8 @@ export class FileContextTracker {
 	 */
 	async trackFileContext(filePath: string, operation: "read_tool" | "user_edited" | "cline_edited" | "file_mentioned") {
 		try {
-			const cwd = await getCwd()
+			const cwd = this.getCwd()
 			if (!cwd) {
-				console.info("No workspace folder available - cannot determine current working directory")
 				return
 			}
 
@@ -235,9 +242,7 @@ export class FileContextTracker {
 	async storePendingFileContextWarning(files: string[]): Promise<void> {
 		try {
 			const key = `pendingFileContextWarning_${this.taskId}`
-			// NOTE: Using 'as any' because dynamic keys like pendingFileContextWarning_${taskId}
-			// are legitimate workspace state keys but don't fit the strict LocalStateKey type system
-			await updateWorkspaceState(this.context, key as any, files)
+			await updateWorkspaceState(this.context, key, files)
 		} catch (error) {
 			console.error("Error storing pending file context warning:", error)
 		}
@@ -249,7 +254,7 @@ export class FileContextTracker {
 	async retrievePendingFileContextWarning(): Promise<string[] | undefined> {
 		try {
 			const key = `pendingFileContextWarning_${this.taskId}`
-			const files = (await getWorkspaceState(this.context, key as any)) as string[]
+			const files = (await getWorkspaceState(this.context, key)) as string[]
 			return files
 		} catch (error) {
 			console.error("Error retrieving pending file context warning:", error)
@@ -264,7 +269,7 @@ export class FileContextTracker {
 		try {
 			const files = await this.retrievePendingFileContextWarning()
 			if (files) {
-				await updateWorkspaceState(this.context, `pendingFileContextWarning_${this.taskId}` as any, undefined)
+				await updateWorkspaceState(this.context, `pendingFileContextWarning_${this.taskId}`, undefined)
 				return files
 			}
 		} catch (error) {
@@ -295,7 +300,7 @@ export class FileContextTracker {
 
 			if (orphanedPendingContextTasks.length > 0) {
 				for (const key of orphanedPendingContextTasks) {
-					await updateWorkspaceState(context, key as any, undefined)
+					await updateWorkspaceState(context, key, undefined)
 				}
 			}
 

src/core/controller/account/accountLoginClicked.ts

@@ -1,9 +1,8 @@
+import * as vscode from "vscode"
+import crypto from "crypto"
 import { Controller } from "../index"
-import { AuthService } from "@/services/auth/AuthService"
+import { storeSecret } from "../../storage/state"
 import { EmptyRequest, String } from "../../../shared/proto/common"
-import { openExternal } from "@utils/env"
-
-const authService = AuthService.getInstance()
 
 /**
  * Handles the user clicking the login link in the UI.
@@ -14,5 +13,21 @@ const authService = AuthService.getInstance()
  * @returns The login URL as a string.
  */
 export async function accountLoginClicked(controller: Controller, _: EmptyRequest): Promise<String> {
-	return await authService.createAuthRequest()
+	// Generate nonce for state validation
+	const nonce = crypto.randomBytes(32).toString("hex")
+	await storeSecret(controller.context, "authNonce", nonce)
+
+	// Open browser for authentication with state param
+	console.log("Login button clicked in account page")
+	console.log("Opening auth page with state param")
+
+	const uriScheme = vscode.env.uriScheme
+
+	const authUrl = vscode.Uri.parse(
+		`https://app.cline.bot/auth?state=${encodeURIComponent(nonce)}&callback_url=${encodeURIComponent(`${uriScheme || "vscode"}://saoudrizwan.claude-dev/auth`)}`,
+	)
+	await vscode.env.openExternal(authUrl)
+	return String.create({
+		value: authUrl.toString(),
+	})
 }

src/core/controller/account/accountLogoutClicked.ts

@@ -1,9 +1,7 @@
-import { AuthService } from "@/services/auth/AuthService"
 import { Empty } from "../../../shared/proto/common"
 import type { EmptyRequest } from "../../../shared/proto/common"
 import type { Controller } from "../index"
 
-const authService = AuthService.getInstance()
 /**
  * Handles the account logout action
  * @param controller The controller instance
@@ -12,6 +10,5 @@ const authService = AuthService.getInstance()
  */
 export async function accountLogoutClicked(controller: Controller, _request: EmptyRequest): Promise<Empty> {
 	await controller.handleSignOut()
-	await authService.handleDeauth()
 	return Empty.create({})
 }

src/core/controller/account/authStateChanged.ts

@@ -1,4 +1,4 @@
-import { AuthStateChangedRequest, AuthState } from "@shared/proto/account"
+import { AuthStateChangedRequest, AuthStateChanged } from "@shared/proto/account"
 import type { Controller } from "../index"
 import { updateGlobalState } from "../../storage/state"
 
@@ -9,13 +9,13 @@ import { updateGlobalState } from "../../storage/state"
  * @param request The auth state change request
  * @returns The updated user info
  */
-export async function authStateChanged(controller: Controller, request: AuthStateChangedRequest): Promise<AuthState> {
+export async function authStateChanged(controller: Controller, request: AuthStateChangedRequest): Promise<AuthStateChanged> {
 	try {
 		// Store the user info directly in global state
 		await updateGlobalState(controller.context, "userInfo", request.user)
 
 		// Return the same user info
-		return AuthState.create({ user: request.user })
+		return AuthStateChanged.create({ user: request.user })
 	} catch (error) {
 		console.error(`Failed to update auth state: ${error}`)
 		throw error

src/core/controller/account/fetchUserCreditsData.ts

@@ -8,7 +8,7 @@ import { UserCreditsData } from "@shared/proto/account"
  * @param request Empty request
  * @returns User credits data response
  */
-export async function getUserCredits(controller: Controller, request: EmptyRequest): Promise<UserCreditsData> {
+export async function fetchUserCreditsData(controller: Controller, request: EmptyRequest): Promise<UserCreditsData> {
 	try {
 		if (!controller.accountService) {
 			throw new Error("Account service not available")
@@ -21,10 +21,11 @@ export async function getUserCredits(controller: Controller, request: EmptyReque
 			controller.accountService.fetchPaymentTransactionsRPC(),
 		])
 
+		// Since generated types match exactly, no conversion needed!
 		return UserCreditsData.create({
-			balance: balance ? { currentBalance: balance.balance / 100 } : { currentBalance: 0 },
-			usageTransactions: usageTransactions,
-			paymentTransactions: paymentTransactions,
+			balance: balance ? { currentBalance: balance.currentBalance } : { currentBalance: 0 },
+			usageTransactions: usageTransactions || [],
+			paymentTransactions: paymentTransactions || [],
 		})
 	} catch (error) {
 		console.error(`Failed to fetch user credits data: ${error}`)

src/core/controller/account/getOrganizationCredits.ts

@@ -1,50 +0,0 @@
-import type { Controller } from "../index"
-import { GetOrganizationCreditsRequest, OrganizationCreditsData, OrganizationUsageTransaction } from "@shared/proto/account"
-
-/**
- * Handles fetching all organization credits data (balance, usage, payments)
- * @param controller The controller instance
- * @param request Organization credits request
- * @returns Organization credits data response
- */
-export async function getOrganizationCredits(
-	controller: Controller,
-	request: GetOrganizationCreditsRequest,
-): Promise<OrganizationCreditsData> {
-	try {
-		if (!controller.accountService) {
-			throw new Error("Account service not available")
-		}
-
-		// Call the individual RPC variants in parallel
-		const [balanceData, usageTransactions] = await Promise.all([
-			controller.accountService.fetchOrganizationCreditsRPC(request.organizationId),
-			controller.accountService.fetchOrganizationUsageTransactionsRPC(request.organizationId),
-		])
-
-		return OrganizationCreditsData.create({
-			balance: balanceData ? { currentBalance: balanceData.balance / 100 } : { currentBalance: 0 },
-			organizationId: balanceData?.organizationId || "",
-			usageTransactions:
-				usageTransactions?.map((tx) =>
-					OrganizationUsageTransaction.create({
-						aiInferenceProviderName: tx.aiInferenceProviderName,
-						aiModelName: tx.aiModelName,
-						aiModelTypeName: tx.aiModelTypeName,
-						completionTokens: tx.completionTokens,
-						costUsd: tx.costUsd,
-						createdAt: tx.createdAt,
-						creditsUsed: tx.creditsUsed,
-						generationId: tx.generationId,
-						organizationId: tx.organizationId,
-						promptTokens: tx.promptTokens,
-						totalTokens: tx.totalTokens,
-						userId: tx.userId,
-					}),
-				) || [],
-		})
-	} catch (error) {
-		console.error(`Failed to fetch organization credits data: ${error}`)
-		throw error
-	}
-}

src/core/controller/account/getUserOrganizations.ts

@@ -1,35 +0,0 @@
-import type { Controller } from "../index"
-import type { EmptyRequest } from "@shared/proto/common"
-import { UserOrganization, UserOrganizationsResponse } from "@shared/proto/account"
-
-/**
- * Handles fetching all user credits data (balance, usage, payments)
- * @param controller The controller instance
- * @param request Empty request
- * @returns User credits data response
- */
-export async function getUserOrganizations(controller: Controller, request: EmptyRequest): Promise<UserOrganizationsResponse> {
-	try {
-		if (!controller.accountService) {
-			throw new Error("Account service not available")
-		}
-
-		// Fetch user organizations from the account service
-		const organizations = await controller.accountService.fetchUserOrganizationsRPC()
-
-		return UserOrganizationsResponse.create({
-			organizations:
-				organizations?.map((org) =>
-					UserOrganization.create({
-						active: org.active,
-						memberId: org.memberId,
-						name: org.name,
-						organizationId: org.organizationId,
-						roles: org.roles ? [...org.roles] : [],
-					}),
-				) || [],
-		})
-	} catch (error) {
-		throw error
-	}
-}

src/core/controller/account/setUserOrganization.ts

@@ -1,24 +0,0 @@
-import type { Controller } from "../index"
-import { Empty } from "@shared/proto/common"
-import { UserOrganizationUpdateRequest } from "@shared/proto/account"
-
-/**
- * Handles setting the user's active organization
- * @param controller The controller instance
- * @param request UserOrganization to set as active
- * @returns Empty response
- */
-export async function setUserOrganization(controller: Controller, request: UserOrganizationUpdateRequest): Promise<Empty> {
-	try {
-		if (!controller.accountService) {
-			throw new Error("Account service not available")
-		}
-
-		// Switch to the specified organization using the account service
-		await controller.accountService.switchAccount(request.organizationId)
-
-		return Empty.create({})
-	} catch (error) {
-		throw error
-	}
-}

src/core/controller/account/subscribeToAuthCallback.ts

@@ -0,0 +1,59 @@
+import { Controller } from "../index"
+import { EmptyRequest } from "../../../shared/proto/common"
+import { String as ProtoString } from "../../../shared/proto/common"
+import { StreamingResponseHandler, getRequestRegistry } from "../grpc-handler"
+
+// Keep track of active authCallback subscriptions
+const activeAuthCallbackSubscriptions = new Set<StreamingResponseHandler>()
+
+/**
+ * Subscribe to authCallback events
+ * @param controller The controller instance
+ * @param request The empty request
+ * @param responseStream The streaming response handler
+ * @param requestId The ID of the request (passed by the gRPC handler)
+ */
+export async function subscribeToAuthCallback(
+	controller: Controller,
+	request: EmptyRequest,
+	responseStream: StreamingResponseHandler,
+	requestId?: string,
+): Promise<void> {
+	// Add this subscription to the active subscriptions
+	activeAuthCallbackSubscriptions.add(responseStream)
+
+	// Register cleanup when the connection is closed
+	const cleanup = () => {
+		activeAuthCallbackSubscriptions.delete(responseStream)
+	}
+
+	// Register the cleanup function with the request registry if we have a requestId
+	if (requestId) {
+		getRequestRegistry().registerRequest(requestId, cleanup, { type: "authCallback_subscription" }, responseStream)
+	}
+}
+
+/**
+ * Send an authCallback event to all active subscribers
+ * @param customToken The custom token for authentication
+ */
+export async function sendAuthCallbackEvent(customToken: string): Promise<void> {
+	// Send the event to all active subscribers
+	const promises = Array.from(activeAuthCallbackSubscriptions).map(async (responseStream) => {
+		try {
+			const event: ProtoString = {
+				value: customToken,
+			}
+			await responseStream(
+				event,
+				false, // Not the last message
+			)
+		} catch (error) {
+			console.error("Error sending authCallback event:", error)
+			// Remove the subscription if there was an error
+			activeAuthCallbackSubscriptions.delete(responseStream)
+		}
+	})
+
+	await Promise.all(promises)
+}

src/core/controller/account/subscribeToAuthStatusUpdate.ts

@@ -1,5 +0,0 @@
-import { AuthService } from "../../../services/auth/AuthService"
-
-const authService = AuthService.getInstance()
-export const subscribeToAuthStatusUpdate = authService.subscribeToAuthStatusUpdate.bind(authService)
-export const sendAuthStatusUpdateEvent = authService.sendAuthStatusUpdate.bind(authService)

src/core/controller/file/copyToClipboard.ts

@@ -1,7 +1,6 @@
 import * as vscode from "vscode"
 import { Controller } from ".."
 import { Empty, StringRequest } from "../../../shared/proto/common"
-import { writeTextToClipboard } from "@/utils/env"
 
 /**
  * Copies text to the system clipboard
@@ -12,7 +11,7 @@ import { writeTextToClipboard } from "@/utils/env"
 export async function copyToClipboard(controller: Controller, request: StringRequest): Promise<Empty> {
 	try {
 		if (request.value) {
-			await writeTextToClipboard(request.value)
+			await vscode.env.clipboard.writeText(request.value)
 		}
 	} catch (error) {
 		console.error("Error copying to clipboard:", error)

src/core/controller/file/createRuleFile.ts

@@ -6,8 +6,8 @@ import { createRuleFile as createRuleFileImpl } from "@core/context/instructions
 import * as vscode from "vscode"
 import * as path from "path"
 import { handleFileServiceRequest } from "./index"
+import { cwd } from "@core/task"
 import { refreshWorkflowToggles } from "@/core/context/instructions/user-instructions/workflows"
-import { getCwd, getDesktopDir } from "@/utils/path"
 
 /**
  * Creates a rule file in either global or workspace rules directory
@@ -32,7 +32,6 @@ export const createRuleFile: FileMethodHandler = async (controller: Controller,
 		throw new Error("Missing or invalid parameters")
 	}
 
-	const cwd = await getCwd(getDesktopDir())
 	const { filePath, fileExists } = await createRuleFileImpl(request.isGlobal, request.filename, cwd, request.type)
 
 	if (!filePath) {

src/core/controller/file/deleteRuleFile.ts

@@ -1,9 +1,13 @@
-import { deleteRuleFile as deleteRuleFileImpl } from "@core/context/instructions/user-instructions/rule-helpers"
-import { RuleFile, RuleFileRequest } from "@shared/proto/file"
-import * as path from "path"
-import * as vscode from "vscode"
 import { Controller } from ".."
+import { RuleFileRequest, RuleFile } from "@shared/proto/file"
 import { FileMethodHandler } from "./index"
+import { refreshClineRulesToggles } from "@core/context/instructions/user-instructions/cline-rules"
+import { deleteRuleFile as deleteRuleFileImpl } from "@core/context/instructions/user-instructions/rule-helpers"
+import { refreshExternalRulesToggles } from "@core/context/instructions/user-instructions/external-rules"
+import { refreshWorkflowToggles } from "@core/context/instructions/user-instructions/workflows"
+import * as vscode from "vscode"
+import * as path from "path"
+import { cwd } from "@core/task"
 
 /**
  * Deletes a rule file from either global or workspace rules directory

src/core/controller/file/getRelativePaths.ts

@@ -1,10 +1,10 @@
-import { asRelativePath } from "@/utils/path"
-import { RelativePaths, RelativePathsRequest } from "@shared/proto/file"
-import * as path from "path"
-import { URI } from "vscode-uri"
 import { Controller } from ".."
+import { RelativePathsRequest, RelativePaths } from "@shared/proto/file"
 import { FileMethodHandler } from "./index"
-import { isDirectory } from "@/utils/fs"
+import * as vscode from "vscode"
+import * as path from "path"
+import { Metadata, StringRequest } from "@shared/proto/common"
+import { getHostBridgeProvider } from "@hosts/host-providers"
 
 /**
  * Converts a list of URIs to workspace-relative paths
@@ -13,32 +13,48 @@ import { isDirectory } from "@/utils/fs"
  * @returns Response with resolved relative paths
  */
 export const getRelativePaths: FileMethodHandler = async (
-	_controller: Controller,
+	controller: Controller,
 	request: RelativePathsRequest,
 ): Promise<RelativePaths> => {
-	const result = []
-	for (const uriString of request.uris) {
-		try {
-			result.push(await getRelativePath(uriString))
-		} catch (error) {
-			console.error(`Error calculating relative path for ${uriString}:`, error)
-		}
-	}
-	return RelativePaths.create({ paths: result })
-}
+	const resolvedPaths = await Promise.all(
+		request.uris.map(async (uriString) => {
+			try {
+				// Use the host URI service client instead of directly using vscode.Uri.parse
+				const parseResponse = await getHostBridgeProvider().uriServiceClient.parse(
+					StringRequest.create({
+						metadata: Metadata.create({}),
+						value: uriString,
+					}),
+				)
+				const fileUri = vscode.Uri.parse(`${parseResponse.scheme}://${parseResponse.authority}${parseResponse.path}`)
+				console.log("[DEBUG] UriServiceClient.parse:", fileUri)
+				const relativePathToGet = vscode.workspace.asRelativePath(fileUri, false)
 
-async function getRelativePath(uriString: string): Promise<string> {
-	const filePath = URI.parse(uriString, true).fsPath
-	const relativePath = await asRelativePath(filePath)
+				// If the path is still absolute, it's outside the workspace
+				if (path.isAbsolute(relativePathToGet)) {
+					console.warn(`Dropped file ${relativePathToGet} is outside the workspace. Sending original path.`)
+					return fileUri.fsPath.replace(/\\/g, "/")
+				} else {
+					let finalPath = "/" + relativePathToGet.replace(/\\/g, "/")
+					try {
+						const stat = await vscode.workspace.fs.stat(fileUri)
+						if (stat.type === vscode.FileType.Directory) {
+							finalPath += "/"
+						}
+					} catch (statError) {
+						console.error(`Error stating file ${fileUri.fsPath}:`, statError)
+					}
+					return finalPath
+				}
+			} catch (error) {
+				console.error(`Error calculating relative path for ${uriString}:`, error)
+				return null
+			}
+		}),
+	)
 
-	// If the path is still absolute, it's outside the workspace
-	if (path.isAbsolute(relativePath)) {
-		throw new Error(`Dropped file ${relativePath} is outside the workspace.`)
-	}
+	// Filter out any null values from errors
+	const validPaths = resolvedPaths.filter((path): path is string => path !== null)
 
-	let result = "/" + relativePath.replace(/\\/g, "/")
-	if (await isDirectory(filePath)) {
-		result += "/"
-	}
-	return result
+	return RelativePaths.create({ paths: validPaths })
 }

src/core/controller/file/openMention.ts

@@ -8,7 +8,7 @@ import { openMention as coreOpenMention } from "../../mentions"
  * @param request The string request containing the mention text
  * @returns Empty response
  */
-export async function openMention(_controller: Controller, request: StringRequest): Promise<Empty> {
+export async function openMention(controller: Controller, request: StringRequest): Promise<Empty> {
 	coreOpenMention(request.value)
 	return Empty.create()
 }

src/core/controller/file/refreshRules.ts

@@ -4,7 +4,7 @@ import type { Controller } from "../index"
 import { refreshClineRulesToggles } from "@core/context/instructions/user-instructions/cline-rules"
 import { refreshExternalRulesToggles } from "@core/context/instructions/user-instructions/external-rules"
 import { refreshWorkflowToggles } from "@core/context/instructions/user-instructions/workflows"
-import { getCwd, getDesktopDir } from "@/utils/path"
+import { cwd } from "@core/task"
 
 /**
  * Refreshes all rule toggles (Cline, External, and Workflows)
@@ -14,7 +14,6 @@ import { getCwd, getDesktopDir } from "@/utils/path"
  */
 export async function refreshRules(controller: Controller, _request: EmptyRequest): Promise<RefreshedRules> {
 	try {
-		const cwd = await getCwd(getDesktopDir())
 		const { globalToggles, localToggles } = await refreshClineRulesToggles(controller.context, cwd)
 		const { cursorLocalToggles, windsurfLocalToggles } = await refreshExternalRulesToggles(controller.context, cwd)
 		const { localWorkflowToggles, globalWorkflowToggles } = await refreshWorkflowToggles(controller.context, cwd)

src/core/controller/file/searchCommits.ts

@@ -13,7 +13,7 @@ import { convertGitCommitsToProtoGitCommits } from "@shared/proto-conversions/fi
  * @returns GitCommits containing the matching commits
  */
 export const searchCommits: FileMethodHandler = async (controller: Controller, request: StringRequest): Promise<GitCommits> => {
-	const cwd = await getWorkspacePath()
+	const cwd = getWorkspacePath()
 	if (!cwd) {
 		return GitCommits.create({ commits: [] })
 	}