better styling for the new task tool

.changeset/beige-cars-drive.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Removed symlink handling in isLocatedInWorkspace()

.changeset/bright-apples-protect.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Detect Ctrl+C termination of terminal activity on long running commands

.changeset/cyan-tigers-camp.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-new slash command menu, slash command to trigger new_task

.changeset/eight-ears-flash.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add a delete button to the Cline Rules modal to delete rule files

.changeset/fast-readers-care.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Added chunking to terminal outputs

.changeset/fresh-cups-tap.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add a row to the Cline Rules modal to create a new rule file

.changeset/friendly-worms-cross.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix flicker on external files icon

.changeset/green-impalas-sit.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add aliasing to imports in the extension

.changeset/hot-pens-own.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add support for Azure's DeepSeek model.

.changeset/late-mice-double.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-gRPC over vscode message bus to make messaging better

.changeset/modern-seas-relax.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Refactor the function constructNewFileContent using a state switching mechanism, and fix the issue of inaccurate SEARCH-REPLACE delimiters generated by some large models through lookahead processing

.changeset/nasty-gifts-look.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Allow user to modify a previous message to continue chat

.changeset/nasty-months-wave.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add command to focus chat input

.changeset/pretty-eels-breathe.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-fix vertexai token count

.changeset/rare-starfishes-design.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Allow user to send context with an option selection

.changeset/rich-bees-talk.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Support baseURL for Google Gemini provider

.changeset/rich-pens-buy.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Safer check for xAI reasoning content

.changeset/six-birds-move.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add an edit button to the Cline Rules toggle modal to open rule files

.changeset/slimy-jeans-dance.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-MCP ImageContent as tool result

.changeset/ten-bananas-begin.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Readme update

.changeset/twelve-eyes-teach.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Add OpenAI o3 & 4o-mini

.changeset/twelve-meals-applaud.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add modal UI for toggling Cline Rules

.changeset/warm-pets-worry.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+add coverage tests to github workflows

.clinerules

@@ -11,12 +11,10 @@ graph TB
     subgraph VSCode Extension Host
         subgraph Core Extension
             ExtensionEntry[Extension Entry<br/>src/extension.ts]
-            WebviewProvider[WebviewProvider<br/>src/core/webview/index.ts]
-            Controller[Controller<br/>src/core/controller/index.ts]
-            Task[Task<br/>src/core/task/index.ts]
+            ClineProvider[ClineProvider<br/>src/core/webview/ClineProvider.ts]
+            ClineClass[Cline Class<br/>src/core/Cline.ts]
             GlobalState[VSCode Global State]
             SecretsStorage[VSCode Secrets Storage]
-            McpHub[McpHub<br/>src/services/mcp/McpHub.ts]
         end
 
         subgraph Webview UI
@@ -29,101 +27,45 @@ graph TB
             TaskStorage[Task Storage<br/>Per-Task Files & History]
             CheckpointSystem[Git-based Checkpoints]
         end
-
-        subgraph API Providers
-            AnthropicAPI[Anthropic]
-            OpenRouterAPI[OpenRouter]
-            BedrockAPI[AWS Bedrock]
-            OtherAPIs[Other Providers]
-        end
-
-        subgraph MCP Servers
-            ExternalMcpServers[External MCP Servers]
-        end
     end
 
     %% Core Extension Data Flow
-    ExtensionEntry --> WebviewProvider
-    WebviewProvider --> Controller
-    Controller --> Task
-    Controller --> McpHub
-    Task --> GlobalState
-    Task --> SecretsStorage
-    Task --> TaskStorage
-    Task --> CheckpointSystem
-    Task --> |API Requests| API Providers
-    McpHub --> |Connects to| ExternalMcpServers
-    Task --> |Uses| McpHub
+    ExtensionEntry --> ClineProvider
+    ClineProvider --> ClineClass
+    ClineClass --> GlobalState
+    ClineClass --> SecretsStorage
+    ClineClass --> TaskStorage
+    ClineClass --> CheckpointSystem
 
     %% Webview Data Flow
     WebviewApp --> ExtStateContext
     ExtStateContext --> ReactComponents
 
     %% Bidirectional Communication
-    WebviewProvider <-->|postMessage| ExtStateContext
+    ClineProvider <-->|postMessage| ExtStateContext
 
     style GlobalState fill:#f9f,stroke:#333,stroke-width:2px
     style SecretsStorage fill:#f9f,stroke:#333,stroke-width:2px
     style ExtStateContext fill:#bbf,stroke:#333,stroke-width:2px
-    style WebviewProvider fill:#bfb,stroke:#333,stroke-width:2px
-    style McpHub fill:#bfb,stroke:#333,stroke-width:2px
-    style API Providers fill:#fdb,stroke:#333,stroke-width:2px
+    style ClineProvider fill:#bfb,stroke:#333,stroke-width:2px
 ```
 
 ## Definitions 
 
-- **Core Extension**: Anything inside the src folder, organized into modular components
-- **Core Extension State**: Managed by the Controller class in src/core/controller/index.ts, which serves as the single source of truth for the extension's state. It manages multiple types of persistent storage (global state, workspace state, and secrets), handles state distribution to both the core extension and webview components, and coordinates state across multiple extension instances. This includes managing API configurations, task history, settings, and MCP configurations.
-- **Webview**: Anything inside the webview-ui. All the react or view's seen by the user and user interaction components
-- **Webview State**: Managed by ExtensionStateContext in webview-ui/src/context/ExtensionStateContext.tsx, which provides React components with access to the extension's state through a context provider pattern. It maintains local state for UI components, handles real-time updates through message events, manages partial message updates, and provides methods for state modifications. The context includes extension version, messages, task history, theme, API configurations, MCP servers, marketplace catalog, and workspace file paths. It synchronizes with the core extension through VSCode's message passing system and provides type-safe access to state through a custom hook (useExtensionState).
-
-### Core Extension Architecture
-
-The core extension follows a clear hierarchical structure:
-
-1. **WebviewProvider** (src/core/webview/index.ts): Manages the webview lifecycle and communication
-2. **Controller** (src/core/controller/index.ts): Handles webview messages and task management
-3. **Task** (src/core/task/index.ts): Executes API requests and tool operations
-
-This architecture provides clear separation of concerns:
-- WebviewProvider focuses on VSCode webview integration
-- Controller manages state and coordinates tasks
-- Task handles the execution of AI requests and tool operations
-
-### WebviewProvider Implementation
-
-The WebviewProvider class in `src/core/webview/index.ts` is responsible for:
-
-- Managing multiple active instances through a static set (`activeInstances`)
-- Handling webview lifecycle events (creation, visibility changes, disposal)
-- Implementing HTML content generation with proper CSP headers
-- Supporting Hot Module Replacement (HMR) for development
-- Setting up message listeners between the webview and extension
-
-The WebviewProvider maintains a reference to the Controller and delegates message handling to it. It also handles the creation of both sidebar and tab panel webviews, allowing Cline to be used in different contexts within VSCode.
+- core extension: Anything inside the src folder starting with the Cline.ts file
+- core extension state: Managed by the ClineProvider class in src/core/webview/ClineProvider.ts, which serves as the single source of truth for the extension's state. It manages multiple types of persistent storage (global state, workspace state, and secrets), handles state distribution to both the core extension and webview components, and coordinates state across multiple extension instances. This includes managing API configurations, task history, settings, and MCP configurations.
+- webview: Anything inside the webview-ui. All the react or view's seen by the user and user interaction compone
+- webview state: Managed by ExtensionStateContext in webview-ui/src/context/ExtensionStateContext.tsx, which provides React components with access to the extension's state through a context provider pattern. It maintains local state for UI components, handles real-time updates through message events, manages partial message updates, and provides methods for state modifications. The context includes extension version, messages, task history, theme, API configurations, MCP servers, marketplace catalog, and workspace file paths. It synchronizes with the core extension through VSCode's message passing system and provides type-safe access to state through a custom hook (useExtensionState).
 
 ### Core Extension State
 
-The `Controller` class manages multiple types of persistent storage:
+The `ClineProvider` class manages multiple types of persistent storage:
 
 - **Global State:** Stored across all VSCode instances. Used for settings and data that should persist globally.
 - **Workspace State:** Specific to the current workspace. Used for task-specific data and settings.
 - **Secrets:** Secure storage for sensitive information like API keys.
 
-The `Controller` handles the distribution of state to both the core extension and webview components. It also coordinates state across multiple extension instances, ensuring consistency.
-
-State synchronization between instances is handled through:
-- File-based storage for task history and conversation data
-- VSCode's global state API for settings and configuration
-- Secrets storage for sensitive information
-- Event listeners for file changes and configuration updates
-
-The Controller implements methods for:
-- Saving and loading task state
-- Managing API configurations
-- Handling user authentication
-- Coordinating MCP server connections
-- Managing task history and checkpoints
+The `ClineProvider` handles the distribution of state to both the core extension and webview components. It also coordinates state across multiple extension instances, ensuring consistency.
 
 ### Webview State
 
@@ -140,65 +82,16 @@ The `ExtensionStateContext` in `webview-ui/src/context/ExtensionStateContext.tsx
 
 It synchronizes with the core extension through VSCode's message passing system and provides type-safe access to the state via a custom hook (`useExtensionState`).
 
-The ExtensionStateContext handles:
-- Real-time updates through message events
-- Partial message updates for streaming content
-- State modifications through setter methods
-- Type-safe access to state through a custom hook
+## Core Extension (Cline.ts)
 
-## API Provider System
-
-Cline supports multiple AI providers through a modular API provider system. Each provider is implemented as a separate module in the `src/api/providers/` directory and follows a common interface.
-
-### API Provider Architecture
-
-The API system consists of:
-
-1. **API Handlers**: Provider-specific implementations in `src/api/providers/`
-2. **API Transformers**: Stream transformation utilities in `src/api/transform/`
-3. **API Configuration**: User settings for API keys and endpoints
-4. **API Factory**: Builder function to create the appropriate handler
-
-Key providers include:
-- **Anthropic**: Direct integration with Claude models
-- **OpenRouter**: Meta-provider supporting multiple model providers
-- **AWS Bedrock**: Integration with Amazon's AI services
-- **Gemini**: Google's AI models
-- **Ollama**: Local model hosting
-- **LM Studio**: Local model hosting
-- **VSCode LM**: VSCode's built-in language models
-
-### API Configuration Management
-
-API configurations are stored securely:
-- API keys are stored in VSCode's secrets storage
-- Model selections and non-sensitive settings are stored in global state
-- The Controller manages switching between providers and updating configurations
-
-The system supports:
-- Secure storage of API keys
-- Model selection and configuration
-- Automatic retry and error handling
-- Token usage tracking and cost calculation
-- Context window management
-
-### Plan/Act Mode API Configuration
-
-Cline supports separate model configurations for Plan and Act modes:
-- Different models can be used for planning vs. execution
-- The system preserves model selections when switching modes
-- The Controller handles the transition between modes and updates the API configuration accordingly
-
-## Task Execution System
-
-The Task class is responsible for executing AI requests and tool operations. Each task runs in its own instance of the Task class, ensuring isolation and proper state management.
+The Cline class is the heart of the extension, managing task execution, state persistence, and tool coordination. Each task runs in its own instance of the Cline class, ensuring isolation and proper state management.
 
 ### Task Execution Loop
 
 The core task execution loop follows this pattern:
 
 ```typescript
-class Task {
+class Cline {
   async initiateTaskLoop(userContent: UserContent, isNewTask: boolean) {
     while (!this.abort) {
       // 1. Make API request and stream response
@@ -233,7 +126,7 @@ class Task {
 The streaming system handles real-time updates and partial content:
 
 ```typescript
-class Task {
+class Cline {
   async presentAssistantMessage() {
     // Handle streaming locks to prevent race conditions
     if (this.presentAssistantMessageLocked) {
@@ -268,7 +161,7 @@ class Task {
 Tools follow a strict execution pattern:
 
 ```typescript
-class Task {
+class Cline {
   async executeToolWithApproval(block: ToolBlock) {
     // 1. Check auto-approval settings
     if (this.shouldAutoApproveTool(block.name)) {
@@ -300,7 +193,7 @@ class Task {
 The system includes robust error handling:
 
 ```typescript
-class Task {
+class Cline {
   async handleError(action: string, error: Error) {
     // 1. Check if task was abandoned
     if (this.abandoned) return
@@ -323,23 +216,23 @@ class Task {
 
 ### API Request & Token Management
 
-The Task class handles API requests with built-in retry, streaming, and token management:
+The Cline class handles API requests with built-in retry, streaming, and token management:
 
 ```typescript
-class Task {
+class Cline {
   async *attemptApiRequest(previousApiReqIndex: number): ApiStream {
     // 1. Wait for MCP servers to connect
-    await pWaitFor(() => this.controllerRef.deref()?.mcpHub?.isConnecting !== true)
+    await pWaitFor(() => this.providerRef.deref()?.mcpHub?.isConnecting !== true)
 
     // 2. Manage context window
     const previousRequest = this.clineMessages[previousApiReqIndex]
     if (previousRequest?.text) {
-      const { tokensIn, tokensOut } = JSON.parse(previousRequest.text || "{}")
+      const { tokensIn, tokensOut } = JSON.parse(previousRequest.text)
       const totalTokens = (tokensIn || 0) + (tokensOut || 0)
       
       // Truncate conversation if approaching context limit
       if (totalTokens >= maxAllowedSize) {
-        this.conversationHistoryDeletedRange = this.contextManager.getNextTruncationRange(
+        this.conversationHistoryDeletedRange = getNextTruncationRange(
           this.apiConversationHistory,
           this.conversationHistoryDeletedRange,
           totalTokens / 2 > maxAllowedSize ? "quarter" : "half"
@@ -406,32 +299,16 @@ Key features:
    - Cost calculation
    - Cache hit monitoring
 
-### Context Management System
-
-The Context Management System handles conversation history truncation to prevent context window overflow errors. Implemented in the `ContextManager` class, it ensures long-running conversations remain within model context limits while preserving critical context.
-
-Key features:
-
-1. **Model-Aware Sizing**: Dynamically adjusts based on different model context windows (64K for DeepSeek, 128K for most models, 200K for Claude).
-
-2. **Proactive Truncation**: Monitors token usage and preemptively truncates conversations when approaching limits, maintaining buffers of 27K-40K tokens depending on the model.
-
-3. **Intelligent Preservation**: Always preserves the original task message and maintains the user-assistant conversation structure when truncating.
-
-4. **Adaptive Strategies**: Uses different truncation strategies based on context pressure - removing half of the conversation for moderate pressure or three-quarters for severe pressure.
-
-5. **Error Recovery**: Includes specialized detection for context window errors from different providers with automatic retry and more aggressive truncation when needed.
-
 ### Task State & Resumption
 
-The Task class provides robust task state management and resumption capabilities:
+The Cline class provides robust task state management and resumption capabilities:
 
 ```typescript
-class Task {
+class Cline {
   async resumeTaskFromHistory() {
     // 1. Load saved state
-    this.clineMessages = await getSavedClineMessages(this.getContext(), this.taskId)
-    this.apiConversationHistory = await getSavedApiConversationHistory(this.getContext(), this.taskId)
+    this.clineMessages = await this.getSavedClineMessages()
+    this.apiConversationHistory = await this.getSavedApiConversationHistory()
 
     // 2. Handle interrupted tool executions
     const lastMessage = this.apiConversationHistory[this.apiConversationHistory.length - 1]
@@ -461,14 +338,14 @@ class Task {
 
   private async saveTaskState() {
     // Save conversation history
-    await saveApiConversationHistory(this.getContext(), this.taskId, this.apiConversationHistory)
-    await saveClineMessages(this.getContext(), this.taskId, this.clineMessages)
+    await this.saveApiConversationHistory()
+    await this.saveClineMessages()
     
     // Create checkpoint
     const commitHash = await this.checkpointTracker?.commit()
     
     // Update task history
-    await this.controllerRef.deref()?.updateTaskHistory({
+    await this.providerRef.deref()?.updateTaskHistory({
       id: this.taskId,
       ts: lastMessage.ts,
       task: taskMessage.text,
@@ -504,54 +381,11 @@ Key aspects of task state management:
    - Resources are cleaned up properly
    - User is notified of state changes
 
-## Plan/Act Mode System
-
-Cline implements a dual-mode system that separates planning from execution:
-
-### Mode Architecture
-
-The Plan/Act mode system consists of:
-
-1. **Mode State**: Stored in `chatSettings.mode` in the Controller's state
-2. **Mode Switching**: Handled by `togglePlanActModeWithChatSettings` in the Controller
-3. **Mode-specific Models**: Optional configuration to use different models for each mode
-4. **Mode-specific Prompting**: Different system prompts for planning vs. execution
-
-### Mode Switching Process
-
-When switching between modes:
-
-1. The current model configuration is saved to mode-specific state
-2. The previous mode's model configuration is restored
-3. The Task instance is updated with the new mode
-4. The webview is notified of the mode change
-5. Telemetry events are captured for analytics
-
-### Plan Mode
-
-Plan mode is designed for:
-- Information gathering and context building
-- Asking clarifying questions
-- Creating detailed execution plans
-- Discussing approaches with the user
-
-In Plan mode, the AI uses the `plan_mode_respond` tool to engage in conversational planning without executing actions.
-
-### Act Mode
-
-Act mode is designed for:
-- Executing the planned actions
-- Using tools to modify files, run commands, etc.
-- Implementing the solution
-- Providing results and completion feedback
-
-In Act mode, the AI has access to all tools except `plan_mode_respond` and focuses on implementation rather than discussion.
-
 ## Data Flow & State Management
 
 ### Core Extension Role
 
-The Controller acts as the single source of truth for all persistent state. It:
+The core extension (ClineProvider) acts as the single source of truth for all persistent state. It:
 - Manages VSCode global state and secrets storage
 - Coordinates state updates between components
 - Ensures state consistency across webview reloads
@@ -560,10 +394,10 @@ The Controller acts as the single source of truth for all persistent state. It:
 
 ### Terminal Management
 
-The Task class manages terminal instances and command execution:
+The Cline class manages terminal instances and command execution:
 
 ```typescript
-class Task {
+class Cline {
   async executeCommandTool(command: string): Promise<[boolean, ToolResponse]> {
     // 1. Get or create terminal
     const terminalInfo = await this.terminalManager.getOrCreateTerminal(cwd)
@@ -619,10 +453,10 @@ Key features:
 
 ### Browser Session Management
 
-The Task class handles browser automation through Puppeteer:
+The Cline class handles browser automation through Puppeteer:
 
 ```typescript
-class Task {
+class Cline {
   async executeBrowserAction(action: BrowserAction): Promise<BrowserActionResult> {
     switch (action) {
       case "launch":
@@ -659,93 +493,13 @@ Key aspects:
    - Screenshot capture
    - Error recovery
 
-## MCP (Model Context Protocol) Integration
-
-### MCP Architecture
-
-The MCP system consists of:
-
-1. **McpHub Class**: Central manager in `src/services/mcp/McpHub.ts`
-2. **MCP Connections**: Manages connections to external MCP servers
-3. **MCP Settings**: Configuration stored in a JSON file
-4. **MCP Marketplace**: Online catalog of available MCP servers
-5. **MCP Tools & Resources**: Capabilities exposed by connected servers
-
-The McpHub class:
-- Manages the lifecycle of MCP server connections
-- Handles server configuration through a settings file
-- Provides methods for calling tools and accessing resources
-- Implements auto-approval settings for MCP tools
-- Monitors server health and handles reconnection
-
-### MCP Server Types
-
-Cline supports two types of MCP server connections:
-- **Stdio**: Command-line based servers that communicate via standard I/O
-- **SSE**: HTTP-based servers that communicate via Server-Sent Events
-
-### MCP Server Management
-
-The McpHub class provides methods for:
-- Discovering and connecting to MCP servers
-- Monitoring server health and status
-- Restarting servers when needed
-- Managing server configurations
-- Setting timeouts and auto-approval rules
-
-### MCP Tool Integration
-
-MCP tools are integrated into the Task execution system:
-- Tools are discovered and registered at connection time
-- The Task class can call MCP tools through the McpHub
-- Tool results are streamed back to the AI
-- Auto-approval settings can be configured per tool
-
-### MCP Marketplace
-
-The MCP Marketplace provides:
-- A catalog of available MCP servers
-- One-click installation
-- README previews
-- Server status monitoring
-
-The Controller class manages MCP servers through the McpHub service:
-
-```typescript
-class Controller {
-  mcpHub?: McpHub
-
-  constructor(context: vscode.ExtensionContext, outputChannel: vscode.OutputChannel, webviewProvider: WebviewProvider) {
-    this.mcpHub = new McpHub(this)
-  }
-
-  async downloadMcp(mcpId: string) {
-    // Fetch server details from marketplace
-    const response = await axios.post<McpDownloadResponse>(
-      "https://api.cline.bot/v1/mcp/download",
-      { mcpId },
-      {
-        headers: { "Content-Type": "application/json" },
-        timeout: 10000,
-      }
-    )
-
-    // Create task with context from README
-    const task = `Set up the MCP server from ${mcpDetails.githubUrl}...`
-
-    // Initialize task and show chat view
-    await this.initClineWithTask(task)
-  }
-}
-```
-
 ## Conclusion
 
 This guide provides a comprehensive overview of the Cline extension architecture, with special focus on state management, data persistence, and code organization. Following these patterns ensures robust feature implementation with proper state handling across the extension's components.
 
 Remember:
 - Always persist important state in the extension
-- The core extension follows a WebviewProvider -> Controller -> Task flow
+- The core extension exists in the src/ folder
 - Use proper typing for all state and messages
 - Handle errors and edge cases
 - Test state persistence across webview reloads

.codespellrc

@@ -1,6 +0,0 @@
-[codespell]
-# Ref: https://github.com/codespell-project/codespell#using-a-config-file
-skip = .git*,*.svg,package-lock.json,*.css,.codespellrc,locales
-check-hidden = true
-ignore-regex = (\b(optIn|isTaller)\b|https://\S+)
-# ignore-words-list =

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -31,14 +31,6 @@ body:
           label: Relevant API REQUEST output
           description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for backticks.
           render: shell
-    - type: input
-      id: provider-model
-      attributes:
-          label: Provider/Model
-          description: What provider and model were you using when the issue occurred?
-          placeholder: "e.g., cline:anthropic/claude-3.7-sonnet, gemini:gemini-2.5-pro-exp-03-25"
-      validations:
-          required: true
     - type: input
       id: operating-system
       attributes:

.github/pull_request_template.md

@@ -13,10 +13,7 @@
 -   [ ] 🐛 Bug fix (non-breaking change which fixes an issue)
 -   [ ] ✨ New feature (non-breaking change which adds functionality)
 -   [ ] 💥 Breaking change (fix or feature that would cause existing functionality to not work as expected)
--   [ ] ♻️ Refactor Changes
--   [ ] 💅 Cosmetic Changes
 -   [ ] 📚 Documentation update
--   [ ] 🏃 Workflow Changes
 
 ### Pre-flight Checklist
 

.github/workflows/changeset-converter.yml

@@ -2,7 +2,6 @@ name: Changeset Converter
 run-name: Changeset Conversion
 
 on:
-    workflow_dispatch:
     pull_request:
         types: [closed]
 
@@ -14,36 +13,16 @@ env:
 jobs:
     # Job 1: Create version bump PR when changesets are merged to main
     changeset-pr-version-bump:
-        if: |
-            github.event_name == 'workflow_dispatch' ||
-            (
-                github.event_name == 'pull_request' &&
-                github.event.pull_request.merged == true &&
-                github.event.pull_request.base.ref == 'main' &&
-                github.actor != 'github-actions'
-            )
+        if: >
+            github.event_name == 'pull_request' &&
+            github.event.pull_request.merged == true &&
+            github.event.pull_request.base.ref == 'main' &&
+            github.actor != 'github-actions'
         runs-on: ubuntu-latest
         permissions:
             contents: write
             pull-requests: write
         steps:
-            - name: Check user for team affiliation
-              id: team_check
-              if: github.event_name == 'workflow_dispatch'
-              uses: morfien101/actions-authorized-user@4a3cfbf0bcb3cafe4a71710a278920c5d94bb38b
-              with:
-                  username: ${{ github.actor }}
-                  team: "deployer"
-                  github_token: ${{ secrets.GITHUB_TOKEN }}
-
-            - name: Check if user is authorized
-              if: github.event_name == 'workflow_dispatch'
-              run: |
-                  if [ "${{ steps.team_check.outputs.authorized }}" != "true" ]; then
-                      echo "User is not authorized to run this workflow."
-                      exit 1
-                  fi
-
             - name: Git Checkout
               uses: actions/checkout@v4
               with:

.github/workflows/codespell.yml

@@ -1,25 +0,0 @@
-# Codespell configuration is within .codespellrc
----
-name: Codespell
-
-on:
-    push:
-        branches: [main]
-    pull_request:
-        branches: [main]
-
-permissions:
-    contents: read
-
-jobs:
-    codespell:
-        name: Check for spelling errors
-        runs-on: ubuntu-latest
-
-        steps:
-            - name: Checkout
-              uses: actions/checkout@v4
-            - name: Annotate locations with typos
-              uses: codespell-project/codespell-problem-matcher@v1
-            - name: Codespell
-              uses: codespell-project/actions-codespell@v2

.github/workflows/test.yml

@@ -73,10 +73,6 @@ jobs:
             - name: Build Extension
               run: npm run compile
 
-            # Disabling due to compatability with test framework and ESM modules
-            # - name: Unit Tests
-            #   run: npm run test:unit
-
             # Run extension tests with coverage
             - name: Extension Tests with Coverage
               id: extension_coverage

.mocharc.json

@@ -1,6 +0,0 @@
-{
-	"extension": ["ts"],
-	"spec": "src/**/__tests__/*.ts",
-	"require": ["ts-node/register", "source-map-support/register"],
-	"recursive": true
-}

.vscode/launch.json

@@ -16,19 +16,6 @@
 				"IS_DEV": "true",
 				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}"
 			}
-		},
-		{
-			"name": "Run Extension (Test Mode)",
-			"type": "extensionHost",
-			"request": "launch",
-			"args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
-			"preLaunchTask": "${defaultBuildTask}",
-			"env": {
-				"IS_DEV": "true",
-				"IS_TEST": "true",
-				"DEV_WORKSPACE_FOLDER": "${workspaceFolder}"
-			}
 		}
 	]
 }

.vscode/tasks.json

@@ -14,14 +14,6 @@
 				"isDefault": true
 			}
 		},
-		{
-			"label": "watch:test",
-			"dependsOn": ["npm: build:webview:test", "npm: dev:webview", "npm: watch:tsc", "npm: watch:esbuild:test"],
-			"presentation": {
-				"reveal": "never"
-			},
-			"group": "build"
-		},
 		{
 			"type": "npm",
 			"script": "build:webview",
@@ -40,25 +32,6 @@
 				}
 			}
 		},
-		{
-			"type": "npm",
-			"script": "build:webview:test",
-			"group": "build",
-			"problemMatcher": [],
-			"isBackground": true,
-			"label": "npm: build:webview:test",
-			"presentation": {
-				"group": "watch",
-				"reveal": "never",
-				"close": true
-			},
-			"options": {
-				"env": {
-					"IS_DEV": "true",
-					"IS_TEST": "true"
-				}
-			}
-		},
 		{
 			"type": "npm",
 			"script": "dev:webview",
@@ -104,30 +77,6 @@
 				"group": "watch",
 				"reveal": "never",
 				"close": true
-			},
-			"options": {
-				"env": {
-					"IS_DEV": "true"
-				}
-			}
-		},
-		{
-			"type": "npm",
-			"script": "watch:esbuild:test",
-			"group": "build",
-			"problemMatcher": "$esbuild-watch",
-			"isBackground": true,
-			"label": "npm: watch:esbuild:test",
-			"presentation": {
-				"group": "watch",
-				"reveal": "never",
-				"close": true
-			},
-			"options": {
-				"env": {
-					"IS_DEV": "true",
-					"IS_TEST": "true"
-				}
 			}
 		},
 		{

CHANGELOG.md

@@ -1,86 +1,5 @@
 # Changelog
 
-## [3.12.3]
-
--   Add copy button to MermaidBlock component (Thanks @cacosub7!)
--   Add the ability to fetch from global cline rules files
--   Add icon to indicate when a file outside of the users workspace is edited
-
-## [3.12.2]
-
--   Add gpt-4.1
-
-## [3.12.1]
-
--   Use visual checkpoint indicator to make it clear when checkpoints are created
--   Big shoutout to @samuel871211 for numerous code quality improvements, refactoring contributions, and webview performance improvements!
--   Use improved context manager
-
-## [3.12.0]
-
--   Add favorite toggles for models when using the Cline & OpenRouter providers
--   Add auto-approve options for edits/reads outside of the workspace
--   Improve diff editing animation for large files
--   Add indicator showing number of diff edits when Cline edits a file
--   Add streaming support and reasoning effort option to xAI's Grok 3 Mini
--   Add settings button to MCP popover to easily modify installed servers
--   Fix bug where browser tool actions would show unparsed results in the chat view
--   Fix issue with new checkpoints popover hiding too quickly
--   Fix duplicate checkpoints bug
--   Improve Ollama provider with retry mechanism, timeout handling, and improved error handling (thanks suvarchal!)
-
-## [3.11.0]
-
--   Redesign checkpoint UI to declutter chat view by using a subtle indicator line that expands to a popover on hover, with a new date indicator for when it was created
--   Add support for xAI's provider's Grok 3 models
--   Add more robust error tracking for users opted in to telemetry (thank you for helping us make Cline better!)
-
-## [3.10.1]
-
--   Add CMD+' keyboard shortcut to add selected text to Cline
--   Cline now auto focuses the text field when using 'Add to Cline' shortcut
--   Add new 'Create New Task' tool to let Cline start a new task autonomously!
--   Fix Mermaid diagram issues
--   Fix Gemini provider cost calculation to take new tiered pricing structure into account
-
-## [3.10.0]
-
--   Add setting to let browser tool use local Chrome via remote debugging, enabling session-based browsing. Replaces sessionless Chromium, unlocking debugging and productivity workflows tied to your real browser state.
--   Add new auto-approve option to approve _ALL_ commands (use at your own risk!)
--   Add modal in the chat area to more easily enable or disable MCP servers
--   Add drag and drop of file/folders into cline chat (Thanks eljapi!)
--   Add prompt caching for LiteLLM + Claude (Thanks sammcj!)
--   Add Improved context management
--   Fix MCP auto approve toggle issues being out of sync with settings
-
-## [3.9.2]
-
--   Add recommended models for Cline provider
--   Add ability to detect when user edits files manually so Cline knows to re-read, leading to reduced diff edit errors
--   Add improvements to file mention searching for faster searching
--   Add scoring logic to file mentions to sort and exclude results based on relevance
--   Add Support for Bytedance Doubao (Thanks Tunixer!)
--   Fix to prevent duplicate BOM (Thanks bamps53!)
-
-## [3.9.1]
-
--   Add Gemini 2.5 Pro Preview 03-25 to Google Provider
-
-## [3.9.0]
-
--   Add Enable extended thinking for LiteLLM provider (Thanks @jorgegarciarey!)
--   Add a tab for configuring local MCP Servers
--   Fix issue with DeepSeek API provider token counting + context management
--   Fix issues with checkpoints hanging under certain conditions
-
-## [3.8.6]
-
--   Add UI for adding remote servers
--   Add Mentions Feature Guide and update related documentation
--   Fix bug where menu would open in sidebar and open tab
--   Fix issue with Cline accounts not showing user info in popout tabs
--   Fix bug where menu buttons wouldn't open view in sidebar
-
 ## [3.8.5]
 
 -   Add support for remote MCP Servers using SSE
@@ -303,8 +222,8 @@
 ## [3.1.0]
 
 -   Added checkpoints: Snapshots of workspace are automatically created whenever Cline uses a tool
--   Compare changes: Hover over any tool use to see a diff between the snapshot and current workspace state
--   Restore options: Choose to restore just the task state, just the workspace files, or both
+    -   Compare changes: Hover over any tool use to see a diff between the snapshot and current workspace state
+    -   Restore options: Choose to restore just the task state, just the workspace files, or both
 -   New 'See new changes' button appears after task completion, providing an overview of all workspace changes
 -   Task header now shows disk space usage with a delete button to help manage snapshot storage
 
@@ -486,10 +405,10 @@
 ## [1.8.0]
 
 -   You can now use '@' in the textarea to add context!
--   @url: Paste in a URL for the extension to fetch and convert to markdown, useful when you want to give Claude the latest docs!
--   @problems: Add workspace errors and warnings for Claude to fix, no more back-and-forth about debugging
--   @file: Adds a file's contents so you don't have to waste API requests approving read file (+ type to search files)
--   @folder: Adds folder's files all at once to speed up your workflow even more
+    -   @url: Paste in a URL for the extension to fetch and convert to markdown, useful when you want to give Claude the latest docs!
+    -   @problems: Add workspace errors and warnings for Claude to fix, no more back-and-forth about debugging
+    -   @file: Adds a file's contents so you don't have to waste API requests approving read file (+ type to search files)
+    -   @folder: Adds folder's files all at once to speed up your workflow even more
 
 ## [1.7.0]
 
@@ -536,7 +455,7 @@
 -   Adds "Always allow read-only operations" setting to let Claude read files and view directories without needing approval (off by default)
 -   Implement sliding window context management to keep tasks going past 200k tokens
 -   Adds Google Cloud Vertex AI support and updates Claude 3.5 Sonnet max output to 8192 tokens for all providers.
--   Improves system prompt to guard against lazy edits (less "//rest of code here")
+-   Improves system prompt to gaurd against lazy edits (less "//rest of code here")
 
 ## [1.3.0]
 

README.md

@@ -24,7 +24,7 @@ English | <a href="https://github.com/cline/cline/blob/main/locales/es/README.md
 <a href="https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop" target="_blank"><strong>Feature Requests</strong></a>
 </td>
 <td align="center">
-<a href="https://docs.cline.bot/getting-started/for-new-coders" target="_blank"><strong>Getting Started</strong></a>
+<a href="https://docs.cline.bot/getting-started/getting-started-new-coders" target="_blank"><strong>Getting Started</strong></a>
 </td>
 </tbody>
 </table>

docs/README.md

@@ -18,7 +18,6 @@ Welcome to the Cline documentation - your comprehensive guide to using and exten
 -   **Understand Cline's capabilities:**
 
     -   [Cline Tools Guide](tools/cline-tools-guide.md)
-    -   [Mentions Feature Guide](tools/mentions-guide.md)
 
 -   **Extend Cline with MCP Servers:**
     -   [MCP Overview](mcp/README.md)

docs/architecture/extension-architecture.mmd

@@ -1,67 +1,41 @@
-flowchart TB
-    subgraph "VSCode Extension Host"
-        subgraph "Core Extension"
-            ExtensionEntry["Extension Entry<br/>src/extension.ts"]
-            WebviewProvider["WebviewProvider<br/>src/core/webview/index.ts"]
-            Controller["Controller<br/>src/core/controller/index.ts"]
-            Task["Task<br/>src/core/task/index.ts"]
-            GlobalState["VSCode Global State"]
-            SecretsStorage["VSCode Secrets Storage"]
-            McpHub["McpHub<br/>src/services/mcp/McpHub.ts"]
+graph TB
+    subgraph VSCode Extension Host
+        subgraph Core Extension
+            ExtensionEntry[Extension Entry<br/>src/extension.ts]
+            ClineProvider[ClineProvider<br/>src/core/webview/ClineProvider.ts]
+            ClineClass[Cline Class<br/>src/core/Cline.ts]
+            GlobalState[VSCode Global State]
+            SecretsStorage[VSCode Secrets Storage]
         end
 
-        subgraph "Webview UI"
-            WebviewApp["React App<br/>webview-ui/src/App.tsx"]
-            ExtStateContext["ExtensionStateContext<br/>webview-ui/src/context/ExtensionStateContext.tsx"]
-            ReactComponents["React Components"]
+        subgraph Webview UI
+            WebviewApp[React App<br/>webview-ui/src/App.tsx]
+            ExtStateContext[ExtensionStateContext<br/>webview-ui/src/context/ExtensionStateContext.tsx]
+            ReactComponents[React Components]
         end
 
-        subgraph "Storage"
-            TaskStorage["Task Storage<br/>Per-Task Files & History"]
-            CheckpointSystem["Git-based Checkpoints"]
-        end
-
-        subgraph "API Providers"
-            AnthropicAPI["Anthropic"]
-            OpenRouterAPI["OpenRouter"]
-            BedrockAPI["AWS Bedrock"]
-            OtherAPIs["Other Providers"]
-        end
-
-        subgraph "MCP Servers"
-            ExternalMcpServers["External MCP Servers"]
+        subgraph Storage
+            TaskStorage[Task Storage<br/>Per-Task Files & History]
+            CheckpointSystem[Git-based Checkpoints]
         end
     end
 
     %% Core Extension Data Flow
-    ExtensionEntry --> WebviewProvider
-    WebviewProvider --> Controller
-    Controller --> Task
-    Controller --> McpHub
-    Task --> GlobalState
-    Task --> SecretsStorage
-    Task --> TaskStorage
-    Task --> CheckpointSystem
-    Task --> |"API Requests"| AnthropicAPI
-    Task --> |"API Requests"| OpenRouterAPI
-    Task --> |"API Requests"| BedrockAPI
-    Task --> |"API Requests"| OtherAPIs
-    McpHub --> |"Connects to"| ExternalMcpServers
-    Task --> |"Uses"| McpHub
+    ExtensionEntry --> ClineProvider
+    ClineProvider --> ClineClass
+    ClineClass --> GlobalState
+    ClineClass --> SecretsStorage
+    ClineClass --> TaskStorage
+    ClineClass --> CheckpointSystem
 
     %% Webview Data Flow
     WebviewApp --> ExtStateContext
     ExtStateContext --> ReactComponents
 
     %% Bidirectional Communication
-    WebviewProvider <--> |"postMessage"| ExtStateContext
+    ClineProvider <-->|postMessage| ExtStateContext
 
-    classDef vscodeState fill:#f9f,stroke:#333,stroke-width:2px
-    classDef contextClass fill:#bbf,stroke:#333,stroke-width:2px
-    classDef providerClass fill:#bfb,stroke:#333,stroke-width:2px
-    classDef apiClass fill:#fdb,stroke:#333,stroke-width:2px
-
-    class GlobalState,SecretsStorage vscodeState
-    class ExtStateContext contextClass
-    class WebviewProvider,McpHub providerClass
-    class AnthropicAPI,OpenRouterAPI,BedrockAPI,OtherAPIs apiClass
+    style GlobalState fill:#ff0066,stroke:#333,stroke-width:2px,color:#ffffff
+    style SecretsStorage fill:#ff0066,stroke:#333,stroke-width:2px,color:#ffffff
+    style ExtStateContext fill:#0066ff,stroke:#333,stroke-width:2px,color:#ffffff
+    style ClineProvider fill:#00cc66,stroke:#333,stroke-width:2px,color:#ffffff

docs/tools/cline-tools-guide.md

@@ -20,9 +20,8 @@ Cline is your AI assistant that can:
 
 2. **Provide Context**
 
-    - Use @ mentions to add files, folders, URLs, diagnostics, terminal output, and more
-    - Example: "@/src/components/App.tsx"
-    - See the [Mentions Feature Guide](./mentions-guide.md) for details
+    - Use @ mentions to add files, folders, or URLs
+    - Example: "@file:src/components/App.tsx"
 
 3. **Review Changes**
     - Cline will show diffs before making changes
@@ -55,7 +54,7 @@ Cline is your AI assistant that can:
 
 ## Available Tools
 
-For the most up-to-date implementation details, you can view the full source code in the [Cline repository](https://github.com/cline/cline/blob/main/src/core/task/index.ts).
+For the most up-to-date implementation details, you can view the full source code in the [Cline repository](https://github.com/cline/cline/blob/main/src/core/Cline.ts).
 
 Cline has access to the following tools for various tasks:
 
@@ -82,7 +81,7 @@ Cline has access to the following tools for various tasks:
 4. **Interaction Tools**
     - `ask_followup_question`: Ask user for clarification
     - `attempt_completion`: Present final results
-    - `new_task`: Start a new task with preloaded context
+    - `new_task`: Create a new task with preloaded context
 
 Each tool has specific parameters and usage patterns. Here are some examples:
 
@@ -115,7 +114,7 @@ Each tool has specific parameters and usage patterns. Here are some examples:
     </execute_command>
     ```
 
--   Start a new task with context (new_task):
+-   Create a new task with context (new_task):
     ```xml
     <new_task>
     <context>
@@ -124,7 +123,7 @@ Each tool has specific parameters and usage patterns. Here are some examples:
     - POST /api/tasks
     - PUT /api/tasks/:id
     - DELETE /api/tasks/:id
-
+    
     Now we need to implement the React frontend.
     </context>
     </new_task>

docs/tools/mentions-guide.md

@@ -1,205 +0,0 @@
-# Cline Mentions Feature Guide
-
-## Overview
-
-The mentions feature is a powerful capability that allows you to reference various resources in your conversations with Cline using the "@" symbol. This includes file contents, directory structures, webpage URLs, VSCode diagnostic information, terminal output, Git change status, and more - all easily incorporated into your conversations.
-
-By using this feature, Cline can gain more accurate context and provide more relevant assistance for your tasks.
-
-## Basic Syntax
-
-Mentions always start with the "@" symbol, followed by the path or identifier of the resource you want to reference:
-
-```
-@resource_identifier
-```
-
-You can place mentions anywhere in your user messages, and Cline will automatically retrieve the referenced content.
-
-## Supported Mention Types
-
-### 1. File References
-
-To reference file contents, use `@/` followed by the relative path within your project:
-
-```
-@/path/to/file.js
-```
-
-**Example:**
-```
-Please analyze the implementation in @/src/components/Button.tsx
-```
-
-In this example, Cline automatically retrieves the contents of Button.tsx and uses it to perform the analysis.
-
-### 2. Directory References
-
-To reference directory contents, use `@/` followed by the relative path of the directory, ending with a trailing `/`:
-
-```
-@/path/to/directory/
-```
-
-**Example:**
-```
-What components are available in the @/src/components/ directory?
-```
-
-In this example, Cline retrieves a listing of the components directory and its contents.
-
-### 3. URL References
-
-To reference web page contents, use `@` followed by the URL:
-
-```
-@https://example.com
-```
-
-**Example:**
-```
-Please parse the JSON response from @https://api.github.com/users/octocat
-```
-
-In this example, Cline fetches the response from the GitHub API and analyzes the JSON.
-
-### 4. Diagnostic References
-
-To reference VSCode diagnostic information (errors and warnings) in the current workspace, use `@problems`:
-
-```
-@problems
-```
-
-**Example:**
-```
-Check @problems and tell me which errors I should prioritize fixing
-```
-
-In this example, Cline retrieves the current errors and warnings from your workspace and identifies high-priority issues.
-
-### 5. Terminal Output References
-
-To reference the latest terminal output, use `@terminal`:
-
-```
-@terminal
-```
-
-**Example:**
-```
-Please identify the cause of the error in the @terminal output
-```
-
-In this example, Cline examines the latest terminal output and analyzes the error's cause.
-
-### 6. Git Working Directory References
-
-To reference the current Git working directory change status, use `@git-changes`:
-
-```
-@git-changes
-```
-
-**Example:**
-```
-Review the @git-changes and summarize the important changes that should be committed
-```
-
-In this example, Cline retrieves the list of changed files in the current Git working directory and identifies candidates for commit.
-
-### 7. Git Commit References
-
-To reference information about a specific Git commit, use `@` followed by the commit hash:
-
-```
-@commit_hash
-```
-
-**Example:**
-```
-Analyze the commit @abcd123 and explain what changes were made
-```
-
-In this example, Cline retrieves information about the specified commit hash and analyzes the changes made in that commit.
-
-## Usage Scenarios
-
-### Code Review
-
-```
-Check @/src/components/Form.jsx and suggest improvements from a performance perspective. Also, if there are any @problems, please suggest how to fix them.
-```
-
-### Debugging Assistance
-
-```
-My npm install failed. Please examine the @terminal output and suggest a solution to the problem.
-```
-
-### Project Analysis
-
-```
-Analyze the code in the @/src/models/ directory and explain the relationships between the data models. Also, tell me how the utility functions in @/src/utils/ are used with these models.
-```
-
-### Code Generation
-
-```
-Create a new Input.tsx component using the same design language as @/src/components/Button.tsx
-```
-
-### Version Control Integration
-
-```
-Review the @git-changes and suggest a commit message for the feature I'm working on.
-```
-
-## Combining Multiple Mentions
-
-You can combine multiple mentions to provide more complex context:
-
-```
-There seems to be a bug in @/src/api/users.js. Please check @problems and @terminal to identify and fix the issue.
-```
-
-## Limitations and Considerations
-
-1. **Large Files**: Referencing very large files may take time to process and could consume a significant amount of tokens.
-
-2. **Binary Files**: Binary files (such as images) will not be properly processed and will show a "Binary file" message.
-
-3. **Directory Structure**: Directory references will only show top-level files and directories, not recursively showing the contents of subdirectories.
-
-4. **URL Limitations**: Some websites may block automated crawling, which could prevent accurate content retrieval.
-
-5. **Path Syntax**: File paths or URLs with special characters (such as spaces) may not be recognized correctly.
-
-## Troubleshooting
-
-### Mentions Not Recognized
-
-If your mentions aren't being recognized correctly, check that:
-
-- There's no space after the `@` symbol
-- File paths are accurate (case-sensitive)
-- URLs include the full format (with `https://`)
-
-### Content Not Retrieved
-
-If the content of referenced resources can't be retrieved:
-
-- Verify the file exists
-- Ensure you have access permissions for the file
-- Check that the file isn't too large or the URL too complex
-
-### Performance Issues
-
-If mention processing is slow:
-
-- Reference smaller files or specific file sections
-- Reduce the number of mentions used at once
-
-## Conclusion
-
-Mastering the mentions feature makes your communication with Cline more efficient. By providing appropriate context, Cline can deliver more accurate assistance, significantly improving your development workflow.

docs/tools/new-task-tool.md

@@ -0,0 +1,88 @@
+# New Task Tool
+
+The `new_task` tool allows Cline to create a new task with preloaded context. This is particularly useful for managing context window limitations and creating focused subtasks.
+
+## Overview
+
+When the context window is approaching capacity or when you want to create a focused subtask, Cline can suggest creating a new task with relevant context preloaded. This helps maintain continuity between tasks while keeping each task focused and efficient.
+
+## How It Works
+
+1. Cline uses the `new_task` tool to suggest creating a new task with specific context
+2. You'll see a preview of the context that will be preloaded into the new task
+3. You can choose to:
+   - Click "Create New Task" to start a new task with the preloaded context in Plan Mode
+   - Respond with a message to continue the current conversation (effectively declining the new task)
+
+## Use Cases
+
+### Context Window Management
+
+As conversations get longer, the context window may approach capacity. Cline can proactively suggest creating a new task with relevant context to continue the work without losing important information.
+
+```
+Cline: I notice our conversation is getting quite long. Would you like me to create a new task with the relevant context to continue our work on the authentication system?
+
+<new_task>
+We've been working on implementing an authentication system for the web application. So far, we've:
+1. Set up the basic user model
+2. Implemented password hashing with bcrypt
+3. Created login and registration endpoints
+
+Next steps:
+- Implement JWT token generation
+- Add token validation middleware
+- Set up refresh token functionality
+</new_task>
+```
+
+### Breaking Down Complex Tasks
+
+For complex projects, you can break down the work into focused subtasks, with each new task containing the relevant context from the previous work.
+
+```
+Cline: Now that we've completed the backend API, let's focus on the frontend implementation. I'll create a new task for this:
+
+<new_task>
+We've completed the backend API for our task management application with the following endpoints:
+- GET /api/tasks - List all tasks
+- POST /api/tasks - Create a new task
+- PUT /api/tasks/:id - Update a task
+- DELETE /api/tasks/:id - Delete a task
+
+Now we need to implement the React frontend that will consume these endpoints.
+</new_task>
+```
+
+### Maintaining Workflow Continuity
+
+When you need to pause work on one aspect of a project and return to it later, Cline can help you create a new task with the necessary context to pick up where you left off.
+
+```
+Cline: Let's save our progress on the database schema design so we can come back to it later:
+
+<new_task>
+Database schema design for e-commerce application:
+- Users table: id, email, password_hash, name, created_at, updated_at
+- Products table: id, name, description, price, inventory_count, category_id
+- Categories table: id, name, parent_category_id
+- Orders table: id, user_id, status, total, created_at, updated_at
+- OrderItems table: id, order_id, product_id, quantity, price
+
+We still need to design:
+- Payment processing tables
+- Shipping information tables
+- Review and rating tables
+</new_task>
+```
+
+## Best Practices
+
+- **Be Selective**: Only include relevant context in the new task to keep it focused
+- **Summarize**: Summarize previous work rather than copying everything verbatim
+- **Include Next Steps**: Clearly indicate what needs to be done in the new task
+- **Maintain Continuity**: Ensure the new task has enough context to continue the work without confusion
+
+## Implementation Details
+
+The `new_task` tool is implemented as part of Cline's tool system. When used, it presents a UI component with a preview of the context and a button to create the new task. The new task is created in Plan Mode, allowing you to review and refine the approach before switching to Act Mode for implementation.

esbuild.js

@@ -4,34 +4,10 @@ const path = require("path")
 
 const production = process.argv.includes("--production")
 const watch = process.argv.includes("--watch")
-const test = process.env.IS_TEST === "true"
 
 /**
  * @type {import('esbuild').Plugin}
  */
-const aliasResolverPlugin = {
-	name: "alias-resolver",
-	setup(build) {
-		const aliases = {
-			"@": path.resolve(__dirname, "src"),
-			"@api": path.resolve(__dirname, "src/api"),
-			"@core": path.resolve(__dirname, "src/core"),
-			"@integrations": path.resolve(__dirname, "src/integrations"),
-			"@services": path.resolve(__dirname, "src/services"),
-			"@shared": path.resolve(__dirname, "src/shared"),
-			"@utils": path.resolve(__dirname, "src/utils"),
-		}
-
-		// For each alias entry, create a resolver
-		Object.entries(aliases).forEach(([alias, aliasPath]) => {
-			const aliasRegex = new RegExp(`^${alias}($|/.*)`)
-			build.onResolve({ filter: aliasRegex }, (args) => {
-				const importPath = args.path.replace(alias, aliasPath)
-				return { path: importPath }
-			})
-		})
-	},
-}
 const esbuildProblemMatcherPlugin = {
 	name: "esbuild-problem-matcher",
 
@@ -92,13 +68,8 @@ const extensionConfig = {
 	minify: production,
 	sourcemap: !production,
 	logLevel: "silent",
-	define: {
-		"process.env.IS_DEV": JSON.stringify(!production),
-		"process.env.IS_TEST": JSON.stringify(test),
-	},
 	plugins: [
 		copyWasmFiles,
-		aliasResolverPlugin,
 		/* add to the end of plugins array */
 		esbuildProblemMatcherPlugin,
 		{

evals/.gitignore

@@ -1,3 +0,0 @@
-repositories
-
-results/evals.db

evals/README.md

@@ -1,162 +0,0 @@
-# Cline Evaluation System
-
-This directory contains the evaluation system for benchmarking Cline against various coding evaluation frameworks.
-
-## Overview
-
-The Cline Evaluation System allows you to:
-
-1. Run Cline against standardized coding benchmarks
-2. Collect comprehensive metrics on performance
-3. Generate detailed reports on evaluation results
-4. Compare performance across different models and benchmarks
-
-## Architecture
-
-The evaluation system consists of two main components:
-
-1. **Test Server**: Enhanced HTTP server in `src/services/test/TestServer.ts` that provides detailed task results
-2. **CLI Tool**: Command-line interface in `evals/cli/` for orchestrating evaluations
-
-## Directory Structure
-
-```
-cline-repo/
-├── src/
-│   ├── services/
-│   │   ├── test/
-│   │   │   ├── TestServer.ts         # Enhanced HTTP server for task execution
-│   │   │   ├── GitHelper.ts          # Git utilities for file tracking
-│   │   │   └── ...
-│   │   └── ...
-│   └── ...
-├── evals/                            # Main directory for evaluation system
-│   ├── cli/                          # CLI tool for orchestrating evaluations
-│   │   ├── src/
-│   │   │   ├── index.ts              # CLI entry point
-│   │   │   ├── commands/             # CLI commands (setup, run, report)
-│   │   │   ├── adapters/             # Benchmark adapters
-│   │   │   ├── db/                   # Database management
-│   │   │   └── utils/                # Utility functions
-│   │   ├── package.json
-│   │   └── tsconfig.json
-│   ├── repositories/                 # Cloned benchmark repositories
-│   │   ├── exercism/                 # Modified Exercism (from pashpashpash/evals)
-│   │   ├── swe-bench/                # SWE-Bench repository
-│   │   ├── swelancer/                # SWELancer repository
-│   │   └── multi-swe/                # Multi-SWE-Bench repository
-│   ├── results/                      # Evaluation results storage
-│   │   ├── runs/                     # Individual run results
-│   │   └── reports/                  # Generated reports
-│   └── README.md                     # This file
-└── ...
-```
-
-## Getting Started
-
-### Prerequisites
-
-- Node.js 16+
-- VSCode with Cline extension installed
-- Git
-
-### Installation
-
-1. Build the CLI tool:
-
-```bash
-cd evals/cli
-npm install
-npm run build
-```
-
-### Usage
-
-#### Setting Up Benchmarks
-
-```bash
-cd evals/cli
-node dist/index.js setup
-```
-
-This will clone and set up all benchmark repositories. You can specify specific benchmarks:
-
-```bash
-node dist/index.js setup --benchmarks exercism
-```
-
-#### Running Evaluations
-
-```bash
-node dist/index.js run --model claude-3-opus-20240229 --benchmark exercism
-```
-
-Options:
-- `--model`: The model to evaluate (default: claude-3-opus-20240229)
-- `--benchmark`: Specific benchmark to run (default: all)
-- `--count`: Number of tasks to run (default: all)
-
-#### Generating Reports
-
-```bash
-node dist/index.js report
-```
-
-Options:
-- `--format`: Report format (json, markdown) (default: markdown)
-- `--output`: Output path for the report
-
-## Benchmarks
-
-### Exercism
-
-Modified Exercism exercises from the [pashpashpash/evals](https://github.com/pashpashpash/evals) repository. These are small, focused programming exercises in various languages.
-
-### SWE-Bench (Coming Soon)
-
-Real-world software engineering tasks from the [SWE-bench](https://github.com/SWE-bench/SWE-bench) repository.
-
-### SWELancer (Coming Soon)
-
-Freelance-style programming tasks from the SWELancer benchmark.
-
-### Multi-SWE-Bench (Coming Soon)
-
-Multi-file software engineering tasks from the Multi-SWE-Bench repository.
-
-## Metrics
-
-The evaluation system collects the following metrics:
-
-- **Token Usage**: Input and output tokens
-- **Cost**: Estimated cost of API calls
-- **Duration**: Time taken to complete tasks
-- **Tool Usage**: Number of tool calls and failures
-- **Success Rate**: Percentage of tasks completed successfully
-- **Functional Correctness**: Percentage of tests passed
-
-## Reports
-
-Reports are generated in Markdown or JSON format and include:
-
-- Overall summary
-- Benchmark-specific results
-- Model-specific results
-- Tool usage statistics
-- Charts and visualizations
-
-## Development
-
-### Adding a New Benchmark
-
-1. Create a new adapter in `evals/cli/src/adapters/`
-2. Implement the `BenchmarkAdapter` interface
-3. Register the adapter in `evals/cli/src/adapters/index.ts`
-
-### Extending Metrics
-
-To add new metrics:
-
-1. Update the database schema in `evals/cli/src/db/schema.ts`
-2. Add collection logic in `evals/cli/src/utils/results.ts`
-3. Update report generation in `evals/cli/src/commands/report.ts`

evals/cli/package.json

@@ -1,39 +0,0 @@
-{
-	"name": "cline-evaluation-cli",
-	"version": "0.1.0",
-	"description": "CLI tool for orchestrating Cline evaluations across multiple benchmarks",
-	"main": "dist/index.js",
-	"scripts": {
-		"build": "tsc",
-		"start": "node dist/index.js",
-		"dev": "ts-node src/index.ts",
-		"test": "echo \"Error: no test specified\" && exit 1"
-	},
-	"keywords": [
-		"cline",
-		"evaluation",
-		"benchmark"
-	],
-	"author": "",
-	"license": "MIT",
-	"dependencies": {
-		"better-sqlite3": "^8.0.0",
-		"chalk": "^4.1.2",
-		"commander": "^9.4.1",
-		"execa": "^5.1.1",
-		"node-fetch": "^2.7.0",
-		"ora": "^5.4.1",
-		"sqlite": "^4.1.2",
-		"uuid": "^9.0.0",
-		"yargs": "^17.6.2"
-	},
-	"devDependencies": {
-		"@types/better-sqlite3": "^7.6.3",
-		"@types/node": "^18.11.18",
-		"@types/node-fetch": "^2.6.12",
-		"@types/uuid": "^9.0.0",
-		"@types/yargs": "^17.0.19",
-		"ts-node": "^10.9.1",
-		"typescript": "^4.9.4"
-	}
-}

evals/cli/src/adapters/exercism.ts

@@ -1,190 +0,0 @@
-import * as path from "path"
-import * as fs from "fs"
-import execa from "execa"
-import { BenchmarkAdapter, Task, VerificationResult } from "./types"
-
-const EVALS_DIR = path.resolve(__dirname, "../../../")
-
-/**
- * Adapter for the modified Exercism benchmark
- */
-export class ExercismAdapter implements BenchmarkAdapter {
-	name = "exercism"
-
-	/**
-	 * Set up the Exercism benchmark repository
-	 */
-	async setup(): Promise<void> {
-		// Clone repository if needed
-		const exercismDir = path.join(EVALS_DIR, "repositories", "exercism")
-
-		if (!fs.existsSync(exercismDir)) {
-			console.log(`Cloning Exercism repository to ${exercismDir}...`)
-			await execa("git", ["clone", "https://github.com/pashpashpash/evals.git", exercismDir])
-			console.log("Exercism repository cloned successfully")
-		} else {
-			console.log(`Exercism repository already exists at ${exercismDir}`)
-
-			// Pull latest changes
-			console.log("Pulling latest changes...")
-			await execa("git", ["pull"], { cwd: exercismDir })
-			console.log("Repository updated successfully")
-		}
-	}
-
-	/**
-	 * List all available tasks in the Exercism benchmark
-	 */
-	async listTasks(): Promise<Task[]> {
-		const tasks: Task[] = []
-		const exercisesDir = path.join(EVALS_DIR, "repositories", "exercism")
-
-		// Ensure the repository exists
-		if (!fs.existsSync(exercisesDir)) {
-			throw new Error(`Exercism repository not found at ${exercisesDir}. Run setup first.`)
-		}
-
-		// Read language directories
-		const languages = fs
-			.readdirSync(exercisesDir)
-			.filter((dir) => fs.statSync(path.join(exercisesDir, dir)).isDirectory())
-			.filter((dir) => !dir.startsWith(".") && !["node_modules", ".git"].includes(dir))
-
-		for (const language of languages) {
-			const languageDir = path.join(exercisesDir, language)
-
-			// Read exercise directories
-			const exercises = fs.readdirSync(languageDir).filter((dir) => fs.statSync(path.join(languageDir, dir)).isDirectory())
-
-			for (const exercise of exercises) {
-				const exerciseDir = path.join(languageDir, exercise)
-
-				// Read instructions
-				let description = ""
-				const instructionsPath = path.join(exerciseDir, "docs", "instructions.md")
-				if (fs.existsSync(instructionsPath)) {
-					description = fs.readFileSync(instructionsPath, "utf-8")
-				}
-
-				// Determine test commands based on language
-				let testCommands: string[] = []
-				switch (language) {
-					case "javascript":
-						testCommands = ["npm install", "npm test"]
-						break
-					case "python":
-						testCommands = ["python -m pytest -o markers=task *_test.py"]
-						break
-					case "go":
-						testCommands = ["go test"]
-						break
-					case "java":
-						testCommands = ["./gradlew test"]
-						break
-					case "rust":
-						testCommands = ["cargo test"]
-						break
-					default:
-						testCommands = []
-				}
-
-				tasks.push({
-					id: `exercism-${language}-${exercise}`,
-					name: exercise,
-					description,
-					workspacePath: exerciseDir,
-					setupCommands: [],
-					verificationCommands: testCommands,
-					metadata: {
-						language,
-						type: "exercism",
-					},
-				})
-			}
-		}
-
-		return tasks
-	}
-
-	/**
-	 * Prepare a specific task for execution
-	 * @param taskId The ID of the task to prepare
-	 */
-	async prepareTask(taskId: string): Promise<Task> {
-		const tasks = await this.listTasks()
-		const task = tasks.find((t) => t.id === taskId)
-
-		if (!task) {
-			throw new Error(`Task ${taskId} not found`)
-		}
-
-		// Check if Git repository is already initialized
-		const gitDirExists = fs.existsSync(path.join(task.workspacePath, ".git"))
-
-		try {
-			// Initialize Git repository if needed
-			if (!gitDirExists) {
-				await execa("git", ["init"], { cwd: task.workspacePath })
-			}
-
-			// Create a dummy file to ensure there's something to commit
-			const dummyFilePath = path.join(task.workspacePath, ".eval-timestamp")
-			fs.writeFileSync(dummyFilePath, new Date().toISOString())
-
-			// Add all files and commit
-			await execa("git", ["add", "."], { cwd: task.workspacePath })
-
-			try {
-				await execa("git", ["commit", "-m", "Initial commit"], { cwd: task.workspacePath })
-			} catch (error: any) {
-				// If commit fails because there are no changes, that's okay
-				if (!error.stderr?.includes("nothing to commit")) {
-					throw error
-				}
-			}
-		} catch (error: any) {
-			console.warn(`Warning: Git operations failed: ${error.message}`)
-			console.warn("Continuing without Git initialization")
-		}
-
-		return task
-	}
-
-	/**
-	 * Verify the result of a task execution
-	 * @param task The task that was executed
-	 * @param result The result of the task execution
-	 */
-	async verifyResult(task: Task, result: any): Promise<VerificationResult> {
-		// Run verification commands
-		let success = true
-		let output = ""
-
-		for (const command of task.verificationCommands) {
-			try {
-				const [cmd, ...args] = command.split(" ")
-				const { stdout } = await execa(cmd, args, { cwd: task.workspacePath })
-				output += stdout + "\n"
-			} catch (error: any) {
-				success = false
-				if (error.stdout) output += error.stdout + "\n"
-				if (error.stderr) output += error.stderr + "\n"
-			}
-		}
-
-		// Parse test results
-		const testsPassed = (output.match(/PASS/g) || []).length
-		const testsFailed = (output.match(/FAIL/g) || []).length
-		const testsTotal = testsPassed + testsFailed
-
-		return {
-			success,
-			metrics: {
-				testsPassed,
-				testsFailed,
-				testsTotal,
-				functionalCorrectness: testsTotal > 0 ? testsPassed / testsTotal : 0,
-			},
-		}
-	}
-}

evals/cli/src/adapters/index.ts

@@ -1,47 +0,0 @@
-import { BenchmarkAdapter } from "./types"
-import { ExercismAdapter } from "./exercism"
-import { SWEBenchAdapter } from "./swe-bench"
-import { SWELancerAdapter } from "./swelancer"
-import { MultiSWEAdapter } from "./multi-swe"
-
-// Registry of all available adapters
-const adapters: Record<string, BenchmarkAdapter> = {
-	// Exercism is the primary adapter with real implementation
-	exercism: new ExercismAdapter(),
-
-	// Dummy adapters for testing
-	"swe-bench": new SWEBenchAdapter(),
-	swelancer: new SWELancerAdapter(),
-	"multi-swe": new MultiSWEAdapter(),
-}
-
-/**
- * Get a specific adapter by name
- * @param name The name of the adapter to get
- * @returns The requested adapter
- * @throws Error if the adapter is not found
- */
-export function getAdapter(name: string): BenchmarkAdapter {
-	const adapter = adapters[name]
-	if (!adapter) {
-		throw new Error(`Adapter for benchmark '${name}' not found`)
-	}
-	return adapter
-}
-
-/**
- * Get all available adapters
- * @returns Array of all registered adapters
- */
-export function getAllAdapters(): BenchmarkAdapter[] {
-	return Object.values(adapters)
-}
-
-/**
- * Register a new adapter
- * @param name The name to register the adapter under
- * @param adapter The adapter to register
- */
-export function registerAdapter(name: string, adapter: BenchmarkAdapter): void {
-	adapters[name] = adapter
-}

evals/cli/src/adapters/multi-swe.ts

@@ -1,192 +0,0 @@
-import * as path from "path"
-import * as fs from "fs"
-import execa from "execa"
-import { BenchmarkAdapter, Task, VerificationResult } from "./types"
-
-const EVALS_DIR = path.resolve(__dirname, "../../../")
-
-/**
- * Dummy adapter for the Multi-SWE-Bench benchmark
- */
-export class MultiSWEAdapter implements BenchmarkAdapter {
-	name = "multi-swe"
-
-	/**
-	 * Set up the Multi-SWE-Bench benchmark repository (dummy implementation)
-	 */
-	async setup(): Promise<void> {
-		console.log("Multi-SWE-Bench dummy setup completed")
-
-		// Create repositories directory if it doesn't exist
-		const repoDir = path.join(EVALS_DIR, "repositories", "multi-swe")
-		if (!fs.existsSync(repoDir)) {
-			fs.mkdirSync(repoDir, { recursive: true })
-			console.log(`Created dummy Multi-SWE-Bench directory at ${repoDir}`)
-		}
-	}
-
-	/**
-	 * List all available tasks in the Multi-SWE-Bench benchmark (dummy implementation)
-	 */
-	async listTasks(): Promise<Task[]> {
-		return [
-			{
-				id: "multi-swe-task-1",
-				name: "Multi-Language API Integration",
-				description:
-					"Implement a system that integrates a Python backend with a TypeScript frontend and a Rust processing service.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "multi-swe"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					languages: ["python", "typescript", "rust"],
-					complexity: "high",
-					type: "multi-swe",
-				},
-			},
-			{
-				id: "multi-swe-task-2",
-				name: "Cross-Platform Mobile App",
-				description: "Create a cross-platform mobile app using React Native with native modules in Swift and Kotlin.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "multi-swe"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					languages: ["javascript", "swift", "kotlin"],
-					complexity: "medium",
-					type: "multi-swe",
-				},
-			},
-			{
-				id: "multi-swe-task-3",
-				name: "Microservice Architecture",
-				description: "Design and implement a microservice architecture with services written in Go, Node.js, and Java.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "multi-swe"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					languages: ["go", "javascript", "java"],
-					complexity: "high",
-					type: "multi-swe",
-				},
-			},
-		]
-	}
-
-	/**
-	 * Prepare a specific task for execution (dummy implementation)
-	 * @param taskId The ID of the task to prepare
-	 */
-	async prepareTask(taskId: string): Promise<Task> {
-		const tasks = await this.listTasks()
-		const task = tasks.find((t) => t.id === taskId)
-
-		if (!task) {
-			throw new Error(`Task ${taskId} not found`)
-		}
-
-		// Create a dummy workspace for the task
-		const taskDir = path.join(task.workspacePath, taskId)
-		if (!fs.existsSync(taskDir)) {
-			fs.mkdirSync(taskDir, { recursive: true })
-
-			// Create a dummy file for the task
-			fs.writeFileSync(
-				path.join(taskDir, "README.md"),
-				`# ${task.name}\n\n${task.description}\n\nThis is a dummy task for testing purposes.`,
-			)
-
-			// Create additional dummy files based on task type
-			if (task.id === "multi-swe-task-1") {
-				// Python backend
-				fs.mkdirSync(path.join(taskDir, "backend"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "backend", "app.py"),
-					`# TODO: Implement Python backend\nfrom flask import Flask\n\napp = Flask(__name__)\n\n@app.route('/')\ndef hello():\n    return "Hello, World!"\n`,
-				)
-
-				// TypeScript frontend
-				fs.mkdirSync(path.join(taskDir, "frontend"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "frontend", "app.ts"),
-					`// TODO: Implement TypeScript frontend\nconsole.log('Frontend starting...');\n`,
-				)
-
-				// Rust processing service
-				fs.mkdirSync(path.join(taskDir, "processor"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "processor", "main.rs"),
-					`// TODO: Implement Rust processing service\nfn main() {\n    println!("Processor starting...");\n}\n`,
-				)
-			} else if (task.id === "multi-swe-task-2") {
-				// React Native app
-				fs.mkdirSync(path.join(taskDir, "app"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "app", "App.js"),
-					`// TODO: Implement React Native app\nimport React from 'react';\nimport { View, Text } from 'react-native';\n\nexport default function App() {\n  return (\n    <View>\n      <Text>Hello, World!</Text>\n    </View>\n  );\n}\n`,
-				)
-
-				// Swift native module
-				fs.mkdirSync(path.join(taskDir, "ios"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "ios", "NativeModule.swift"),
-					`// TODO: Implement Swift native module\nimport Foundation\n\n@objc(NativeModule)\nclass NativeModule: NSObject {\n  @objc\n  func hello() -> String {\n    return "Hello from Swift"\n  }\n}\n`,
-				)
-
-				// Kotlin native module
-				fs.mkdirSync(path.join(taskDir, "android"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "android", "NativeModule.kt"),
-					`// TODO: Implement Kotlin native module\npackage com.example.app\n\nclass NativeModule {\n  fun hello(): String {\n    return "Hello from Kotlin"\n  }\n}\n`,
-				)
-			} else if (task.id === "multi-swe-task-3") {
-				// Go service
-				fs.mkdirSync(path.join(taskDir, "service-go"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "service-go", "main.go"),
-					`// TODO: Implement Go service\npackage main\n\nimport "fmt"\n\nfunc main() {\n\tfmt.Println("Go service starting...")\n}\n`,
-				)
-
-				// Node.js service
-				fs.mkdirSync(path.join(taskDir, "service-node"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "service-node", "server.js"),
-					`// TODO: Implement Node.js service\nconsole.log('Node.js service starting...');\n`,
-				)
-
-				// Java service
-				fs.mkdirSync(path.join(taskDir, "service-java"), { recursive: true })
-				fs.writeFileSync(
-					path.join(taskDir, "service-java", "Main.java"),
-					`// TODO: Implement Java service\npublic class Main {\n    public static void main(String[] args) {\n        System.out.println("Java service starting...");\n    }\n}\n`,
-				)
-			}
-		}
-
-		// Update the task's workspace path to the task-specific directory
-		return {
-			...task,
-			workspacePath: taskDir,
-		}
-	}
-
-	/**
-	 * Verify the result of a task execution (dummy implementation)
-	 * @param task The task that was executed
-	 * @param result The result of the task execution
-	 */
-	async verifyResult(task: Task, result: any): Promise<VerificationResult> {
-		// Always return success for dummy implementation
-		return {
-			success: true,
-			metrics: {
-				testsPassed: 1,
-				testsFailed: 0,
-				testsTotal: 1,
-				functionalCorrectness: 1.0,
-				crossLanguageIntegration: 0.9, // Dummy metric specific to Multi-SWE
-				architectureQuality: 0.85, // Dummy metric specific to Multi-SWE
-			},
-		}
-	}
-}

evals/cli/src/adapters/swe-bench.ts

@@ -1,125 +0,0 @@
-import * as path from "path"
-import * as fs from "fs"
-import execa from "execa"
-import { BenchmarkAdapter, Task, VerificationResult } from "./types"
-
-const EVALS_DIR = path.resolve(__dirname, "../../../")
-
-/**
- * Dummy adapter for the SWE-Bench benchmark
- */
-export class SWEBenchAdapter implements BenchmarkAdapter {
-	name = "swe-bench"
-
-	/**
-	 * Set up the SWE-Bench benchmark repository (dummy implementation)
-	 */
-	async setup(): Promise<void> {
-		console.log("SWE-Bench dummy setup completed")
-
-		// Create repositories directory if it doesn't exist
-		const repoDir = path.join(EVALS_DIR, "repositories", "swe-bench")
-		if (!fs.existsSync(repoDir)) {
-			fs.mkdirSync(repoDir, { recursive: true })
-			console.log(`Created dummy SWE-Bench directory at ${repoDir}`)
-		}
-	}
-
-	/**
-	 * List all available tasks in the SWE-Bench benchmark (dummy implementation)
-	 */
-	async listTasks(): Promise<Task[]> {
-		return [
-			{
-				id: "swe-bench-task-1",
-				name: "Fix React Component Bug",
-				description: "Fix a bug in a React component where the state is not properly updated.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "swe-bench"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					repository: "facebook/react",
-					issue: "#12345",
-					type: "swe-bench",
-				},
-			},
-			{
-				id: "swe-bench-task-2",
-				name: "Optimize Database Query",
-				description: "Optimize a slow database query in a Django application.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "swe-bench"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					repository: "django/django",
-					issue: "#6789",
-					type: "swe-bench",
-				},
-			},
-			{
-				id: "swe-bench-task-3",
-				name: "Fix Memory Leak",
-				description: "Fix a memory leak in a Node.js application.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "swe-bench"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					repository: "nodejs/node",
-					issue: "#9876",
-					type: "swe-bench",
-				},
-			},
-		]
-	}
-
-	/**
-	 * Prepare a specific task for execution (dummy implementation)
-	 * @param taskId The ID of the task to prepare
-	 */
-	async prepareTask(taskId: string): Promise<Task> {
-		const tasks = await this.listTasks()
-		const task = tasks.find((t) => t.id === taskId)
-
-		if (!task) {
-			throw new Error(`Task ${taskId} not found`)
-		}
-
-		// Create a dummy workspace for the task
-		const taskDir = path.join(task.workspacePath, taskId)
-		if (!fs.existsSync(taskDir)) {
-			fs.mkdirSync(taskDir, { recursive: true })
-
-			// Create a dummy file for the task
-			fs.writeFileSync(
-				path.join(taskDir, "README.md"),
-				`# ${task.name}\n\n${task.description}\n\nThis is a dummy task for testing purposes.`,
-			)
-		}
-
-		// Update the task's workspace path to the task-specific directory
-		return {
-			...task,
-			workspacePath: taskDir,
-		}
-	}
-
-	/**
-	 * Verify the result of a task execution (dummy implementation)
-	 * @param task The task that was executed
-	 * @param result The result of the task execution
-	 */
-	async verifyResult(task: Task, result: any): Promise<VerificationResult> {
-		// Always return success for dummy implementation
-		return {
-			success: true,
-			metrics: {
-				testsPassed: 1,
-				testsFailed: 0,
-				testsTotal: 1,
-				functionalCorrectness: 1.0,
-				performanceImprovement: 0.25, // Dummy metric specific to SWE-Bench
-				codeQuality: 0.9, // Dummy metric specific to SWE-Bench
-			},
-		}
-	}
-}

evals/cli/src/adapters/swelancer.ts

@@ -1,143 +0,0 @@
-import * as path from "path"
-import * as fs from "fs"
-import execa from "execa"
-import { BenchmarkAdapter, Task, VerificationResult } from "./types"
-
-const EVALS_DIR = path.resolve(__dirname, "../../../")
-
-/**
- * Dummy adapter for the SWELancer benchmark
- */
-export class SWELancerAdapter implements BenchmarkAdapter {
-	name = "swelancer"
-
-	/**
-	 * Set up the SWELancer benchmark repository (dummy implementation)
-	 */
-	async setup(): Promise<void> {
-		console.log("SWELancer dummy setup completed")
-
-		// Create repositories directory if it doesn't exist
-		const repoDir = path.join(EVALS_DIR, "repositories", "swelancer")
-		if (!fs.existsSync(repoDir)) {
-			fs.mkdirSync(repoDir, { recursive: true })
-			console.log(`Created dummy SWELancer directory at ${repoDir}`)
-		}
-	}
-
-	/**
-	 * List all available tasks in the SWELancer benchmark (dummy implementation)
-	 */
-	async listTasks(): Promise<Task[]> {
-		return [
-			{
-				id: "swelancer-task-1",
-				name: "Create Landing Page",
-				description: "Create a responsive landing page for a new product using HTML, CSS, and JavaScript.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "swelancer"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					client: "TechStartup Inc.",
-					difficulty: "medium",
-					type: "swelancer",
-				},
-			},
-			{
-				id: "swelancer-task-2",
-				name: "Build REST API",
-				description: "Create a RESTful API for a blog application using Node.js and Express.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "swelancer"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					client: "BlogCo",
-					difficulty: "hard",
-					type: "swelancer",
-				},
-			},
-			{
-				id: "swelancer-task-3",
-				name: "Fix CSS Layout Issues",
-				description: "Fix layout issues in a responsive website across different screen sizes.",
-				workspacePath: path.join(EVALS_DIR, "repositories", "swelancer"),
-				setupCommands: [],
-				verificationCommands: [],
-				metadata: {
-					client: "DesignAgency",
-					difficulty: "easy",
-					type: "swelancer",
-				},
-			},
-		]
-	}
-
-	/**
-	 * Prepare a specific task for execution (dummy implementation)
-	 * @param taskId The ID of the task to prepare
-	 */
-	async prepareTask(taskId: string): Promise<Task> {
-		const tasks = await this.listTasks()
-		const task = tasks.find((t) => t.id === taskId)
-
-		if (!task) {
-			throw new Error(`Task ${taskId} not found`)
-		}
-
-		// Create a dummy workspace for the task
-		const taskDir = path.join(task.workspacePath, taskId)
-		if (!fs.existsSync(taskDir)) {
-			fs.mkdirSync(taskDir, { recursive: true })
-
-			// Create a dummy file for the task
-			fs.writeFileSync(
-				path.join(taskDir, "README.md"),
-				`# ${task.name}\n\n${task.description}\n\nThis is a dummy task for testing purposes.`,
-			)
-
-			// Create additional dummy files based on task type
-			if (task.id === "swelancer-task-1") {
-				fs.writeFileSync(
-					path.join(taskDir, "index.html"),
-					`<!DOCTYPE html>\n<html>\n<head>\n  <title>Landing Page</title>\n</head>\n<body>\n  <!-- TODO: Implement landing page -->\n</body>\n</html>`,
-				)
-			} else if (task.id === "swelancer-task-2") {
-				fs.writeFileSync(
-					path.join(taskDir, "server.js"),
-					`// TODO: Implement REST API\nconsole.log('Server starting...');`,
-				)
-			} else if (task.id === "swelancer-task-3") {
-				fs.writeFileSync(
-					path.join(taskDir, "styles.css"),
-					`/* TODO: Fix layout issues */\nbody {\n  margin: 0;\n  padding: 0;\n}`,
-				)
-			}
-		}
-
-		// Update the task's workspace path to the task-specific directory
-		return {
-			...task,
-			workspacePath: taskDir,
-		}
-	}
-
-	/**
-	 * Verify the result of a task execution (dummy implementation)
-	 * @param task The task that was executed
-	 * @param result The result of the task execution
-	 */
-	async verifyResult(task: Task, result: any): Promise<VerificationResult> {
-		// Always return success for dummy implementation
-		return {
-			success: true,
-			metrics: {
-				testsPassed: 1,
-				testsFailed: 0,
-				testsTotal: 1,
-				functionalCorrectness: 1.0,
-				clientSatisfaction: 0.95, // Dummy metric specific to SWELancer
-				timeEfficiency: 0.85, // Dummy metric specific to SWELancer
-			},
-		}
-	}
-}

evals/cli/src/adapters/types.ts

@@ -1,31 +0,0 @@
-/**
- * Represents a task to be executed
- */
-export interface Task {
-	id: string
-	name: string
-	description: string
-	workspacePath: string
-	setupCommands: string[]
-	verificationCommands: string[]
-	metadata: Record<string, any>
-}
-
-/**
- * Result of verifying a task execution
- */
-export interface VerificationResult {
-	success: boolean
-	metrics: Record<string, any>
-}
-
-/**
- * Interface for benchmark adapters
- */
-export interface BenchmarkAdapter {
-	name: string
-	setup(): Promise<void>
-	listTasks(): Promise<Task[]>
-	prepareTask(taskId: string): Promise<Task>
-	verifyResult(task: Task, result: any): Promise<VerificationResult>
-}

evals/cli/src/commands/report.ts

@@ -1,237 +0,0 @@
-import * as fs from "fs"
-import * as path from "path"
-import chalk from "chalk"
-import ora from "ora"
-import { ResultsDatabase } from "../db"
-import { generateMarkdownReport } from "../utils/markdown"
-
-interface ReportOptions {
-	format?: "json" | "markdown"
-	output?: string
-}
-
-/**
- * Handler for the report command
- * @param options Command options
- */
-export async function reportHandler(options: ReportOptions): Promise<void> {
-	const format = options.format || "markdown"
-	const db = new ResultsDatabase()
-
-	try {
-		const spinner = ora("Generating report...").start()
-
-		// Get all runs
-		const runs = db.getRuns()
-
-		console.log(chalk.blue(`Found ${runs.length} evaluation runs`))
-
-		if (runs.length === 0) {
-			spinner.fail("No evaluation runs found")
-			return
-		}
-
-		// Generate summary report
-		const summary = {
-			runs: runs.length,
-			models: [...new Set(runs.map((run) => run.model))],
-			benchmarks: [...new Set(runs.map((run) => run.benchmark))],
-			tasks: 0,
-			successRate: 0,
-			averageTokens: 0,
-			averageCost: 0,
-			averageDuration: 0,
-			totalToolCalls: 0,
-			totalToolFailures: 0,
-			toolSuccessRate: 0,
-			toolUsage: {} as Record<string, { calls: number; failures: number }>,
-		}
-
-		let totalTasks = 0
-		let successfulTasks = 0
-		let totalTokens = 0
-		let totalCost = 0
-		let totalDuration = 0
-		let totalToolCalls = 0
-		let totalToolFailures = 0
-
-		for (const run of runs) {
-			const tasks = db.getRunTasks(run.id)
-			totalTasks += tasks.length
-
-			for (const task of tasks) {
-				if (task.success) {
-					successfulTasks++
-				}
-
-				const metrics = db.getTaskMetrics(task.id)
-
-				const tokensIn = metrics.find((m) => m.name === "tokensIn")?.value || 0
-				const tokensOut = metrics.find((m) => m.name === "tokensOut")?.value || 0
-				totalTokens += tokensIn + tokensOut
-
-				totalCost += metrics.find((m) => m.name === "cost")?.value || 0
-				totalDuration += metrics.find((m) => m.name === "duration")?.value || 0
-
-				// Collect tool call metrics
-				totalToolCalls += task.total_tool_calls || 0
-				totalToolFailures += task.total_tool_failures || 0
-
-				// Get detailed tool usage
-				const toolCalls = db.getTaskToolCalls(task.id)
-
-				for (const toolCall of toolCalls) {
-					if (!summary.toolUsage[toolCall.tool_name]) {
-						summary.toolUsage[toolCall.tool_name] = {
-							calls: 0,
-							failures: 0,
-						}
-					}
-
-					summary.toolUsage[toolCall.tool_name].calls += toolCall.call_count
-					summary.toolUsage[toolCall.tool_name].failures += toolCall.failure_count
-				}
-			}
-		}
-
-		// Calculate tool success rate
-		summary.totalToolCalls = totalToolCalls
-		summary.totalToolFailures = totalToolFailures
-		summary.toolSuccessRate = totalToolCalls > 0 ? 1 - totalToolFailures / totalToolCalls : 1.0
-
-		summary.tasks = totalTasks
-		summary.successRate = totalTasks > 0 ? successfulTasks / totalTasks : 0
-		summary.averageTokens = totalTasks > 0 ? totalTokens / totalTasks : 0
-		summary.averageCost = totalTasks > 0 ? totalCost / totalTasks : 0
-		summary.averageDuration = totalTasks > 0 ? totalDuration / totalTasks : 0
-
-		// Generate benchmark-specific reports
-		const benchmarkReports: Record<string, any> = {}
-
-		for (const benchmark of summary.benchmarks) {
-			const benchmarkRuns = runs.filter((run) => run.benchmark === benchmark)
-			const benchmarkSummary = {
-				runs: benchmarkRuns.length,
-				models: [...new Set(benchmarkRuns.map((run) => run.model))],
-				tasks: 0,
-				successRate: 0,
-				averageTokens: 0,
-				averageCost: 0,
-				averageDuration: 0,
-			}
-
-			let benchmarkTasks = 0
-			let benchmarkSuccessfulTasks = 0
-			let benchmarkTotalTokens = 0
-			let benchmarkTotalCost = 0
-			let benchmarkTotalDuration = 0
-
-			for (const run of benchmarkRuns) {
-				const tasks = db.getRunTasks(run.id)
-				benchmarkTasks += tasks.length
-
-				for (const task of tasks) {
-					if (task.success) {
-						benchmarkSuccessfulTasks++
-					}
-
-					const metrics = db.getTaskMetrics(task.id)
-
-					const tokensIn = metrics.find((m) => m.name === "tokensIn")?.value || 0
-					const tokensOut = metrics.find((m) => m.name === "tokensOut")?.value || 0
-					benchmarkTotalTokens += tokensIn + tokensOut
-
-					benchmarkTotalCost += metrics.find((m) => m.name === "cost")?.value || 0
-					benchmarkTotalDuration += metrics.find((m) => m.name === "duration")?.value || 0
-				}
-			}
-
-			benchmarkSummary.tasks = benchmarkTasks
-			benchmarkSummary.successRate = benchmarkTasks > 0 ? benchmarkSuccessfulTasks / benchmarkTasks : 0
-			benchmarkSummary.averageTokens = benchmarkTasks > 0 ? benchmarkTotalTokens / benchmarkTasks : 0
-			benchmarkSummary.averageCost = benchmarkTasks > 0 ? benchmarkTotalCost / benchmarkTasks : 0
-			benchmarkSummary.averageDuration = benchmarkTasks > 0 ? benchmarkTotalDuration / benchmarkTasks : 0
-
-			benchmarkReports[benchmark] = benchmarkSummary
-		}
-
-		// Generate model-specific reports
-		const modelReports: Record<string, any> = {}
-
-		for (const model of summary.models) {
-			const modelRuns = runs.filter((run) => run.model === model)
-			const modelSummary = {
-				runs: modelRuns.length,
-				benchmarks: [...new Set(modelRuns.map((run) => run.benchmark))],
-				tasks: 0,
-				successRate: 0,
-				averageTokens: 0,
-				averageCost: 0,
-				averageDuration: 0,
-			}
-
-			let modelTasks = 0
-			let modelSuccessfulTasks = 0
-			let modelTotalTokens = 0
-			let modelTotalCost = 0
-			let modelTotalDuration = 0
-
-			for (const run of modelRuns) {
-				const tasks = db.getRunTasks(run.id)
-				modelTasks += tasks.length
-
-				for (const task of tasks) {
-					if (task.success) {
-						modelSuccessfulTasks++
-					}
-
-					const metrics = db.getTaskMetrics(task.id)
-
-					const tokensIn = metrics.find((m) => m.name === "tokensIn")?.value || 0
-					const tokensOut = metrics.find((m) => m.name === "tokensOut")?.value || 0
-					modelTotalTokens += tokensIn + tokensOut
-
-					modelTotalCost += metrics.find((m) => m.name === "cost")?.value || 0
-					modelTotalDuration += metrics.find((m) => m.name === "duration")?.value || 0
-				}
-			}
-
-			modelSummary.tasks = modelTasks
-			modelSummary.successRate = modelTasks > 0 ? modelSuccessfulTasks / modelTasks : 0
-			modelSummary.averageTokens = modelTasks > 0 ? modelTotalTokens / modelTasks : 0
-			modelSummary.averageCost = modelTasks > 0 ? modelTotalCost / modelTasks : 0
-			modelSummary.averageDuration = modelTasks > 0 ? modelTotalDuration / modelTasks : 0
-
-			modelReports[model] = modelSummary
-		}
-
-		// Save reports
-		const reportDir = path.join(path.resolve(__dirname, "../../../"), "results", "reports")
-		fs.mkdirSync(reportDir, { recursive: true })
-
-		const timestamp = new Date().toISOString().replace(/:/g, "-")
-
-		if (format === "json") {
-			// Save JSON reports
-			fs.writeFileSync(path.join(reportDir, `summary-${timestamp}.json`), JSON.stringify(summary, null, 2))
-
-			fs.writeFileSync(path.join(reportDir, `benchmarks-${timestamp}.json`), JSON.stringify(benchmarkReports, null, 2))
-
-			fs.writeFileSync(path.join(reportDir, `models-${timestamp}.json`), JSON.stringify(modelReports, null, 2))
-
-			spinner.succeed(`JSON reports generated in ${reportDir}`)
-		} else {
-			// Generate markdown report
-			const outputPath = options.output || path.join(reportDir, `report-${timestamp}.md`)
-
-			generateMarkdownReport(summary, benchmarkReports, modelReports, outputPath)
-
-			spinner.succeed(`Markdown report generated at ${outputPath}`)
-		}
-	} catch (error: any) {
-		console.error(chalk.red(`Error generating report: ${error.message}`))
-		console.error(error.stack)
-	} finally {
-		db.close()
-	}
-}

evals/cli/src/commands/run.ts

@@ -1,133 +0,0 @@
-import * as path from "path"
-import { v4 as uuidv4 } from "uuid"
-import chalk from "chalk"
-import ora from "ora"
-import { getAdapter } from "../adapters"
-import { ResultsDatabase } from "../db"
-import { spawnVSCode, cleanupVSCode } from "../utils/vscode"
-import { sendTaskToServer } from "../utils/task"
-import { storeTaskResult } from "../utils/results"
-
-interface RunOptions {
-	benchmark?: string
-	model: string
-	count?: number
-	apiKey?: string
-}
-
-/**
- * Handler for the run command
- * @param options Command options
- */
-export async function runHandler(options: RunOptions): Promise<void> {
-	// Determine which benchmarks to run
-	const benchmarks = options.benchmark ? [options.benchmark] : ["exercism"] // Default to exercism for now
-	const model = options.model
-	const count = options.count || Infinity
-
-	console.log(chalk.blue(`Running evaluations for model: ${model}`))
-	console.log(chalk.blue(`Benchmarks: ${benchmarks.join(", ")}`))
-
-	// Create a run for each benchmark
-	for (const benchmark of benchmarks) {
-		const runId = uuidv4()
-		const db = new ResultsDatabase()
-
-		console.log(chalk.green(`\nStarting run for benchmark: ${benchmark}`))
-
-		// Create run in database
-		db.createRun(runId, model, benchmark)
-
-		// Get adapter for this benchmark
-		try {
-			const adapter = getAdapter(benchmark)
-
-			// List tasks
-			const spinner = ora("Listing tasks...").start()
-			const tasks = await adapter.listTasks()
-			spinner.succeed(`Found ${tasks.length} tasks for ${benchmark}`)
-
-			// Limit number of tasks if specified
-			const tasksToRun = tasks.slice(0, count)
-
-			console.log(chalk.blue(`Running ${tasksToRun.length} tasks...`))
-
-			// Run each task
-			for (let i = 0; i < tasksToRun.length; i++) {
-				const task = tasksToRun[i]
-
-				console.log(chalk.cyan(`\nTask ${i + 1}/${tasksToRun.length}: ${task.name}`))
-
-				// Prepare task
-				const prepareSpinner = ora("Preparing task...").start()
-				const preparedTask = await adapter.prepareTask(task.id)
-				prepareSpinner.succeed("Task prepared")
-
-				// Spawn VSCode
-				console.log("Spawning VSCode...")
-				await spawnVSCode(preparedTask.workspacePath)
-
-				// Send task to server
-				const sendSpinner = ora("Sending task to server...").start()
-				try {
-					const result = await sendTaskToServer(preparedTask.description, options.apiKey)
-					sendSpinner.succeed("Task completed")
-
-					// Verify result
-					const verifySpinner = ora("Verifying result...").start()
-					const verification = await adapter.verifyResult(preparedTask, result)
-
-					if (verification.success) {
-						verifySpinner.succeed(
-							`Verification successful: ${verification.metrics.testsPassed}/${verification.metrics.testsTotal} tests passed`,
-						)
-					} else {
-						verifySpinner.fail(
-							`Verification failed: ${verification.metrics.testsPassed}/${verification.metrics.testsTotal} tests passed`,
-						)
-					}
-
-					// Store result
-					const storeSpinner = ora("Storing result...").start()
-					await storeTaskResult(runId, preparedTask, result, verification)
-					storeSpinner.succeed("Result stored")
-
-					console.log(chalk.green(`Task completed. Success: ${verification.success}`))
-
-					// Clean up VS Code and temporary files
-					const cleanupSpinner = ora("Cleaning up...").start()
-					try {
-						await cleanupVSCode(preparedTask.workspacePath)
-						cleanupSpinner.succeed("Cleanup completed")
-					} catch (cleanupError: any) {
-						cleanupSpinner.fail(`Cleanup failed: ${cleanupError.message}`)
-						console.error(chalk.yellow(cleanupError.stack))
-					}
-				} catch (error: any) {
-					sendSpinner.fail(`Task failed: ${error.message}`)
-					console.error(chalk.red(error.stack))
-
-					// Clean up VS Code and temporary files even if the task failed
-					const cleanupSpinner = ora("Cleaning up...").start()
-					try {
-						await cleanupVSCode(preparedTask.workspacePath)
-						cleanupSpinner.succeed("Cleanup completed")
-					} catch (cleanupError: any) {
-						cleanupSpinner.fail(`Cleanup failed: ${cleanupError.message}`)
-						console.error(chalk.yellow(cleanupError.stack))
-					}
-				}
-			}
-
-			// Mark run as complete
-			db.completeRun(runId)
-
-			console.log(chalk.green(`\nRun complete for benchmark: ${benchmark}`))
-		} catch (error: any) {
-			console.error(chalk.red(`Error running benchmark ${benchmark}: ${error.message}`))
-			console.error(error.stack)
-		}
-	}
-
-	console.log(chalk.green("\nAll evaluations complete"))
-}

evals/cli/src/commands/setup.ts

@@ -1,72 +0,0 @@
-import * as path from "path"
-import * as fs from "fs"
-import execa from "execa"
-import chalk from "chalk"
-import ora from "ora"
-import { getAllAdapters } from "../adapters/index"
-import { BenchmarkAdapter } from "../adapters/types"
-
-interface SetupOptions {
-	benchmarks: string
-}
-
-/**
- * Handler for the setup command
- * @param options Command options
- */
-export async function setupHandler(options: SetupOptions): Promise<void> {
-	const benchmarks = options.benchmarks.split(",")
-
-	console.log(chalk.blue(`Setting up benchmarks: ${benchmarks.join(", ")}`))
-
-	// Create directories
-	const evalsDir = path.resolve(__dirname, "../../../")
-	const reposDir = path.join(evalsDir, "repositories")
-	const resultsDir = path.join(evalsDir, "results")
-
-	const spinner = ora("Creating directory structure").start()
-
-	try {
-		fs.mkdirSync(reposDir, { recursive: true })
-		fs.mkdirSync(resultsDir, { recursive: true })
-		fs.mkdirSync(path.join(resultsDir, "runs"), { recursive: true })
-		fs.mkdirSync(path.join(resultsDir, "reports"), { recursive: true })
-		spinner.succeed("Directory structure created")
-	} catch (error) {
-		spinner.fail(`Failed to create directory structure: ${(error as Error).message}`)
-		throw error
-	}
-
-	// Set up each benchmark
-	try {
-		const adapters = getAllAdapters().filter((adapter: BenchmarkAdapter) => benchmarks.includes(adapter.name))
-
-		if (adapters.length === 0) {
-			console.warn(chalk.yellow("No valid benchmarks specified. Available benchmarks:"))
-			console.warn(
-				chalk.yellow(
-					getAllAdapters()
-						.map((a: BenchmarkAdapter) => a.name)
-						.join(", "),
-				),
-			)
-			return
-		}
-
-		for (const adapter of adapters) {
-			const setupSpinner = ora(`Setting up ${adapter.name}...`).start()
-			try {
-				await adapter.setup()
-				setupSpinner.succeed(`${adapter.name} setup complete`)
-			} catch (error) {
-				setupSpinner.fail(`Failed to set up ${adapter.name}: ${(error as Error).message}`)
-				throw error
-			}
-		}
-
-		console.log(chalk.green("Setup complete"))
-	} catch (error) {
-		console.error(chalk.red(`Setup failed: ${(error as Error).message}`))
-		throw error
-	}
-}

evals/cli/src/db/index.ts

@@ -1,211 +0,0 @@
-import * as path from "path"
-import * as fs from "fs"
-import Database from "better-sqlite3"
-import { SCHEMA } from "./schema"
-
-const EVALS_DIR = path.resolve(__dirname, "../../../")
-
-/**
- * Database class for storing evaluation results
- */
-export class ResultsDatabase {
-	db: Database.Database
-
-	constructor() {
-		// Ensure results directory exists
-		const resultsDir = path.join(EVALS_DIR, "results")
-		fs.mkdirSync(resultsDir, { recursive: true })
-
-		// Create database file
-		const dbPath = path.join(resultsDir, "evals.db")
-		this.db = new Database(dbPath)
-
-		// Initialize schema
-		this.initSchema()
-	}
-
-	/**
-	 * Initialize the database schema
-	 */
-	private initSchema(): void {
-		this.db.exec(SCHEMA)
-	}
-
-	/**
-	 * Create a new evaluation run
-	 * @param id Run ID
-	 * @param model Model name
-	 * @param benchmark Benchmark name
-	 */
-	createRun(id: string, model: string, benchmark: string): void {
-		const stmt = this.db.prepare(`
-      INSERT INTO runs (id, timestamp, model, benchmark)
-      VALUES (?, ?, ?, ?)
-    `)
-
-		stmt.run(id, Date.now(), model, benchmark)
-	}
-
-	/**
-	 * Mark a run as completed
-	 * @param id Run ID
-	 */
-	completeRun(id: string): void {
-		const stmt = this.db.prepare(`
-      UPDATE runs SET completed = 1 WHERE id = ?
-    `)
-
-		stmt.run(id)
-	}
-
-	/**
-	 * Create a new task
-	 * @param id Task ID
-	 * @param runId Run ID
-	 * @param taskId Original task ID
-	 */
-	createTask(id: string, runId: string, taskId: string): void {
-		const stmt = this.db.prepare(`
-      INSERT INTO tasks (id, run_id, task_id, timestamp)
-      VALUES (?, ?, ?, ?)
-    `)
-
-		stmt.run(id, runId, taskId, Date.now())
-	}
-
-	/**
-	 * Mark a task as completed
-	 * @param id Task ID
-	 * @param success Whether the task was successful
-	 * @param toolCalls Total tool calls
-	 * @param toolFailures Total tool failures
-	 */
-	completeTask(id: string, success: boolean, toolCalls: number = 0, toolFailures: number = 0): void {
-		const stmt = this.db.prepare(`
-      UPDATE tasks 
-      SET success = ?, total_tool_calls = ?, total_tool_failures = ? 
-      WHERE id = ?
-    `)
-
-		stmt.run(success ? 1 : 0, toolCalls, toolFailures, id)
-	}
-
-	/**
-	 * Add a metric to a task
-	 * @param taskId Task ID
-	 * @param name Metric name
-	 * @param value Metric value
-	 */
-	addMetric(taskId: string, name: string, value: number): void {
-		const stmt = this.db.prepare(`
-      INSERT INTO metrics (task_id, name, value)
-      VALUES (?, ?, ?)
-    `)
-
-		stmt.run(taskId, name, value)
-	}
-
-	/**
-	 * Add a tool call record
-	 * @param taskId Task ID
-	 * @param toolName Tool name
-	 * @param callCount Number of calls
-	 * @param failureCount Number of failures
-	 */
-	addToolCall(taskId: string, toolName: string, callCount: number, failureCount: number): void {
-		const stmt = this.db.prepare(`
-      INSERT INTO tool_calls (task_id, tool_name, call_count, failure_count)
-      VALUES (?, ?, ?, ?)
-    `)
-
-		stmt.run(taskId, toolName, callCount, failureCount)
-	}
-
-	/**
-	 * Add a file record
-	 * @param taskId Task ID
-	 * @param filePath File path
-	 * @param status File status (created, modified, deleted)
-	 */
-	addFile(taskId: string, filePath: string, status: "created" | "modified" | "deleted"): void {
-		const stmt = this.db.prepare(`
-      INSERT INTO files (task_id, path, status)
-      VALUES (?, ?, ?)
-    `)
-
-		stmt.run(taskId, filePath, status)
-	}
-
-	/**
-	 * Get all runs
-	 * @returns Array of runs
-	 */
-	getRuns(): any[] {
-		const stmt = this.db.prepare(`
-      SELECT * FROM runs ORDER BY timestamp DESC
-    `)
-
-		return stmt.all()
-	}
-
-	/**
-	 * Get all tasks for a run
-	 * @param runId Run ID
-	 * @returns Array of tasks
-	 */
-	getRunTasks(runId: string): any[] {
-		const stmt = this.db.prepare(`
-      SELECT * FROM tasks WHERE run_id = ? ORDER BY timestamp ASC
-    `)
-
-		return stmt.all(runId)
-	}
-
-	/**
-	 * Get all metrics for a task
-	 * @param taskId Task ID
-	 * @returns Array of metrics
-	 */
-	getTaskMetrics(taskId: string): any[] {
-		const stmt = this.db.prepare(`
-      SELECT name, value FROM metrics WHERE task_id = ?
-    `)
-
-		return stmt.all(taskId)
-	}
-
-	/**
-	 * Get all tool calls for a task
-	 * @param taskId Task ID
-	 * @returns Array of tool calls
-	 */
-	getTaskToolCalls(taskId: string): any[] {
-		const stmt = this.db.prepare(`
-      SELECT tool_name, call_count, failure_count 
-      FROM tool_calls 
-      WHERE task_id = ?
-    `)
-
-		return stmt.all(taskId)
-	}
-
-	/**
-	 * Get all files for a task
-	 * @param taskId Task ID
-	 * @returns Array of files
-	 */
-	getTaskFiles(taskId: string): any[] {
-		const stmt = this.db.prepare(`
-      SELECT path, status FROM files WHERE task_id = ?
-    `)
-
-		return stmt.all(taskId)
-	}
-
-	/**
-	 * Close the database connection
-	 */
-	close(): void {
-		this.db.close()
-	}
-}

evals/cli/src/db/schema.ts

@@ -1,48 +0,0 @@
-/**
- * SQL schema for the evaluation database
- */
-export const SCHEMA = `
-CREATE TABLE IF NOT EXISTS runs (
-  id TEXT PRIMARY KEY,
-  timestamp INTEGER NOT NULL,
-  model TEXT NOT NULL,
-  benchmark TEXT NOT NULL,
-  completed INTEGER NOT NULL DEFAULT 0
-);
-
-CREATE TABLE IF NOT EXISTS tasks (
-  id TEXT PRIMARY KEY,
-  run_id TEXT NOT NULL,
-  task_id TEXT NOT NULL,
-  timestamp INTEGER NOT NULL,
-  success INTEGER NOT NULL DEFAULT 0,
-  total_tool_calls INTEGER DEFAULT 0,
-  total_tool_failures INTEGER DEFAULT 0,
-  FOREIGN KEY (run_id) REFERENCES runs(id)
-);
-
-CREATE TABLE IF NOT EXISTS metrics (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  task_id TEXT NOT NULL,
-  name TEXT NOT NULL,
-  value REAL NOT NULL,
-  FOREIGN KEY (task_id) REFERENCES tasks(id)
-);
-
-CREATE TABLE IF NOT EXISTS tool_calls (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  task_id TEXT NOT NULL,
-  tool_name TEXT NOT NULL,
-  call_count INTEGER NOT NULL,
-  failure_count INTEGER NOT NULL,
-  FOREIGN KEY (task_id) REFERENCES tasks(id)
-);
-
-CREATE TABLE IF NOT EXISTS files (
-  id INTEGER PRIMARY KEY AUTOINCREMENT,
-  task_id TEXT NOT NULL,
-  path TEXT NOT NULL,
-  status TEXT NOT NULL,
-  FOREIGN KEY (task_id) REFERENCES tasks(id)
-);
-`

evals/cli/src/index.ts

@@ -1,70 +0,0 @@
-#!/usr/bin/env node
-import { Command } from "commander"
-import chalk from "chalk"
-import { setupHandler } from "./commands/setup"
-import { runHandler } from "./commands/run"
-import { reportHandler } from "./commands/report"
-
-// Create the CLI program
-const program = new Command()
-
-// Set up CLI metadata
-program.name("cline-eval").description("CLI tool for orchestrating Cline evaluations across multiple benchmarks").version("0.1.0")
-
-// Setup command
-program
-	.command("setup")
-	.description("Clone and set up benchmark repositories")
-	.option(
-		"-b, --benchmarks <benchmarks>",
-		"Comma-separated list of benchmarks to set up",
-		"exercism,swe-bench,swelancer,multi-swe",
-	)
-	.action(async (options) => {
-		try {
-			await setupHandler(options)
-		} catch (error) {
-			console.error(chalk.red(`Error during setup: ${error instanceof Error ? error.message : String(error)}`))
-			process.exit(1)
-		}
-	})
-
-// Run command
-program
-	.command("run")
-	.description("Run evaluations")
-	.option("-b, --benchmark <benchmark>", "Specific benchmark to run")
-	.option("-m, --model <model>", "Model to evaluate", "claude-3-opus-20240229")
-	.option("-c, --count <count>", "Number of tasks to run", parseInt)
-	.option("-k, --api-key <apiKey>", "Cline API key to use for evaluations")
-	.action(async (options) => {
-		try {
-			await runHandler(options)
-		} catch (error) {
-			console.error(chalk.red(`Error during run: ${error instanceof Error ? error.message : String(error)}`))
-			process.exit(1)
-		}
-	})
-
-// Report command
-program
-	.command("report")
-	.description("Generate reports")
-	.option("-f, --format <format>", "Report format (json, markdown)", "markdown")
-	.option("-o, --output <path>", "Output path for the report")
-	.action(async (options) => {
-		try {
-			await reportHandler(options)
-		} catch (error) {
-			console.error(chalk.red(`Error generating report: ${error instanceof Error ? error.message : String(error)}`))
-			process.exit(1)
-		}
-	})
-
-// Parse command line arguments
-program.parse(process.argv)
-
-// If no arguments provided, show help
-if (process.argv.length === 2) {
-	program.help()
-}

evals/cli/src/utils/extensions.ts

@@ -1,131 +0,0 @@
-import execa from "execa"
-import * as fs from "fs"
-import * as path from "path"
-import * as os from "os"
-
-/**
- * List of VSCode extensions to install for evaluation environments
- * These extensions provide language support and other useful features
- */
-export const REQUIRED_EXTENSIONS = [
-	"golang.go", // Go language support
-	"dbaeumer.vscode-eslint", // ESLint support
-	"redhat.java", // Java support
-	"ms-python.python", // Python support
-	"rust-lang.rust-analyzer", // Rust support
-	"ms-vscode.cpptools", // C/C++ support
-]
-
-/**
- * Install required VSCode extensions in the specified extensions directory
- * @param extensionsDir The directory where extensions should be installed
- * @returns Promise that resolves when all extensions are installed
- */
-export async function installRequiredExtensions(extensionsDir: string): Promise<void> {
-	console.log("Installing required VSCode extensions...")
-
-	// Create the extensions directory if it doesn't exist
-	if (!fs.existsSync(extensionsDir)) {
-		fs.mkdirSync(extensionsDir, { recursive: true })
-	}
-
-	// Install each extension
-	for (const extension of REQUIRED_EXTENSIONS) {
-		try {
-			console.log(`Installing extension: ${extension}...`)
-			await execa("code", ["--extensions-dir", extensionsDir, "--install-extension", extension, "--force"])
-			console.log(`✅ Extension ${extension} installed successfully`)
-		} catch (error: any) {
-			console.warn(`⚠️ Failed to install extension ${extension}: ${error.message}`)
-			// Continue with other extensions even if one fails
-		}
-	}
-
-	console.log("✅ All required extensions installed")
-}
-
-/**
- * Check if a VSCode extension is installed in the specified directory
- * @param extensionsDir The directory to check for installed extensions
- * @param extensionId The ID of the extension to check
- * @returns True if the extension is installed, false otherwise
- */
-export function isExtensionInstalled(extensionsDir: string, extensionId: string): boolean {
-	// Extensions are installed in directories named publisher.name-version
-	// We need to check if any directory starts with the extensionId
-	const extensionPrefix = extensionId.toLowerCase() + "-"
-
-	try {
-		const files = fs.readdirSync(extensionsDir)
-		return files.some((file) => {
-			const lowerCaseFile = file.toLowerCase()
-			return lowerCaseFile === extensionId.toLowerCase() || lowerCaseFile.startsWith(extensionPrefix)
-		})
-	} catch (error) {
-		return false
-	}
-}
-
-/**
- * Get the path to the VSCode settings file in the specified user data directory
- * @param userDataDir The VSCode user data directory
- * @returns The path to the settings.json file
- */
-export function getSettingsPath(userDataDir: string): string {
-	const settingsDir = path.join(userDataDir, "User")
-	fs.mkdirSync(settingsDir, { recursive: true })
-	return path.join(settingsDir, "settings.json")
-}
-
-/**
- * Configure extension settings in the VSCode user data directory
- * @param userDataDir The VSCode user data directory
- */
-export function configureExtensionSettings(userDataDir: string): void {
-	const settingsPath = getSettingsPath(userDataDir)
-
-	// Read existing settings if they exist
-	let settings = {}
-	if (fs.existsSync(settingsPath)) {
-		try {
-			settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"))
-		} catch (error) {
-			console.warn(`Error reading settings file: ${error}`)
-		}
-	}
-
-	// Add or update extension-specific settings
-	const updatedSettings = {
-		...settings,
-		// Go extension settings
-		"go.toolsManagement.autoUpdate": false,
-		"go.survey.prompt": false,
-
-		// ESLint settings
-		"eslint.enable": true,
-		"eslint.run": "onSave",
-
-		// Java settings
-		"java.configuration.checkProjectSettingsExclusions": false,
-		"java.configure.checkForOutdatedExtensions": false,
-		"java.help.firstView": false,
-
-		// Python settings
-		"python.experiments.enabled": false,
-		"python.showStartPage": false,
-
-		// Rust settings
-		"rust-analyzer.checkOnSave.command": "check",
-
-		// C/C++ settings
-		"C_Cpp.intelliSenseEngine": "default",
-
-		// General extension settings
-		"extensions.autoUpdate": false,
-		"extensions.ignoreRecommendations": true,
-	}
-
-	// Write updated settings
-	fs.writeFileSync(settingsPath, JSON.stringify(updatedSettings, null, 2))
-	console.log("✅ Extension settings configured")
-}

evals/cli/src/utils/markdown.ts

@@ -1,109 +0,0 @@
-import * as fs from "fs"
-import * as path from "path"
-
-/**
- * Generate a markdown report from evaluation results
- * @param summary Overall summary
- * @param benchmarkReports Benchmark-specific reports
- * @param modelReports Model-specific reports
- * @param outputPath Output file path
- */
-export function generateMarkdownReport(
-	summary: any,
-	benchmarkReports: Record<string, any>,
-	modelReports: Record<string, any>,
-	outputPath: string,
-): void {
-	let markdown = `# Cline Evaluation Report\n\n`
-
-	// Generate summary section
-	markdown += `## Summary\n\n`
-	markdown += `- **Total Runs:** ${summary.runs}\n`
-	markdown += `- **Models:** ${summary.models.join(", ")}\n`
-	markdown += `- **Benchmarks:** ${summary.benchmarks.join(", ")}\n`
-	markdown += `- **Total Tasks:** ${summary.tasks}\n`
-	markdown += `- **Success Rate:** ${(summary.successRate * 100).toFixed(2)}%\n`
-	markdown += `- **Average Tokens:** ${Math.round(summary.averageTokens)}\n`
-	markdown += `- **Average Cost:** $${summary.averageCost.toFixed(4)}\n`
-	markdown += `- **Average Duration:** ${(summary.averageDuration / 1000).toFixed(2)}s\n`
-	markdown += `- **Total Tool Calls:** ${summary.totalToolCalls}\n`
-	markdown += `- **Tool Success Rate:** ${(summary.toolSuccessRate * 100).toFixed(2)}%\n\n`
-
-	// Generate tool usage section
-	markdown += `## Tool Usage\n\n`
-	markdown += `| Tool | Calls | Failures | Success Rate |\n`
-	markdown += `| ---- | ----- | -------- | ------------ |\n`
-
-	for (const [toolName, metrics] of Object.entries(summary.toolUsage)) {
-		const calls = (metrics as any).calls
-		const failures = (metrics as any).failures
-		const successRate = calls > 0 ? (1 - failures / calls) * 100 : 100
-
-		markdown += `| ${toolName} | ${calls} | ${failures} | ${successRate.toFixed(2)}% |\n`
-	}
-
-	// Generate benchmark results section
-	markdown += `\n## Benchmark Results\n\n`
-
-	for (const [benchmark, report] of Object.entries(benchmarkReports)) {
-		markdown += `### ${benchmark}\n\n`
-		markdown += `- **Runs:** ${report.runs}\n`
-		markdown += `- **Models:** ${report.models.join(", ")}\n`
-		markdown += `- **Tasks:** ${report.tasks}\n`
-		markdown += `- **Success Rate:** ${(report.successRate * 100).toFixed(2)}%\n`
-		markdown += `- **Average Tokens:** ${Math.round(report.averageTokens)}\n`
-		markdown += `- **Average Cost:** $${report.averageCost.toFixed(4)}\n`
-		markdown += `- **Average Duration:** ${(report.averageDuration / 1000).toFixed(2)}s\n\n`
-	}
-
-	// Generate model results section
-	markdown += `## Model Results\n\n`
-
-	for (const [model, report] of Object.entries(modelReports)) {
-		markdown += `### ${model}\n\n`
-		markdown += `- **Runs:** ${report.runs}\n`
-		markdown += `- **Benchmarks:** ${report.benchmarks.join(", ")}\n`
-		markdown += `- **Tasks:** ${report.tasks}\n`
-		markdown += `- **Success Rate:** ${(report.successRate * 100).toFixed(2)}%\n`
-		markdown += `- **Average Tokens:** ${Math.round(report.averageTokens)}\n`
-		markdown += `- **Average Cost:** $${report.averageCost.toFixed(4)}\n`
-		markdown += `- **Average Duration:** ${(report.averageDuration / 1000).toFixed(2)}s\n\n`
-	}
-
-	// Add charts using Mermaid
-	markdown += `## Charts\n\n`
-
-	// Success rate by benchmark chart
-	markdown += `### Success Rate by Benchmark\n\n`
-	markdown += "```mermaid\n"
-	markdown += "graph TD\n"
-	markdown += "  title[Success Rate by Benchmark]\n"
-	markdown += "  style title fill:none,stroke:none\n\n"
-
-	for (const [benchmark, report] of Object.entries(benchmarkReports)) {
-		const successRate = (report.successRate * 100).toFixed(2)
-		markdown += `  ${benchmark}[${benchmark}: ${successRate}%]\n`
-	}
-
-	markdown += "```\n\n"
-
-	// Success rate by model chart
-	markdown += `### Success Rate by Model\n\n`
-	markdown += "```mermaid\n"
-	markdown += "graph TD\n"
-	markdown += "  title[Success Rate by Model]\n"
-	markdown += "  style title fill:none,stroke:none\n\n"
-
-	for (const [model, report] of Object.entries(modelReports)) {
-		const successRate = (report.successRate * 100).toFixed(2)
-		markdown += `  ${model.replace(/[-\.]/g, "_")}[${model}: ${successRate}%]\n`
-	}
-
-	markdown += "```\n\n"
-
-	// Add timestamp
-	markdown += `\n\n---\n\nReport generated on ${new Date().toISOString()}\n`
-
-	// Write markdown to file
-	fs.writeFileSync(outputPath, markdown)
-}

evals/cli/src/utils/results.ts

@@ -1,79 +0,0 @@
-import { v4 as uuidv4 } from "uuid"
-import { ResultsDatabase } from "../db"
-import { Task } from "../adapters/types"
-
-/**
- * Store task result in the database
- * @param runId The run ID
- * @param task The task that was executed
- * @param result The result from the test server
- * @param verification The verification result
- */
-export async function storeTaskResult(runId: string, task: Task, result: any, verification: any): Promise<void> {
-	const db = new ResultsDatabase()
-	const taskId = uuidv4()
-
-	try {
-		// Extract metrics from the result
-		const { metrics } = result
-		const totalToolCalls = metrics?.totalToolCalls || 0
-		const totalToolFailures = metrics?.totalToolFailures || 0
-
-		// Create task with tool metrics
-		db.createTask(taskId, runId, task.id)
-		db.completeTask(taskId, verification.success, totalToolCalls, totalToolFailures)
-
-		// Store metrics
-		if (metrics) {
-			// Store token metrics
-			if (metrics.tokensIn) db.addMetric(taskId, "tokensIn", metrics.tokensIn)
-			if (metrics.tokensOut) db.addMetric(taskId, "tokensOut", metrics.tokensOut)
-			if (metrics.cost) db.addMetric(taskId, "cost", metrics.cost)
-			if (metrics.duration) db.addMetric(taskId, "duration", metrics.duration)
-
-			// Store tool call metrics
-			if (metrics.toolCalls) {
-				for (const [toolName, callCount] of Object.entries(metrics.toolCalls)) {
-					const failureCount = metrics.toolFailures?.[toolName] || 0
-					db.addToolCall(taskId, toolName, callCount as number, failureCount)
-				}
-			}
-		}
-
-		// Store verification metrics
-		if (verification.metrics) {
-			for (const [key, value] of Object.entries(verification.metrics)) {
-				if (typeof value === "number") {
-					db.addMetric(taskId, key, value)
-				}
-			}
-		}
-
-		// Store file changes
-		if (result.files) {
-			// Store created files
-			if (result.files.created) {
-				for (const file of result.files.created) {
-					db.addFile(taskId, file, "created")
-				}
-			}
-
-			// Store modified files
-			if (result.files.modified) {
-				for (const file of result.files.modified) {
-					db.addFile(taskId, file, "modified")
-				}
-			}
-
-			// Store deleted files
-			if (result.files.deleted) {
-				for (const file of result.files.deleted) {
-					db.addFile(taskId, file, "deleted")
-				}
-			}
-		}
-	} finally {
-		// Close the database connection
-		db.close()
-	}
-}

evals/cli/src/utils/task.ts

@@ -1,52 +0,0 @@
-import fetch from "node-fetch"
-import chalk from "chalk"
-
-/**
- * Send a task to the Cline test server
- * @param task The task description to send
- * @param apiKey Optional Cline API key to use for the task
- * @returns The result of the task execution
- */
-export async function sendTaskToServer(task: string, apiKey?: string): Promise<any> {
-	const SERVER_URL = "http://localhost:9876/task"
-
-	try {
-		console.log(chalk.blue(`Sending task to server: ${task.substring(0, 100)}${task.length > 100 ? "..." : ""}`))
-
-		const response = await fetch(SERVER_URL, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-			},
-			body: JSON.stringify({
-				task,
-				apiKey,
-			}),
-		})
-
-		if (!response.ok) {
-			const errorText = await response.text()
-			throw new Error(`Server responded with status ${response.status}: ${errorText}`)
-		}
-
-		const result = await response.json()
-
-		if (!result.success) {
-			throw new Error(`Task execution failed: ${result.error || "Unknown error"}`)
-		}
-
-		if (result.timeout) {
-			throw new Error("Task execution timed out")
-		}
-
-		return result
-	} catch (error: any) {
-		if (error.code === "ECONNREFUSED") {
-			throw new Error(
-				"Could not connect to the test server. Make sure VSCode is running with the Cline extension and the test server is active.",
-			)
-		}
-
-		throw error
-	}
-}

evals/cli/src/utils/vscode.ts

@@ -1,570 +0,0 @@
-import execa from "execa"
-import * as path from "path"
-import * as fs from "fs"
-import fetch from "node-fetch"
-import * as os from "os"
-import * as child_process from "child_process"
-import { installRequiredExtensions, configureExtensionSettings } from "./extensions"
-
-// Store temporary directories for cleanup
-interface VSCodeResources {
-	tempUserDataDir: string
-	tempExtensionsDir: string
-	vscodePid?: number
-}
-
-// Global map to track resources for each workspace
-const workspaceResources = new Map<string, VSCodeResources>()
-
-/**
- * Spawn a VSCode instance with the Cline extension
- * @param workspacePath The workspace path to open
- * @param vsixPath Optional path to a VSIX file to install
- * @returns The resources created for this VS Code instance
- */
-export async function spawnVSCode(workspacePath: string, vsixPath?: string): Promise<VSCodeResources> {
-	// Ensure the workspace path exists
-	if (!fs.existsSync(workspacePath)) {
-		throw new Error(`Workspace path does not exist: ${workspacePath}`)
-	}
-
-	// If no VSIX path is provided, build one with IS_TEST=true
-	if (!vsixPath) {
-		try {
-			// Build the VSIX with IS_TEST=true
-			console.log("Building test VSIX...")
-			const clineRoot = path.resolve(process.cwd(), "..", "..")
-			await execa("npx", ["vsce", "package"], {
-				cwd: clineRoot,
-				env: {
-					IS_TEST: "true",
-				},
-				stdio: "inherit",
-			})
-
-			// Find the generated VSIX file
-			const files = fs.readdirSync(clineRoot)
-			const vsixFile = files.find((file) => file.endsWith(".vsix"))
-			if (vsixFile) {
-				vsixPath = path.join(clineRoot, vsixFile)
-				console.log(`Using built VSIX: ${vsixPath}`)
-			} else {
-				console.warn("Could not find generated VSIX file")
-			}
-		} catch (error) {
-			console.warn("Failed to build test VSIX:", error)
-		}
-	}
-
-	// Create a temporary user data directory for this VS Code instance
-	const tempUserDataDir = path.join(os.tmpdir(), `vscode-cline-eval-${Date.now()}`)
-	fs.mkdirSync(tempUserDataDir, { recursive: true })
-	console.log(`Created temporary user data directory: ${tempUserDataDir}`)
-
-	// Create a temporary extensions directory to ensure no other extensions are loaded
-	const tempExtensionsDir = path.join(os.tmpdir(), `vscode-cline-eval-ext-${Date.now()}`)
-	fs.mkdirSync(tempExtensionsDir, { recursive: true })
-	console.log(`Created temporary extensions directory: ${tempExtensionsDir}`)
-
-	// Create settings.json in the temporary user data directory to disable workspace trust
-	// and configure Cline to auto-open on startup
-	const settingsDir = path.join(tempUserDataDir, "User")
-	fs.mkdirSync(settingsDir, { recursive: true })
-	const settingsPath = path.join(settingsDir, "settings.json")
-	const settings = {
-		// Disable workspace trust
-		"security.workspace.trust.enabled": false,
-		"security.workspace.trust.startupPrompt": "never",
-		"security.workspace.trust.banner": "never",
-		"security.workspace.trust.emptyWindow": true,
-
-		// Configure startup behavior
-		"workbench.startupEditor": "none",
-
-		// Auto-open Cline on startup
-		"cline.autoOpenOnStartup": true,
-
-		// Show the activity bar and sidebar
-		"workbench.activityBar.visible": true,
-		"workbench.sideBar.visible": true,
-		"workbench.view.extension.saoudrizwan.claude-dev-ActivityBar.visible": true,
-		"workbench.view.alwaysShowHeaderActions": true,
-		"workbench.editor.openSideBySideDirection": "right",
-
-		// Disable GitLens from opening automatically
-		"gitlens.views.repositories.autoReveal": false,
-		"gitlens.views.fileHistory.autoReveal": false,
-		"gitlens.views.lineHistory.autoReveal": false,
-		"gitlens.views.compare.autoReveal": false,
-		"gitlens.views.search.autoReveal": false,
-		"gitlens.showWelcomeOnInstall": false,
-		"gitlens.showWhatsNewAfterUpgrades": false,
-
-		// Disable other extensions that might compete for startup focus
-		"extensions.autoUpdate": false,
-	}
-	fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2))
-	console.log(`Created settings.json to disable workspace trust and auto-open Cline`)
-
-	// Create keybindings.json to automatically open Cline on startup
-	const keybindingsPath = path.join(settingsDir, "keybindings.json")
-	const keybindings = [
-		{
-			key: "alt+c",
-			command: "workbench.view.extension.saoudrizwan.claude-dev-ActivityBar",
-			when: "viewContainer.workbench.view.extension.saoudrizwan.claude-dev-ActivityBar.enabled",
-		},
-		{
-			key: "alt+shift+c",
-			command: "cline.openInNewTab",
-			when: "viewContainer.workbench.view.extension.saoudrizwan.claude-dev-ActivityBar.enabled",
-		},
-	]
-	fs.writeFileSync(keybindingsPath, JSON.stringify(keybindings, null, 2))
-	console.log(`Created keybindings.json to help with Cline activation`)
-
-	// Build the command arguments with custom user data directory
-	const args = [
-		// Use a custom user data directory to isolate this instance
-		"--user-data-dir",
-		tempUserDataDir,
-		// Use a custom extensions directory to ensure only our extension is loaded
-		"--extensions-dir",
-		tempExtensionsDir,
-		// Disable workspace trust
-		"--disable-workspace-trust",
-		"-n",
-		workspacePath,
-		// Force the extension to be activated on startup
-		"--start-up-extension",
-		"saoudrizwan.claude-dev",
-		// Run a command on startup to open Cline
-		"--command",
-		"workbench.view.extension.saoudrizwan.claude-dev-ActivityBar",
-		// Additional flags to help with extension activation
-		"--disable-gpu=false",
-		"--max-memory=4096",
-	]
-
-	// Create a startup script to run commands after VS Code launches
-	const startupScriptPath = path.join(settingsDir, "startup.js")
-	const startupScript = `
-		// This script will be executed when VS Code starts
-		setTimeout(() => {
-			// Try to open Cline in the sidebar
-			require('vscode').commands.executeCommand('workbench.view.extension.saoudrizwan.claude-dev-ActivityBar');
-			
-			// Also try to open Cline in a tab as a fallback
-			setTimeout(() => {
-				require('vscode').commands.executeCommand('cline.openInNewTab');
-			}, 5000);
-		}, 5000);
-	`
-	fs.writeFileSync(startupScriptPath, startupScript)
-	console.log(`Created startup script to activate Cline`)
-
-	// If a VSIX is provided, install it
-	if (vsixPath) {
-		if (!fs.existsSync(vsixPath)) {
-			throw new Error(`VSIX file does not exist: ${vsixPath}`)
-		}
-		args.unshift("--install-extension", vsixPath)
-	}
-
-	// Install required extensions
-	console.log("Installing required VSCode extensions...")
-	await installRequiredExtensions(tempExtensionsDir)
-
-	// Configure extension settings
-	console.log("Configuring extension settings...")
-	configureExtensionSettings(tempUserDataDir)
-
-	// Execute the command
-	try {
-		// We don't need to install extensions globally anymore since we're using a custom user data directory
-		// The VSIX will be installed in the isolated environment if provided in the args
-
-		// Launch VS Code
-		console.log("Launching VS Code...")
-		await execa("code", args, {
-			stdio: "inherit",
-		})
-
-		// Wait longer for VSCode to initialize and extension to load
-		console.log("Waiting for VS Code to initialize...")
-		await new Promise((resolve) => setTimeout(resolve, 30000))
-
-		// Create a JavaScript file that will be loaded as a VS Code extension
-		const extensionDir = path.join(tempExtensionsDir, "cline-activator")
-		fs.mkdirSync(extensionDir, { recursive: true })
-
-		// Create package.json for the extension
-		const packageJsonPath = path.join(extensionDir, "package.json")
-		const packageJson = {
-			name: "cline-activator",
-			displayName: "Cline Activator",
-			description: "Activates Cline and starts the test server",
-			version: "0.0.1",
-			engines: {
-				vscode: "^1.60.0",
-			},
-			main: "./extension.js",
-			activationEvents: ["*"],
-			contributes: {
-				commands: [
-					{
-						command: "cline-activator.activate",
-						title: "Activate Cline",
-					},
-				],
-			},
-		}
-		fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2))
-
-		// Create extension.js
-		const extensionJsPath = path.join(extensionDir, "extension.js")
-		const extensionJs = `
-			const vscode = require('vscode');
-			
-			/**
-			 * @param {vscode.ExtensionContext} context
-			 */
-			function activate(context) {
-				console.log('Cline Activator is now active!');
-				
-				// Register the command to activate Cline
-				let disposable = vscode.commands.registerCommand('cline-activator.activate', async function () {
-					try {
-						// Make sure the Cline extension is activated
-						const extension = vscode.extensions.getExtension('saoudrizwan.claude-dev');
-						if (!extension) {
-							console.error('Cline extension not found');
-							return;
-						}
-						
-						if (!extension.isActive) {
-							console.log('Activating Cline extension...');
-							await extension.activate();
-						}
-						
-						// Show the Cline sidebar
-						console.log('Opening Cline sidebar...');
-						await vscode.commands.executeCommand('workbench.view.extension.saoudrizwan.claude-dev-ActivityBar');
-						
-						// Wait a moment for the sidebar to initialize
-						await new Promise(resolve => setTimeout(resolve, 2000));
-						
-						// Also open Cline in a tab as a fallback
-						console.log('Opening Cline in a tab...');
-						await vscode.commands.executeCommand('cline.openInNewTab');
-						
-						// Wait a moment for the tab to initialize
-						await new Promise(resolve => setTimeout(resolve, 2000));
-						
-						// Create the test server if it doesn't exist
-						console.log('Creating test server...');
-						
-						// Get the visible webview instance
-						const clineRootPath = '${path.resolve(process.cwd(), "..", "..")}';
-						const visibleWebview = require(path.join(clineRootPath, 'src', 'core', 'webview')).WebviewProvider.getVisibleInstance();
-						if (visibleWebview) {
-							require(path.join(clineRootPath, 'src', 'services', 'test', 'TestServer')).createTestServer(visibleWebview);
-							console.log('Test server created successfully');
-						} else {
-							console.error('No visible webview instance found');
-						}
-					} catch (error) {
-						console.error('Error activating Cline:', error);
-					}
-				});
-				
-				context.subscriptions.push(disposable);
-				
-				// Automatically run the command after a delay
-				setTimeout(() => {
-					vscode.commands.executeCommand('cline-activator.activate');
-				}, 5000);
-			}
-			
-			function deactivate() {}
-			
-			module.exports = {
-				activate,
-				deactivate
-			}
-		`
-		fs.writeFileSync(extensionJsPath, extensionJs)
-		console.log(`Created Cline Activator extension`)
-
-		// Try multiple approaches to activate the extension
-		let serverStarted = false
-
-		// Create an activation script to run in VS Code
-		const activationScriptPath = path.join(settingsDir, "activate-cline.js")
-		const activationScript = `
-			// This script will be executed to activate Cline and start the test server
-			const vscode = require('vscode');
-			
-			// Execute the cline-activator.activate command
-			vscode.commands.executeCommand('cline-activator.activate');
-		`
-		fs.writeFileSync(activationScriptPath, activationScript)
-		console.log(`Created activation script to run in VS Code`)
-
-		// Execute the activation script
-		try {
-			console.log("Executing activation script to start Cline and test server...")
-			await execa(
-				"code",
-				[
-					"--user-data-dir",
-					tempUserDataDir,
-					"--extensions-dir",
-					tempExtensionsDir,
-					"--folder-uri",
-					`file://${workspacePath}`,
-					"--execute",
-					activationScriptPath,
-				],
-				{
-					stdio: "inherit",
-				},
-			)
-
-			// Wait for the test server to start
-			console.log("Waiting for test server to start...")
-			for (let i = 0; i < 30; i++) {
-				try {
-					// Try to connect to the test server
-					const response = await fetch("http://localhost:9876/task", {
-						method: "OPTIONS",
-						headers: {
-							"Content-Type": "application/json",
-						},
-					})
-
-					if (response.status === 204) {
-						console.log("Test server is running!")
-						serverStarted = true
-						break
-					}
-				} catch (error) {
-					// Server not started yet, wait and try again
-					await new Promise((resolve) => setTimeout(resolve, 1000))
-				}
-			}
-		} catch (error) {
-			console.warn("Failed to execute activation script:", error)
-		}
-
-		if (!serverStarted) {
-			console.warn("Test server did not start after multiple attempts")
-			console.log("You may need to manually open the Cline extension in VS Code")
-		}
-
-		// Store the resources for this workspace
-		const resources: VSCodeResources = {
-			tempUserDataDir,
-			tempExtensionsDir,
-		}
-
-		// Store in the global map
-		workspaceResources.set(workspacePath, resources)
-
-		// Return the resources
-		return resources
-	} catch (error: any) {
-		throw new Error(`Failed to spawn VSCode: ${error.message}`)
-	}
-}
-
-/**
- * Clean up VS Code resources and shut down the test server
- * @param workspacePath The workspace path to clean up resources for
- */
-export async function cleanupVSCode(workspacePath: string): Promise<void> {
-	console.log(`Cleaning up VS Code resources for workspace: ${workspacePath}`)
-
-	// Get the resources for this workspace
-	const resources = workspaceResources.get(workspacePath)
-	if (!resources) {
-		console.log(`No resources found for workspace: ${workspacePath}`)
-		return
-	}
-
-	// Try to shut down the test server
-	try {
-		console.log("Shutting down test server...")
-		await fetch("http://localhost:9876/shutdown", {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-			},
-		}).catch(() => {
-			// Ignore errors, the server might already be down
-		})
-	} catch (error) {
-		console.warn(`Error shutting down test server: ${error}`)
-	}
-
-	// Try to gracefully close VS Code instead of killing it
-	try {
-		console.log("Attempting to gracefully close VS Code...")
-
-		// Create a settings file that will disable the crash reporter and the exit confirmation dialog
-		const settingsDir = path.join(resources.tempUserDataDir, "User")
-		const settingsPath = path.join(settingsDir, "settings.json")
-
-		// Read existing settings if they exist
-		let settings = {}
-		if (fs.existsSync(settingsPath)) {
-			try {
-				settings = JSON.parse(fs.readFileSync(settingsPath, "utf8"))
-			} catch (error) {
-				console.warn(`Error reading settings file: ${error}`)
-			}
-		}
-
-		// Update settings to disable crash reporter and exit confirmation
-		settings = {
-			...settings,
-			"window.confirmBeforeClose": "never",
-			"telemetry.enableCrashReporter": false,
-			"window.restoreWindows": "none",
-			"window.newWindowDimensions": "default",
-		}
-
-		// Write updated settings
-		fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2))
-
-		// On macOS, use AppleScript to quit VS Code gracefully
-		if (process.platform === "darwin") {
-			try {
-				// First try AppleScript to quit VS Code gracefully
-				await execa("osascript", ["-e", 'tell application "Visual Studio Code" to quit'])
-
-				// Wait a moment for VS Code to close
-				await new Promise((resolve) => setTimeout(resolve, 2000))
-			} catch (appleScriptError) {
-				console.warn(`Error using AppleScript to quit VS Code: ${appleScriptError}`)
-			}
-		} else if (process.platform === "win32") {
-			// On Windows, try to use taskkill without /F first
-			try {
-				await execa("taskkill", ["/IM", "code.exe"])
-
-				// Wait a moment for VS Code to close
-				await new Promise((resolve) => setTimeout(resolve, 2000))
-			} catch (taskkillError) {
-				console.warn(`Error using taskkill to quit VS Code: ${taskkillError}`)
-			}
-		} else {
-			// On Linux, try to use SIGTERM first
-			try {
-				// Find VS Code processes
-				const { stdout } = await execa("ps", ["aux"])
-				const lines = stdout.split("\n")
-
-				for (const line of lines) {
-					if (line.includes(resources.tempUserDataDir)) {
-						const parts = line.trim().split(/\s+/)
-						const pid = parseInt(parts[1])
-
-						if (pid && !isNaN(pid)) {
-							console.log(`Sending SIGTERM to VS Code process with PID: ${pid}`)
-							try {
-								// Use SIGTERM instead of SIGKILL for a graceful shutdown
-								process.kill(pid, "SIGTERM")
-							} catch (killError) {
-								console.warn(`Failed to terminate process ${pid}: ${killError}`)
-							}
-						}
-					}
-				}
-
-				// Wait a moment for VS Code to close
-				await new Promise((resolve) => setTimeout(resolve, 2000))
-			} catch (psError) {
-				console.warn(`Error listing processes: ${psError}`)
-			}
-		}
-
-		// If graceful methods failed, fall back to forceful termination as a last resort
-		// Check if VS Code is still running with the temp user data dir
-		let vsCodeStillRunning = false
-
-		if (process.platform !== "win32") {
-			try {
-				const { stdout } = await execa("ps", ["aux"])
-				vsCodeStillRunning = stdout.split("\n").some((line) => line.includes(resources.tempUserDataDir))
-			} catch (error) {
-				console.warn(`Error checking if VS Code is still running: ${error}`)
-			}
-		} else {
-			try {
-				const { stdout } = await execa("tasklist", ["/FI", `IMAGENAME eq code.exe`])
-				vsCodeStillRunning = stdout.includes("code.exe")
-			} catch (error) {
-				console.warn(`Error checking if VS Code is still running: ${error}`)
-			}
-		}
-
-		// If VS Code is still running, use forceful termination as a last resort
-		if (vsCodeStillRunning) {
-			console.log("Graceful shutdown failed, falling back to forceful termination...")
-
-			if (process.platform === "win32") {
-				try {
-					await execa("taskkill", ["/IM", "code.exe", "/F"])
-				} catch (error) {
-					console.warn(`Error forcefully terminating VS Code: ${error}`)
-				}
-			} else {
-				try {
-					const { stdout } = await execa("ps", ["aux"])
-					const lines = stdout.split("\n")
-
-					for (const line of lines) {
-						if (line.includes(resources.tempUserDataDir)) {
-							const parts = line.trim().split(/\s+/)
-							const pid = parseInt(parts[1])
-
-							if (pid && !isNaN(pid)) {
-								console.log(`Forcefully killing VS Code process with PID: ${pid}`)
-								try {
-									process.kill(pid, "SIGKILL")
-								} catch (killError) {
-									console.warn(`Failed to kill process ${pid}: ${killError}`)
-								}
-							}
-						}
-					}
-				} catch (error) {
-					console.warn(`Error forcefully terminating VS Code: ${error}`)
-				}
-			}
-		}
-	} catch (error) {
-		console.warn(`Error closing VS Code: ${error}`)
-	}
-
-	// Clean up temporary directories
-	try {
-		console.log(`Removing temporary user data directory: ${resources.tempUserDataDir}`)
-		fs.rmSync(resources.tempUserDataDir, { recursive: true, force: true })
-	} catch (error) {
-		console.warn(`Error removing temporary user data directory: ${error}`)
-	}
-
-	try {
-		console.log(`Removing temporary extensions directory: ${resources.tempExtensionsDir}`)
-		fs.rmSync(resources.tempExtensionsDir, { recursive: true, force: true })
-	} catch (error) {
-		console.warn(`Error removing temporary extensions directory: ${error}`)
-	}
-
-	// Remove from the global map
-	workspaceResources.delete(workspacePath)
-
-	console.log("Cleanup completed")
-}

evals/cli/tsconfig.json

@@ -1,17 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "ES2020",
-		"module": "commonjs",
-		"lib": ["ES2020"],
-		"declaration": true,
-		"outDir": "dist",
-		"rootDir": "src",
-		"strict": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"forceConsistentCasingInFileNames": true,
-		"resolveJsonModule": true
-	},
-	"include": ["src/**/*"],
-	"exclude": ["node_modules", "dist"]
-}

locales/ar-sa/README.md

@@ -2,7 +2,7 @@
 العربية | <a href="https://github.com/cline/cline/blob/main/locales/es/README.md" target="_blank">الإسبانية</a> | <a href="https://github.com/cline/cline/blob/main/locales/de/README.md" target="_blank">الألمانية</a> | <a href="https://github.com/cline/cline/blob/main/locales/ja/README.md" target="_blank">اليابانية</a> | <a href="https://github.com/cline/cline/blob/main/locales/zh-cn/README.md" target="_blank">الصينية المبسطة</a> | <a href="https://github.com/cline/cline/blob/main/locales/zh-tw/README.md" target="_blank">الصينية التقليدية</a> | <a href="https://github.com/cline/cline/blob/main/locales/pt-BR/README.md" target="_blank">البرتغالية</a>
 </sub></div>
 
-# Cline
+# Cline – \#1 على OpenRouter
 
 <p align="center">
   <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />

locales/de/README.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline – \#1 auf OpenRouter
 
 <p align="center">
         <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />

locales/es/README.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline – #1 en OpenRouter
 
 <p align="center">
         <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />

locales/ja/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Cline
+# Clineへの貢献
 
 Clineへの貢献に興味をお持ちいただきありがとうございます。
 

locales/ja/README.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline – OpenRouterでのナンバーワン
 
 <p align="center">
     <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />

locales/ko/CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline에 기여하기
 
 Cline에 기여하는 것에 관심을 가져주셔서 감사합니다! 버그 수정, 기능 추가, 문서 개선 등 모든 기여는 Cline을 더욱 스마트하게 만드는 데 기여합니다. 활기차고 환영하는 커뮤니티를 유지하기 위해 모든 구성원은 [행동 강령](CODE_OF_CONDUCT.md)을 준수해야 합니다.
 

locales/ko/README.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline - 최고의 OpenRouter
 
 <p align="center">
     <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />

locales/pt-BR/README.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline – #1 no OpenRouter
 
 <p align="center">
         <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />

locales/zh-cn/README.md

@@ -1,4 +1,4 @@
-# Cline
+# Cline – OpenRouter 排名第一
 
 <p align="center">
     <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />
@@ -20,25 +20,25 @@
 <a href="https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop" target="_blank"><strong>功能请求</strong></a>
 </td>
 <td align="center">
-<a href="https://docs.cline.bot/getting-started/for-new-coders" target="_blank"><strong>新手上路</strong></a>
+<a href="https://cline.bot/join-us" target="_blank"><strong>我们正在招聘！</strong></a>
 </td>
 </tbody>
 </table>
 </div>
 
-认识 Cline —— 一个可以使用你的 **终端** 和 **编辑器** 的 AI 助手。
+认识 Cline，一个可以使用你的 **CLI** 和 **编辑器** 的 AI 助手。
 
-得益于 [Claude 3.7 Sonnet 的代理式编码能力](https://www.anthropic.com/claude/sonnet)，Cline 能够逐步处理复杂的软件开发任务。借助于一系列工具，他可以创建和编辑文件、浏览大型项目、使用浏览器，并在你授权后执行终端命令，从而在代码补全或技术支持之外提供更深入的帮助。Cline 甚至还能使用 Model Context Protocol（MCP）来创建新工具，并扩展自身的能力。虽然传统的自动化 AI 脚本通常运行在沙盒环境中，但这个扩展提供了一个人类参与审核的图形界面（GUI），用于审批每一次文件变更和终端命令，从而为探索代理式 AI 的潜力提供了一种安全且易于使用的方式。
+感谢 [Claude 3.7 Sonnet 的代理编码能力](https://www.anthropic.com/claude/sonnet)，Cline 可以一步步处理复杂的软件开发任务。通过允许他创建和编辑文件、探索大型项目、使用浏览器和执行终端命令（在你授予权限后），他可以提供超越代码完成或技术支持的帮助。Cline 甚至可以使用 Model Context Protocol (MCP) 创建新工具并扩展自己的能力。虽然自主 AI 脚本传统上在沙盒环境中运行，但此扩展提供了一个人机交互的 GUI 来批准每个文件更改和终端命令，提供了一种安全且可访问的方式来探索代理 AI 的潜力。
 
-1. 输入你的任务，并添加图片，以将界面原型（mockup）转换为功能应用，或通过截图修复 bug。
-2. Cline 会从分析你的文件结构和源代码的抽象语法树（AST）开始，同时执行正则搜索并读取相关文件，以便尽快熟悉项目上下文。通过精细地管理上下文中引入的信息，即使面对大型复杂项目，Cline 也能在不超出上下文窗口限制的前提下提供有效协助。
-3. 一旦获取了所需信息，Cline 能够：
-   - 创建和编辑文件，并在过程中监控 linter 或编译器错误，主动修复诸如缺少导入、语法错误等问题。
-   - 直接在你的终端中执行命令，并在运行过程中监控输出，例如在修改文件后自动响应开发服务器问题。
-   - 针对 Web 开发任务，Cline 可以在无头浏览器中打开网站，进行点击、输入、滚动操作，并采集截图与控制台日志，从而修复运行时错误和界面问题。
-4. 当任务完成后，Cline 会通过类似 `open -a "Google Chrome" index.html` 的终端命令将结果展示给你，你只需点击按钮即可执行。
+1. 输入你的任务并添加图像，将模型转换为功能应用程序或通过截图修复错误。
+2. Cline 首先分析你的文件结构和源代码 AST，运行正则表达式搜索，并阅读相关文件以了解现有项目。通过仔细管理添加到上下文中的信息，Cline 即使在大型复杂项目中也能提供有价值的帮助，而不会使上下文窗口过载。
+3. 一旦 Cline 获得所需信息，他可以：
+        - 创建和编辑文件 + 监控 linter/编译器错误，从而主动修复诸如缺少导入和语法错误等问题。
+        - 直接在你的终端中执行命令并监控其输出，从而在编辑文件后对开发服务器问题做出反应。
+        - 对于 Web 开发任务，Cline 可以在无头浏览器中启动网站，点击、输入、滚动并捕获截图和控制台日志，从而修复运行时错误和视觉错误。
+4. 当任务完成时，Cline 将通过终端命令如 `open -a "Google Chrome" index.html` 向你展示结果，你可以通过点击按钮运行该命令。
 
-> [!TIP]
+> [!提示]
 > 使用 `CMD/CTRL + Shift + P` 快捷键打开命令面板并输入 "Cline: Open In New Tab" 将扩展作为标签在编辑器中打开。这让你可以与文件资源管理器并排使用 Cline，更清楚地看到他如何改变你的工作空间。
 
 ---
@@ -49,7 +49,7 @@
 
 Cline 支持 OpenRouter、Anthropic、OpenAI、Google Gemini、AWS Bedrock、Azure 和 GCP Vertex 等 API 提供商。你还可以配置任何兼容 OpenAI 的 API，或通过 LM Studio/Ollama 使用本地模型。如果你使用 OpenRouter，扩展会获取他们的最新模型列表，让你在新模型可用时立即使用。
 
-此外，该扩展还会记录整个任务流程中以及每次请求的总 token 数和 API 使用费用，确保你在每一步都能清楚了解花费情况。
+扩展还会跟踪整个任务循环和单个请求的总令牌和 API 使用成本，让你在每一步都了解支出情况。
 
 <!-- 透明像素以在浮动图像后创建换行 -->
 

locales/zh-tw/README.md

@@ -2,7 +2,7 @@
 <a href="https://github.com/cline/cline/blob/main/README.md" target="_blank">English</a> | <a href="https://github.com/cline/cline/blob/main/locales/es/README.md" target="_blank">Español</a> | <a href="https://github.com/cline/cline/blob/main/locales/de/README.md" target="_blank">Deutsch</a> | <a href="https://github.com/cline/cline/blob/main/locales/ja/README.md" target="_blank">日本語</a> | <a href="https://github.com/cline/cline/blob/main/locales/zh-cn/README.md" target="_blank">简体中文</a> | 繁體中文 | <a href="https://github.com/cline/cline/blob/main/locales/ko/README.md" target="_blank">한국어</a>
 </sub></div>
 
-# Cline
+# Cline – OpenRouter 第一名的 AI 工具
 
 <p align="center">
     <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />
@@ -32,7 +32,7 @@
 
 認識 Cline，一個可以使用您的**命令列介面** (CLI) 和**程式編輯器** (Editor) 的 AI 助理。
 
-感謝 [Claude 3.7 Sonnet 的代理式程式設計能力](https://www.anthropic.com/claude/sonnet)，Cline 能夠逐步處理複雜的軟體開發任務。透過能讓他建立和編輯檔案、探索大型專案、使用瀏覽器，以及執行終端機指令（在您授權後）的工具，從而在程式碼補全或技術支援之外提供更深入的協助。Cline 甚至能使用模型上下文協定（Model Context Protocol，MCP）來建立新工具並擴展自己的功能。雖然自主 AI 腳本傳統上會在沙箱環境中執行，但這個擴充套件提供了人機互動的圖形介面，讓您可以核准每個檔案變更和終端機指令，提供一個安全且容易使用的方式來探索代理式 AI 的潛力。
+感謝 [Claude 3.7 Sonnet 的代理式程式設計能力](https://www.anthropic.com/claude/sonnet)，Cline 能夠逐步處理複雜的軟體開發任務。透過能讓他建立和編輯檔案、探索大型專案、使用瀏覽器，以及執行終端機指令（在您授權後）的工具，他能以超越程式碼自動完成或技術支援的方式協助您。Cline 甚至能使用模型上下文協定（Model Context Protocol，MCP）來建立新工具並擴展自己的功能。雖然自主 AI 腳本傳統上會在沙箱環境中執行，但這個擴充套件提供了人機互動的圖形介面，讓您可以核准每個檔案變更和終端機指令，提供一個安全且容易使用的方式來探索代理式 AI 的潛力。
 
 1. 輸入您的任務，並可以加入圖片來將設計稿轉換成功能性應用程式，或使用截圖來修正錯誤。
 2. Cline 會先分析您的檔案結構和程式碼 AST、執行正規表達式搜尋，並讀取相關檔案，以便在現有專案中快速掌握狀況。透過仔細管理加入上下文的資訊，Cline 可以在不超過上下文視窗的情況下，為大型且複雜的專案提供有價值的協助。

package-lock.json

@@ -1,22 +1,20 @@
 {
 	"name": "claude-dev",
-	"version": "3.12.3",
+	"version": "3.8.5",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "claude-dev",
-			"version": "3.12.3",
+			"version": "3.8.5",
 			"license": "Apache-2.0",
 			"dependencies": {
 				"@anthropic-ai/bedrock-sdk": "^0.12.4",
 				"@anthropic-ai/sdk": "^0.37.0",
 				"@anthropic-ai/vertex-sdk": "^0.6.4",
 				"@aws-sdk/client-bedrock-runtime": "^3.758.0",
-				"@bufbuild/protobuf": "^2.2.5",
 				"@google-cloud/vertexai": "^1.9.3",
 				"@google/generative-ai": "^0.18.0",
-				"@grpc/grpc-js": "^1.9.15",
 				"@mistralai/mistralai": "^1.5.0",
 				"@modelcontextprotocol/sdk": "^1.7.0",
 				"@opentelemetry/api": "^1.4.1",
@@ -25,19 +23,16 @@
 				"@opentelemetry/sdk-node": "^0.39.1",
 				"@opentelemetry/sdk-trace-node": "^1.30.1",
 				"@opentelemetry/semantic-conventions": "^1.30.0",
-				"@sentry/browser": "^9.12.0",
 				"@vscode/codicons": "^0.0.36",
 				"axios": "^1.8.2",
 				"cheerio": "^1.0.0",
 				"chokidar": "^4.0.1",
-				"chrome-launcher": "^1.1.2",
 				"clone-deep": "^4.0.1",
 				"default-shell": "^2.2.0",
 				"diff": "^5.2.0",
 				"execa": "^9.5.2",
 				"fast-deep-equal": "^3.1.3",
 				"firebase": "^11.2.0",
-				"fzf": "^0.5.2",
 				"get-folder-size": "^5.0.0",
 				"globby": "^14.0.2",
 				"ignore": "^7.0.3",
@@ -71,7 +66,6 @@
 				"@types/mocha": "^10.0.7",
 				"@types/node": "20.x",
 				"@types/pdf-parse": "^1.1.4",
-				"@types/proxyquire": "^1.3.31",
 				"@types/should": "^11.2.0",
 				"@types/sinon": "^17.0.4",
 				"@types/turndown": "^5.0.5",
@@ -81,18 +75,13 @@
 				"@vscode/test-cli": "^0.0.9",
 				"@vscode/test-electron": "^2.4.0",
 				"chai": "^4.3.10",
-				"chalk": "^5.3.0",
 				"esbuild": "^0.25.0",
 				"eslint": "^8.57.0",
 				"husky": "^9.1.7",
 				"npm-run-all": "^4.1.5",
 				"prettier": "^3.3.3",
-				"protoc-gen-ts": "^0.8.7",
-				"proxyquire": "^2.1.3",
 				"should": "^13.2.3",
 				"sinon": "^19.0.2",
-				"ts-node": "^10.9.2",
-				"ts-proto": "^2.6.1",
 				"typescript": "^5.4.5"
 			},
 			"engines": {
@@ -3962,12 +3951,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/@bufbuild/protobuf": {
-			"version": "2.2.5",
-			"resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.2.5.tgz",
-			"integrity": "sha512-/g5EzJifw5GF8aren8wZ/G5oMuPoGeS6MQD3ca8ddcvdXR5UELUfdTZITCGNhNXynY/AYl3Z4plmxdj/tRl/hQ==",
-			"license": "(Apache-2.0 AND BSD-3-Clause)"
-		},
 		"node_modules/@changesets/apply-release-plan": {
 			"version": "7.0.8",
 			"resolved": "https://registry.npmjs.org/@changesets/apply-release-plan/-/apply-release-plan-7.0.8.tgz",
@@ -4303,30 +4286,6 @@
 				"url": "https://github.com/prettier/prettier?sponsor=1"
 			}
 		},
-		"node_modules/@cspotcode/source-map-support": {
-			"version": "0.8.1",
-			"resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-			"integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/trace-mapping": "0.3.9"
-			},
-			"engines": {
-				"node": ">=12"
-			}
-		},
-		"node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
-			"version": "0.3.9",
-			"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-			"integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@jridgewell/resolve-uri": "^3.0.3",
-				"@jridgewell/sourcemap-codec": "^1.4.10"
-			}
-		},
 		"node_modules/@esbuild/aix-ppc64": {
 			"version": "0.25.0",
 			"resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.0.tgz",
@@ -5577,7 +5536,6 @@
 			"version": "1.9.15",
 			"resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.9.15.tgz",
 			"integrity": "sha512-nqE7Hc0AzI+euzUwDAy0aY5hCp10r734gMGRdU+qOPX0XSceI2ULrcXB5U2xSc5VkWwalCj4M7GzCAygZl2KoQ==",
-			"license": "Apache-2.0",
 			"dependencies": {
 				"@grpc/proto-loader": "^0.7.8",
 				"@types/node": ">=12.12.47"
@@ -6869,81 +6827,6 @@
 			"integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==",
 			"license": "MIT"
 		},
-		"node_modules/@sentry-internal/browser-utils": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/browser-utils/-/browser-utils-9.12.0.tgz",
-			"integrity": "sha512-GXuDEG2Ix8DmVtTkjsItWdusk2CvJ6EPWKYVqFKifxt+IAT3ZbhGZd99Rg3wdRmt9xhCNuS4QrDzDTPMPgfdCw==",
-			"license": "MIT",
-			"dependencies": {
-				"@sentry/core": "9.12.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry-internal/feedback": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/feedback/-/feedback-9.12.0.tgz",
-			"integrity": "sha512-3+UxoT97QIXNSUQS4ATL1FFws0RkUb6PeaQN8CPndI6mFlqTW5tuVVLNg9Eo1seNg7R/dfk6WHCWrYN1NbFFKQ==",
-			"license": "MIT",
-			"dependencies": {
-				"@sentry/core": "9.12.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry-internal/replay": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/replay/-/replay-9.12.0.tgz",
-			"integrity": "sha512-njEQosFeO/UX+gG+DMRANkPUuz6OIJLb+A1GVylhq9adUgFQydQ9Ay3v7/x1gMhdfHVP6Jeb27qkti0BWYbzBQ==",
-			"license": "MIT",
-			"dependencies": {
-				"@sentry-internal/browser-utils": "9.12.0",
-				"@sentry/core": "9.12.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry-internal/replay-canvas": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/@sentry-internal/replay-canvas/-/replay-canvas-9.12.0.tgz",
-			"integrity": "sha512-p8LuKZgWT/CoQBbDOXkSGjWWnc8WsnAayWgna8M/ZFWNITCNEM2rCuqZOyWOElIlrni+M7qoEA3jS7MZe8Ejxw==",
-			"license": "MIT",
-			"dependencies": {
-				"@sentry-internal/replay": "9.12.0",
-				"@sentry/core": "9.12.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry/browser": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/@sentry/browser/-/browser-9.12.0.tgz",
-			"integrity": "sha512-4xQYoZqi+VVhNvlhWiwRd57+SMr3Og4sLjuayAA+zIp1Wx/bDcIld697cugLwml/BR+mVJI2eokkgh1CBl6zag==",
-			"license": "MIT",
-			"dependencies": {
-				"@sentry-internal/browser-utils": "9.12.0",
-				"@sentry-internal/feedback": "9.12.0",
-				"@sentry-internal/replay": "9.12.0",
-				"@sentry-internal/replay-canvas": "9.12.0",
-				"@sentry/core": "9.12.0"
-			},
-			"engines": {
-				"node": ">=18"
-			}
-		},
-		"node_modules/@sentry/core": {
-			"version": "9.12.0",
-			"resolved": "https://registry.npmjs.org/@sentry/core/-/core-9.12.0.tgz",
-			"integrity": "sha512-jOqQK/90uzHmsBvkPTj/DAEFvA5poX4ZRyC7LE1zjg4F5jdOp3+M4W3qCy0CkSTu88Zu5VWBoppCU2Bs34XEqg==",
-			"license": "MIT",
-			"engines": {
-				"node": ">=18"
-			}
-		},
 		"node_modules/@sindresorhus/merge-streams": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz",
@@ -8686,34 +8569,6 @@
 			"integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
 			"license": "MIT"
 		},
-		"node_modules/@tsconfig/node10": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.11.tgz",
-			"integrity": "sha512-DcRjDCujK/kCk/cUe8Xz8ZSpm8mS3mNNpta+jGCA6USEDfktlNvm1+IuZ9eTcDbNk41BHwpHHeW+N1lKCz4zOw==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@tsconfig/node12": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-			"integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@tsconfig/node14": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-			"integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-			"dev": true,
-			"license": "MIT"
-		},
-		"node_modules/@tsconfig/node16": {
-			"version": "1.0.4",
-			"resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
-			"integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@types/chai": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.0.1.tgz",
@@ -8793,13 +8648,6 @@
 			"dev": true,
 			"license": "MIT"
 		},
-		"node_modules/@types/proxyquire": {
-			"version": "1.3.31",
-			"resolved": "https://registry.npmjs.org/@types/proxyquire/-/proxyquire-1.3.31.tgz",
-			"integrity": "sha512-uALowNG2TSM1HNPMMOR0AJwv4aPYPhqB0xlEhkeRTMuto5hjoSPZkvgu1nbPUkz3gEPAHv4sy4DmKsurZiEfRQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/@types/should": {
 			"version": "11.2.0",
 			"resolved": "https://registry.npmjs.org/@types/should/-/should-11.2.0.tgz",
@@ -9264,19 +9112,6 @@
 				"acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
 			}
 		},
-		"node_modules/acorn-walk": {
-			"version": "8.3.4",
-			"resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-			"integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"acorn": "^8.11.0"
-			},
-			"engines": {
-				"node": ">=0.4.0"
-			}
-		},
 		"node_modules/agent-base": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.1.tgz",
@@ -9380,13 +9215,6 @@
 			"integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
 			"license": "ISC"
 		},
-		"node_modules/arg": {
-			"version": "4.1.3",
-			"resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-			"integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/argparse": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -9931,19 +9759,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/case-anything": {
-			"version": "2.1.13",
-			"resolved": "https://registry.npmjs.org/case-anything/-/case-anything-2.1.13.tgz",
-			"integrity": "sha512-zlOQ80VrQ2Ue+ymH5OuM/DlDq64mEm+B9UTdHULv5osUMD6HalNTblf2b1u/m6QecjsnOkBpqVZ+XPwIVsy7Ng==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=12.13"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/mesqueeb"
-			}
-		},
 		"node_modules/chai": {
 			"version": "4.3.10",
 			"resolved": "https://registry.npmjs.org/chai/-/chai-4.3.10.tgz",
@@ -9963,18 +9778,35 @@
 			}
 		},
 		"node_modules/chalk": {
-			"version": "5.4.1",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.4.1.tgz",
-			"integrity": "sha512-zgVZuo2WcZgfUEmsn6eO3kINexW8RAE4maiQ8QNs8CtpPCSyMiYsULR3HQYkm3w8FIA3SberyMJMSldGsW+U3w==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"license": "MIT",
+			"dependencies": {
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
+			},
 			"engines": {
-				"node": "^12.17.0 || ^14.13 || >=16.0.0"
+				"node": ">=10"
 			},
 			"funding": {
 				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
+		"node_modules/chalk/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/chardet": {
 			"version": "0.7.0",
 			"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
@@ -10051,24 +9883,6 @@
 				"url": "https://paulmillr.com/funding/"
 			}
 		},
-		"node_modules/chrome-launcher": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/chrome-launcher/-/chrome-launcher-1.1.2.tgz",
-			"integrity": "sha512-YclTJey34KUm5jB1aEJCq807bSievi7Nb/TU4Gu504fUYi3jw3KCIaH6L7nFWQhdEgH3V+wCh+kKD1P5cXnfxw==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"@types/node": "*",
-				"escape-string-regexp": "^4.0.0",
-				"is-wsl": "^2.2.0",
-				"lighthouse-logger": "^2.0.1"
-			},
-			"bin": {
-				"print-chrome-path": "bin/print-chrome-path.js"
-			},
-			"engines": {
-				"node": ">=12.13.0"
-			}
-		},
 		"node_modules/chromium-bidi": {
 			"version": "0.6.5",
 			"resolved": "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.5.tgz",
@@ -10359,13 +10173,6 @@
 				"node": ">= 0.10"
 			}
 		},
-		"node_modules/create-require": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-			"integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -10620,19 +10427,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/detect-libc": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-			"integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"bin": {
-				"detect-libc": "bin/detect-libc.js"
-			},
-			"engines": {
-				"node": ">=0.10"
-			}
-		},
 		"node_modules/devtools-protocol": {
 			"version": "0.0.1342118",
 			"resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1342118.tgz",
@@ -10743,16 +10537,6 @@
 				"url": "https://github.com/fb55/domutils?sponsor=1"
 			}
 		},
-		"node_modules/dprint-node": {
-			"version": "1.0.8",
-			"resolved": "https://registry.npmjs.org/dprint-node/-/dprint-node-1.0.8.tgz",
-			"integrity": "sha512-iVKnUtYfGrYcW1ZAlfR/F59cUVL8QIhWoBJoSjkkdua/dkWIgjZfiLMeTjiB06X0ZLkQ0M2C1VbUj/CxkIf1zg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"detect-libc": "^1.0.3"
-			}
-		},
 		"node_modules/duck": {
 			"version": "0.1.12",
 			"resolved": "https://registry.npmjs.org/duck/-/duck-0.1.12.tgz",
@@ -11079,9 +10863,9 @@
 			}
 		},
 		"node_modules/escalade": {
-			"version": "3.2.0",
-			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-			"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
+			"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
 			"license": "MIT",
 			"engines": {
 				"node": ">=6"
@@ -11097,6 +10881,7 @@
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
 			"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+			"dev": true,
 			"license": "MIT",
 			"engines": {
 				"node": ">=10"
@@ -11223,23 +11008,6 @@
 				"concat-map": "0.0.1"
 			}
 		},
-		"node_modules/eslint/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
 		"node_modules/eslint/node_modules/glob-parent": {
 			"version": "6.0.2",
 			"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -11288,19 +11056,6 @@
 				"node": ">=8"
 			}
 		},
-		"node_modules/eslint/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/espree": {
 			"version": "9.6.1",
 			"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
@@ -11835,30 +11590,6 @@
 				"node": "^10.12.0 || >=12.0.0"
 			}
 		},
-		"node_modules/fill-keys": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
-			"integrity": "sha512-tcgI872xXjwFF4xgQmLxi76GnwJG3g/3isB1l4/G5Z4zrbddGpBjqZCO9oEAcB5wX0Hj/5iQB3toxfO7in1hHA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"is-object": "~1.0.1",
-				"merge-descriptors": "~1.0.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/fill-keys/node_modules/merge-descriptors": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-			"integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/fill-range": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -12152,12 +11883,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/fzf": {
-			"version": "0.5.2",
-			"resolved": "https://registry.npmjs.org/fzf/-/fzf-0.5.2.tgz",
-			"integrity": "sha512-Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q==",
-			"license": "BSD-3-Clause"
-		},
 		"node_modules/gauge": {
 			"version": "5.0.2",
 			"resolved": "https://registry.npmjs.org/gauge/-/gauge-5.0.2.tgz",
@@ -13052,21 +12777,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/is-docker": {
-			"version": "2.2.1",
-			"resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-			"integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-			"license": "MIT",
-			"bin": {
-				"is-docker": "cli.js"
-			},
-			"engines": {
-				"node": ">=8"
-			},
-			"funding": {
-				"url": "https://github.com/sponsors/sindresorhus"
-			}
-		},
 		"node_modules/is-extglob": {
 			"version": "2.1.1",
 			"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -13148,16 +12858,6 @@
 				"url": "https://github.com/sponsors/ljharb"
 			}
 		},
-		"node_modules/is-object": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz",
-			"integrity": "sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==",
-			"dev": true,
-			"license": "MIT",
-			"funding": {
-				"url": "https://github.com/sponsors/ljharb"
-			}
-		},
 		"node_modules/is-path-inside": {
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
@@ -13337,18 +13037,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/is-wsl": {
-			"version": "2.2.0",
-			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-			"license": "MIT",
-			"dependencies": {
-				"is-docker": "^2.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/isarray": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
@@ -13620,31 +13308,6 @@
 				"immediate": "~3.0.5"
 			}
 		},
-		"node_modules/lighthouse-logger": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-2.0.1.tgz",
-			"integrity": "sha512-ioBrW3s2i97noEmnXxmUq7cjIcVRjT5HBpAYy8zE11CxU9HqlWHHeRxfeN1tn8F7OEMVPIC9x1f8t3Z7US9ehQ==",
-			"license": "Apache-2.0",
-			"dependencies": {
-				"debug": "^2.6.9",
-				"marky": "^1.2.2"
-			}
-		},
-		"node_modules/lighthouse-logger/node_modules/debug": {
-			"version": "2.6.9",
-			"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-			"integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-			"license": "MIT",
-			"dependencies": {
-				"ms": "2.0.0"
-			}
-		},
-		"node_modules/lighthouse-logger/node_modules/ms": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-			"integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-			"license": "MIT"
-		},
 		"node_modules/load-json-file": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
@@ -13720,36 +13383,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/log-symbols/node_modules/chalk": {
-			"version": "4.1.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"ansi-styles": "^4.1.0",
-				"supports-color": "^7.1.0"
-			},
-			"engines": {
-				"node": ">=10"
-			},
-			"funding": {
-				"url": "https://github.com/chalk/chalk?sponsor=1"
-			}
-		},
-		"node_modules/log-symbols/node_modules/supports-color": {
-			"version": "7.2.0",
-			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"has-flag": "^4.0.0"
-			},
-			"engines": {
-				"node": ">=8"
-			}
-		},
 		"node_modules/long": {
 			"version": "5.2.4",
 			"resolved": "https://registry.npmjs.org/long/-/long-5.2.4.tgz",
@@ -13813,13 +13446,6 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
-		"node_modules/make-error": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-			"integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-			"dev": true,
-			"license": "ISC"
-		},
 		"node_modules/mammoth": {
 			"version": "1.8.0",
 			"resolved": "https://registry.npmjs.org/mammoth/-/mammoth-1.8.0.tgz",
@@ -13853,12 +13479,6 @@
 				"sprintf-js": "~1.0.2"
 			}
 		},
-		"node_modules/marky": {
-			"version": "1.2.5",
-			"resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-			"integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q==",
-			"license": "Apache-2.0"
-		},
 		"node_modules/math-intrinsics": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
@@ -14231,13 +13851,6 @@
 			"integrity": "sha512-ySViT69/76t8VhE1xXHK6Ch4NcDd26gx0MzKXLO+F7NOtnqH68d9zF94nT8ZWSxXh8ELOERsnJO/sWt1xZYw5A==",
 			"license": "MIT"
 		},
-		"node_modules/module-not-found-error": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
-			"integrity": "sha512-pEk4ECWQXV6z2zjhRZUongnLJNUeGQJ3w6OQ5ctGwD+i5o93qjRQUk2Rt6VdNeu3sEP0AB4LcfvdebpxBRVr4g==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/monaco-vscode-textmate-theme-converter": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/monaco-vscode-textmate-theme-converter/-/monaco-vscode-textmate-theme-converter-0.1.7.tgz",
@@ -14859,6 +14472,19 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/ora/node_modules/chalk": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz",
+			"integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": "^12.17.0 || ^14.13 || >=16.0.0"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
+			}
+		},
 		"node_modules/ora/node_modules/emoji-regex": {
 			"version": "10.3.0",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz",
@@ -15444,20 +15070,6 @@
 				"node": ">=12.0.0"
 			}
 		},
-		"node_modules/protoc-gen-ts": {
-			"version": "0.8.7",
-			"resolved": "https://registry.npmjs.org/protoc-gen-ts/-/protoc-gen-ts-0.8.7.tgz",
-			"integrity": "sha512-jr4VJey2J9LVYCV7EVyVe53g1VMw28cCmYJhBe5e3YX5wiyiDwgxWxeDf9oTqAe4P1bN/YGAkW2jhlH8LohwiQ==",
-			"dev": true,
-			"license": "MIT",
-			"bin": {
-				"protoc-gen-ts": "protoc-gen-ts.js"
-			},
-			"funding": {
-				"type": "individual",
-				"url": "https://www.buymeacoffee.com/thesayyn"
-			}
-		},
 		"node_modules/proxy-addr": {
 			"version": "2.0.7",
 			"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
@@ -15504,18 +15116,6 @@
 			"resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
 			"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
 		},
-		"node_modules/proxyquire": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
-			"integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"fill-keys": "^1.0.2",
-				"module-not-found-error": "^1.0.1",
-				"resolve": "^1.11.1"
-			}
-		},
 		"node_modules/pump": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz",
@@ -16008,9 +15608,9 @@
 			"license": "MIT"
 		},
 		"node_modules/semver": {
-			"version": "7.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-			"integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+			"version": "7.6.3",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+			"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
 			"license": "ISC",
 			"bin": {
 				"semver": "bin/semver.js"
@@ -17008,96 +16608,6 @@
 				"typescript": ">=4.2.0"
 			}
 		},
-		"node_modules/ts-node": {
-			"version": "10.9.2",
-			"resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz",
-			"integrity": "sha512-f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==",
-			"dev": true,
-			"license": "MIT",
-			"dependencies": {
-				"@cspotcode/source-map-support": "^0.8.0",
-				"@tsconfig/node10": "^1.0.7",
-				"@tsconfig/node12": "^1.0.7",
-				"@tsconfig/node14": "^1.0.0",
-				"@tsconfig/node16": "^1.0.2",
-				"acorn": "^8.4.1",
-				"acorn-walk": "^8.1.1",
-				"arg": "^4.1.0",
-				"create-require": "^1.1.0",
-				"diff": "^4.0.1",
-				"make-error": "^1.1.1",
-				"v8-compile-cache-lib": "^3.0.1",
-				"yn": "3.1.1"
-			},
-			"bin": {
-				"ts-node": "dist/bin.js",
-				"ts-node-cwd": "dist/bin-cwd.js",
-				"ts-node-esm": "dist/bin-esm.js",
-				"ts-node-script": "dist/bin-script.js",
-				"ts-node-transpile-only": "dist/bin-transpile.js",
-				"ts-script": "dist/bin-script-deprecated.js"
-			},
-			"peerDependencies": {
-				"@swc/core": ">=1.2.50",
-				"@swc/wasm": ">=1.2.50",
-				"@types/node": "*",
-				"typescript": ">=2.7"
-			},
-			"peerDependenciesMeta": {
-				"@swc/core": {
-					"optional": true
-				},
-				"@swc/wasm": {
-					"optional": true
-				}
-			}
-		},
-		"node_modules/ts-node/node_modules/diff": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-			"integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-			"dev": true,
-			"license": "BSD-3-Clause",
-			"engines": {
-				"node": ">=0.3.1"
-			}
-		},
-		"node_modules/ts-poet": {
-			"version": "6.11.0",
-			"resolved": "https://registry.npmjs.org/ts-poet/-/ts-poet-6.11.0.tgz",
-			"integrity": "sha512-r5AGF8vvb+GjBsnqiTqbLhN1/U2FJt6BI+k0dfCrkKzWvUhNlwMmq9nDHuucHs45LomgHjZPvYj96dD3JawjJA==",
-			"dev": true,
-			"license": "Apache-2.0",
-			"dependencies": {
-				"dprint-node": "^1.0.8"
-			}
-		},
-		"node_modules/ts-proto": {
-			"version": "2.7.0",
-			"resolved": "https://registry.npmjs.org/ts-proto/-/ts-proto-2.7.0.tgz",
-			"integrity": "sha512-BGHjse2wTOeswOqnnPKinpxmbaRd882so/e1En6ww59YMG7AO9Kg4vPpJcbVfrpBixPRDqHafXD/RDyd2T99GA==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@bufbuild/protobuf": "^2.0.0",
-				"case-anything": "^2.1.13",
-				"ts-poet": "^6.7.0",
-				"ts-proto-descriptors": "2.0.0"
-			},
-			"bin": {
-				"protoc-gen-ts_proto": "protoc-gen-ts_proto"
-			}
-		},
-		"node_modules/ts-proto-descriptors": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/ts-proto-descriptors/-/ts-proto-descriptors-2.0.0.tgz",
-			"integrity": "sha512-wHcTH3xIv11jxgkX5OyCSFfw27agpInAd6yh89hKG6zqIXnjW9SYqSER2CVQxdPj4czeOhGagNvZBEbJPy7qkw==",
-			"dev": true,
-			"license": "ISC",
-			"dependencies": {
-				"@bufbuild/protobuf": "^2.0.0"
-			}
-		},
 		"node_modules/tslib": {
 			"version": "1.14.1",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
@@ -17422,13 +16932,6 @@
 				"uuid": "dist/bin/uuid"
 			}
 		},
-		"node_modules/v8-compile-cache-lib": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-			"integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-			"dev": true,
-			"license": "MIT"
-		},
 		"node_modules/v8-to-istanbul": {
 			"version": "9.3.0",
 			"resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
@@ -17983,16 +17486,6 @@
 				"fd-slicer": "~1.1.0"
 			}
 		},
-		"node_modules/yn": {
-			"version": "3.1.1",
-			"resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-			"integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-			"dev": true,
-			"license": "MIT",
-			"engines": {
-				"node": ">=6"
-			}
-		},
 		"node_modules/yocto-queue": {
 			"version": "0.1.0",
 			"resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.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.12.3",
+	"version": "3.8.5",
 	"icon": "assets/icons/icon.png",
 	"engines": {
 		"vscode": "^1.84.0"
@@ -116,21 +116,6 @@
 				"command": "cline.fixWithCline",
 				"title": "Fix with Cline",
 				"category": "Cline"
-			},
-			{
-				"command": "cline.focusChatInput",
-				"title": "Jump to Chat Input",
-				"category": "Cline"
-			}
-		],
-		"keybindings": [
-			{
-				"command": "cline.addToChat",
-				"key": "cmd+'",
-				"mac": "cmd+'",
-				"win": "ctrl+'",
-				"linux": "ctrl+'",
-				"when": "editorHasSelection"
 			}
 		],
 		"menus": {
@@ -229,6 +214,21 @@
 					},
 					"description": "Settings for VSCode Language Model API"
 				},
+				"cline.mcp.mode": {
+					"type": "string",
+					"enum": [
+						"full",
+						"server-use-only",
+						"off"
+					],
+					"enumDescriptions": [
+						"Enable all MCP functionality (server use and build instructions)",
+						"Enable MCP server use only (excludes instructions about building MCP servers)",
+						"Disable all MCP functionality"
+					],
+					"default": "full",
+					"description": "Controls MCP inclusion in prompts, reduces token usage if you only need access to certain functionality."
+				},
 				"cline.enableCheckpoints": {
 					"type": "boolean",
 					"default": true,
@@ -292,13 +292,8 @@
 		"compile": "npm run check-types && npm run lint && node esbuild.js",
 		"watch": "npm-run-all -p watch:*",
 		"watch:esbuild": "node esbuild.js --watch",
-		"watch:esbuild:test": "IS_TEST=true node esbuild.js --watch",
 		"watch:tsc": "tsc --noEmit --watch --project tsconfig.json",
 		"package": "npm run build:webview && npm run check-types && npm run lint && node esbuild.js --production",
-		"protos": "node proto/build-proto.js && prettier src/shared/proto --write && prettier src/core/controller --write",
-		"package:test": "IS_TEST=true npm run build:webview:test && npm run check-types && npm run lint && IS_TEST=true node esbuild.js --production",
-		"build:webview:test": "cd webview-ui && IS_TEST=true npm run build",
-		"watch:test": "IS_TEST=true npm-run-all -p watch:tsc watch:esbuild:test",
 		"compile-tests": "tsc -p ./tsconfig.test.json --outDir out",
 		"watch-tests": "tsc -p . -w --outDir out",
 		"pretest": "npm run compile-tests && npm run compile && npm run lint",
@@ -306,10 +301,8 @@
 		"lint": "eslint src --ext ts && eslint webview-ui/src --ext ts",
 		"format": "prettier . --check",
 		"format:fix": "prettier . --write",
-		"test": "npm-run-all test:unit test:integration",
+		"test": "vscode-test",
 		"test:ci": "node scripts/test-ci.js",
-		"test:integration": "vscode-test",
-		"test:unit": "TS_NODE_PROJECT='./tsconfig.unit-test.json' mocha",
 		"test:coverage": "vscode-test --coverage",
 		"install:all": "npm install && cd webview-ui && npm install",
 		"dev:webview": "cd webview-ui && npm run dev",
@@ -330,7 +323,6 @@
 		"@types/mocha": "^10.0.7",
 		"@types/node": "20.x",
 		"@types/pdf-parse": "^1.1.4",
-		"@types/proxyquire": "^1.3.31",
 		"@types/should": "^11.2.0",
 		"@types/sinon": "^17.0.4",
 		"@types/turndown": "^5.0.5",
@@ -340,18 +332,13 @@
 		"@vscode/test-cli": "^0.0.9",
 		"@vscode/test-electron": "^2.4.0",
 		"chai": "^4.3.10",
-		"chalk": "^5.3.0",
 		"esbuild": "^0.25.0",
 		"eslint": "^8.57.0",
 		"husky": "^9.1.7",
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.3.3",
-		"protoc-gen-ts": "^0.8.7",
-		"proxyquire": "^2.1.3",
 		"should": "^13.2.3",
 		"sinon": "^19.0.2",
-		"ts-node": "^10.9.2",
-		"ts-proto": "^2.6.1",
 		"typescript": "^5.4.5"
 	},
 	"dependencies": {
@@ -359,10 +346,8 @@
 		"@anthropic-ai/sdk": "^0.37.0",
 		"@anthropic-ai/vertex-sdk": "^0.6.4",
 		"@aws-sdk/client-bedrock-runtime": "^3.758.0",
-		"@bufbuild/protobuf": "^2.2.5",
 		"@google-cloud/vertexai": "^1.9.3",
 		"@google/generative-ai": "^0.18.0",
-		"@grpc/grpc-js": "^1.9.15",
 		"@mistralai/mistralai": "^1.5.0",
 		"@modelcontextprotocol/sdk": "^1.7.0",
 		"@opentelemetry/api": "^1.4.1",
@@ -371,19 +356,16 @@
 		"@opentelemetry/sdk-node": "^0.39.1",
 		"@opentelemetry/sdk-trace-node": "^1.30.1",
 		"@opentelemetry/semantic-conventions": "^1.30.0",
-		"@sentry/browser": "^9.12.0",
 		"@vscode/codicons": "^0.0.36",
 		"axios": "^1.8.2",
 		"cheerio": "^1.0.0",
 		"chokidar": "^4.0.1",
-		"chrome-launcher": "^1.1.2",
 		"clone-deep": "^4.0.1",
 		"default-shell": "^2.2.0",
 		"diff": "^5.2.0",
 		"execa": "^9.5.2",
 		"fast-deep-equal": "^3.1.3",
 		"firebase": "^11.2.0",
-		"fzf": "^0.5.2",
 		"get-folder-size": "^5.0.0",
 		"globby": "^14.0.2",
 		"ignore": "^7.0.3",

proto/browser.proto

@@ -1,22 +0,0 @@
-syntax = "proto3";
-
-package cline;
-
-import "common.proto";
-
-service BrowserService {
-  rpc getBrowserConnectionInfo(EmptyRequest) returns (BrowserConnectionInfo);
-  rpc testBrowserConnection(StringRequest) returns (BrowserConnection);
-}
-
-message BrowserConnectionInfo {
-  bool is_connected = 1;
-  bool is_remote = 2;
-  optional string host = 3;
-}
-
-message BrowserConnection {
-  bool success = 1;
-  string message = 2;
-  optional string endpoint = 3;
-}

proto/build-proto.js

@@ -1,157 +0,0 @@
-#!/usr/bin/env node
-
-import * as fs from "fs/promises"
-import * as path from "path"
-import { execSync } from "child_process"
-import { globby } from "globby"
-import chalk from "chalk"
-
-// Get script directory and root directory
-const SCRIPT_DIR = path.dirname(new URL(import.meta.url).pathname)
-const ROOT_DIR = path.resolve(SCRIPT_DIR, "..")
-
-async function main() {
-	console.log(chalk.bold.blue("Starting Protocol Buffer code generation..."))
-
-	// Check if protoc is installed
-	try {
-		const options = { stdio: "ignore" }
-		execSync("protoc --version", options)
-	} catch (error) {
-		console.warn(chalk.yellow("Warning: protoc is not installed. Skipping proto generation."))
-		console.warn(chalk.yellow("To install Protocol Buffers compiler, visit: https://grpc.io/docs/protoc-installation/"))
-		process.exit(0) // Exit with success as requested
-	}
-
-	// Check if ts-proto plugin is available
-	const TS_PROTO_PLUGIN = path.join(ROOT_DIR, "node_modules", ".bin", "protoc-gen-ts_proto")
-	try {
-		await fs.access(TS_PROTO_PLUGIN)
-	} catch (error) {
-		console.error(chalk.red("Error: ts-proto plugin not found at"), TS_PROTO_PLUGIN)
-		console.error(chalk.red('Please run "npm install" to install the required dependencies.'))
-		process.exit(1)
-	}
-
-	// Define output directories
-	const TS_OUT_DIR = path.join(ROOT_DIR, "src", "shared", "proto")
-
-	// Create output directory if it doesn't exist
-	await fs.mkdir(TS_OUT_DIR, { recursive: true })
-
-	// Clean up existing generated files
-	console.log(chalk.cyan("Cleaning up existing generated TypeScript files..."))
-	const existingFiles = await globby("**/*.ts", { cwd: TS_OUT_DIR })
-	for (const file of existingFiles) {
-		await fs.unlink(path.join(TS_OUT_DIR, file))
-	}
-
-	// Process all proto files
-	console.log(chalk.cyan("Processing proto files from"), SCRIPT_DIR)
-	const protoFiles = await globby("**/*.proto", { cwd: SCRIPT_DIR })
-
-	for (const protoFile of protoFiles) {
-		console.log(chalk.cyan(`Generating TypeScript code for ${protoFile}...`))
-
-		// Build the protoc command with proper path handling for cross-platform
-		const protocCommand = [
-			"protoc",
-			`--plugin=protoc-gen-ts_proto="${TS_PROTO_PLUGIN}"`,
-			`--ts_proto_out="${TS_OUT_DIR}"`,
-			"--ts_proto_opt=outputServices=generic-definitions,env=node,esModuleInterop=true,useDate=false,useOptionals=messages",
-			`--proto_path="${SCRIPT_DIR}"`,
-			`"${path.join(SCRIPT_DIR, protoFile)}"`,
-		].join(" ")
-
-		try {
-			const execOptions = {
-				stdio: "inherit",
-			}
-			execSync(protocCommand, execOptions)
-		} catch (error) {
-			console.error(chalk.red(`Error generating TypeScript for ${protoFile}:`), error)
-			process.exit(1)
-		}
-	}
-
-	console.log(chalk.green("Protocol Buffer code generation completed successfully."))
-	console.log(chalk.green(`TypeScript files generated in: ${TS_OUT_DIR}`))
-
-	// Generate method registration files
-	await generateMethodRegistrations()
-
-	// Make the script executable
-	try {
-		await fs.chmod(path.join(SCRIPT_DIR, "build-proto.js"), 0o755)
-	} catch (error) {
-		console.warn(chalk.yellow("Warning: Could not make script executable:"), error)
-	}
-}
-
-async function generateMethodRegistrations() {
-	console.log(chalk.cyan("Generating method registration files..."))
-
-	const serviceDirs = [
-		path.join(ROOT_DIR, "src", "core", "controller", "browser"),
-		// Add more service directories here as needed
-	]
-
-	for (const serviceDir of serviceDirs) {
-		try {
-			await fs.access(serviceDir)
-		} catch (error) {
-			console.log(chalk.gray(`Skipping ${serviceDir} - directory does not exist`))
-			continue
-		}
-
-		const serviceName = path.basename(serviceDir)
-		const registryFile = path.join(serviceDir, "methods.ts")
-
-		console.log(chalk.cyan(`Generating method registrations for ${serviceName}...`))
-
-		// Get all TypeScript files in the service directory
-		const files = await globby("*.ts", { cwd: serviceDir })
-
-		// Filter out index.ts and methods.ts
-		const implementationFiles = files.filter((file) => file !== "index.ts" && file !== "methods.ts")
-
-		// Create the output file with header
-		let content = `// AUTO-GENERATED FILE - DO NOT MODIFY DIRECTLY
-// Generated by proto/build-proto.js
-
-// Import all method implementations
-import { registerMethod } from "./index"\n`
-
-		// Add imports for all implementation files
-		for (const file of implementationFiles) {
-			const baseName = path.basename(file, ".ts")
-			content += `import { ${baseName} } from "./${baseName}"\n`
-		}
-
-		// Add registration function
-		content += `\n// Register all ${serviceName} service methods
-export function registerAllMethods(): void {
-\t// Register each method with the registry\n`
-
-		// Add registration statements
-		for (const file of implementationFiles) {
-			const baseName = path.basename(file, ".ts")
-			content += `\tregisterMethod("${baseName}", ${baseName})\n`
-		}
-
-		// Close the function
-		content += `}`
-
-		// Write the file
-		await fs.writeFile(registryFile, content)
-		console.log(chalk.green(`Generated ${registryFile}`))
-	}
-
-	console.log(chalk.green("Method registration files generated successfully."))
-}
-
-// Run the main function
-main().catch((error) => {
-	console.error(chalk.red("Error:"), error)
-	process.exit(1)
-})

proto/common.proto

@@ -1,40 +0,0 @@
-syntax = "proto3";
-
-package cline;
-
-message Metadata {
-}
-
-message EmptyRequest {
-  Metadata metadata = 1;
-}
-
-message Empty {
-}
-
-message StringRequest {
-  Metadata metadata = 1;
-  string value = 2;
-}
-
-message String {
-  string value = 1;
-}
-
-message Int64Request {
-  Metadata metadata = 1;
-  int64 value = 2;
-}
-
-message Int64 {
-  int64 value = 1;
-}
-
-message BytesRequest {
-  Metadata metadata = 1;
-  bytes value = 2;
-}
-
-message Bytes {
-  bytes value = 1;
-}

proto/package.json

@@ -1,3 +0,0 @@
-{
-	"type": "module"
-}

scripts/test-ci.js

@@ -9,10 +9,10 @@ try {
 		execSync("which xvfb-run", { stdio: "ignore" })
 
 		console.log("xvfb-run is installed. Running tests with xvfb-run...")
-		execSync("xvfb-run -a npm run test:integration", { stdio: "inherit" })
+		execSync("xvfb-run -a npm run test", { stdio: "inherit" })
 	} else {
 		console.log("Non-Linux environment detected. Running tests normally.")
-		execSync("npm run test:integration", { stdio: "inherit" })
+		execSync("npm run test", { stdio: "inherit" })
 	}
 } catch (error) {
 	if (process.platform === "linux") {

src/api/index.ts

@@ -15,7 +15,6 @@ import { RequestyHandler } from "./providers/requesty"
 import { TogetherHandler } from "./providers/together"
 import { QwenHandler } from "./providers/qwen"
 import { MistralHandler } from "./providers/mistral"
-import { DoubaoHandler } from "./providers/doubao"
 import { VsCodeLmHandler } from "./providers/vscode-lm"
 import { ClineHandler } from "./providers/cline"
 import { LiteLlmHandler } from "./providers/litellm"
@@ -62,8 +61,6 @@ export function buildApiHandler(configuration: ApiConfiguration): ApiHandler {
 			return new TogetherHandler(options)
 		case "qwen":
 			return new QwenHandler(options)
-		case "doubao":
-			return new DoubaoHandler(options)
 		case "mistral":
 			return new MistralHandler(options)
 		case "vscode-lm":

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

@@ -1,228 +0,0 @@
-import { describe, it, beforeEach, afterEach, before } from "mocha"
-import "should"
-import sinon from "sinon"
-import { Anthropic } from "@anthropic-ai/sdk"
-import { OllamaHandler } from "../ollama"
-import { ApiHandlerOptions } from "../../../shared/api"
-import axios from "axios"
-
-describe("OllamaHandler", () => {
-	let ollamaAvailable = false
-
-	// Check if Ollama is running before running tests
-	before(async function () {
-		this.timeout(5000)
-		try {
-			await axios.get("http://localhost:11434/api/version", { timeout: 2000 })
-			ollamaAvailable = true
-		} catch (error) {
-			console.log("Ollama server not available, skipping tests")
-			ollamaAvailable = false
-		}
-	})
-	let handler: OllamaHandler
-	let options: ApiHandlerOptions
-	let clock: sinon.SinonFakeTimers
-
-	beforeEach(() => {
-		options = {
-			ollamaModelId: "llama2",
-			ollamaBaseUrl: "http://localhost:11434",
-		}
-		handler = new OllamaHandler(options)
-		// Use fake timers for testing timeouts
-		clock = sinon.useFakeTimers()
-	})
-
-	afterEach(() => {
-		clock.restore()
-		sinon.restore()
-	})
-
-	describe("createMessage", () => {
-		it("should handle successful responses", async function () {
-			if (!ollamaAvailable) {
-				this.skip()
-			}
-			this.timeout(5000)
-			// Mock the Ollama client's chat method
-			const chatStub = sinon.stub(handler["client"], "chat").resolves({
-				[Symbol.asyncIterator]: async function* () {
-					yield {
-						message: { content: "Hello, world!" },
-						eval_count: 10,
-						prompt_eval_count: 20,
-					}
-				},
-			} as any)
-
-			const systemPrompt = "You are a helpful assistant."
-			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello" }]
-
-			const result = []
-			const usageInfo = []
-
-			// Collect the results
-			for await (const chunk of handler.createMessage(systemPrompt, messages)) {
-				if (chunk.type === "text") {
-					result.push(chunk.text)
-				} else if (chunk.type === "usage") {
-					usageInfo.push({
-						inputTokens: chunk.inputTokens,
-						outputTokens: chunk.outputTokens,
-					})
-				}
-			}
-
-			// Verify the results
-			result.should.deepEqual(["Hello, world!"])
-			usageInfo.should.deepEqual([{ inputTokens: 20, outputTokens: 10 }])
-			chatStub.calledOnce.should.be.true()
-		})
-
-		it("should handle timeout errors", async function () {
-			if (!ollamaAvailable) {
-				this.skip()
-			}
-			this.timeout(10000)
-			// Restore real timers for this test
-			clock.restore()
-
-			// Create a handler with a very short timeout for testing
-			const testHandler = new OllamaHandler(options)
-
-			// Replace the createMessage method with one that has a shorter timeout
-			testHandler.createMessage = async function* (systemPrompt, messages) {
-				try {
-					// Create a promise that rejects after a short timeout
-					const timeoutPromise = new Promise<never>((_, reject) => {
-						setTimeout(() => reject(new Error("Ollama request timed out after 30 seconds")), 100)
-					})
-
-					// Create a promise that never resolves
-					const neverPromise = new Promise(() => {})
-
-					// Race them
-					await Promise.race([timeoutPromise, neverPromise])
-				} catch (error: any) {
-					// Enhance error reporting
-					console.error(`Ollama API error: ${error.message}`)
-					throw error
-				}
-			}
-
-			const systemPrompt = "You are a helpful assistant."
-			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello" }]
-
-			// Start the request and catch the error
-			let errorMessage = ""
-			try {
-				for await (const _ of testHandler.createMessage(systemPrompt, messages)) {
-					// This should not be reached
-				}
-			} catch (error: any) {
-				errorMessage = error.message
-			}
-
-			// Check the result
-			errorMessage.should.equal("Ollama request timed out after 30 seconds")
-
-			// Restore the fake timers for other tests
-			clock = sinon.useFakeTimers()
-		})
-
-		it("should retry on errors when using the withRetry decorator", async function () {
-			if (!ollamaAvailable) {
-				this.skip()
-			}
-			this.timeout(10000)
-			// Restore real timers for this test
-			clock.restore()
-
-			// 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"))
-
-			// Second call succeeds
-			chatStub.onSecondCall().resolves({
-				[Symbol.asyncIterator]: async function* () {
-					yield {
-						message: { content: "Success after retry" },
-					}
-				},
-			} as any)
-
-			const systemPrompt = "You are a helpful assistant."
-			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello" }]
-
-			const result = []
-
-			// Add a small delay to ensure the retry mechanism has time to work
-			await new Promise((resolve) => setTimeout(resolve, 100))
-
-			// Collect the results
-			for await (const chunk of handler.createMessage(systemPrompt, messages)) {
-				if (chunk.type === "text") {
-					result.push(chunk.text)
-				}
-			}
-
-			// Verify the results
-			result.should.deepEqual(["Success after retry"])
-			chatStub.calledTwice.should.be.true()
-
-			// Restore the fake timers for other tests
-			clock = sinon.useFakeTimers()
-		})
-
-		it("should handle stream processing errors", async function () {
-			if (!ollamaAvailable) {
-				this.skip()
-			}
-			this.timeout(10000)
-			// Restore real timers for this test
-			clock.restore()
-
-			// Create a handler with a custom implementation for testing
-			const testHandler = new OllamaHandler(options)
-
-			// Replace the createMessage method with one that simulates a stream error
-			testHandler.createMessage = async function* (systemPrompt, messages) {
-				// First yield a successful chunk
-				yield {
-					type: "text",
-					text: "Partial response",
-				}
-
-				// Then throw an error in the stream
-				throw new Error("Ollama stream processing error: Stream error")
-			}
-
-			const systemPrompt = "You are a helpful assistant."
-			const messages: Anthropic.Messages.MessageParam[] = [{ role: "user", content: "Hello" }]
-
-			const result = []
-
-			// Collect the results and catch the error
-			let errorMessage = ""
-			try {
-				for await (const chunk of testHandler.createMessage(systemPrompt, messages)) {
-					if (chunk.type === "text") {
-						result.push(chunk.text)
-					}
-				}
-			} catch (error: any) {
-				errorMessage = error.message
-			}
-
-			// Verify the results
-			errorMessage.should.equal("Ollama stream processing error: Stream error")
-			result.should.deepEqual(["Partial response"])
-
-			// Restore the fake timers for other tests
-			clock = sinon.useFakeTimers()
-		})
-	})
-})

src/api/providers/anthropic.ts

@@ -114,7 +114,7 @@ export class AnthropicHandler implements ApiHandler {
 				break
 			}
 			default: {
-				stream = await this.client.messages.create({
+				stream = (await this.client.messages.create({
 					model: modelId,
 					max_tokens: model.info.maxTokens || 8192,
 					temperature: 0,
@@ -123,7 +123,7 @@ export class AnthropicHandler implements ApiHandler {
 					// tools,
 					// tool_choice: { type: "auto" },
 					stream: true,
-				})
+				})) as any
 				break
 			}
 		}

src/api/providers/deepseek.ts

@@ -36,15 +36,14 @@ export class DeepSeekHandler implements ApiHandler {
 		}
 		const deepUsage = usage as DeepSeekUsage
 
-		const inputTokens = deepUsage?.prompt_tokens || 0 // sum of cache hits and misses
+		const inputTokens = deepUsage?.prompt_tokens || 0
 		const outputTokens = deepUsage?.completion_tokens || 0
 		const cacheReadTokens = deepUsage?.prompt_cache_hit_tokens || 0
 		const cacheWriteTokens = deepUsage?.prompt_cache_miss_tokens || 0
 		const totalCost = calculateApiCostOpenAI(info, inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens)
-		const nonCachedInputTokens = Math.max(0, inputTokens - cacheReadTokens - cacheWriteTokens) // this will always be 0
 		yield {
 			type: "usage",
-			inputTokens: nonCachedInputTokens,
+			inputTokens: inputTokens,
 			outputTokens: outputTokens,
 			cacheWriteTokens: cacheWriteTokens,
 			cacheReadTokens: cacheReadTokens,

src/api/providers/doubao.ts

@@ -1,68 +0,0 @@
-import { ApiHandler } from ".."
-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"
-
-export class DoubaoHandler implements ApiHandler {
-	private options: ApiHandlerOptions
-	private client: OpenAI
-	constructor(options: ApiHandlerOptions) {
-		this.options = options
-		this.client = new OpenAI({
-			baseURL: "https://ark.cn-beijing.volces.com/api/v3/",
-			apiKey: this.options.doubaoApiKey,
-		})
-	}
-
-	getModel(): { id: DoubaoModelId; info: ModelInfo } {
-		const modelId = this.options.apiModelId
-		if (modelId && modelId in doubaoModels) {
-			const id = modelId as DoubaoModelId
-			return { id, info: doubaoModels[id] }
-		}
-		return {
-			id: doubaoDefaultModelId,
-			info: doubaoModels[doubaoDefaultModelId],
-		}
-	}
-
-	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const model = this.getModel()
-		let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
-			{ role: "system", content: systemPrompt },
-			...convertToOpenAiMessages(messages),
-		]
-		const stream = await this.client.chat.completions.create({
-			model: model.id,
-			max_completion_tokens: model.info.maxTokens,
-			messages: openAiMessages,
-			stream: true,
-			stream_options: { include_usage: true },
-			temperature: 0,
-		})
-
-		for await (const chunk of stream) {
-			const delta = chunk.choices[0]?.delta
-			if (delta?.content) {
-				yield {
-					type: "text",
-					text: delta.content,
-				}
-			}
-
-			if (chunk.usage) {
-				yield {
-					type: "usage",
-					inputTokens: chunk.usage.prompt_tokens || 0,
-					outputTokens: chunk.usage.completion_tokens || 0,
-					// @ts-ignore-next-line
-					cacheReadTokens: chunk.usage.prompt_cache_hit_tokens || 0,
-					// @ts-ignore-next-line
-					cacheWriteTokens: chunk.usage.prompt_cache_miss_tokens || 0,
-				}
-			}
-		}
-	}
-}

src/api/providers/gemini.ts

@@ -20,13 +20,10 @@ export class GeminiHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const modelOptions = {
+		const model = this.client.getGenerativeModel({
 			model: this.getModel().id,
 			systemInstruction: systemPrompt,
-		}
-
-		const clientOptions = this.options.geminiBaseUrl ? { baseUrl: this.options.geminiBaseUrl } : undefined
-		const model = this.client.getGenerativeModel(modelOptions, clientOptions)
+		})
 		const result = await model.generateContentStream({
 			contents: messages.map(convertAnthropicMessageToGemini),
 			generationConfig: {

src/api/providers/litellm.ts

@@ -59,53 +59,18 @@ export class LiteLlmHandler implements ApiHandler {
 		}
 		const modelId = this.options.liteLlmModelId || liteLlmDefaultModelId
 		const isOminiModel = modelId.includes("o1-mini") || modelId.includes("o3-mini")
-
-		// Configuration for extended thinking
-		const budgetTokens = this.options.thinkingBudgetTokens || 0
-		const reasoningOn = budgetTokens !== 0 ? true : false
-		const thinkingConfig = reasoningOn ? { type: "enabled", budget_tokens: budgetTokens } : undefined
-
 		let temperature: number | undefined = 0
 
-		if (isOminiModel && reasoningOn) {
-			temperature = undefined // Thinking mode doesn't support temperature
+		if (isOminiModel) {
+			temperature = undefined // does not support temperature
 		}
 
-		// Define cache control object if prompt caching is enabled
-		const cacheControl = this.options.liteLlmUsePromptCache ? { cache_control: { type: "ephemeral" } } : undefined
-
-		// Add cache_control to system message if enabled
-		const enhancedSystemMessage = {
-			...systemMessage,
-			...(cacheControl && cacheControl),
-		}
-
-		// Find the last two user messages to apply caching
-		const userMsgIndices = formattedMessages.reduce(
-			(acc, msg, index) => (msg.role === "user" ? [...acc, index] : acc),
-			[] as number[],
-		)
-		const lastUserMsgIndex = userMsgIndices[userMsgIndices.length - 1] ?? -1
-		const secondLastUserMsgIndex = userMsgIndices[userMsgIndices.length - 2] ?? -1
-
-		// Apply cache_control to the last two user messages if enabled
-		const enhancedMessages = formattedMessages.map((message, index) => {
-			if ((index === lastUserMsgIndex || index === secondLastUserMsgIndex) && cacheControl) {
-				return {
-					...message,
-					...cacheControl,
-				}
-			}
-			return message
-		})
-
 		const stream = await this.client.chat.completions.create({
 			model: this.options.liteLlmModelId || liteLlmDefaultModelId,
-			messages: [enhancedSystemMessage, ...enhancedMessages],
+			messages: [systemMessage, ...formattedMessages],
 			temperature,
 			stream: true,
 			stream_options: { include_usage: true },
-			...(thinkingConfig && { thinking: thinkingConfig }), // Add thinking configuration when applicable
 		})
 
 		const inputCost = (await this.calculateCost(1e6, 0)) || 0
@@ -113,8 +78,6 @@ export class LiteLlmHandler implements ApiHandler {
 
 		for await (const chunk of stream) {
 			const delta = chunk.choices[0]?.delta
-
-			// Handle normal text content
 			if (delta?.content) {
 				yield {
 					type: "text",
@@ -122,44 +85,13 @@ export class LiteLlmHandler implements ApiHandler {
 				}
 			}
 
-			// Handle reasoning events (thinking)
-			// Thinking is not in the standard types but may be in the response
-			interface ThinkingDelta {
-				thinking?: string
-			}
-
-			if ((delta as ThinkingDelta)?.thinking) {
-				yield {
-					type: "reasoning",
-					reasoning: (delta as ThinkingDelta).thinking || "",
-				}
-			}
-
-			// Handle token usage information
 			if (chunk.usage) {
 				const totalCost =
 					(inputCost * chunk.usage.prompt_tokens) / 1e6 + (outputCost * chunk.usage.completion_tokens) / 1e6
-
-				// Extract cache-related information if available
-				// Need to use type assertion since these properties are not in the standard OpenAI types
-				const usage = chunk.usage as {
-					prompt_tokens: number
-					completion_tokens: number
-					cache_creation_input_tokens?: number
-					prompt_cache_miss_tokens?: number
-					cache_read_input_tokens?: number
-					prompt_cache_hit_tokens?: number
-				}
-
-				const cacheWriteTokens = usage.cache_creation_input_tokens || usage.prompt_cache_miss_tokens || 0
-				const cacheReadTokens = usage.cache_read_input_tokens || usage.prompt_cache_hit_tokens || 0
-
 				yield {
 					type: "usage",
-					inputTokens: usage.prompt_tokens || 0,
-					outputTokens: usage.completion_tokens || 0,
-					cacheWriteTokens: cacheWriteTokens > 0 ? cacheWriteTokens : undefined,
-					cacheReadTokens: cacheReadTokens > 0 ? cacheReadTokens : undefined,
+					inputTokens: chunk.usage.prompt_tokens || 0,
+					outputTokens: chunk.usage.completion_tokens || 0,
 					totalCost,
 				}
 			}

src/api/providers/ollama.ts

@@ -4,7 +4,6 @@ import { ApiHandler } from "../"
 import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
 import { convertToOllamaMessages } from "../transform/ollama-format"
 import { ApiStream } from "../transform/stream"
-import { withRetry } from "../retry"
 
 export class OllamaHandler implements ApiHandler {
 	private options: ApiHandlerOptions
@@ -15,63 +14,24 @@ export class OllamaHandler implements ApiHandler {
 		this.client = new Ollama({ host: this.options.ollamaBaseUrl || "http://localhost:11434" })
 	}
 
-	@withRetry({ retryAllErrors: true })
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
 		const ollamaMessages: Message[] = [{ role: "system", content: systemPrompt }, ...convertToOllamaMessages(messages)]
 
-		try {
-			// Create a promise that rejects after timeout
-			const timeoutPromise = new Promise<never>((_, reject) => {
-				setTimeout(() => reject(new Error("Ollama request timed out after 30 seconds")), 30000)
-			})
-
-			// Create the actual API request promise
-			const apiPromise = this.client.chat({
-				model: this.getModel().id,
-				messages: ollamaMessages,
-				stream: true,
-				options: {
-					num_ctx: Number(this.options.ollamaApiOptionsCtxNum) || 32768,
-				},
-			})
-
-			// Race the API request against the timeout
-			const stream = (await Promise.race([apiPromise, timeoutPromise])) as Awaited<typeof apiPromise>
-
-			try {
-				for await (const chunk of stream) {
-					if (typeof chunk.message.content === "string") {
-						yield {
-							type: "text",
-							text: chunk.message.content,
-						}
-					}
-
-					// Handle token usage if available
-					if (chunk.eval_count !== undefined || chunk.prompt_eval_count !== undefined) {
-						yield {
-							type: "usage",
-							inputTokens: chunk.prompt_eval_count || 0,
-							outputTokens: chunk.eval_count || 0,
-						}
-					}
+		const stream = await this.client.chat({
+			model: this.getModel().id,
+			messages: ollamaMessages,
+			stream: true,
+			options: {
+				num_ctx: Number(this.options.ollamaApiOptionsCtxNum) || 32768,
+			},
+		})
+		for await (const chunk of stream) {
+			if (typeof chunk.message.content === "string") {
+				yield {
+					type: "text",
+					text: chunk.message.content,
 				}
-			} catch (streamError: any) {
-				console.error("Error processing Ollama stream:", streamError)
-				throw new Error(`Ollama stream processing error: ${streamError.message || "Unknown error"}`)
 			}
-		} catch (error: any) {
-			// Check if it's a timeout error
-			if (error.message && error.message.includes("timed out")) {
-				throw new Error("Ollama request timed out after 30 seconds")
-			}
-
-			// Enhance error reporting
-			const statusCode = error.status || error.statusCode
-			const errorMessage = error.message || "Unknown error"
-
-			console.error(`Ollama API error (${statusCode || "unknown"}): ${errorMessage}`)
-			throw error
 		}
 	}
 

src/api/providers/openai-native.ts

@@ -12,7 +12,7 @@ import {
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { calculateApiCostOpenAI } from "../../utils/cost"
 import { ApiStream } from "../transform/stream"
-import type { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
+import { ChatCompletionReasoningEffort } from "openai/resources/chat/completions.mjs"
 
 export class OpenAiNativeHandler implements ApiHandler {
 	private options: ApiHandlerOptions
@@ -26,15 +26,14 @@ export class OpenAiNativeHandler implements ApiHandler {
 	}
 
 	private async *yieldUsage(info: ModelInfo, usage: OpenAI.Completions.CompletionUsage | undefined): ApiStream {
-		const inputTokens = usage?.prompt_tokens || 0 // sum of cache hits and misses
+		const inputTokens = usage?.prompt_tokens || 0
 		const outputTokens = usage?.completion_tokens || 0
 		const cacheReadTokens = usage?.prompt_tokens_details?.cached_tokens || 0
 		const cacheWriteTokens = 0
 		const totalCost = calculateApiCostOpenAI(info, inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens)
-		const nonCachedInputTokens = Math.max(0, inputTokens - cacheReadTokens - cacheWriteTokens)
 		yield {
 			type: "usage",
-			inputTokens: nonCachedInputTokens,
+			inputTokens: inputTokens,
 			outputTokens: outputTokens,
 			cacheWriteTokens: cacheWriteTokens,
 			cacheReadTokens: cacheReadTokens,
@@ -50,7 +49,7 @@ export class OpenAiNativeHandler implements ApiHandler {
 			case "o1":
 			case "o1-preview":
 			case "o1-mini": {
-				// o1 doesn't support streaming, non-1 temp, or system prompt
+				// o1 doesnt support streaming, non-1 temp, or system prompt
 				const response = await this.client.chat.completions.create({
 					model: model.id,
 					messages: [{ role: "user", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
@@ -64,8 +63,6 @@ export class OpenAiNativeHandler implements ApiHandler {
 
 				break
 			}
-			case "o4-mini":
-			case "o3":
 			case "o3-mini": {
 				const stream = await this.client.chat.completions.create({
 					model: model.id,

src/api/providers/openai.ts

@@ -6,7 +6,7 @@ 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"
+import { ChatCompletionReasoningEffort } from "openai/resources/chat/completions.mjs"
 
 export class OpenAiHandler implements ApiHandler {
 	private options: ApiHandlerOptions
@@ -16,22 +16,16 @@ export class OpenAiHandler implements ApiHandler {
 		this.options = options
 		// 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.openAiModelId?.toLowerCase().includes("deepseek"))
-		) {
+		if (this.options.azureApiVersion || this.options.openAiBaseUrl?.toLowerCase().includes("azure.com")) {
 			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,
 			})
 		}
 	}
@@ -41,7 +35,7 @@ export class OpenAiHandler implements ApiHandler {
 		const modelId = this.options.openAiModelId ?? ""
 		const isDeepseekReasoner = modelId.includes("deepseek-reasoner")
 		const isR1FormatRequired = this.options.openAiModelInfo?.isR1FormatRequired ?? false
-		const isReasoningModelFamily = modelId.includes("o3") || modelId.includes("o4")
+		const isO3Mini = modelId.includes("o3-mini")
 
 		let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
 			{ role: "system", content: systemPrompt },
@@ -61,7 +55,7 @@ export class OpenAiHandler implements ApiHandler {
 			openAiMessages = convertToR1Format([{ role: "user", content: systemPrompt }, ...messages])
 		}
 
-		if (isReasoningModelFamily) {
+		if (isO3Mini) {
 			openAiMessages = [{ role: "developer", content: systemPrompt }, ...convertToOpenAiMessages(messages)]
 			temperature = undefined // does not support temperature
 			reasoningEffort = (this.options.o3MiniReasoningEffort as ChatCompletionReasoningEffort) || "medium"

src/api/providers/requesty.ts

@@ -1,10 +1,9 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import OpenAI from "openai"
-import { ApiHandlerOptions, ModelInfo, requestyDefaultModelId, requestyDefaultModelInfo } from "../../shared/api"
+import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
 import { ApiHandler } from "../index"
 import { withRetry } from "../retry"
 import { convertToOpenAiMessages } from "../transform/openai-format"
-import { calculateApiCostOpenAI } from "../../utils/cost"
 import { ApiStream } from "../transform/stream"
 
 export class RequestyHandler implements ApiHandler {
@@ -25,34 +24,21 @@ export class RequestyHandler implements ApiHandler {
 
 	@withRetry()
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const model = this.getModel()
+		const modelId = this.options.requestyModelId ?? ""
 
 		const openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
 			{ role: "system", content: systemPrompt },
 			...convertToOpenAiMessages(messages),
 		]
 
-		const reasoningEffort = this.options.o3MiniReasoningEffort || "medium"
-		const reasoning = { reasoning_effort: reasoningEffort }
-		const reasoningArgs = model.id === "openai/o3-mini" ? reasoning : {}
-
-		const thinkingBudget = this.options.thinkingBudgetTokens || 0
-		const thinking =
-			thinkingBudget > 0
-				? { thinking: { type: "enabled", budget_tokens: thinkingBudget } }
-				: { thinking: { type: "disabled" } }
-		const thinkingArgs = model.id.includes("claude-3-7-sonnet") ? thinking : {}
-
 		// @ts-ignore-next-line
 		const stream = await this.client.chat.completions.create({
-			model: model.id,
-			max_tokens: model.info.maxTokens || undefined,
+			model: modelId,
 			messages: openAiMessages,
 			temperature: 0,
 			stream: true,
 			stream_options: { include_usage: true },
-			...reasoningArgs,
-			...thinkingArgs,
+			...(modelId === "openai/o3-mini" ? { reasoning_effort: this.options.o3MiniReasoningEffort || "medium" } : {}),
 		})
 
 		for await (const chunk of stream) {
@@ -87,7 +73,7 @@ export class RequestyHandler implements ApiHandler {
 				const outputTokens = usage.completion_tokens || 0
 				const cacheWriteTokens = usage.prompt_tokens_details?.caching_tokens || undefined
 				const cacheReadTokens = usage.prompt_tokens_details?.cached_tokens || undefined
-				const totalCost = calculateApiCostOpenAI(model.info, inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens)
+				const totalCost = 0 // TODO: Replace with calculateApiCostOpenAI(model.info, inputTokens, outputTokens, cacheWriteTokens, cacheReadTokens)
 
 				yield {
 					type: "usage",
@@ -102,11 +88,9 @@ export class RequestyHandler implements ApiHandler {
 	}
 
 	getModel(): { id: string; info: ModelInfo } {
-		const modelId = this.options.requestyModelId
-		const modelInfo = this.options.requestyModelInfo
-		if (modelId && modelInfo) {
-			return { id: modelId, info: modelInfo }
+		return {
+			id: this.options.requestyModelId ?? "",
+			info: openAiModelInfoSaneDefaults,
 		}
-		return { id: requestyDefaultModelId, info: requestyDefaultModelInfo }
 	}
 }

src/api/providers/types.ts

@@ -1,13 +1,6 @@
 // For the following openrouter error type sources, see the docs here:
 // https://openrouter.ai/docs/api-reference/errors
 
-export interface LanguageModelChatSelector {
-	vendor?: string
-	family?: string
-	version?: string
-	id?: string
-}
-
 export type OpenRouterErrorResponse = {
 	error: {
 		message: string

src/api/providers/vertex.ts

@@ -5,7 +5,6 @@ import { ApiHandler } from "../"
 import { ApiHandlerOptions, ModelInfo, vertexDefaultModelId, VertexModelId, vertexModels } from "../../shared/api"
 import { ApiStream } from "../transform/stream"
 import { VertexAI } from "@google-cloud/vertexai"
-import { calculateApiCostOpenAI } from "../../utils/cost"
 
 // https://docs.anthropic.com/en/api/claude-on-vertex-ai
 export class VertexHandler implements ApiHandler {
@@ -267,17 +266,6 @@ export class VertexHandler implements ApiHandler {
 					}
 				}
 			}
-			// Handle token usage metadata
-			const { usageMetadata } = await streamingResult.response
-			if (usageMetadata) {
-				const { promptTokenCount = 0, candidatesTokenCount = 0 } = usageMetadata
-				yield {
-					type: "usage",
-					inputTokens: promptTokenCount,
-					outputTokens: candidatesTokenCount,
-					totalCost: calculateApiCostOpenAI(model.info, promptTokenCount, candidatesTokenCount, 0, 0),
-				}
-			}
 		}
 	}
 

src/api/providers/vscode-lm.ts

@@ -6,7 +6,6 @@ import { ApiStream } from "../transform/stream"
 import { convertToVsCodeLmMessages } from "../transform/vscode-lm-format"
 import { SELECTOR_SEPARATOR, stringifyVsCodeLmModelSelector } from "../../shared/vsCodeSelectorUtils"
 import { ApiHandlerOptions, ModelInfo, openAiModelInfoSaneDefaults } from "../../shared/api"
-import type { LanguageModelChatSelector as LanguageModelChatSelectorFromTypes } from "./types"
 
 // 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.
@@ -20,7 +19,12 @@ declare module "vscode" {
 		Auto = 1,
 		Required = 2,
 	}
-	interface LanguageModelChatSelector extends LanguageModelChatSelectorFromTypes {}
+	interface LanguageModelChatSelector {
+		vendor?: string
+		family?: string
+		version?: string
+		id?: string
+	}
 	interface LanguageModelChatTool {
 		name: string
 		description: string

src/api/providers/xai.ts

@@ -4,7 +4,6 @@ import { ApiHandler } from "../"
 import { ApiHandlerOptions, XAIModelId, ModelInfo, xaiDefaultModelId, xaiModels } from "../../shared/api"
 import { convertToOpenAiMessages } from "../transform/openai-format"
 import { ApiStream } from "../transform/stream"
-import { ChatCompletionReasoningEffort } from "openai/resources/chat/completions"
 
 export class XAIHandler implements ApiHandler {
 	private options: ApiHandlerOptions
@@ -19,23 +18,13 @@ export class XAIHandler implements ApiHandler {
 	}
 
 	async *createMessage(systemPrompt: string, messages: Anthropic.Messages.MessageParam[]): ApiStream {
-		const modelId = this.getModel().id
-		// ensure reasoning effort is either "low" or "high" for grok-3-mini
-		let reasoningEffort: ChatCompletionReasoningEffort | undefined
-		if (modelId.includes("3-mini")) {
-			let reasoningEffort = this.options.reasoningEffort
-			if (reasoningEffort && !["low", "high"].includes(reasoningEffort)) {
-				reasoningEffort = undefined
-			}
-		}
 		const stream = await this.client.chat.completions.create({
-			model: modelId,
+			model: this.getModel().id,
 			max_completion_tokens: this.getModel().info.maxTokens,
 			temperature: 0,
 			messages: [{ role: "system", content: systemPrompt }, ...convertToOpenAiMessages(messages)],
 			stream: true,
 			stream_options: { include_usage: true },
-			reasoning_effort: reasoningEffort,
 		})
 
 		for await (const chunk of stream) {
@@ -47,14 +36,6 @@ export class XAIHandler implements ApiHandler {
 				}
 			}
 
-			if (delta && "reasoning_content" in delta && delta.reasoning_content) {
-				yield {
-					type: "reasoning",
-					// @ts-ignore-next-line
-					reasoning: delta.reasoning_content,
-				}
-			}
-
 			if (chunk.usage) {
 				yield {
 					type: "usage",

src/api/transform/gemini-format.ts

@@ -20,7 +20,7 @@ export function convertAnthropicContentToGemini(content: string | Anthropic.Cont
 					},
 				} as InlineDataPart
 			default:
-				throw new Error(`Unsupported content block type: ${block.type}`)
+				throw new Error(`Unsupported content block type: ${(block as any).type}`)
 		}
 	})
 }

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

@@ -1,211 +0,0 @@
-// This file contains `declare module "vscode"` so we must import it.
-import "../providers/vscode-lm"
-import { describe, it } from "mocha"
-import "should"
-import * as vscode from "vscode"
-import { Anthropic } from "@anthropic-ai/sdk"
-import { asObjectSafe, convertToAnthropicRole, convertToVsCodeLmMessages, convertToAnthropicMessage } from "./vscode-lm-format"
-
-describe("asObjectSafe", () => {
-	it("should handle falsy values", () => {
-		asObjectSafe(0).should.deepEqual({})
-		asObjectSafe("").should.deepEqual({})
-		asObjectSafe(null).should.deepEqual({})
-		asObjectSafe(undefined).should.deepEqual({})
-	})
-
-	it("should parse valid JSON strings", () => {
-		asObjectSafe('{"key": "value"}').should.deepEqual({ key: "value" })
-	})
-
-	it("should return an empty object for invalid JSON strings", () => {
-		asObjectSafe("invalid json").should.deepEqual({})
-	})
-
-	it("should convert objects to plain objects", () => {
-		const input = { prop: "value" }
-		asObjectSafe(input).should.deepEqual(input)
-		asObjectSafe(input).should.not.equal(input) // Should be a new object
-	})
-
-	it("should convert arrays to plain objects", () => {
-		const input = ["hello world"]
-		asObjectSafe(input).should.deepEqual({ 0: "hello world" })
-	})
-})
-
-describe("convertToAnthropicRole", () => {
-	it("should convert VSCode roles to Anthropic roles", () => {
-		// @ts-expect-error（Testing with an invalid role）
-		const unknownRole = "unknown" as vscode.LanguageModelChatMessageRole
-		;(convertToAnthropicRole(vscode.LanguageModelChatMessageRole.Assistant) === "assistant").should.be.true()
-		;(convertToAnthropicRole(vscode.LanguageModelChatMessageRole.User) === "user").should.be.true()
-		;(convertToAnthropicRole(unknownRole) === null).should.be.true()
-	})
-})
-
-describe("convertToVsCodeLmMessages", () => {
-	it("should convert simple string messages", () => {
-		const anthropicMessages: Anthropic.Messages.MessageParam[] = [
-			{ role: "user", content: "Hello" },
-			{ role: "assistant", content: "Hi there" },
-		]
-
-		const result = convertToVsCodeLmMessages(anthropicMessages)
-
-		result.should.have.length(2)
-		result[0].role.should.equal(vscode.LanguageModelChatMessageRole.User)
-		result[0].content[0].should.be.instanceof(vscode.LanguageModelTextPart)
-		const textPart0 = result[0].content[0] as vscode.LanguageModelTextPart
-		textPart0.should.have.property("value", "Hello")
-
-		result[1].role.should.equal(vscode.LanguageModelChatMessageRole.Assistant)
-		result[1].content[0].should.be.instanceof(vscode.LanguageModelTextPart)
-		const textPart1 = result[1].content[0] as vscode.LanguageModelTextPart
-		textPart1.should.have.property("value", "Hi there")
-	})
-
-	it("should convert complex user messages with tool results", () => {
-		const anthropicMessages: Anthropic.Messages.MessageParam[] = [
-			{
-				role: "user",
-				content: [
-					{ type: "text", text: "User text" },
-					{
-						type: "tool_result",
-						tool_use_id: "tool-123",
-						content: [{ type: "text", text: "Tool result" }],
-					},
-				],
-			},
-		]
-
-		const result = convertToVsCodeLmMessages(anthropicMessages)
-
-		result.should.have.length(1)
-		result[0].role.should.equal(vscode.LanguageModelChatMessageRole.User)
-		result[0].content.should.have.length(2)
-
-		// Check that the first content part is a ToolResultPart
-		result[0].content[0].should.be.instanceof(vscode.LanguageModelToolResultPart)
-		const toolResultPart = result[0].content[0] as vscode.LanguageModelToolResultPart
-		toolResultPart.should.have.property("callId", "tool-123")
-
-		// Skip detailed testing of internal structure as it may vary
-		// Just verify it's the right type with the right ID
-
-		// Check the second content part is a TextPart
-		result[0].content[1].should.be.instanceof(vscode.LanguageModelTextPart)
-		const textPart = result[0].content[1] as vscode.LanguageModelTextPart
-		textPart.should.have.property("value", "User text")
-	})
-
-	it("should convert complex assistant messages with tool calls", () => {
-		const anthropicMessages: Anthropic.Messages.MessageParam[] = [
-			{
-				role: "assistant",
-				content: [
-					{ type: "text", text: "Assistant text" },
-					{
-						type: "tool_use",
-						id: "tool-123",
-						name: "testTool",
-						input: { param: "value" },
-					},
-				],
-			},
-		]
-
-		const result = convertToVsCodeLmMessages(anthropicMessages)
-
-		result.should.have.length(1)
-		result[0].role.should.equal(vscode.LanguageModelChatMessageRole.Assistant)
-		result[0].content.should.have.length(2)
-
-		result[0].content[0].should.be.instanceof(vscode.LanguageModelToolCallPart)
-		const toolCallPart = result[0].content[0] as vscode.LanguageModelToolCallPart
-		toolCallPart.should.have.property("callId", "tool-123")
-		toolCallPart.should.have.property("name", "testTool")
-		toolCallPart.should.have.property("input")
-		toolCallPart.input.should.deepEqual({ param: "value" })
-
-		result[0].content[1].should.be.instanceof(vscode.LanguageModelTextPart)
-		const textPart = result[0].content[1] as vscode.LanguageModelTextPart
-		textPart.should.have.property("value", "Assistant text")
-	})
-
-	it("should handle image blocks with appropriate placeholders", () => {
-		const anthropicMessages: Anthropic.Messages.MessageParam[] = [
-			{
-				role: "user",
-				content: [
-					{
-						type: "image",
-						source: {
-							type: "base64",
-							media_type: "image/jpeg",
-							data: "base64data",
-						},
-					},
-				],
-			},
-		]
-
-		const result = convertToVsCodeLmMessages(anthropicMessages)
-
-		result.should.have.length(1)
-		result[0].content[0].should.be.instanceof(vscode.LanguageModelTextPart)
-		const textPart = result[0].content[0] as vscode.LanguageModelTextPart
-		textPart.should.have.property("value")
-		textPart.value.should.match(/Image \(base64\): image\/jpeg not supported by VSCode LM API/)
-	})
-})
-
-describe("convertToAnthropicMessage", () => {
-	it("should convert VSCode assistant messages to Anthropic format", () => {
-		const vsCodeMsg = vscode.LanguageModelChatMessage.Assistant([
-			new vscode.LanguageModelTextPart("Test message"),
-			new vscode.LanguageModelToolCallPart("tool-id", "testTool", { param: "value" }),
-		])
-
-		const result = convertToAnthropicMessage(vsCodeMsg)
-
-		result.should.have.property("role", "assistant")
-		result.should.have.property("content").which.is.an.Array()
-		result.content.should.have.length(2)
-
-		// Check properties carefully to avoid null reference errors
-		if (result.content && result.content.length >= 1) {
-			const textContent = result.content[0]
-			if (textContent) {
-				textContent.should.have.property("type", "text")
-				if (textContent.type === "text") {
-					textContent.should.have.property("text", "Test message")
-				}
-			}
-		}
-
-		if (result.content && result.content.length >= 2) {
-			const toolContent = result.content[1]
-			if (toolContent) {
-				toolContent.should.have.property("type", "tool_use")
-				if (toolContent.type === "tool_use") {
-					toolContent.should.have.property("id", "tool-id")
-					toolContent.should.have.property("name", "testTool")
-					toolContent.should.have.property("input").which.deepEqual({ param: "value" })
-				}
-			}
-		}
-	})
-
-	it("should throw an error for non-assistant messages", () => {
-		const vsCodeMsg = vscode.LanguageModelChatMessage.User("User message")
-
-		try {
-			convertToAnthropicMessage(vsCodeMsg)
-			throw new Error("Should have thrown an error")
-		} catch (error: any) {
-			error.message.should.match(/Only assistant messages are supported/)
-		}
-	})
-})

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

@@ -4,7 +4,7 @@ import * as vscode from "vscode"
 /**
  * Safely converts a value into a plain object.
  */
-export function asObjectSafe(value: any): object {
+function asObjectSafe(value: any): object {
 	// Handle null/undefined
 	if (!value) {
 		return {}
@@ -145,9 +145,7 @@ export function convertToVsCodeLmMessages(
 	return vsCodeLmMessages
 }
 
-export function convertToAnthropicRole(
-	vsCodeLmMessageRole: vscode.LanguageModelChatMessageRole,
-): Anthropic.Messages.MessageParam["role"] | null {
+export function convertToAnthropicRole(vsCodeLmMessageRole: vscode.LanguageModelChatMessageRole): string | null {
 	switch (vsCodeLmMessageRole) {
 		case vscode.LanguageModelChatMessageRole.Assistant:
 			return "assistant"
@@ -158,8 +156,10 @@ export function convertToAnthropicRole(
 	}
 }
 
-export function convertToAnthropicMessage(vsCodeLmMessage: vscode.LanguageModelChatMessage): Anthropic.Messages.Message {
-	const anthropicRole = convertToAnthropicRole(vsCodeLmMessage.role)
+export async function convertToAnthropicMessage(
+	vsCodeLmMessage: vscode.LanguageModelChatMessage,
+): Promise<Anthropic.Messages.Message> {
+	const anthropicRole: string | null = convertToAnthropicRole(vsCodeLmMessage.role)
 	if (anthropicRole !== "assistant") {
 		throw new Error("Cline <Language Model API>: Only assistant messages are supported.")
 	}

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

@@ -1,178 +0,0 @@
-import { constructNewFileContent as cnfc2 } from "./diff"
-import { describe, it } from "mocha"
-import { expect } from "chai"
-
-async function cnfc(diffContent: string, originalContent: string, isFinal: boolean): Promise<string> {
-	return cnfc2(diffContent, originalContent, isFinal, "v1")
-}
-
-describe("constructNewFileContent", () => {
-	const testCases = [
-		{
-			name: "empty file",
-			original: "",
-			diff: `<<<<<<< SEARCH
-=======
-new content
->>>>>>> REPLACE`,
-			expected: "new content\n",
-			isFinal: true,
-		},
-		{
-			name: "full file replacement",
-			original: "old content",
-			diff: `<<<<<<< SEARCH
-=======
-new content
->>>>>>> REPLACE`,
-			expected: "new content\n",
-			isFinal: true,
-		},
-		{
-			name: "exact match replacement",
-			original: "line1\nline2\nline3",
-			diff: `<<<<<<< SEARCH
-line2
-=======
-replaced
->>>>>>> REPLACE`,
-			expected: "line1\nreplaced\nline3",
-			isFinal: true,
-		},
-		{
-			name: "line-trimmed match replacement",
-			original: "line1\n line2 \nline3",
-			diff: `<<<<<<< SEARCH
-line2
-=======
-replaced
->>>>>>> REPLACE`,
-			expected: "line1\nreplaced\nline3",
-			isFinal: true,
-		},
-		{
-			name: "block anchor match replacement",
-			original: "line1\nstart\nmiddle\nend\nline5",
-			diff: `<<<<<<< SEARCH
-start
-middle
-end
-=======
-replaced
->>>>>>> REPLACE`,
-			expected: "line1\nreplaced\nline5",
-			isFinal: true,
-		},
-		{
-			name: "incremental processing",
-			original: "line1\nline2\nline3",
-			diff: [
-				`<<<<<<< SEARCH
-line2
-=======`,
-				"replaced\n",
-				">>>>>>> REPLACE",
-			].join("\n"),
-			expected: "line1\nreplaced\n\nline3",
-			isFinal: true,
-		},
-		{
-			name: "final chunk with remaining content",
-			original: "line1\nline2\nline3",
-			diff: `<<<<<<< SEARCH
-line2
-=======
-replaced
->>>>>>> REPLACE`,
-			expected: "line1\nreplaced\nline3",
-			isFinal: true,
-		},
-		{
-			name: "multiple ordered replacements",
-			original: "First\nSecond\nThird\nFourth",
-			diff: `<<<<<<< SEARCH
-First
-=======
-1st
->>>>>>> REPLACE
-
-<<<<<<< SEARCH
-Third
-=======
-3rd
->>>>>>> REPLACE`,
-			expected: "1st\nSecond\n3rd\nFourth",
-			isFinal: true,
-		},
-		{
-			name: "replace then delete",
-			original: "line1\nline2\nline3\nline4",
-			diff: `<<<<<<< SEARCH
-line2
-=======
-replaced
->>>>>>> REPLACE
-
-<<<<<<< SEARCH
-line4
-=======
->>>>>>> REPLACE`,
-			expected: "line1\nreplaced\nline3\n",
-			isFinal: true,
-		},
-		{
-			name: "delete then replace",
-			original: "line1\nline2\nline3\nline4",
-			diff: `<<<<<<< SEARCH
-line1
-=======
->>>>>>> REPLACE
-
-<<<<<<< SEARCH
-line3
-=======
-replaced
->>>>>>> REPLACE`,
-			expected: "line2\nreplaced\nline4",
-			isFinal: true,
-		},
-	]
-	//.filter(({name}) => name === "multiple ordered replacements")
-	//.filter(({name}) => name === "delete then replace")
-	testCases.forEach(({ name, original, diff, expected, isFinal }) => {
-		it(`should handle ${name} case correctly`, async () => {
-			const result1 = await cnfc(diff, original, isFinal)
-			const result2 = await cnfc2(diff, original, isFinal)
-			const equal = result1 === result2
-			const equal2 = result1 === expected
-			// Verify both implementations produce same result
-			expect(result1).to.equal(result2)
-
-			// Verify result matches expected
-			expect(result1).to.equal(expected)
-		})
-	})
-
-	it("should throw error when no match found", async () => {
-		const original = "line1\nline2\nline3"
-		const diff = `<<<<<<< SEARCH
-non-existent
-=======
-replaced
->>>>>>> REPLACE`
-
-		try {
-			await cnfc(diff, original, true)
-			expect.fail("Expected an error to be thrown")
-		} catch (err) {
-			expect(err).to.be.an("error")
-		}
-
-		try {
-			await cnfc2(diff, original, true)
-			expect.fail("Expected an error to be thrown")
-		} catch (err) {
-			expect(err).to.be.an("error")
-		}
-	})
-})

src/core/assistant-message/diff.ts

@@ -200,31 +200,7 @@ function blockAnchorFallbackMatch(originalContent: string, searchContent: string
  * - If the search block cannot be matched using any of the available matching strategies,
  *   an error is thrown.
  */
-export async function constructNewFileContent(
-	diffContent: string,
-	originalContent: string,
-	isFinal: boolean,
-	version: "v1" | "v2" = "v2",
-): Promise<string> {
-	const constructor = constructNewFileContentVersionMapping[version]
-	if (!constructor) {
-		throw new Error(`Invalid version '${version}' for file content constructor`)
-	}
-	return constructor(diffContent, originalContent, isFinal)
-}
-
-const constructNewFileContentVersionMapping: Record<
-	string,
-	(diffContent: string, originalContent: string, isFinal: boolean) => Promise<string>
-> = {
-	v1: constructNewFileContentV1,
-	v2: constructNewFileContentV2,
-} as const
-
-/**
- * @deprecated
- */
-async function constructNewFileContentV1(diffContent: string, originalContent: string, isFinal: boolean): Promise<string> {
+export async function constructNewFileContent(diffContent: string, originalContent: string, isFinal: boolean): Promise<string> {
 	let result = ""
 	let lastProcessedIndex = 0
 
@@ -308,7 +284,7 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 							;[searchMatchIndex, searchEndIndex] = blockMatch
 						} else {
 							throw new Error(
-								`The SEARCH block:\n${currentSearchContent.trimEnd()}\n...does not match anything in the file or was searched out of order in the provided blocks.`,
+								`The SEARCH block:\n${currentSearchContent.trimEnd()}\n...does not match anything in the file.`,
 							)
 						}
 					}
@@ -365,359 +341,3 @@ async function constructNewFileContentV1(diffContent: string, originalContent: s
 
 	return result
 }
-
-enum ProcessingState {
-	Idle = 0,
-	StateSearch = 1 << 0,
-	StateReplace = 1 << 1,
-}
-
-class NewFileContentConstructor {
-	private originalContent: string
-	private isFinal: boolean
-	private state: number
-	private pendingNonStandardLines: string[]
-	private result: string
-	private lastProcessedIndex: number
-	private currentSearchContent: string
-	private currentReplaceContent: string
-	private searchMatchIndex: number
-	private searchEndIndex: number
-
-	constructor(originalContent: string, isFinal: boolean) {
-		this.originalContent = originalContent
-		this.isFinal = isFinal
-		this.pendingNonStandardLines = []
-		this.result = ""
-		this.lastProcessedIndex = 0
-		this.state = ProcessingState.Idle
-		this.currentSearchContent = ""
-		this.currentReplaceContent = ""
-		this.searchMatchIndex = -1
-		this.searchEndIndex = -1
-	}
-
-	private resetForNextBlock() {
-		// Reset for next block
-		this.state = ProcessingState.Idle
-		this.currentSearchContent = ""
-		this.currentReplaceContent = ""
-		this.searchMatchIndex = -1
-		this.searchEndIndex = -1
-	}
-
-	private findLastMatchingLineIndex(regx: RegExp, lineLimit: number) {
-		for (let i = lineLimit; i > 0; ) {
-			i--
-			if (this.pendingNonStandardLines[i].match(regx)) {
-				return i
-			}
-		}
-		return -1
-	}
-
-	private updateProcessingState(newState: ProcessingState) {
-		const isValidTransition =
-			(this.state === ProcessingState.Idle && newState === ProcessingState.StateSearch) ||
-			(this.state === ProcessingState.StateSearch && newState === ProcessingState.StateReplace)
-
-		if (!isValidTransition) {
-			throw new Error(
-				`Invalid state transition.\n` +
-					"Valid transitions are:\n" +
-					"- Idle → StateSearch\n" +
-					"- StateSearch → StateReplace",
-			)
-		}
-
-		this.state |= newState
-	}
-
-	private isStateActive(state: ProcessingState): boolean {
-		return (this.state & state) === state
-	}
-
-	private activateReplaceState() {
-		this.updateProcessingState(ProcessingState.StateReplace)
-	}
-
-	private activateSearchState() {
-		this.updateProcessingState(ProcessingState.StateSearch)
-		this.currentSearchContent = ""
-		this.currentReplaceContent = ""
-	}
-
-	private isSearchingActive(): boolean {
-		return this.isStateActive(ProcessingState.StateSearch)
-	}
-
-	private isReplacingActive(): boolean {
-		return this.isStateActive(ProcessingState.StateReplace)
-	}
-
-	private hasPendingNonStandardLines(pendingNonStandardLineLimit: number): boolean {
-		return this.pendingNonStandardLines.length - pendingNonStandardLineLimit < this.pendingNonStandardLines.length
-	}
-
-	public processLine(line: string) {
-		this.internalProcessLine(line, true, this.pendingNonStandardLines.length)
-	}
-
-	public getResult() {
-		// If this is the final chunk, append any remaining original content
-		if (this.isFinal && this.lastProcessedIndex < this.originalContent.length) {
-			this.result += this.originalContent.slice(this.lastProcessedIndex)
-		}
-		if (this.isFinal && this.state !== ProcessingState.Idle) {
-			throw new Error("File processing incomplete - SEARCH/REPLACE operations still active during finalization")
-		}
-		return this.result
-	}
-
-	private internalProcessLine(
-		line: string,
-		canWritependingNonStandardLines: boolean,
-		pendingNonStandardLineLimit: number,
-	): number {
-		let removeLineCount = 0
-		if (line === "<<<<<<< SEARCH") {
-			removeLineCount = this.trimPendingNonStandardTrailingEmptyLines(pendingNonStandardLineLimit)
-			if (removeLineCount > 0) {
-				pendingNonStandardLineLimit = pendingNonStandardLineLimit - removeLineCount
-			}
-			if (this.hasPendingNonStandardLines(pendingNonStandardLineLimit)) {
-				this.tryFixSearchReplaceBlock(pendingNonStandardLineLimit)
-				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
-			}
-			this.activateSearchState()
-		} else if (line === "=======") {
-			// 校验非标内容
-			if (!this.isSearchingActive()) {
-				this.tryFixSearchBlock(pendingNonStandardLineLimit)
-				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
-			}
-			this.activateReplaceState()
-			this.beforeReplace()
-		} else if (line === ">>>>>>> REPLACE") {
-			if (!this.isReplacingActive()) {
-				this.tryFixReplaceBlock(pendingNonStandardLineLimit)
-				canWritependingNonStandardLines && (this.pendingNonStandardLines.length = 0)
-			}
-			this.lastProcessedIndex = this.searchEndIndex
-			this.resetForNextBlock()
-		} else {
-			// Accumulate content for search or replace
-			// (currentReplaceContent is not being used for anything right now since we directly append to result.)
-			// (We artificially add a linebreak since we split on \n at the beginning. In order to not include a trailing linebreak in the final search/result blocks we need to remove it before using them. This allows for partial line matches to be correctly identified.)
-			// NOTE: search/replace blocks must be arranged in the order they appear in the file due to how we build the content using lastProcessedIndex. We also cannot strip the trailing newline since for non-partial lines it would remove the linebreak from the original content. (If we remove end linebreak from search, then we'd also have to remove it from replace but we can't know if it's a partial line or not since the model may be using the line break to indicate the end of the block rather than as part of the search content.) We require the model to output full lines in order for our fallbacks to work as well.
-			if (this.isReplacingActive()) {
-				this.currentReplaceContent += line + "\n"
-				// Output replacement lines immediately if we know the insertion point
-				if (this.searchMatchIndex !== -1) {
-					this.result += line + "\n"
-				}
-			} else if (this.isSearchingActive()) {
-				this.currentSearchContent += line + "\n"
-			} else {
-				let appendToPendingNonStandardLines = canWritependingNonStandardLines
-				if (appendToPendingNonStandardLines) {
-					console.log("unstandard line:" + line)
-					// 处理非标内容
-					this.pendingNonStandardLines.push(line)
-				}
-			}
-		}
-		return removeLineCount
-	}
-
-	private beforeReplace() {
-		// Remove trailing linebreak for adding the === marker
-		// if (currentSearchContent.endsWith("\r\n")) {
-		// 	currentSearchContent = currentSearchContent.slice(0, -2)
-		// } else if (currentSearchContent.endsWith("\n")) {
-		// 	currentSearchContent = currentSearchContent.slice(0, -1)
-		// }
-
-		if (!this.currentSearchContent) {
-			// Empty search block
-			if (this.originalContent.length === 0) {
-				// New file scenario: nothing to match, just start inserting
-				this.searchMatchIndex = 0
-				this.searchEndIndex = 0
-			} else {
-				// Complete file replacement scenario: treat the entire file as matched
-				this.searchMatchIndex = 0
-				this.searchEndIndex = this.originalContent.length
-			}
-		} else {
-			// Add check for inefficient full-file search
-			// if (currentSearchContent.trim() === originalContent.trim()) {
-			// 	throw new Error(
-			// 		"The SEARCH block contains the entire file content. Please either:\n" +
-			// 			"1. Use an empty SEARCH block to replace the entire file, or\n" +
-			// 			"2. Make focused changes to specific parts of the file that need modification.",
-			// 	)
-			// }
-			// Exact search match scenario
-			const exactIndex = this.originalContent.indexOf(this.currentSearchContent, this.lastProcessedIndex)
-			if (exactIndex !== -1) {
-				this.searchMatchIndex = exactIndex
-				this.searchEndIndex = exactIndex + this.currentSearchContent.length
-			} else {
-				// Attempt fallback line-trimmed matching
-				const lineMatch = lineTrimmedFallbackMatch(
-					this.originalContent,
-					this.currentSearchContent,
-					this.lastProcessedIndex,
-				)
-				if (lineMatch) {
-					;[this.searchMatchIndex, this.searchEndIndex] = lineMatch
-				} else {
-					// Try block anchor fallback for larger blocks
-					const blockMatch = blockAnchorFallbackMatch(
-						this.originalContent,
-						this.currentSearchContent,
-						this.lastProcessedIndex,
-					)
-					if (blockMatch) {
-						;[this.searchMatchIndex, this.searchEndIndex] = blockMatch
-					} else {
-						throw new Error(
-							`The SEARCH block:\n${this.currentSearchContent.trimEnd()}\n...does not match anything in the file.`,
-						)
-					}
-				}
-			}
-		}
-		if (this.searchMatchIndex < this.lastProcessedIndex) {
-			throw new Error(
-				`The SEARCH block:\n${this.currentSearchContent.trimEnd()}\n...matched an incorrect content in the file.`,
-			)
-		}
-		// Output everything up to the match location
-		this.result += this.originalContent.slice(this.lastProcessedIndex, this.searchMatchIndex)
-	}
-
-	private tryFixSearchBlock(lineLimit: number): number {
-		let removeLineCount = 0
-		if (lineLimit < 0) {
-			lineLimit = this.pendingNonStandardLines.length
-		}
-		if (!lineLimit) {
-			throw new Error("Invalid SEARCH/REPLACE block structure - no lines available to process")
-		}
-		let searchTagRegexp = /^[<]{3,} SEARCH$/
-		const searchTagIndex = this.findLastMatchingLineIndex(searchTagRegexp, lineLimit)
-		if (searchTagIndex !== -1) {
-			let fixLines = this.pendingNonStandardLines.slice(searchTagIndex, lineLimit)
-			fixLines[0] = "<<<<<<< SEARCH"
-			for (const line of fixLines) {
-				removeLineCount += this.internalProcessLine(line, false, searchTagIndex)
-			}
-		} else {
-			throw new Error(
-				`Invalid REPLACE marker detected - could not find matching SEARCH block starting from line ${searchTagIndex + 1}`,
-			)
-		}
-		return removeLineCount
-	}
-
-	private tryFixReplaceBlock(lineLimit: number): number {
-		let removeLineCount = 0
-		if (lineLimit < 0) {
-			lineLimit = this.pendingNonStandardLines.length
-		}
-		if (!lineLimit) {
-			throw new Error()
-		}
-		let replaceBeginTagRegexp = /^[=]{3,}$/
-		const replaceBeginTagIndex = this.findLastMatchingLineIndex(replaceBeginTagRegexp, lineLimit)
-		if (replaceBeginTagIndex !== -1) {
-			// // 校验非标内容
-			// if (!this.isSearchingActive()) {
-			// 	removeLineCount += this.tryFixSearchBlock(replaceBeginTagIndex)
-			// }
-			let fixLines = this.pendingNonStandardLines.slice(replaceBeginTagIndex - removeLineCount, lineLimit - removeLineCount)
-			fixLines[0] = "======="
-			for (const line of fixLines) {
-				removeLineCount += this.internalProcessLine(line, false, replaceBeginTagIndex - removeLineCount)
-			}
-		} else {
-			throw new Error(`Malformed REPLACE block - missing valid separator after line ${replaceBeginTagIndex + 1}`)
-		}
-		return removeLineCount
-	}
-
-	private tryFixSearchReplaceBlock(lineLimit: number): number {
-		let removeLineCount = 0
-		if (lineLimit < 0) {
-			lineLimit = this.pendingNonStandardLines.length
-		}
-		if (!lineLimit) {
-			throw new Error()
-		}
-
-		let replaceEndTagRegexp = /^[>]{3,} REPLACE$/
-		const replaceEndTagIndex = this.findLastMatchingLineIndex(replaceEndTagRegexp, lineLimit)
-		const likeReplaceEndTag = replaceEndTagIndex === lineLimit - 1
-		if (likeReplaceEndTag) {
-			// // 校验非标内容
-			// if (!this.isReplacingActive()) {
-			// 	removeLineCount += this.tryFixReplaceBlock(replaceEndTagIndex)
-			// }
-			let fixLines = this.pendingNonStandardLines.slice(replaceEndTagIndex - removeLineCount, lineLimit - removeLineCount)
-			fixLines[fixLines.length - 1] = ">>>>>>> REPLACE"
-			for (const line of fixLines) {
-				removeLineCount += this.internalProcessLine(line, false, replaceEndTagIndex - removeLineCount)
-			}
-		} else {
-			throw new Error("Malformed SEARCH/REPLACE block structure: Missing valid closing REPLACE marker")
-		}
-		return removeLineCount
-	}
-
-	/**
-	 * Removes trailing empty lines from the pendingNonStandardLines array
-	 * @param lineLimit - The index to start checking from (exclusive).
-	 *                    Removes empty lines from lineLimit-1 backwards.
-	 * @returns The number of empty lines removed
-	 */
-	private trimPendingNonStandardTrailingEmptyLines(lineLimit: number): number {
-		let removedCount = 0
-		let i = Math.min(lineLimit, this.pendingNonStandardLines.length) - 1
-
-		while (i >= 0 && this.pendingNonStandardLines[i].trim() === "") {
-			this.pendingNonStandardLines.pop()
-			removedCount++
-			i--
-		}
-
-		return removedCount
-	}
-}
-
-export async function constructNewFileContentV2(diffContent: string, originalContent: string, isFinal: boolean): Promise<string> {
-	let newFileContentConstructor = new NewFileContentConstructor(originalContent, isFinal)
-
-	let lines = diffContent.split("\n")
-
-	// If the last line looks like a partial marker but isn't recognized,
-	// remove it because it might be incomplete.
-	const lastLine = lines[lines.length - 1]
-	if (
-		lines.length > 0 &&
-		(lastLine.startsWith("<") || lastLine.startsWith("=") || lastLine.startsWith(">")) &&
-		lastLine !== "<<<<<<< SEARCH" &&
-		lastLine !== "=======" &&
-		lastLine !== ">>>>>>> REPLACE"
-	) {
-		lines.pop()
-	}
-
-	for (const line of lines) {
-		newFileContentConstructor.processLine(line)
-	}
-
-	let result = newFileContentConstructor.getResult()
-	return result
-}