ensuring we don't overwrite the changelog

.changeset/afraid-items-help.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-feat(bedrock): adding Amazon Nova

.changeset/beige-monkeys-prove.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Improve file handling for NextJS folder naming conventions and increase file listing limits. Fix glob pattern interpretation issues with parentheses in folder names

.changeset/eighty-ravens-jog.md

@@ -0,0 +1,5 @@
+---
+"claude-dev": minor
+---
+
+Adding automation for bumping version number, generating release notes, and generating changelists

.changeset/eighty-tables-warn.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Handle input too large Anthropic

.changeset/eleven-shirts-play.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix "See more" not showing up for tasks after task un-fold

.changeset/fresh-falcons-hang.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Fix gpt-4.5-preview's supportsPromptCache value to true

.changeset/hungry-buckets-serve.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Feature to open basic settings & scroll a section into view with a highlight animation

.changeset/nasty-pigs-camp.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Added a script to create test tasks in dev mode

.changeset/nice-boats-kick.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-updated move context management out of cline

.changeset/polite-flowers-lick.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-Remote browser control via devtools protocol

.changeset/serious-spoons-knock.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Added support for SambaNova QwQ-32B model

.changeset/short-pants-serve.md

@@ -1,5 +0,0 @@
----
-"claude-dev": minor
----
-
-Add OpenAI "dynamic" model chatgpt-4o-latest

.changeset/tasty-cheetahs-vanish.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-DangerButton.tsx to Tailwind

.changeset/tricky-starfishes-invite.md

@@ -1,5 +0,0 @@
----
-"claude-dev": patch
----
-
-feat(bedrock): adding two regions

.changie.yaml

@@ -1,26 +0,0 @@
-changesDir: .changes
-unreleasedDir: unreleased
-headerPath: header.tpl.md
-changelogPath: CHANGELOG.md
-versionExt: md
-versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
-kindFormat: "### {{.Kind}}"
-changeFormat: "* {{.Body}}"
-kinds:
-    - label: Added
-      auto: minor
-    - label: Changed
-      auto: major
-    - label: Deprecated
-      auto: minor
-    - label: Removed
-      auto: major
-    - label: Fixed
-      auto: patch
-    - label: Security
-      auto: patch
-newlines:
-    afterChangelogHeader: 1
-    beforeChangelogVersion: 1
-    endOfVersion: 1
-envPrefix: CHANGIE_

.clinerules

@@ -252,7 +252,7 @@ class Cline {
     } catch (error) {
       // 4. Error handling with retry
       if (isOpenRouter && !this.didAutomaticallyRetryFailedApiRequest) {
-        await setTimeoutPromise(1000)
+        await delay(1000)
         this.didAutomaticallyRetryFailedApiRequest = true
         yield* this.attemptApiRequest(previousApiReqIndex)
         return

.github/CODEOWNERS

@@ -1 +1 @@
-*       @saoudrizwan @ocasta181 @NightTrek @pashpashpash @dcbartlett @saito-sv
+*       @saoudrizwan @ocasta181 @NightTrek @pashpashpash @dcbartlett

.github/scripts/README.md

@@ -0,0 +1,173 @@
+# Release Notes Scripts
+
+This directory contains Python scripts for managing release notes, version bumping, and changelog updates.
+
+## Development Setup
+
+### Prerequisites
+
+- Python 3.10 or higher
+- [uv](https://github.com/astral-sh/uv) - Fast Python package installer
+  ```bash
+  brew install uv
+  ```
+- [act](https://github.com/nektos/act) - Run GitHub Actions locally
+  ```bash
+  brew install act
+  ```
+
+### Environment Variables
+
+For local testing, you'll need:
+- `OPENROUTER_API_KEY` - Your OpenRouter API key for release notes generation
+
+### Setting Up Development Environment
+
+1. Create and activate a virtual environment:
+   ```bash
+   cd .github/scripts
+   uv venv
+   source .venv/bin/activate  # On Unix/macOS
+   # or
+   .venv\Scripts\activate  # On Windows
+   ```
+
+2. Install dependencies:
+   ```bash
+   uv pip install -r requirements.txt
+   ```
+
+### Running Tests
+
+With the virtual environment activated:
+
+```bash
+# Run all tests (including integration tests)
+python -m pytest test_*.py -v --api-key=your_openrouter_api_key
+
+# Run tests with coverage report
+python -m pytest test_*.py -v --cov=. --cov-report=term-missing --api-key=your_openrouter_api_key
+
+# Run specific test file
+python -m pytest test_version_manager.py -v
+
+# Run specific test
+python -m pytest test_version_manager.py::TestVersionManager::test_bump_version -v
+
+# Run unit tests only (excluding integration tests)
+python -m pytest test_*.py -v --ignore=test_integration.py
+
+# Run integration tests only
+python -m pytest test_integration.py -v --api-key=your_openrouter_api_key
+```
+
+### Integration Testing
+
+The test suite includes integration tests that verify:
+1. Complete release flow with OpenRouter API calls
+2. Error handling (rate limits, invalid keys)
+3. Changelog updates and version management
+
+Integration tests require a valid OpenRouter API key passed via the --api-key parameter. This ensures:
+- Real API interactions are tested
+- No reliance on environment variables
+- Clear separation between unit and integration tests
+- Explicit API key management
+
+## Scripts Overview
+
+### version_manager.py
+Handles version bumping based on changesets. Determines the appropriate version bump (major, minor, patch) based on accumulated changes.
+
+```bash
+python version_manager.py --release-type release
+python version_manager.py --release-type pre-release
+```
+
+### generate_release_notes.py
+Generates release notes using OpenRouter's Claude model. Analyzes changesets and git history to create comprehensive release notes.
+
+```bash
+python generate_release_notes.py \
+  --release-type release \
+  --version v3.3.0 \
+  --changesets '[{"type":"major","content":"Added new feature"}]' \
+  --api-key your_openrouter_api_key
+```
+
+### overwrite_changeset_changelog.py
+Updates CHANGELOG.md with new release notes, maintaining proper formatting and structure.
+
+```bash
+python overwrite_changeset_changelog.py \
+  --version v3.3.0 \
+  --content "Release notes content" \
+  --changelog-path CHANGELOG.md
+```
+
+## End-to-End Testing
+
+### test-release.sh
+Runs the complete release workflow locally using GitHub CLI, exactly as it would run in production:
+
+```bash
+# Run a test pre-release
+./test-release.sh
+```
+
+This script triggers the publish workflow with pre-release mode, allowing you to verify:
+- Version bumping from changesets
+- Release notes generation
+- Changelog updates
+- Complete workflow integration
+
+## Testing
+
+The test suite includes:
+- Unit tests for all core functionality
+- Integration tests with real API calls
+- Mock git commands and file operations
+- Edge case handling
+- Pre-release to release transitions
+- Error scenarios
+
+### Test Files
+
+- `test_version_manager.py`: Tests version bumping logic
+- `test_generate_release_notes.py`: Tests release notes generation
+- `test_overwrite_changelog.py`: Tests changelog updating
+- `test_integration.py`: End-to-end integration tests
+
+## Command Line Arguments
+
+### For Tests
+- `--api-key`: Required for integration tests. Provides the OpenRouter API key.
+
+### For Scripts
+- `--release-type`: Type of release (release or pre-release)
+- `--version`: Version number for the release
+- `--changesets`: JSON string of changes
+- `--content`: Release notes content
+- `--changelog-path`: Path to changelog file
+- `--github-output`: Optional, path for GitHub Actions output
+- `--api-key`: Required for generate_release_notes.py, OpenRouter API key
+
+## Adding New Tests
+
+1. Create test file following the naming convention `test_*.py`
+2. Use pytest fixtures for common setup
+3. Mock external dependencies (git commands, file operations)
+4. Include both success and error cases
+5. Add to existing test suite
+
+Example:
+```python
+def test_new_feature(self):
+    # Unit test example
+    result = my_function()
+    assert result == expected_value
+
+def test_api_integration(self, api_key):
+    # Integration test example
+    result = my_api_function(api_key=api_key)
+    assert result is not None

.github/scripts/conftest.py

@@ -0,0 +1,16 @@
+import pytest
+
+def pytest_addoption(parser):
+    parser.addoption(
+        "--api-key",
+        action="store",
+        help="API key for integration tests"
+    )
+
+@pytest.fixture
+def api_key(request):
+    """Fixture to provide API key to tests."""
+    api_key = request.config.getoption("--api-key")
+    if not api_key:
+        pytest.skip("API key is required for integration tests")
+    return api_key

.github/scripts/generate_release_notes.py

@@ -0,0 +1,233 @@
+#!/usr/bin/env python3
+
+"""
+Release Notes Generator
+
+This script generates release notes using OpenRouter's API with the Claude 3.5 Sonnet model.
+It takes the changesets and git information as input and produces formatted release notes
+suitable for both GitHub releases and VSCode marketplace.
+
+Process:
+1. Read changesets from input
+2. Get git diff and commit information
+3. Generate release notes using OpenRouter API
+4. Format and output the notes
+
+Command line arguments:
+    --github-output: Path to GitHub Actions output file
+    --changesets: JSON string of changesets
+    --version: Version being released
+    --release-type: Either 'release' or 'pre-release'
+    --api-key: OpenRouter API key for generating release notes
+"""
+
+import os
+import sys
+import json
+import argparse
+import subprocess
+from typing import List, Dict, Optional
+import requests
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Generate release notes using OpenRouter API")
+    parser.add_argument(
+        "--github-output",
+        help="Path to GitHub Actions output file"
+    )
+    parser.add_argument(
+        "--changesets",
+        help="JSON string of changesets",
+        required=True
+    )
+    parser.add_argument(
+        "--version",
+        help="Version being released",
+        required=True
+    )
+    parser.add_argument(
+        "--release-type",
+        choices=["release", "pre-release"],
+        default="release",
+        help="Type of release"
+    )
+    parser.add_argument(
+        "--api-key",
+        help="OpenRouter API key",
+        required=True
+    )
+    return parser.parse_args()
+
+def get_git_info(version: str) -> Dict[str, str]:
+    """Get git diff and commit information since the last release."""
+    try:
+        # Always get changes since last regular release, ignoring pre-releases
+        tags = subprocess.check_output(
+            ["git", "tag", "--sort=-v:refname"],
+            text=True
+        ).strip().split("\n")
+        
+        # Filter out pre-releases to get the last regular release
+        regular_releases = [tag for tag in tags if not tag.endswith("-pre")]
+        last_tag = regular_releases[0] if regular_releases else "v0.0.0"
+        print(f"Generating release notes with changes since {last_tag}")
+        
+        # Get commit messages
+        commit_log = subprocess.check_output(
+            ["git", "log", f"{last_tag}...HEAD", "--pretty=format:%s"],
+            text=True
+        ).strip()
+        
+        # Get diff stats
+        diff_stats = subprocess.check_output(
+            ["git", "diff", "--stat", f"{last_tag}...HEAD"],
+            text=True
+        ).strip()
+        
+        return {
+            "commit_log": commit_log,
+            "diff_stats": diff_stats,
+            "last_tag": last_tag
+        }
+    except subprocess.CalledProcessError as e:
+        print(f"Error getting git info: {str(e)}")
+        return {
+            "commit_log": "",
+            "diff_stats": "",
+            "last_tag": "v0.0.0"
+        }
+
+def generate_prompt(changesets: List[Dict], git_info: Dict[str, str], version: str, is_prerelease: bool) -> str:
+    """Generate the prompt for the OpenRouter API."""
+    changes_by_type = {
+        "major": [],
+        "minor": [],
+        "patch": []
+    }
+    
+    for change in changesets:
+        change_type = change["type"].lower()
+        if "major" in change_type:
+            changes_by_type["major"].append(change["content"])
+        elif "minor" in change_type:
+            changes_by_type["minor"].append(change["content"])
+        elif "patch" in change_type:
+            changes_by_type["patch"].append(change["content"])
+    
+    changes_text = "\n\n".join([
+        f"Major Changes:\n{chr(10).join(changes_by_type['major'])}" if changes_by_type["major"] else "",
+        f"Minor Changes:\n{chr(10).join(changes_by_type['minor'])}" if changes_by_type["minor"] else "",
+        f"Patch Changes:\n{chr(10).join(changes_by_type['patch'])}" if changes_by_type["patch"] else ""
+    ]).strip()
+    
+    return f"""Please generate release notes for version {version} of the Cline VSCode extension.
+
+{'''IMPORTANT: This is a pre-release version. The release notes MUST include "(Pre-release)" in the title.
+Example title: "## New Features Added (Pre-release)"''' if is_prerelease else ''}
+
+Changesets:
+{changes_text}
+
+Git Information:
+Commit Messages:
+{git_info['commit_log']}
+
+Changes Overview:
+{git_info['diff_stats']}
+
+Please format the release notes in markdown with:
+1. A short, descriptive title (max 8 words) with heading level 2
+2. A brief summary paragraph explaining the key changes and their impact
+3. Optional sections (include only if relevant):
+   - 🚀 New Features & Improvements (heading level 3)
+   - 🐛 Bugs Fixed (heading level 3)
+   - 🔧 Other Updates (heading level 3)
+
+Focus on user-facing changes and their benefits. Ignore version bumps, dependency updates, and minor syntax changes.
+Be concise but informative, highlighting the most important changes first."""
+
+def generate_release_notes(prompt: str, api_key: str = None) -> str:
+    """Generate release notes using OpenRouter API with Claude 3.5 Sonnet.
+    
+    Args:
+        prompt: The prompt to send to the API
+        api_key: OpenRouter API key.
+    """
+    if not api_key:
+        raise Exception("API key not provided and OPENROUTER_API_KEY environment variable not set")
+        
+    headers = {
+        "Authorization": f"Bearer {api_key}",
+        "HTTP-Referer": "https://github.com/cline/cline",
+        "Content-Type": "application/json"
+    }
+    
+    data = {
+        "model": "anthropic/claude-3.5-sonnet",
+        "messages": [{
+            "role": "user",
+            "content": prompt
+        }],
+        "temperature": 0.7
+    }
+    
+    try:
+        response = requests.post(
+            "https://openrouter.ai/api/v1/chat/completions",
+            headers=headers,
+            json=data
+        )
+        
+        if response.status_code == 429:
+            raise Exception("Rate limit exceeded")
+        elif response.status_code == 401:
+            raise Exception("Invalid API key")
+            
+        response.raise_for_status()
+        return response.json()["choices"][0]["message"]["content"]
+        
+    except requests.exceptions.RequestException as e:
+        error_msg = f"Error calling OpenRouter API: {str(e)}"
+        if hasattr(e, 'response'):
+            error_msg += f"\nResponse: {e.response.text}"
+        raise Exception(error_msg)
+
+def main():
+    args = parse_args()
+    
+    # Parse changesets
+    try:
+        changesets = json.loads(args.changesets)
+    except json.JSONDecodeError:
+        print("Error: Invalid changesets JSON")
+        sys.exit(1)
+    
+    # Get git information
+    git_info = get_git_info(args.version)
+    
+    # Generate prompt
+    prompt = generate_prompt(
+        changesets,
+        git_info,
+        args.version,
+        args.release_type == "pre-release"
+    )
+    
+    # Generate release notes
+    try:
+        release_notes = generate_release_notes(prompt, api_key=args.api_key)
+        print("Generated Release Notes:")
+        print("-" * 80)
+        print(release_notes)
+        print("-" * 80)
+        
+        # Write outputs for GitHub Actions
+        if args.github_output:
+            with open(args.github_output, "a") as f:
+                f.write(f"release_notes<<EOF\n{release_notes}\nEOF\n")
+    except Exception as e:
+        print(f"Error: {str(e)}")
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()

.github/scripts/overwrite_changeset_changelog.py

@@ -1,103 +0,0 @@
-"""
-This script updates a specific version's release notes section in CHANGELOG.md with new content
-or reformats existing content.
-
-The script:
-1. Takes a version number, changelog path, and optionally new content as input from environment variables
-2. Finds the section in the changelog for the specified version
-3. Either:
-   a) Replaces the content with new content if provided, or
-   b) Reformats existing content by:
-      - Removing the first two lines of the changeset format
-      - Ensuring version numbers are wrapped in square brackets
-4. Writes the updated changelog back to the file
-
-Environment Variables:
-    CHANGELOG_PATH: Path to the changelog file (defaults to 'CHANGELOG.md')
-    VERSION: The version number to update/format
-    PREV_VERSION: The previous version number (used to locate section boundaries)
-    NEW_CONTENT: Optional new content to insert for this version
-"""
-
-#!/usr/bin/env python3
-
-import os
-import sys
-
-CHANGELOG_PATH = os.environ.get("CHANGELOG_PATH", "CHANGELOG.md")
-VERSION = os.environ['VERSION']
-PREV_VERSION = os.environ.get("PREV_VERSION", "")
-NEW_CONTENT = os.environ.get("NEW_CONTENT", "")
-
-def overwrite_changelog_section(changelog_text: str, new_content: str):
-    # Find the section for the specified version
-    version_pattern = f"## {VERSION}\n"
-    bracketed_version_pattern = f"## [{VERSION}]\n"
-    prev_version_pattern = f"## [{PREV_VERSION}]\n"
-    print(f"latest version: {VERSION}")
-    print(f"prev_version: {PREV_VERSION}")
-
-    # Try both unbracketed and bracketed version patterns
-    version_index = changelog_text.find(version_pattern)
-    if version_index == -1:
-        version_index = changelog_text.find(bracketed_version_pattern)
-        if version_index == -1:
-            # If version not found, add it at the top (after the first line)
-            first_newline = changelog_text.find('\n')
-            if first_newline == -1:
-                # If no newline found, just prepend
-                return f"## [{VERSION}]\n\n{changelog_text}"
-            return f"{changelog_text[:first_newline + 1]}## [{VERSION}]\n\n{changelog_text[first_newline + 1:]}"
-        else:
-            # Using bracketed version
-            version_pattern = bracketed_version_pattern
-
-    notes_start_index = version_index + len(version_pattern)
-    notes_end_index = changelog_text.find(prev_version_pattern, notes_start_index) if PREV_VERSION and prev_version_pattern in changelog_text else len(changelog_text)
-
-    if new_content:
-        return changelog_text[:notes_start_index] + f"{new_content}\n" + changelog_text[notes_end_index:]
-    else:
-        changeset_lines = changelog_text[notes_start_index:notes_end_index].split("\n")
-        # Ensure we have at least 2 lines before removing them
-        if len(changeset_lines) < 2:
-            print("Warning: Changeset content has fewer than 2 lines")
-            parsed_lines = "\n".join(changeset_lines)
-        else:
-            # Remove the first two lines from the regular changeset format, ex: \n### Patch Changes
-            parsed_lines = "\n".join(changeset_lines[2:])
-        updated_changelog = changelog_text[:notes_start_index] + parsed_lines + changelog_text[notes_end_index:]
-        # Ensure version number is bracketed
-        updated_changelog = updated_changelog.replace(f"## {VERSION}", f"## [{VERSION}]")
-        return updated_changelog
-
-try:
-    print(f"Reading changelog from: {CHANGELOG_PATH}")
-    with open(CHANGELOG_PATH, 'r') as f:
-        changelog_content = f.read()
-
-    print(f"Changelog content length: {len(changelog_content)} characters")
-    print("First 200 characters of changelog:")
-    print(changelog_content[:200])
-    print("----------------------------------------------------------------------------------")
-
-    new_changelog = overwrite_changelog_section(changelog_content, NEW_CONTENT)
-    
-    print("New changelog content:")
-    print("----------------------------------------------------------------------------------")
-    print(new_changelog)
-    print("----------------------------------------------------------------------------------")
-    
-    print(f"Writing updated changelog back to: {CHANGELOG_PATH}")
-    with open(CHANGELOG_PATH, 'w') as f:
-        f.write(new_changelog)
-
-    print(f"{CHANGELOG_PATH} updated successfully!")
-
-except FileNotFoundError:
-    print(f"Error: Changelog file not found at {CHANGELOG_PATH}")
-    sys.exit(1)
-except Exception as e:
-    print(f"Error updating changelog: {str(e)}")
-    print(f"Current working directory: {os.getcwd()}")
-    sys.exit(1)

.github/scripts/requirements.txt

@@ -0,0 +1,5 @@
+requests>=2.31.0
+pytest>=8.0.0
+pytest-cov>=4.1.0
+pytest-integration>=0.2.3
+coverage>=7.4.0

.github/scripts/test_generate_release_notes.py

@@ -0,0 +1,145 @@
+#!/usr/bin/env python3
+
+import os
+import unittest
+from unittest.mock import patch, MagicMock
+import json
+from generate_release_notes import generate_release_notes, generate_prompt, parse_args
+
+class TestGenerateReleaseNotes(unittest.TestCase):
+    def setUp(self):
+        self.test_changesets = [
+            {
+                "type": "minor",
+                "content": "Added new feature"
+            },
+            {
+                "type": "patch",
+                "content": "Fixed bug"
+            }
+        ]
+        
+        self.test_git_info = {
+            "commit_log": "test commit",
+            "diff_stats": "1 file changed",
+            "last_tag": "v3.2.0"
+        }
+        
+        self.test_version = "v3.3.0"
+    
+    def test_parse_args(self):
+        with patch('sys.argv', ['script.py',
+            '--changesets', json.dumps(self.test_changesets),
+            '--version', self.test_version,
+            '--release-type', 'release',
+            '--api-key', 'test-api-key'
+        ]):
+            args = parse_args()
+            self.assertEqual(args.changesets, json.dumps(self.test_changesets))
+            self.assertEqual(args.version, self.test_version)
+            self.assertEqual(args.release_type, 'release')
+            self.assertEqual(args.api_key, 'test-api-key')
+    
+    def test_generate_prompt(self):
+        # Test regular release prompt
+        prompt = generate_prompt(
+            self.test_changesets,
+            self.test_git_info,
+            self.test_version,
+            is_prerelease=False
+        )
+        
+        self.assertIn(self.test_version, prompt)
+        self.assertIn("Added new feature", prompt)
+        self.assertIn("Fixed bug", prompt)
+        self.assertIn("test commit", prompt)
+        self.assertIn("1 file changed", prompt)
+        self.assertNotIn("(Pre-release)", prompt)
+        
+        # Test pre-release prompt
+        pre_version = f"{self.test_version}-pre"
+        pre_prompt = generate_prompt(
+            self.test_changesets,
+            self.test_git_info,
+            pre_version,
+            is_prerelease=True
+        )
+        
+        self.assertIn(pre_version, pre_prompt)
+        self.assertIn("(Pre-release)", pre_prompt)
+        self.assertIn("Added new feature", pre_prompt)
+        self.assertIn("Fixed bug", pre_prompt)
+    
+    @patch('requests.post')
+    def test_generate_release_notes_success(self, mock_post):
+        # Test regular release notes
+        mock_response = MagicMock()
+        mock_response.json.return_value = {
+            "choices": [{
+                "message": {
+                    "content": "Test release notes"
+                }
+            }]
+        }
+        mock_post.return_value = mock_response
+        
+        prompt = generate_prompt(
+            self.test_changesets,
+            self.test_git_info,
+            self.test_version,
+            is_prerelease=False
+        )
+        
+        result = generate_release_notes(prompt, api_key="mock-api-key")
+        self.assertEqual(result, "Test release notes")
+        
+        # Test pre-release notes
+        mock_response.json.return_value = {
+            "choices": [{
+                "message": {
+                    "content": "Test pre-release notes"
+                }
+            }]
+        }
+        mock_post.return_value = mock_response
+        
+        pre_prompt = generate_prompt(
+            self.test_changesets,
+            self.test_git_info,
+            f"{self.test_version}-pre",
+            is_prerelease=True
+        )
+        
+        pre_result = generate_release_notes(pre_prompt, api_key="mock-api-key")
+        self.assertEqual(pre_result, "Test pre-release notes")
+    
+    def test_generate_release_notes_no_api_key(self):
+        prompt = generate_prompt(
+            self.test_changesets,
+            self.test_git_info,
+            self.test_version,
+            is_prerelease=False
+        )
+        
+        with self.assertRaises(Exception) as context:
+            generate_release_notes(prompt)
+        self.assertIn("API key not provided", str(context.exception))
+    
+    @patch('requests.post')
+    def test_generate_release_notes_api_error(self, mock_post):
+        # Mock API error
+        mock_post.side_effect = Exception("API Error")
+        
+        prompt = generate_prompt(
+            self.test_changesets,
+            self.test_git_info,
+            self.test_version,
+            is_prerelease=False
+        )
+        
+        with self.assertRaises(Exception) as context:
+            generate_release_notes(prompt, api_key="mock-api-key")
+        self.assertIn("API Error", str(context.exception))
+
+if __name__ == '__main__':
+    unittest.main()

.github/scripts/test_integration.py

@@ -0,0 +1,195 @@
+#!/usr/bin/env python3
+
+"""
+Integration tests for release notes automation.
+
+Tests the interaction between components and external services.
+Makes real API calls to OpenRouter for thorough testing.
+"""
+
+import os
+import shutil
+import tempfile
+import unittest
+from unittest.mock import patch, MagicMock
+from generate_release_notes import generate_release_notes, generate_prompt
+
+import pytest
+
+class TestIntegration:
+    @pytest.fixture(autouse=True)
+    def setup_teardown(self, request):
+        # Setup
+        self.test_dir = tempfile.mkdtemp()
+        self.original_cwd = os.getcwd()
+        os.chdir(self.test_dir)
+        
+        # Create test changesets directory
+        self.changeset_dir = os.path.join(self.test_dir, ".changeset")
+        os.makedirs(self.changeset_dir)
+        
+        # Create test changesets
+        self.changesets = [
+            {
+                "type": "minor",
+                "content": "Added new browser automation feature"
+            },
+            {
+                "type": "patch",
+                "content": "Fixed issue with file watching"
+            }
+        ]
+        
+        # Write test changeset files
+        for i, change in enumerate(self.changesets):
+            path = os.path.join(self.changeset_dir, f"change-{i}.md")
+            with open(path, "w") as f:
+                f.write(f"---\n{change['type']}\n{change['content']}")
+        
+        # Setup test environment
+        self.test_version = "v3.3.0"
+        self.test_changelog = os.path.join(self.test_dir, "CHANGELOG.md")
+        
+        # Create initial changelog
+        with open(self.test_changelog, "w") as f:
+            f.write("# Changelog\n\n## [v3.2.0]\n\nPrevious release notes here.\n")
+            
+        # Setup common test data
+        self.git_info = {
+            "commit_log": "test commit",
+            "diff_stats": "1 file changed",
+            "last_tag": "v3.2.0"
+        }
+
+        yield
+
+        # Teardown
+        os.chdir(self.original_cwd)
+        shutil.rmtree(self.test_dir)
+    
+    def generate_prompt_for_test(self, git_info=None):
+        """Helper method to generate prompt with default or custom git info."""
+        return generate_prompt(
+            self.changesets,
+            git_info or self.git_info,
+            self.test_version,
+            is_prerelease=False
+        )
+    
+    @patch('subprocess.check_output')
+    def test_complete_release_flow(self, mock_git, api_key):
+        """Test the complete release flow with live API calls."""
+        # Mock git commands
+        mock_git.side_effect = [
+            "v3.2.0".encode(),  # get_last_release_tag
+            "\n".join(os.listdir(self.changeset_dir)).encode()  # get_changesets_since_tag
+        ]
+            
+        # Generate and verify release notes
+        prompt = self.generate_prompt_for_test()
+        release_notes = generate_release_notes(prompt, api_key=api_key)
+        assert release_notes is not None
+        assert "browser automation" in release_notes.lower()
+        
+        # Verify release notes content
+        assert "browser automation" in release_notes.lower()
+        
+    @patch('subprocess.check_output')
+    def test_pre_release_flow(self, mock_git, api_key):
+        """Test the pre-release flow with live API calls."""
+        # Create additional changeset for pre-release
+        pre_changeset = {
+            "type": "minor",
+            "content": "Added experimental feature"
+        }
+        path = os.path.join(self.changeset_dir, "pre-change.md")
+        with open(path, "w") as f:
+            f.write(f"---\n{pre_changeset['type']}\n{pre_changeset['content']}")
+        
+        # Mock git commands for pre-release
+        mock_git.side_effect = [
+            "v3.2.0".encode(),  # get_last_release_tag
+            "\n".join(os.listdir(self.changeset_dir)).encode()  # get_changesets_since_tag
+        ]
+        
+        # Generate pre-release notes
+        prompt = generate_prompt(
+            self.changesets + [pre_changeset],
+            self.git_info,
+            f"{self.test_version}-pre",
+            is_prerelease=True
+        )
+        pre_release_notes = generate_release_notes(prompt, api_key=api_key)
+        
+        # Verify pre-release notes
+        assert pre_release_notes is not None
+        assert "experimental feature" in pre_release_notes.lower()
+        assert "(pre-release)" in pre_release_notes.lower()
+        
+    @patch('subprocess.check_output')
+    def test_pre_release_to_release_flow(self, mock_git, api_key):
+        """Test converting a pre-release to a full release."""
+        # First create a pre-release
+        pre_version = f"{self.test_version}-pre"
+        pre_prompt = generate_prompt(
+            self.changesets,
+            self.git_info,
+            pre_version,
+            is_prerelease=True
+        )
+        pre_release_notes = generate_release_notes(pre_prompt, api_key=api_key)
+        assert "(pre-release)" in pre_release_notes.lower()
+        
+        # Mock git commands showing no changes since pre-release
+        mock_git.side_effect = [
+            f"{pre_version}\nv3.2.0".encode(),  # get_last_release_tag with pre
+            "".encode(),  # no changesets since pre-release
+            "v3.2.0".encode(),  # get_last_release_tag without pre
+            "\n".join(os.listdir(self.changeset_dir)).encode()  # all changesets since last regular release
+        ]
+        
+        # Generate full release notes
+        release_prompt = generate_prompt(
+            self.changesets,
+            self.git_info,
+            self.test_version,
+            is_prerelease=False
+        )
+        release_notes = generate_release_notes(release_prompt, api_key=api_key)
+        
+        # Verify full release notes include all changes
+        assert release_notes is not None
+        assert "browser automation" in release_notes.lower()
+        assert "(pre-release)" not in release_notes.lower()
+    
+    def test_error_handling(self, api_key):
+        """Test error handling in the release flow."""
+        empty_git_info = {
+            "commit_log": "",
+            "diff_stats": "",
+            "last_tag": "v3.2.0"
+        }
+        
+        # Test API errors
+        with patch('requests.post') as mock_post:
+            mock_post.side_effect = Exception("API Error")
+            with pytest.raises(Exception, match="API Error"):
+                prompt = self.generate_prompt_for_test(empty_git_info)
+                generate_release_notes(prompt, api_key=api_key)
+        
+        # Test rate limiting
+        with patch('requests.post') as mock_post:
+            mock_post.return_value.status_code = 429
+            with pytest.raises(Exception, match="Rate limit exceeded"):
+                prompt = self.generate_prompt_for_test(empty_git_info)
+                generate_release_notes(prompt, api_key=api_key)
+        
+        # Test invalid API key
+        with patch('requests.post') as mock_post:
+            mock_post.return_value.status_code = 401
+            with pytest.raises(Exception, match="Invalid API key"):
+                prompt = self.generate_prompt_for_test(empty_git_info)
+                generate_release_notes(prompt, api_key=api_key)
+
+if __name__ == '__main__':
+    unittest.main()

.github/scripts/test_version_manager.py

@@ -0,0 +1,221 @@
+#!/usr/bin/env python3
+
+"""
+Unit tests for version_manager.py
+
+Tests the version bumping logic and changeset handling.
+Mock git commands to test different scenarios.
+"""
+
+import unittest
+from unittest.mock import patch, MagicMock
+import tempfile
+import os
+import json
+from version_manager import (
+    get_last_release_tag,
+    get_changesets_since_tag,
+    determine_version_bump,
+    bump_version,
+    parse_args,
+    overwrite_package_version
+)
+
+class TestVersionManager(unittest.TestCase):
+    def setUp(self):
+        # Create a temporary directory for test changesets
+        self.temp_dir = tempfile.mkdtemp()
+        
+    def create_changeset_file(self, content: str) -> str:
+        """Helper to create a test changeset file."""
+        with tempfile.NamedTemporaryFile(
+            mode='w',
+            suffix='.md',
+            dir=self.temp_dir,
+            delete=False
+        ) as f:
+            f.write(content)
+            return f.name
+    
+    @patch('subprocess.check_output')
+    def test_get_last_release_tag_no_tags(self, mock_check_output):
+        mock_check_output.return_value = "".encode()
+        tag, is_pre = get_last_release_tag()
+        self.assertEqual(tag, "v0.0.0")
+        self.assertFalse(is_pre)
+    
+    @patch('subprocess.check_output')
+    def test_get_last_release_tag_with_pre(self, mock_check_output):
+        # Test with both pre-release and regular releases
+        mock_check_output.return_value = """v3.2.1-pre
+v3.2.0
+v3.1.0""".encode()
+        
+        # When including pre-releases
+        tag, is_pre = get_last_release_tag(include_pre=True)
+        self.assertEqual(tag, "v3.2.1-pre")
+        self.assertTrue(is_pre)
+        
+        # When excluding pre-releases
+        tag, is_pre = get_last_release_tag(include_pre=False)
+        self.assertEqual(tag, "v3.2.0")
+        self.assertFalse(is_pre)
+        
+        # Test with only pre-releases
+        mock_check_output.return_value = """v3.2.1-pre
+v3.2.0-pre""".encode()
+        
+        # Should still find pre-release when requested
+        tag, is_pre = get_last_release_tag(include_pre=True)
+        self.assertEqual(tag, "v3.2.1-pre")
+        self.assertTrue(is_pre)
+        
+        # Should return v0.0.0 when no regular releases exist
+        tag, is_pre = get_last_release_tag(include_pre=False)
+        self.assertEqual(tag, "v0.0.0")
+        self.assertFalse(is_pre)
+    
+    def test_determine_version_bump(self):
+        # Test major change
+        changesets = [{"type": "major"}, {"type": "minor"}, {"type": "patch"}]
+        bump_type, count = determine_version_bump(changesets)
+        self.assertEqual(bump_type, "major")
+        self.assertEqual(count, 3)
+        
+        # Test minor change
+        changesets = [{"type": "minor"}, {"type": "patch"}]
+        bump_type, count = determine_version_bump(changesets)
+        self.assertEqual(bump_type, "minor")
+        self.assertEqual(count, 2)
+        
+        # Test patch change
+        changesets = [{"type": "patch"}]
+        bump_type, count = determine_version_bump(changesets)
+        self.assertEqual(bump_type, "patch")
+        self.assertEqual(count, 1)
+        
+        # Test no changes
+        changesets = []
+        bump_type, count = determine_version_bump(changesets)
+        self.assertEqual(bump_type, "patch")
+        self.assertEqual(count, 0)
+    
+    def test_bump_version(self):
+        # Test major bump
+        self.assertEqual(bump_version("v1.2.3", "major"), "v2.0.0")
+        
+        # Test minor bump
+        self.assertEqual(bump_version("v1.2.3", "minor"), "v1.3.0")
+        
+        # Test patch bump
+        self.assertEqual(bump_version("v1.2.3", "patch"), "v1.2.4")
+        
+        # Test without v prefix
+        self.assertEqual(bump_version("1.2.3", "minor"), "v1.3.0")
+        
+        # Test with pre-release tag
+        self.assertEqual(bump_version("v1.2.3-pre", "minor"), "v1.3.0")
+    
+    @patch('subprocess.check_output')
+    def test_get_changesets_since_tag(self, mock_check_output):
+        # Create test changeset files
+        major_change = self.create_changeset_file("""---
+major
+Added new feature X that changes the API""")
+        
+        minor_change = self.create_changeset_file("""---
+minor
+Added new helper function""")
+        
+        patch_change = self.create_changeset_file("""---
+patch
+Fixed bug in error handling""")
+        
+        # Mock git diff to return our test files
+        mock_check_output.return_value = "\n".join([
+            major_change,
+            minor_change,
+            patch_change
+        ]).encode()
+        
+        changesets = get_changesets_since_tag("v1.0.0")
+        
+        self.assertEqual(len(changesets), 3)
+        self.assertEqual(changesets[0]["type"], "major")
+        self.assertEqual(changesets[1]["type"], "minor")
+        self.assertEqual(changesets[2]["type"], "patch")
+    
+    def test_parse_args(self):
+        with patch('sys.argv', ['script.py', '--release-type', 'pre-release']):
+            args = parse_args()
+            self.assertEqual(args.release_type, "pre-release")
+        
+        with patch('sys.argv', ['script.py']):
+            args = parse_args()
+            self.assertEqual(args.release_type, "release")  # default value
+            
+        with patch('sys.argv', ['script.py', '--release-type', 'release']):
+            args = parse_args()
+            self.assertEqual(args.release_type, "release")
+            
+    def test_overwrite_package_version(self):
+        # Create a temporary package.json
+        package_json = os.path.join(self.temp_dir, 'package.json')
+        initial_content = {
+            "name": "test-package",
+            "version": "1.0.0"
+        }
+        
+        # Write initial content
+        with open(package_json, 'w') as f:
+            json.dump(initial_content, f, indent='\t')
+            f.write('\n')
+        
+        # Test with v prefix
+        overwrite_package_version('v2.0.0', package_json)
+        with open(package_json, 'r') as f:
+            content = json.load(f)
+            self.assertEqual(content['version'], '2.0.0')
+        
+        # Test without v prefix
+        overwrite_package_version('3.0.0', package_json)
+        with open(package_json, 'r') as f:
+            content = json.load(f)
+            self.assertEqual(content['version'], '3.0.0')
+
+    @patch('subprocess.check_output')
+    def test_pre_release_to_release_conversion(self, mock_check_output):
+        # Mock git tags to show a pre-release
+        mock_check_output.return_value = """v1.2.0-pre
+v1.1.0""".encode()
+        
+        # Create a temporary package.json
+        package_json = os.path.join(self.temp_dir, 'package.json')
+        with open(package_json, 'w') as f:
+            json.dump({"version": "1.2.0-pre"}, f)
+        
+        # Mock no changesets since pre-release
+        mock_check_output.side_effect = [
+            "v1.2.0-pre\nv1.1.0".encode(),  # for get_last_release_tag
+            "".encode()  # for get_changesets_since_tag
+        ]
+        
+        # Test converting pre-release to release
+        with patch('sys.argv', ['script.py', '--release-type', 'release', '--package-path', package_json]):
+            args = parse_args()
+            
+            # Get last tag including pre-releases
+            tag, is_pre = get_last_release_tag(include_pre=True)
+            self.assertEqual(tag, "v1.2.0-pre")
+            self.assertTrue(is_pre)
+            
+            # Get changesets since pre-release
+            changesets = get_changesets_since_tag(tag)
+            self.assertEqual(len(changesets), 0)
+            
+            # Version should be converted to release
+            new_version = tag.replace("-pre", "")
+            self.assertEqual(new_version, "v1.2.0")
+
+if __name__ == '__main__':
+    unittest.main()

.github/scripts/version_manager.py

@@ -0,0 +1,246 @@
+#!/usr/bin/env python3
+
+"""
+Version Manager Script
+
+This script analyzes changesets since the last release to determine the appropriate version bump.
+It follows semantic versioning rules and determines the minimum version bump needed based on
+all accumulated changes.
+
+Process:
+1. Find the last release tag
+2. Collect all changesets since that tag
+3. Determine minimum version bump needed (major, minor, or patch)
+4. Compare with pre-release version if in release mode
+
+Environment Variables:
+    GITHUB_OUTPUT: Path to GitHub output file
+    RELEASE_TYPE: Either 'release' or 'pre-release'
+"""
+
+import os
+import sys
+import json
+import subprocess
+from typing import List, Tuple, Literal
+
+import argparse
+
+ChangeType = Literal["major", "minor", "patch"]
+
+def parse_args():
+    parser = argparse.ArgumentParser(description="Determine version bump from changesets")
+    parser.add_argument(
+        "--release-type",
+        choices=["release", "pre-release"],
+        default="release",
+        help="Type of release to create"
+    )
+    parser.add_argument(
+        "--github-output",
+        help="Path to GitHub Actions output file"
+    )
+    parser.add_argument(
+        "--package-path",
+        default="package.json",
+        help="Path to package.json file"
+    )
+    return parser.parse_args()
+
+def get_last_release_tag(include_pre: bool = False) -> tuple[str, bool]:
+    """
+    Get the most recent release tag.
+    
+    Args:
+        include_pre: Whether to consider pre-release tags
+        
+    Returns:
+        Tuple of (tag, is_prerelease)
+    """
+    try:
+        # Get all tags sorted by version
+        output = subprocess.check_output(
+            ["git", "tag", "--sort=-v:refname"]
+        ).decode().strip()
+        
+        tags = output.split("\n") if output else []
+        if not tags:
+            return "v0.0.0", False
+        
+        # First try to find a pre-release tag if we're looking for one
+        if include_pre:
+            pre_tags = [tag for tag in tags if tag.endswith("-pre")]
+            if pre_tags:
+                return pre_tags[0], True
+        
+        # Then look for regular release tags
+        release_tags = [tag for tag in tags if not tag.endswith("-pre")]
+        if release_tags:
+            return release_tags[0], False
+        
+        return "v0.0.0", False
+    
+    except subprocess.CalledProcessError:
+        print("Error: Failed to get git tags")
+        return "v0.0.0", False
+
+def get_changesets_since_tag(tag: str) -> List[dict]:
+    """Get all changeset files added since the specified tag."""
+    try:
+        # Get list of changeset files
+        changeset_files = subprocess.check_output(
+            ["git", "diff", "--name-only", f"{tag}...HEAD", ".changeset"]
+        ).decode().strip().split("\n")
+        
+        changesets = []
+        for file_path in changeset_files:
+            if file_path.endswith(".md") and not file_path.endswith("README.md"):
+                try:
+                    with open(file_path, 'r') as f:
+                        content = f.read()
+                        # Parse changeset format
+                        # First line is ---, second line has type, rest is content
+                        lines = content.split("\n")
+                        if len(lines) >= 3:
+                            change_type = lines[1].strip().lower()
+                            if any(t in change_type for t in ["major", "minor", "patch"]):
+                                changesets.append({
+                                    "file": file_path,
+                                    "type": change_type,
+                                    "content": "\n".join(lines[2:]).strip()
+                                })
+                except Exception as e:
+                    print(f"Error reading changeset {file_path}: {str(e)}")
+                    continue
+        
+        return changesets
+    except subprocess.CalledProcessError:
+        print("Error: Failed to get changeset files")
+        return []
+
+def determine_version_bump(changesets: List[dict]) -> Tuple[ChangeType, int]:
+    """
+    Determine the minimum version bump needed based on all changesets.
+    Returns the bump type and count of changes.
+    """
+    has_major = any("major" in c["type"].lower() for c in changesets)
+    has_minor = any("minor" in c["type"].lower() for c in changesets)
+    has_patch = any("patch" in c["type"].lower() for c in changesets)
+    
+    if has_major:
+        return "major", len(changesets)
+    elif has_minor:
+        return "minor", len(changesets)
+    elif has_patch:
+        return "patch", len(changesets)
+    else:
+        return "patch", 0
+
+def bump_version(current: str, bump_type: ChangeType) -> str:
+    """
+    Bump the version number according to semver rules.
+    Example: 3.2.1 with minor bump becomes 3.3.0
+    """
+    # Strip v prefix if present
+    version = current[1:] if current.startswith("v") else current
+    
+    # Strip pre-release suffix if present
+    version = version.split("-")[0]
+    
+    major, minor, patch = map(int, version.split("."))
+    
+    if bump_type == "major":
+        return f"v{major + 1}.0.0"
+    elif bump_type == "minor":
+        return f"v{major}.{minor + 1}.0"
+    else:  # patch
+        return f"v{major}.{minor}.{patch + 1}"
+
+def overwrite_package_version(version: str, package_path: str = "package.json"):
+    """
+    Overwrite version in package.json with our determined version.
+    
+    Args:
+        version: New version to set (with or without v prefix)
+        package_path: Path to package.json file
+    """
+    try:
+        # Read package.json
+        with open(package_path, 'r') as f:
+            package_data = json.load(f)
+        
+        # Remove v prefix for package.json
+        version_no_prefix = version[1:] if version.startswith('v') else version
+        
+        # Update version
+        package_data['version'] = version_no_prefix
+        
+        # Write back to package.json
+        with open(package_path, 'w') as f:
+            json.dump(package_data, f, indent='\t')
+            f.write('\n')  # Add newline at end of file
+            
+    except Exception as e:
+        print(f"Error updating package.json: {str(e)}")
+        sys.exit(1)
+
+def main():
+    args = parse_args()
+    
+    # For releases, first check if there's a recent pre-release
+    if args.release_type == "release":
+        last_tag, is_pre = get_last_release_tag(include_pre=True)
+        if is_pre:
+            # If the most recent tag is a pre-release, check for changes since then
+            changesets = get_changesets_since_tag(last_tag)
+            if not changesets:
+                # No changes since pre-release, use it as the release
+                new_version = last_tag.replace("-pre", "")
+                print(f"No changes since pre-release {last_tag}, using {new_version}")
+                if args.github_output:
+                    with open(args.github_output, "a") as f:
+                        f.write(f"new_version={new_version}\n")
+                        f.write("has_changes=false\n")
+                        f.write("change_count=0\n")
+                        f.write("changesets<<EOF\n[]\nEOF\n")
+                return
+    
+    # Get last regular release tag
+    last_tag, _ = get_last_release_tag(include_pre=False)
+    print(f"Last release tag: {last_tag}")
+    
+    # Get changesets since last release
+    changesets = get_changesets_since_tag(last_tag)
+    print(f"Found {len(changesets)} changesets")
+    
+    # Determine version bump
+    bump_type, change_count = determine_version_bump(changesets)
+    print(f"Determined version bump: {bump_type}")
+    
+    # Calculate new version
+    new_version = bump_version(last_tag, bump_type)
+    print(f"New version: {new_version}")
+    
+    # Add pre-release suffix if needed
+    if args.release_type == "pre-release":
+        new_version = f"{new_version}-pre"
+    
+    # Write outputs for GitHub Actions
+    if args.github_output:
+        with open(args.github_output, "a") as f:
+            f.write(f"new_version={new_version}\n")
+            f.write(f"has_changes={'true' if change_count > 0 else 'false'}\n")
+            f.write(f"change_count={change_count}\n")
+            # Write changesets as JSON for use in release notes
+            changesets_json = json.dumps([{
+                "type": c["type"],
+                "content": c["content"]
+            } for c in changesets])
+            f.write(f"changesets<<EOF\n{changesets_json}\nEOF\n")
+    
+    # Overwrite version in package.json
+    if change_count > 0:
+        overwrite_package_version(new_version, args.package_path)
+
+if __name__ == "__main__":
+    main()

.github/workflows/draft-release.yml

@@ -0,0 +1,47 @@
+name: "Update Draft Release"
+
+on:
+    release:
+        types: [created]
+
+permissions:
+    contents: write
+
+jobs:
+    update-notes:
+        name: Update Draft Release Notes
+        runs-on: ubuntu-latest
+        # Run on both draft and published releases to ensure notes are always populated
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Setup Python
+              uses: actions/setup-python@v5
+              with:
+                  python-version: "3.x"
+
+            - name: Install Python Dependencies
+              run: |
+                  pip install requests
+
+            - name: Generate Release Notes
+              id: notes
+              run: |
+                  python .github/scripts/generate_release_notes.py \
+                    --release-type ${{ contains(github.event.release.tag_name, '-pre') && 'pre-release' || 'release' }} \
+                    --version ${{ github.event.release.tag_name }} \
+                    --changesets '[]' \
+                    --github-output $GITHUB_OUTPUT \
+                    --api-key ${{ secrets.OPENROUTER_API_KEY }}
+
+            - name: Update Release Notes
+              env:
+                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+              run: |
+                  gh api \
+                    --method PATCH \
+                    /repos/${{ github.repository }}/releases/${{ github.event.release.id }} \
+                    -f body="${{ steps.notes.outputs.release_notes }}"

.github/workflows/publish.yml

@@ -22,8 +22,109 @@ jobs:
     test:
         uses: ./.github/workflows/test.yml
 
+    test-scripts:
+        name: Test Release Scripts
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Setup Python
+              uses: actions/setup-python@v5
+              with:
+                  python-version: "3.x"
+
+            - name: Install Dependencies
+              run: |
+                  cd .github/scripts
+                  python -m pip install uv
+                  uv venv
+                  source .venv/bin/activate
+                  uv pip install -r requirements.txt
+
+            - name: Run Unit Tests
+              run: |
+                  cd .github/scripts
+                  source .venv/bin/activate
+                  python -m pytest test_*.py -v --cov=. --cov-report=term-missing --ignore=test_integration.py
+
+            - name: Run Integration Tests
+              env:
+                  OPENROUTER_API_KEY: ${{ secrets.OPENROUTER_API_KEY }}
+              run: |
+                  cd .github/scripts
+                  source .venv/bin/activate
+                  python -m pytest test_integration.py -v --api-key=$OPENROUTER_API_KEY
+
+    prepare:
+        needs: [test, test-scripts]
+        name: Prepare Release
+        runs-on: ubuntu-latest
+        outputs:
+            new_version: ${{ steps.version.outputs.new_version }}
+            has_changes: ${{ steps.version.outputs.has_changes }}
+
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+
+            - name: Setup Python
+              uses: actions/setup-python@v5
+              with:
+                  python-version: "3.x"
+
+            - name: Install Python Dependencies
+              run: |
+                  pip install requests
+
+            - name: Setup Node.js
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 20.15.1
+
+            - name: Install Dependencies
+              run: npm ci
+
+            - name: Generate Changelog
+              run: |
+                  if [ "${{ github.event.inputs.release-type }}" = "pre-release" ]; then
+                    # Enter prerelease mode and version
+                    npx changeset pre enter next
+                    npx changeset version
+                  else
+                    # Exit prerelease mode if we're in it
+                    npx changeset pre exit
+                    # Regular release
+                    npx changeset version
+                  fi
+
+            - name: Determine Version and Overwrite Changes
+              id: version
+              run: |
+                  python .github/scripts/version_manager.py \
+                    --release-type ${{ github.event.inputs.release-type }} \
+                    --github-output $GITHUB_OUTPUT \
+                    --package-path package.json
+
+            - name: Check for Changes
+              if: steps.version.outputs.has_changes != 'true'
+              run: |
+                  echo "No changes detected since last release. Skipping release process."
+                  exit 0
+
+            - name: Commit Changes
+              run: |
+                  git config user.name "github-actions[bot]"
+                  git config user.email "github-actions[bot]@users.noreply.github.com"
+                  # Remove all changeset files except config.json and README.md
+                  find .changeset -type f -not -name 'config.json' -not -name 'README.md' -delete
+                  git add CHANGELOG.md package.json .changeset
+                  git commit -m "Release ${{ steps.version.outputs.new_version }}"
+                  git push
+
     publish:
-        needs: test
+        needs: prepare
+        if: needs.prepare.outputs.has_changes == 'true'
         name: Publish Extension
         runs-on: ubuntu-latest
         environment: publish
@@ -63,17 +164,9 @@ jobs:
             - name: Install Publishing Tools
               run: npm install -g vsce ovsx
 
-            - name: Get Version
-              id: get_version
-              run: |
-                  VERSION=$(node -p "require('./package.json').version")
-                  echo "version=$VERSION" >> $GITHUB_OUTPUT
-
             - name: Create Git Tag
-              id: create_tag
               run: |
-                  VERSION=v${{ steps.get_version.outputs.version }}
-                  echo "tag=$VERSION" >> $GITHUB_OUTPUT
+                  VERSION=${{ needs.prepare.outputs.new_version }}
                   echo "Tagging with $VERSION"
                   git tag "$VERSION"
                   git push origin "$VERSION"
@@ -84,32 +177,24 @@ jobs:
                   OVSX_PAT: ${{ secrets.OVSX_PAT }}
               run: |
                   # Required to generate the .vsix
-                  vsce package --out "cline-${{ steps.get_version.outputs.version }}.vsix"
+                  VERSION=${{ needs.prepare.outputs.new_version }}
+                  VERSION=${VERSION#v}  # Remove v prefix for package name
+                  vsce package --out "cline-${VERSION}.vsix"
 
                   if [ "${{ github.event.inputs.release-type }}" = "pre-release" ]; then
                     npm run publish:marketplace:prerelease
-                    echo "Successfully published pre-release version ${{ steps.get_version.outputs.version }} to VS Code Marketplace and Open VSX Registry"
+                    echo "Successfully published pre-release version ${VERSION} to VS Code Marketplace and Open VSX Registry"
                   else
                     npm run publish:marketplace
-                    echo "Successfully published release version ${{ steps.get_version.outputs.version }} to VS Code Marketplace and Open VSX Registry"
+                    echo "Successfully published release version ${VERSION} to VS Code Marketplace and Open VSX Registry"
                   fi
 
-            # - name: Get Changelog Entry
-            #   id: changelog
-            #   uses: mindsers/changelog-reader-action@v2
-            #   with:
-            #       # This expects a standard Keep a Changelog format
-            #       # "latest" means it will read whichever is the most recent version
-            #       # set in "## [1.2.3] - 2025-01-28" style
-            #       version: latest
-
             - name: Create GitHub Release
               uses: softprops/action-gh-release@v1
               with:
-                  tag_name: ${{ steps.create_tag.outputs.tag }}
+                  tag_name: ${{ needs.prepare.outputs.new_version }}
                   files: "*.vsix"
-                  # body: ${{ steps.changelog.outputs.content }}
-                  generate_release_notes: true
-                  prerelease: ${{ github.event.inputs.release-type == 'pre-release' }}
+                  draft: true # Create as draft so our draft-release.yml can populate the notes
+                  prerelease: ${{ github.event.inputs.release-type == 'pre-release' }} # This determines if it's a pre-release when published
               env:
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -9,4 +9,10 @@ tmp
 
 pnpm-lock.yaml
 
-.clineignore
+.clineignore
+.coverage
+
+# python
+.venv/
+.pytest_cache/
+__pycache__/

CHANGELOG.md

@@ -1,28 +1,5 @@
 # Changelog
 
-## [3.8.2]
-
--   Fix bug where switching to plan/act would result in VS Code LM/OpenRouter model being reset
-
-## [3.8.0]
-
--   Add 'Add to Cline' as an option when you right-click in a file or the terminal, making it easier to add context to your current task
--   Add 'Fix with Cline' code action - when you see a lightbulb icon in your editor, you can now select 'Fix with Cline' to send the  code and associated errors for Cline to fix. (Cursor users can also use the 'Quick Fix (CMD + .)' menu to see this option)
--   Add Account view to display billing and usage history for Cline account users. You can now keep track of credits used and transaction history right in the extension!
--   Add 'Sort underling provider routing' setting to Cline/OpenRouter allowing you to sort provider used by throughput, price, latency, or the default (combination of price and uptime)
--   Improve rich MCP display with dynamic image loading and support for GIFs
--   Add 'Documentation' menu item to easily access Cline's docs
--   Add OpenRouter's new usage_details feature for more reliable cost reporting 
--   Display total space Cline takes on disk next to 'Delete all Tasks' button in History view
--   Fix 'Context Window Exceeded' error for OpenRouter/Cline Accounts (additional support coming soon)
--   Fix bug where OpenRouter model ID would be set to invalid value
--   Add button to delete MCP servers in a failure state
-
-## [3.7.1]
-
--   Fix issue with 'See more' button in task header not showing when starting new tasks
--   Fix issue with checkpoints using local git commit hooks
-
 ## [3.7.0]
 
 -   Cline now displays selectable options when asking questions or presenting a plan, saving you from having to type out responses!

locales/zh-tw/CODE_OF_CONDUCT.md

@@ -2,48 +2,46 @@
 
 ## 我們的承諾
 
-為了營造開放且友善的環境，我們身為貢獻者與維護者，承諾讓參與本專案及社群的體驗，對每個人都不帶有騷擾，不論其年齡、體型、身心障礙、族裔、性徵、性別認同與表現、經驗程度、教育程度、社經地位、國籍、個人外表、種族、宗教信仰、或性傾向。
+為了促進一個開放和歡迎的環境，我們作為貢獻者和維護者承諾，使我們的項目和社區的參與對每個人來說都是一個無騷擾的體驗，不論年齡、體型、殘疾、種族、性別特徵、性別認同和表達、經驗水平、教育程度、社會經濟地位、國籍、個人外貌、種族、宗教或性取向。
 
-## 我們的準則
+## 我們的標準
 
-有助於創造正面環境的行為包括：
+有助於創造積極環境的行為示例包括：
 
-- 使用友善和包容的語言
-- 尊重不同的觀點與經驗
-- 優雅地接受建設性批評
-- 著重於對社群最有利的事情
-- 對其他社群成員展現同理心
+- 使用歡迎和包容的語言
+- 尊重不同的觀點和經驗
+- 優雅地接受建設性的批評
+- 專注於對社區最有利的事情
+- 對其他社區成員表示同情
 
-參與者不可接受的行為包括：
+參與者不可接受的行為示例包括：
 
-- 使用帶有性暗示的言語或影像，以及不受歡迎的性關注或騷擾
-- 挑釁、羞辱/貶低他人的評論，以及人身或政治攻擊
-- 公開或私下的騷擾行為
-- 未經他人明確許可，公開他人的私人資料，如實體或電子郵件地址
-- 其他在專業環境中可被合理認定為不恰當的行為
+- 使用性化語言或圖像以及不受歡迎的性注意或挑逗
+- 騷擾、侮辱/貶低性評論和個人或政治攻擊
+- 公開或私下騷擾
+- 未經明確許可發布他人的私人信息，例如物理或電子地址
+- 其他在專業環境中合理認為不適當的行為
 
 ## 我們的責任
 
-專案維護者有責任釐清可接受行為的標準，並應對任何不可接受的行為採取適當且公平的糾正措施。
+項目維護者有責任澄清可接受行為的標準，並預期對任何不可接受行為的實例採取適當和公平的糾正行動。
 
-專案維護者有權利和責任移除、編輯或拒絕不符合本行為準則的評論、提交、程式碼、維基編輯、議題和其他貢獻，或暫時或永久封鎖任何他們認為有不當、威脅、冒犯或有害行為的貢獻者。
+項目維護者有權利和責任刪除、編輯或拒絕與本行為準則不符的評論、提交、代碼、維基編輯、問題和其他貢獻，或暫時或永久禁止任何他們認為不適當、威脅、冒犯或有害的貢獻者。
 
-## 範疇
+## 範圍
 
-本行為準則適用於專案空間及公開場合，當個人代表本專案或其社群時都必須遵守。代表本專案或社群的情況包括：使用官方專案電子郵件地址、透過官方社群媒體帳號發文，或在線上或實體活動中擔任指定代表。專案維護者可進一步定義並釐清專案代表的其他情況。
+此行為準則適用於項目空間內以及當個人代表項目或其社區時的公共空間。代表項目或社區的示例包括使用官方項目電子郵件地址、通過官方社交媒體帳戶發布或作為在線或離線活動的指定代表。項目的代表可能由項目維護者進一步定義和澄清。
 
 ## 執行
 
-如發生辱罵、騷擾或其他不可接受的行為，請透過 hi@cline.bot 聯絡專案團隊回報。所有申訴都將被審查和調查，並做出必要且合適的回應。專案團隊有義務為事件回報者保密。具體執行政策的更多細節可能另行公佈。
+濫用、騷擾或其他不可接受行為的實例可以通過聯繫項目團隊 hi@cline.bot 來報告。所有投訴將被審查和調查，並將根據情況作出必要和適當的回應。項目團隊有義務對事件的報告者保密。具體執行政策的詳細信息可能會單獨發布。
 
-未遵守或未切實執行本行為準則的專案維護者，可能會面臨由專案領導團隊其他成員所決定的暫時或永久的處置。
+未能善意遵循或執行行為準則的項目維護者可能會面臨由項目領導層其他成員決定的暫時或永久後果。
 
-## 來源說明
+## 歸屬
 
-本行為準則改編自[貢獻者公約][homepage]第 1.4 版，可在此查閱：
-https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+此行為準則改編自 [Contributor Covenant][homepage]，版本 1.4，可在 https://www.contributor-covenant.org/version/1/4/code-of-conduct.html 獲得。
 
 [homepage]: https://www.contributor-covenant.org
 
-關於本行為準則的常見問題解答，請參考：
-https://www.contributor-covenant.org/faq
+有關此行為準則的常見問題的答案，請參見 https://www.contributor-covenant.org/faq

locales/zh-tw/CONTRIBUTING.md

@@ -1,85 +1,82 @@
-# 貢獻至 Cline
+# 貢獻於 Cline
 
-我們非常感謝您有意願貢獻至 Cline。無論是修正程式錯誤、新增功能或改善文件，每一份貢獻都能讓 Cline 更加出色！為了維持社群的活力與友善，所有成員都必須遵守我們的[行為準則](CODE_OF_CONDUCT.md)。
+我們很高興您有興趣為 Cline 做出貢獻。無論您是修復錯誤、添加功能還是改進我們的文檔，每一個貢獻都讓 Cline 更加智能！為了保持我們的社區充滿活力和歡迎，所有成員必須遵守我們的[行為準則](CODE_OF_CONDUCT.md)。
 
-## 回報程式錯誤或問題
+## 報告錯誤或問題
 
-程式錯誤回報能幫助 Cline 變得更好！在建立新的議題之前，請先[搜尋現有議題](https://github.com/cline/cline/issues)，避免重複。當您準備好回報程式錯誤時，請前往我們的[議題頁面](https://github.com/cline/cline/issues/new/choose)，您會找到協助填寫相關資訊的範本。
+錯誤報告有助於讓 Cline 對每個人都更好！在創建新問題之前，請[搜索現有問題](https://github.com/cline/cline/issues)以避免重複。當您準備報告錯誤時，請前往我們的[問題頁面](https://github.com/cline/cline/issues/new/choose)，您會找到一個模板來幫助您填寫相關信息。
 
 <blockquote class='warning-note'>
-    🔐 <b>重要：</b> 若您發現安全性漏洞，請使用 <a href="https://github.com/cline/cline/security/advisories/new">GitHub 安全性工具進行私密回報</a>。
+    🔐 <b>重要：</b> 如果您發現安全漏洞，請使用<a href="https://github.com/cline/cline/security/advisories/new">Github 安全工具私下報告</a>。
 </blockquote>
 
-## 決定要處理的工作
+## 決定要做什麼
 
-想找適合第一次貢獻的工作嗎？請檢視標示為[「good first issue」](https://github.com/cline/cline/labels/good%20first%20issue)或[「help wanted」](https://github.com/cline/cline/labels/help%20wanted)的議題。這些議題特別適合新手貢獻者，我們也非常歡迎您的協助！
+尋找一個好的首次貢獻？查看標有["good first issue"](https://github.com/cline/cline/labels/good%20first%20issue)或["help wanted"](https://github.com/cline/cline/labels/help%20wanted)的問題。這些是專門為新貢獻者和我們希望得到幫助的領域策劃的！
 
-我們也歡迎對[文件](https://github.com/cline/cline/tree/main/docs)的貢獻！無論是修正錯字、改善現有指南或建立新的教學內容，我們都期待能建立一個由社群共同維護的知識庫，協助每個人充分運用 Cline。您可以從 `/docs` 開始，尋找需要改善的地方。
+我們也歡迎對我們[文檔](https://github.com/cline/cline/tree/main/docs)的貢獻！無論是修正錯別字、改進現有指南還是創建新的教育內容 - 我們希望建立一個由社區驅動的資源庫，幫助每個人充分利用 Cline。您可以從深入研究 `/docs` 並尋找需要改進的領域開始。
 
-若您計畫處理較大的功能，請先建立一個[功能請求](https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop)，以便我們討論該功能是否符合 Cline 的願景。
+如果您計劃開發一個更大的功能，請先創建一個[功能請求](https://github.com/cline/cline/discussions/categories/feature-requests?discussions_q=is%3Aopen+category%3A%22Feature+Requests%22+sort%3Atop)，以便我們討論它是否符合 Cline 的願景。
 
-## 開發環境設定
+## 開發設置
 
-1. **VS Code 擴充套件**
-    - 開啟專案時，VS Code 會提示您安裝建議的擴充套件
-    - 這些擴充套件是開發所需，請接受所有安裝提示
-    - 若您已關閉提示，可從擴充套件面板手動安裝
+1. **VS Code 擴展**
 
-2. **本機開發**
-    - 執行 `npm run install:all` 安裝相依套件
-    - 執行 `npm run test` 在本機執行測試
-    - 提交 PR 前，執行 `npm run format:fix` 格式化您的程式碼
+    - 打開項目時，VS Code 會提示您安裝推薦的擴展
+    - 這些擴展是開發所需的 - 請接受所有安裝提示
+    - 如果您忽略了提示，可以從擴展面板手動安裝它們
 
-## 撰寫與提交程式碼
+2. **本地開發**
+    - 運行 `npm run install:all` 安裝依賴項
+    - 運行 `npm run test` 本地運行測試
+    - 提交 PR 之前，運行 `npm run format:fix` 格式化您的代碼
 
-任何人都可以貢獻程式碼至 Cline，但我們要求您遵守以下指引，以確保您的貢獻能順利整合：
+## 編寫和提交代碼
 
-1. **保持 Pull Request 聚焦**
-    - 每個 PR 限制在單一功能或錯誤修正
-    - 將較大的變更拆分成較小且相關的 PR
-    - 將變更拆分成邏輯性的提交，以便獨立審查
+任何人都可以為 Cline 貢獻代碼，但我們要求您遵循以下指南，以確保您的貢獻能夠順利集成：
 
-2. **程式碼品質**
-    - 執行 `npm run lint` 檢查程式碼風格
-    - 執行 `npm run format` 自動格式化程式碼
-    - 所有 PR 必須通過包含程式碼風格檢查與格式化的 CI 檢查
+1. **保持 Pull Requests 集中**
+
+    - 將 PR 限制在單個功能或錯誤修復
+    - 將較大的更改拆分為較小的相關 PR
+    - 將更改分為邏輯提交，可以獨立審查
+
+2. **代碼質量**
+
+    - 運行 `npm run lint` 檢查代碼風格
+    - 運行 `npm run format` 自動格式化代碼
+    - 所有 PR 必須通過包括 lint 和格式化在內的 CI 檢查
     - 提交前解決所有 ESLint 警告或錯誤
-    - 遵循 TypeScript 最佳實務並維持型別安全
+    - 遵循 TypeScript 最佳實踐並保持類型安全
 
 3. **測試**
-    - 為新功能新增測試
-    - 執行 `npm test` 確保所有測試通過
-    - 若您的變更影響現有測試，請更新測試
-    - 適當時包含單元測試與整合測試
 
-4. **使用 Changesets 管理版本**
-    - 使用 `npm run changeset` 為任何面向使用者的變更建立 changeset
-    - 選擇適當的版本升級：
-        - `major` 重大變更 (1.0.0 → 2.0.0)
-        - `minor` 新功能 (1.0.0 → 1.1.0)
-        - `patch` 錯誤修正 (1.0.0 → 1.0.1)
-    - 撰寫清晰且描述性的 changeset 訊息，說明影響
-    - 僅文件變更不需建立 changeset
+    - 為新功能添加測試
+    - 運行 `npm test` 確保所有測試通過
+    - 如果您的更改影響現有測試，請更新它們
+    - 在適當的地方包括單元測試和集成測試
 
-5. **提交指引**
-    - 撰寫清晰且描述性的提交訊息
-    - 使用慣用提交格式（例如：「feat:」、「fix:」、「docs:」）
-    - 在提交中引用相關議題，使用 #issue-number
+4. **提交指南**
 
-6. **提交前檢查**
-    - 將您的分支 rebase 到最新的 main
-    - 確保您的分支可以成功建置
-    - 再次確認所有測試通過
-    - 檢查您的變更是否包含除錯程式碼或 console 紀錄
+    - 撰寫清晰、描述性的提交消息
+    - 使用常規提交格式（例如 "feat:"、"fix:"、"docs:"）
+    - 在提交中引用相關問題，使用 #issue-number
 
-7. **Pull Request 說明**
-    - 清楚描述您的變更內容
-    - 包含測試變更的步驟
-    - 列出任何重大變更
-    - 若有使用者介面變更，請附上截圖
+5. **提交前**
+
+    - 將您的分支重新基於最新的 main
+    - 確保您的分支成功構建
+    - 仔細檢查所有測試是否通過
+    - 檢查您的更改是否有任何調試代碼或控制台日誌
+
+6. **Pull Request 描述**
+    - 清楚地描述您的更改內容
+    - 包括測試更改的步驟
+    - 列出任何重大更改
+    - 為 UI 更改添加截圖
 
 ## 貢獻協議
 
-提交 Pull Request 即表示您同意您的貢獻將依照專案相同的授權條款（[Apache 2.0](LICENSE)）進行授權。
+通過提交 pull request，您同意您的貢獻將根據與項目相同的許可證（[Apache 2.0](LICENSE)）進行許可。
 
-請記住：貢獻至 Cline 不只是撰寫程式碼，更是成為塑造 AI 輔助開發未來的社群一份子。讓我們一起打造令人驚艷的成果吧！🚀
+記住：貢獻於 Cline 不僅僅是編寫代碼 - 這是關於成為一個塑造 AI 輔助開發未來的社區的一部分。讓我們一起創造一些驚人的東西！🚀

locales/zh-tw/README.md

@@ -1,8 +1,4 @@
-<div align="center"><sub>
-<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 – OpenRouter 第一名的 AI 工具
+# Cline – OpenRouter 上的 \#1
 
 <p align="center">
     <img src="https://media.githubusercontent.com/media/cline/cline/main/assets/docs/demo.gif" width="100%" />
@@ -12,7 +8,7 @@
 <table>
 <tbody>
 <td align="center">
-<a href="https://marketplace.visualstudio.com/items?itemName=saoudrizwan.claude-dev" target="_blank"><strong>從 VS Marketplace 下載</strong></a>
+<a href="https://marketplace.visualstudio.com/items?itemName=saoudrizwan.claude-dev" target="_blank"><strong>在 VS Marketplace 下載</strong></a>
 </td>
 <td align="center">
 <a href="https://discord.gg/cline" target="_blank"><strong>Discord</strong></a>
@@ -21,29 +17,29 @@
 <a href="https://www.reddit.com/r/cline/" target="_blank"><strong>r/cline</strong></a>
 </td>
 <td align="center">
-<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>
+<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/getting-started-new-coders" target="_blank"><strong>新手上路</strong></a>
+<a href="https://cline.bot/join-us" target="_blank"><strong>我們正在招聘！</strong></a>
 </td>
 </tbody>
 </table>
 </div>
 
-認識 Cline，一個可以使用您的**命令列介面** (CLI) 和**程式編輯器** (Editor) 的 AI 助理。
+認識 Cline，一個可以使用你的 **CLI** 和 **編輯器** 的 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 腳本傳統上在沙盒環境中運行，但此擴展提供了一個人機交互的 GUI 來批准每個文件更改和終端命令，提供了一種安全且可訪問的方式來探索代理 AI 的潛力。
 
-1. 輸入您的任務，並可以加入圖片來將設計稿轉換成功能性應用程式，或使用截圖來修正錯誤。
-2. Cline 會先分析您的檔案結構和程式碼 AST、執行正規表達式搜尋，並讀取相關檔案，以便在現有專案中快速掌握狀況。透過仔細管理加入上下文的資訊，Cline 可以在不超過上下文視窗的情況下，為大型且複雜的專案提供有價值的協助。
-3. 一旦 Cline 取得所需資訊後，他可以：
-    - 建立和編輯檔案，並在過程中監控程式碼檢查工具/編譯器的錯誤，讓他能主動修正缺少的匯入語句和語法錯誤等問題。
-    - 直接在您的終端機中執行指令並監控其輸出，讓他能夠在編輯檔案後回應開發伺服器的問題。
-    - 對於網頁開發任務，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 如何變更您的工作區。
+> [!提示]
+> 使用 `CMD/CTRL + Shift + P` 快捷鍵打開命令面板並輸入 "Cline: Open In New Tab" 將擴展作為標籤在編輯器中打開。這讓你可以與文件資源管理器並排使用 Cline，更清楚地看到他如何改變你的工作空間。
 
 ---
 
@@ -51,137 +47,115 @@
 
 ### 使用任何 API 和模型
 
-Cline 支援 OpenRouter、Anthropic、OpenAI、Google Gemini、AWS Bedrock、Azure 和 GCP Vertex 等 API 提供者。您也可以設定任何與 OpenAI 相容的 API，或透過 LM Studio/Ollama 使用本機模型。若您使用 OpenRouter，此擴充套件會擷取他們最新的模型列表，讓您能在新模型推出時立即使用。
+Cline 支持 OpenRouter、Anthropic、OpenAI、Google Gemini、AWS Bedrock、Azure 和 GCP Vertex 等 API 提供商。你還可以配置任何兼容 OpenAI 的 API，或通過 LM Studio/Ollama 使用本地模型。如果你使用 OpenRouter，擴展會獲取他們的最新模型列表，讓你在新模型可用時立即使用。
 
-此擴充套件也會追蹤整個任務迴圈和個別請求的 token 總數和 API 使用成本，讓您隨時掌握費用支出。
+擴展還會跟蹤整個任務循環和單個請求的總令牌和 API 使用成本，讓你在每一步都了解支出情況。
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 <img align="left" width="370" src="https://github.com/user-attachments/assets/81be79a8-1fdb-4028-9129-5fe055e01e76">
 
-### 在終端機中執行指令
+### 在終端中運行命令
 
-感謝 [VSCode v1.93 的終端機整合更新](https://code.visualstudio.com/updates/v1_93#_terminal-shell-integration-api)，Cline 可以直接在您的終端機中執行指令並接收輸出。這讓他能執行各種任務，從安裝套件和執行建置腳本到部署應用程式、管理資料庫和執行測試，同時適應您的開發環境和工具鏈，以正確完成工作。
+感謝 VSCode v1.93 中的新 [終端 shell 集成更新](https://code.visualstudio.com/updates/v1_93#_terminal-shell-integration-api)，Cline 可以直接在你的終端中執行命令並接收輸出。這使他能夠執行廣泛的任務，從安裝包和運行構建腳本到部署應用程序、管理數據庫和執行測試，同時適應你的開發環境和工具鏈以正確完成工作。
 
-對於開發伺服器等長時間執行的程序，使用「繼續執行中的程序」按鈕讓 Cline 在指令於背景執行時繼續任務。當 Cline 工作時，他會收到任何新的終端機輸出通知，讓他能回應可能出現的問題，例如編輯檔案時的編譯錯誤。
+對於長時間運行的進程如開發服務器，使用“在運行時繼續”按鈕讓 Cline 在命令後台運行時繼續任務。當 Cline 工作時，他會在過程中收到任何新的終端輸出通知，讓他對可能出現的問題做出反應，例如編輯文件時的編譯時錯誤。
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 <img align="right" width="400" src="https://github.com/user-attachments/assets/c5977833-d9b8-491e-90f9-05f9cd38c588">
 
-### 建立和編輯檔案
+### 創建和編輯文件
 
-Cline 可以直接在您的編輯器中建立和編輯檔案，並顯示變更的差異檢視。您可以直接在差異檢視編輯器中編輯或還原 Cline 的變更，或在聊天中提供意見回饋，直到您滿意結果為止。Cline 也會監控程式碼檢查工具/編譯器的錯誤（缺少的匯入語句、語法錯誤等），讓他能自行修正過程中出現的問題。
+Cline 可以直接在你的編輯器中創建和編輯文件，向你展示更改的差異視圖。你可以直接在差異視圖編輯器中編輯或恢復 Cline 的更改，或在聊天中提供反饋，直到你對結果滿意。Cline 還會監控 linter/編譯器錯誤（缺少導入、語法錯誤等），以便他在過程中自行修復出現的問題。
 
-所有 Cline 做的變更都會記錄在您檔案的時間軸中，提供簡單的方式來追蹤和還原修改。
+Cline 所做的所有更改都會記錄在你的文件時間軸中，提供了一種簡單的方法來跟蹤和恢復修改（如果需要）。
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 <img align="left" width="370" src="https://github.com/user-attachments/assets/bc2e85ba-dfeb-4fe6-9942-7cfc4703cbe5">
 
 ### 使用瀏覽器
 
-透過 Claude 3.5 Sonnet 的新[電腦使用](https://www.anthropic.com/news/3-5-models-and-computer-use)功能，Cline 可以啟動瀏覽器、點選元素、輸入文字和捲動，在每個步驟擷取螢幕截圖和主控台記錄。這讓互動式除錯、端對端測試，甚至一般網頁使用成為可能！這讓他能獨立修正視覺問題和執行時錯誤，而不需要您手動複製錯誤記錄。
+借助 Claude 3.5 Sonnet 的新 [計算機使用](https://www.anthropic.com/news/3-5-models-and-computer-use) 功能，Cline 可以啟動瀏覽器，點擊元素，輸入文本和滾動，在每一步捕獲截圖和控制台日誌。這允許進行交互式調試、端到端測試，甚至是一般的網頁使用！這使他能夠自主修復視覺錯誤和運行時問題，而無需你親自操作和複製粘貼錯誤日誌。
 
-試著請 Cline 「測試應用程式」，觀察他如何執行 `npm run dev`、在瀏覽器中啟動您的本機開發伺服器，並執行一系列測試來確認一切正常運作。[點此觀看示範](https://x.com/sdrzn/status/1850880547825823989)。
+試試讓 Cline “測試應用程序”，看看他如何運行 `npm run dev` 命令，在瀏覽器中啟動你本地運行的開發服務器，並執行一系列測試以確認一切正常。[在這裡查看演示。](https://x.com/sdrzn/status/1850880547825823989)
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 <img align="right" width="350" src="https://github.com/user-attachments/assets/ac0efa14-5c1f-4c26-a42d-9d7c56f5fadd">
 
-### 「新增一個工具來...」
+### “添加一個工具……”
 
-感謝[模型上下文協定](https://github.com/modelcontextprotocol)，Cline 可以透過自訂工具擴展他的功能。雖然您可以使用[社群製作的伺服器](https://github.com/modelcontextprotocol/servers)，但 Cline 可以改為建立專門為您的工作流程量身打造的工具。只要請 Cline 「新增工具」，他就會處理所有事情，從建立新的 MCP 伺服器到將其安裝到擴充套件中。這些自訂工具就會成為 Cline 工具箱的一部分，隨時可用於未來的任務。
+感謝 [Model Context Protocol](https://github.com/modelcontextprotocol)，Cline 可以通過自定義工具擴展他的能力。雖然你可以使用 [社區製作的服務器](https://github.com/modelcontextprotocol/servers)，但 Cline 可以創建和安裝適合你特定工作流程的工具。只需讓 Cline “添加一個工具”，他將處理所有事情，從創建新的 MCP 服務器到將其安裝到擴展中。這些自定義工具將成為 Cline 工具包的一部分，準備在未來的任務中使用。
 
-- 「新增一個擷取 Jira 工單的工具」：取得工單驗收條件並讓 Cline 開始工作
-- 「新增一個管理 AWS EC2 的工具」：檢查伺服器指標並調整執行個體規模
-- 「新增一個擷取最新 PagerDuty 事件的工具」：取得詳細資訊並請 Cline 修復錯誤
+- “添加一個獲取 Jira 工單的工具”：檢索工單 AC 並讓 Cline 開始工作
+- “添加一個管理 AWS EC2 的工具”：檢查服務器指標並上下擴展實例
+- “添加一個獲取最新 PagerDuty 事件的工具”：獲取詳細信息並讓 Cline 修復錯誤
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 <img align="left" width="360" src="https://github.com/user-attachments/assets/7fdf41e6-281a-4b4b-ac19-020b838b6970">
 
-### 新增上下文
+### 添加上下文
 
-**`@url`：**貼上網址讓擴充套件擷取並轉換為 Markdown，當您想給 Cline 最新文件時很有用
-**`@problems`：**新增工作區的錯誤和警告（「問題」面板）給 Cline 修正
-**`@file`：**新增檔案內容，讓您不必浪費 API 請求來核准讀取檔案（+ 輸入以搜尋檔案）
-**`@folder`：**一次新增整個資料夾的檔案，讓您的工作流程更快速
+**`@url`：** 粘貼一個 URL 以供擴展獲取並轉換為 markdown，當你想給 Cline 提供最新文檔時非常有用
+
+**`@problems`：** 添加工作區錯誤和警告（“問題”面板）以供 Cline 修復
+
+**`@file`：** 添加文件內容，這樣你就不必浪費 API 請求批准讀取文件（+ 輸入以搜索文件）
+
+**`@folder`：** 一次添加文件夾的文件，以進一步加快你的工作流程
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 <img align="right" width="350" src="https://github.com/user-attachments/assets/140c8606-d3bf-41b9-9a1f-4dbf0d4c90cb">
 
-### 檢查點：比較和還原
+### 檢查點：比較和恢復
 
-當 Cline 處理任務時，擴充套件會在每個步驟擷取您工作區的快照。您可以使用「比較」按鈕檢視快照與目前工作區的差異，並使用「還原」按鈕回到該時間點。
+當 Cline 完成任務時，擴展會在每一步拍攝你的工作區快照。你可以使用“比較”按鈕查看快照和當前工作區之間的差異，並使用“恢復”按鈕回滾到該點。
 
-例如，在使用本機網頁伺服器時，您可以使用「僅還原工作區」來快速測試應用程式的不同版本，然後在找到想要繼續開發的版本時使用「還原任務和工作區」。這讓您能安全地探索不同方法而不會失去進度。
+例如，當使用本地 Web 服務器時，你可以使用“僅恢復工作區”快速測試應用程序的不同版本，然後在找到要繼續構建的版本時使用“恢復任務和工作區”。這讓你可以安全地探索不同的方法而不會丟失進度。
+
+<!-- 透明像素以在浮動圖像後創建換行 -->
 
-<!-- 透明像素用於浮動圖片後的換行 -->
 <img width="2000" height="0" src="https://github.com/user-attachments/assets/ee14e6f7-20b8-4391-9091-8e8e25561929"><br>
 
 ## 貢獻
 
-要為專案貢獻，請先閱讀我們的[貢獻指南](CONTRIBUTING.md)來了解基礎知識。您也可以加入我們的 [Discord](https://discord.gg/cline)，在 `#contributors` 頻道與其他貢獻者交流。如果您在尋找全職工作，請檢視我們[職涯頁面](https://cline.bot/join-us)上的職缺！
+要為項目做出貢獻，請從我們的 [貢獻指南](CONTRIBUTING.md) 開始，了解基礎知識。你還可以加入我們的 [Discord](https://discord.gg/cline) 在 `#contributors` 頻道與其他貢獻者聊天。如果你正在尋找全職工作，請查看我們在 [招聘頁面](https://cline.bot/join-us) 上的開放職位！
 
 <details>
-<summary>本機開發說明</summary>
+<summary>本地開發說明</summary>
 
-1. 複製程式碼庫（需要 [git-lfs](https://git-lfs.com/)）：
-
-    ```bash
-    git clone https://github.com/cline/cline.git
-    ```
-
-2. 在 VSCode 中開啟專案：
-
-    ```bash
-    code cline
-    ```
-
-3. 安裝擴充套件和網頁介面所需的相依套件：
-
-    ```bash
-    npm run install:all
-    ```
-
-4. 按下 `F5`（或選擇「執行」->「開始除錯」）來啟動並開啟一個已載入擴充套件的新 VSCode 視窗。（如果建置專案時遇到問題，您可能需要安裝 [esbuild problem matchers 擴充套件](https://marketplace.visualstudio.com/items?itemName=connor4312.esbuild-problem-matchers)）
+1. 克隆倉庫 _(需要 [git-lfs](https://git-lfs.com/))_：
+        ```bash
+        git clone https://github.com/cline/cline.git
+        ```
+2. 在 VSCode 中打開項目：
+        ```bash
+        code cline
+        ```
+3. 安裝擴展和 webview-gui 的必要依賴：
+        ```bash
+        npm run install:all
+        ```
+4. 按 `F5`（或 `運行`->`開始調試`）啟動以打開一個加載了擴展的新 VSCode 窗口。（如果你在構建項目時遇到問題，可能需要安裝 [esbuild problem matchers 擴展](https://marketplace.visualstudio.com/items?itemName=connor4312.esbuild-problem-matchers)）
 
 </details>
 
-<details>
-<summary>建立 Pull Request</summary>
-
-1. 在建立 PR 前，產生一個 changeset 項目：
-
-    ```bash
-    npm run changeset
-    ```
-
-   這會提示您填寫：
-   - 變更類型（major、minor、patch）
-     - `major` → 重大變更（1.0.0 → 2.0.0）
-     - `minor` → 新功能（1.0.0 → 1.1.0）
-     - `patch` → 錯誤修正（1.0.0 → 1.0.1）
-   - 您的變更說明
-
-2. 提交您的變更和產生的 `.changeset` 檔案
-
-3. 推送您的分支並在 GitHub 上建立 PR。我們的 CI 會：
-   - 執行測試和檢查
-   - Changesetbot 會建立一個顯示版本影響的評論
-   - 當合併到 main 時，changesetbot 會建立一個 Version Packages PR
-   - 當 Version Packages PR 合併時，就會發布新版本
-
-</details>
-
-## 授權條款
+## 許可證
 
 [Apache 2.0 © 2025 Cline Bot Inc.](./LICENSE)

package.json

@@ -2,8 +2,12 @@
 	"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.8.2",
+	"version": "3.7.0",
 	"icon": "assets/icons/icon.png",
+	"galleryBanner": {
+		"color": "#617A91",
+		"theme": "dark"
+	},
 	"engines": {
 		"vscode": "^1.84.0"
 	},
@@ -69,7 +73,7 @@
 			{
 				"command": "cline.mcpButtonClicked",
 				"title": "MCP Servers",
-				"icon": "$(server)"
+				"icon": "$(extensions)"
 			},
 			{
 				"command": "cline.historyButtonClicked",
@@ -81,11 +85,6 @@
 				"title": "Open in Editor",
 				"icon": "$(link-external)"
 			},
-			{
-				"command": "cline.accountButtonClicked",
-				"title": "Account",
-				"icon": "$(account)"
-			},
 			{
 				"command": "cline.settingsButtonClicked",
 				"title": "Settings",
@@ -95,32 +94,6 @@
 				"command": "cline.openInNewTab",
 				"title": "Open In New Tab",
 				"category": "Cline"
-			},
-			{
-				"command": "cline.dev.createTestTasks",
-				"title": "Create Test Tasks",
-				"category": "Cline",
-				"when": "cline.isDevMode"
-			},
-			{
-				"command": "cline.openDocumentation",
-				"title": "Documentation",
-				"icon": "$(book)"
-			},
-			{
-				"command": "cline.addToChat",
-				"title": "Add to Cline",
-				"category": "Cline"
-			},
-			{
-				"command": "cline.addTerminalOutputToChat",
-				"title": "Add to Cline",
-				"category": "Cline"
-			},
-			{
-				"command": "cline.fixWithCline",
-				"title": "Fix with Cline",
-				"category": "Cline"
 			}
 		],
 		"menus": {
@@ -146,32 +119,9 @@
 					"when": "view == claude-dev.SidebarProvider"
 				},
 				{
-					"command": "cline.openDocumentation",
+					"command": "cline.settingsButtonClicked",
 					"group": "navigation@5",
 					"when": "view == claude-dev.SidebarProvider"
-				},
-				{
-					"command": "cline.accountButtonClicked",
-					"group": "navigation@6",
-					"when": "view == claude-dev.SidebarProvider"
-				},
-				{
-					"command": "cline.settingsButtonClicked",
-					"group": "navigation@7",
-					"when": "view == claude-dev.SidebarProvider"
-				}
-			],
-			"editor/context": [
-				{
-					"command": "cline.addToChat",
-					"group": "navigation",
-					"when": "editorHasSelection"
-				}
-			],
-			"terminal/context": [
-				{
-					"command": "cline.addTerminalOutputToChat",
-					"group": "navigation"
 				}
 			]
 		},
@@ -232,16 +182,6 @@
 					"default": null,
 					"description": "Path to Chrome executable for browser use functionality. If not set, the extension will attempt to find or download it automatically."
 				},
-				"cline.remoteBrowserEnabled": {
-					"type": "boolean",
-					"default": false,
-					"description": "Enable connection to a remote Chrome browser with remote debugging enabled (--remote-debugging-port=9222)."
-				},
-				"cline.remoteBrowserHost": {
-					"type": "string",
-					"default": "http://localhost:9222",
-					"description": "URL of the remote Chrome browser's DevTools Protocol endpoint. Leave empty for auto-discovery."
-				},
 				"cline.preferredLanguage": {
 					"type": "string",
 					"enum": [
@@ -331,13 +271,7 @@
 		"@google-cloud/vertexai": "^1.9.3",
 		"@google/generative-ai": "^0.18.0",
 		"@mistralai/mistralai": "^1.5.0",
-		"@modelcontextprotocol/sdk": "^1.7.0",
-		"@opentelemetry/api": "^1.4.1",
-		"@opentelemetry/exporter-trace-otlp-http": "^0.39.1",
-		"@opentelemetry/resources": "^1.30.1",
-		"@opentelemetry/sdk-node": "^0.39.1",
-		"@opentelemetry/sdk-trace-node": "^1.30.1",
-		"@opentelemetry/semantic-conventions": "^1.30.0",
+		"@modelcontextprotocol/sdk": "^1.0.1",
 		"@types/clone-deep": "^4.0.4",
 		"@types/get-folder-size": "^3.0.4",
 		"@types/pdf-parse": "^1.1.4",
@@ -348,6 +282,7 @@
 		"chokidar": "^4.0.1",
 		"clone-deep": "^4.0.1",
 		"default-shell": "^2.2.0",
+		"delay": "^6.0.0",
 		"diff": "^5.2.0",
 		"execa": "^9.5.2",
 		"fast-deep-equal": "^3.1.3",

src/api/providers/bedrock.ts

@@ -7,12 +7,7 @@ import { ApiHandlerOptions, bedrockDefaultModelId, BedrockModelId, bedrockModels
 import { calculateApiCostOpenAI } from "../../utils/cost"
 import { ApiStream } from "../transform/stream"
 import { fromNodeProviderChain } from "@aws-sdk/credential-providers"
-import {
-	BedrockRuntimeClient,
-	ConversationRole,
-	ConverseStreamCommand,
-	InvokeModelWithResponseStreamCommand,
-} from "@aws-sdk/client-bedrock-runtime"
+import { BedrockRuntimeClient, InvokeModelWithResponseStreamCommand } from "@aws-sdk/client-bedrock-runtime"
 
 // https://docs.anthropic.com/en/api/claude-on-amazon-bedrock
 export class AwsBedrockHandler implements ApiHandler {
@@ -28,12 +23,6 @@ export class AwsBedrockHandler implements ApiHandler {
 		let modelId = await this.getModelId()
 		const model = this.getModel()
 
-		// Check if this is an Amazon Nova model
-		if (modelId.includes("amazon.nova")) {
-			yield* this.createNovaMessage(systemPrompt, messages, modelId, model)
-			return
-		}
-
 		// Check if this is a Deepseek model
 		if (modelId.includes("deepseek")) {
 			yield* this.createDeepseekMessage(systemPrompt, messages, modelId, model)
@@ -473,192 +462,4 @@ export class AwsBedrockHandler implements ApiHandler {
 		// Approximate 4 characters per token
 		return Math.ceil(text.length / 4)
 	}
-
-	/**
-	 * Creates a message using Amazon Nova models through AWS Bedrock
-	 * Implements support for Nova Micro, Nova Lite, and Nova Pro models
-	 */
-	private async *createNovaMessage(
-		systemPrompt: string,
-		messages: Anthropic.Messages.MessageParam[],
-		modelId: string,
-		model: { id: BedrockModelId; info: ModelInfo },
-	): ApiStream {
-		// Get Bedrock client with proper credentials
-		const client = await this.getBedrockClient()
-
-		// Format messages for Nova model
-		const formattedMessages = this.formatNovaMessages(messages)
-
-		// Prepare request for Nova model
-		const command = new ConverseStreamCommand({
-			modelId: modelId,
-			messages: formattedMessages,
-			system: systemPrompt ? [{ text: systemPrompt }] : undefined,
-			inferenceConfig: {
-				maxTokens: model.info.maxTokens || 5000,
-				temperature: 0,
-				// topP: 0.9, // Alternative: use topP instead of temperature
-			},
-		})
-
-		// Execute the streaming request and handle response
-		try {
-			const response = await client.send(command)
-
-			if (response.stream) {
-				let hasReportedInputTokens = false
-
-				for await (const chunk of response.stream) {
-					// Handle metadata events with token usage information
-					if (chunk.metadata?.usage) {
-						// Report complete token usage from the model itself
-						const inputTokens = chunk.metadata.usage.inputTokens || 0
-						const outputTokens = chunk.metadata.usage.outputTokens || 0
-						yield {
-							type: "usage",
-							inputTokens,
-							outputTokens,
-							totalCost: calculateApiCostOpenAI(model.info, inputTokens, outputTokens, 0, 0),
-						}
-						hasReportedInputTokens = true
-					}
-
-					// Handle content delta (text generation)
-					if (chunk.contentBlockDelta?.delta?.text) {
-						yield {
-							type: "text",
-							text: chunk.contentBlockDelta.delta.text,
-						}
-					}
-
-					// Handle reasoning content if present
-					if (chunk.contentBlockDelta?.delta?.reasoningContent?.text) {
-						yield {
-							type: "reasoning",
-							reasoning: chunk.contentBlockDelta.delta.reasoningContent.text,
-						}
-					}
-
-					// Handle errors
-					if (chunk.internalServerException) {
-						yield {
-							type: "text",
-							text: `[ERROR] Internal server error: ${chunk.internalServerException.message}`,
-						}
-					} else if (chunk.modelStreamErrorException) {
-						yield {
-							type: "text",
-							text: `[ERROR] Model stream error: ${chunk.modelStreamErrorException.message}`,
-						}
-					} else if (chunk.validationException) {
-						yield {
-							type: "text",
-							text: `[ERROR] Validation error: ${chunk.validationException.message}`,
-						}
-					} else if (chunk.throttlingException) {
-						yield {
-							type: "text",
-							text: `[ERROR] Throttling error: ${chunk.throttlingException.message}`,
-						}
-					} else if (chunk.serviceUnavailableException) {
-						yield {
-							type: "text",
-							text: `[ERROR] Service unavailable: ${chunk.serviceUnavailableException.message}`,
-						}
-					}
-				}
-			}
-		} catch (error) {
-			console.error("Error processing Nova model response:", error)
-			yield {
-				type: "text",
-				text: `[ERROR] Failed to process Nova response: ${error instanceof Error ? error.message : String(error)}`,
-			}
-		}
-	}
-
-	/**
-	 * Formats messages for Amazon Nova models according to the SDK specification
-	 */
-	private formatNovaMessages(messages: Anthropic.Messages.MessageParam[]): { role: ConversationRole; content: any[] }[] {
-		return messages.map((message) => {
-			// Determine role (user or assistant)
-			const role = message.role === "user" ? ConversationRole.USER : ConversationRole.ASSISTANT
-
-			// Process content based on type
-			let content: any[] = []
-
-			if (typeof message.content === "string") {
-				// Simple text content
-				content = [{ text: message.content }]
-			} else if (Array.isArray(message.content)) {
-				// Convert Anthropic content format to Nova content format
-				content = message.content
-					.map((item) => {
-						// Text content
-						if (item.type === "text") {
-							return { text: item.text }
-						}
-
-						// Image content
-						if (item.type === "image") {
-							// Handle different image source formats
-							let imageData: Uint8Array
-							let format = "jpeg" // default format
-
-							// Extract format from media_type if available
-							if (item.source.media_type) {
-								// Extract format from media_type (e.g., "image/jpeg" -> "jpeg")
-								const formatMatch = item.source.media_type.match(/image\/(\w+)/)
-								if (formatMatch && formatMatch[1]) {
-									format = formatMatch[1]
-									// Ensure format is one of the allowed values
-									if (!["png", "jpeg", "gif", "webp"].includes(format)) {
-										format = "jpeg" // Default to jpeg if not supported
-									}
-								}
-							}
-
-							// Get image data
-							try {
-								if (typeof item.source.data === "string") {
-									// Handle base64 encoded data
-									const base64Data = item.source.data.replace(/^data:image\/\w+;base64,/, "")
-									imageData = new Uint8Array(Buffer.from(base64Data, "base64"))
-								} else if (item.source.data && typeof item.source.data === "object") {
-									// Try to convert to Uint8Array
-									imageData = new Uint8Array(Buffer.from(item.source.data as any))
-								} else {
-									console.error("Unsupported image data format")
-									return null // Skip this item if format is not supported
-								}
-							} catch (error) {
-								console.error("Could not convert image data to Uint8Array:", error)
-								return null // Skip this item if conversion fails
-							}
-
-							return {
-								image: {
-									format,
-									source: {
-										bytes: imageData,
-									},
-								},
-							}
-						}
-
-						// Return null for unsupported content types
-						return null
-					})
-					.filter(Boolean) // Remove any null items
-			}
-
-			// Return formatted message
-			return {
-				role,
-				content,
-			}
-		})
-	}
 }

src/api/providers/cline.ts

@@ -30,11 +30,8 @@ export class ClineHandler implements ApiHandler {
 			this.getModel(),
 			this.options.o3MiniReasoningEffort,
 			this.options.thinkingBudgetTokens,
-			this.options.openRouterProviderSorting,
 		)
 
-		let didOutputUsage: boolean = false
-
 		for await (const chunk of stream) {
 			// openrouter returns an error object instead of the openai sdk throwing an error
 			if ("error" in chunk) {
@@ -65,25 +62,11 @@ export class ClineHandler implements ApiHandler {
 					reasoning: delta.reasoning,
 				}
 			}
-
-			if (!didOutputUsage && chunk.usage) {
-				yield {
-					type: "usage",
-					inputTokens: chunk.usage.prompt_tokens || 0,
-					outputTokens: chunk.usage.completion_tokens || 0,
-					// @ts-ignore-next-line
-					totalCost: chunk.usage.cost || 0,
-				}
-				didOutputUsage = true
-			}
 		}
 
-		// Fallback to generation endpoint if usage chunk not returned
-		if (!didOutputUsage) {
-			const apiStreamUsage = await this.getApiStreamUsage()
-			if (apiStreamUsage) {
-				yield apiStreamUsage
-			}
+		const apiStreamUsage = await this.getApiStreamUsage()
+		if (apiStreamUsage) {
+			yield apiStreamUsage
 		}
 	}
 

src/api/providers/openai.ts

@@ -15,8 +15,7 @@ export class OpenAiHandler implements ApiHandler {
 	constructor(options: ApiHandlerOptions) {
 		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")) {
+		if (this.options.openAiBaseUrl?.toLowerCase().includes("azure.com")) {
 			this.client = new AzureOpenAI({
 				baseURL: this.options.openAiBaseUrl,
 				apiKey: this.options.openAiApiKey,

src/api/providers/openrouter.ts

@@ -1,6 +1,6 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import axios from "axios"
-import { setTimeout as setTimeoutPromise } from "node:timers/promises"
+import delay from "delay"
 import OpenAI from "openai"
 import { ApiHandler } from "../"
 import { ApiHandlerOptions, ModelInfo, openRouterDefaultModelId, openRouterDefaultModelInfo } from "../../shared/api"
@@ -37,11 +37,8 @@ export class OpenRouterHandler implements ApiHandler {
 			this.getModel(),
 			this.options.o3MiniReasoningEffort,
 			this.options.thinkingBudgetTokens,
-			this.options.openRouterProviderSorting,
 		)
 
-		let didOutputUsage: boolean = false
-
 		for await (const chunk of stream) {
 			// openrouter returns an error object instead of the openai sdk throwing an error
 			if ("error" in chunk) {
@@ -72,31 +69,17 @@ export class OpenRouterHandler implements ApiHandler {
 					reasoning: delta.reasoning,
 				}
 			}
-
-			if (!didOutputUsage && chunk.usage) {
-				yield {
-					type: "usage",
-					inputTokens: chunk.usage.prompt_tokens || 0,
-					outputTokens: chunk.usage.completion_tokens || 0,
-					// @ts-ignore-next-line
-					totalCost: chunk.usage.cost || 0,
-				}
-				didOutputUsage = true
-			}
 		}
 
-		// Fallback to generation endpoint if usage chunk not returned
-		if (!didOutputUsage) {
-			const apiStreamUsage = await this.getApiStreamUsage()
-			if (apiStreamUsage) {
-				yield apiStreamUsage
-			}
+		const apiStreamUsage = await this.getApiStreamUsage()
+		if (apiStreamUsage) {
+			yield apiStreamUsage
 		}
 	}
 
 	async getApiStreamUsage(): Promise<ApiStreamUsageChunk | undefined> {
 		if (this.lastGenerationId) {
-			await setTimeoutPromise(500) // FIXME: necessary delay to ensure generation endpoint is ready
+			await delay(500) // FIXME: necessary delay to ensure generation endpoint is ready
 			try {
 				const generationIterator = this.fetchGenerationDetails(this.lastGenerationId)
 				const generation = (await generationIterator.next()).value

src/api/transform/openrouter-stream.ts

@@ -13,7 +13,6 @@ export async function createOpenRouterStream(
 	model: { id: string; info: ModelInfo },
 	o3MiniReasoningEffort?: string,
 	thinkingBudgetTokens?: number,
-	openRouterProviderSorting?: string,
 ) {
 	// Convert Anthropic messages to OpenAI format
 	let openAiMessages: OpenAI.Chat.ChatCompletionMessageParam[] = [
@@ -142,12 +141,10 @@ export async function createOpenRouterStream(
 		top_p: topP,
 		messages: openAiMessages,
 		stream: true,
-		stream_options: { include_usage: true },
 		transforms: shouldApplyMiddleOutTransform ? ["middle-out"] : undefined,
 		include_reasoning: true,
 		...(model.id === "openai/o3-mini" ? { reasoning_effort: o3MiniReasoningEffort || "medium" } : {}),
 		...(reasoning ? { reasoning } : {}),
-		...(openRouterProviderSorting ? { provider: { sort: openRouterProviderSorting } } : {}),
 	})
 
 	return stream

src/core/Cline.ts

@@ -1,6 +1,6 @@
 import { Anthropic } from "@anthropic-ai/sdk"
 import cloneDeep from "clone-deep"
-import { setTimeout as setTimeoutPromise } from "node:timers/promises"
+import delay from "delay"
 import fs from "fs/promises"
 import getFolderSize from "get-folder-size"
 import os from "os"
@@ -57,21 +57,14 @@ import { ClineIgnoreController, LOCK_TEXT_SYMBOL } from "./ignore/ClineIgnoreCon
 import { parseMentions } from "./mentions"
 import { formatResponse } from "./prompts/responses"
 import { addUserInstructions, SYSTEM_PROMPT } from "./prompts/system"
-import { ContextManager } from "./context-management/ContextManager"
+import { getNextTruncationRange, getTruncatedMessages } from "./sliding-window"
 import { OpenAiHandler } from "../api/providers/openai"
 import { ApiStream } from "../api/transform/stream"
 import { ClineHandler } from "../api/providers/cline"
-import { ClineProvider } from "./webview/ClineProvider"
+import { ClineProvider, GlobalFileNames } from "./webview/ClineProvider"
 import { DEFAULT_LANGUAGE_SETTINGS, getLanguageKey, LanguageDisplay, LanguageKey } from "../shared/Languages"
 import { telemetryService } from "../services/telemetry/TelemetryService"
-import { ConversationTelemetryService, TelemetryChatMessage } from "../services/telemetry/ConversationTelemetryService"
 import pTimeout from "p-timeout"
-import { GlobalFileNames } from "../global-constants"
-import {
-	checkIsAnthropicContextWindowError,
-	checkIsOpenRouterContextWindowError,
-} from "./context-management/context-error-handling"
-import { AnthropicHandler } from "../api/providers/anthropic"
 
 const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0) ?? path.join(os.homedir(), "Desktop") // may or may not exist but fs checking existence would immediately ask for permission which would be bad UX, need to come up with a better solution
 
@@ -85,7 +78,6 @@ export class Cline {
 	private terminalManager: TerminalManager
 	private urlContentFetcher: UrlContentFetcher
 	browserSession: BrowserSession
-	contextManager: ContextManager
 	private didEditFile: boolean = false
 	customInstructions?: string
 	autoApprovalSettings: AutoApprovalSettings
@@ -147,7 +139,6 @@ export class Cline {
 		this.terminalManager = new TerminalManager()
 		this.urlContentFetcher = new UrlContentFetcher(provider.context)
 		this.browserSession = new BrowserSession(provider.context, browserSettings)
-		this.contextManager = new ContextManager()
 		this.diffViewProvider = new DiffViewProvider(cwd)
 		this.customInstructions = customInstructions
 		this.autoApprovalSettings = autoApprovalSettings
@@ -1215,7 +1206,7 @@ export class Cline {
 		// for their associated messages to be sent to the webview, maintaining
 		// the correct order of messages (although the webview is smart about
 		// grouping command_output messages despite any gaps anyways)
-		await setTimeoutPromise(50)
+		await delay(50)
 
 		result = result.trim()
 
@@ -1355,38 +1346,58 @@ export class Cline {
 			)
 		}
 
-		// Capture system prompt for telemetry,
-		// ONLY if user is opted in, in advanced settings
-		if (this.providerRef.deref()?.conversationTelemetryService.isOptedInToConversationTelemetry()) {
-			const systemMessage: TelemetryChatMessage = {
-				role: "system",
-				content: systemPrompt,
-				ts: Date.now(), // we dont uniquely identify system messages, so we use the timestamp as the id
-			}
+		// If the previous API request's total token usage is close to the context window, truncate the conversation history to free up space for the new request
+		if (previousApiReqIndex >= 0) {
+			const previousRequest = this.clineMessages[previousApiReqIndex]
+			if (previousRequest && previousRequest.text) {
+				const { tokensIn, tokensOut, cacheWrites, cacheReads }: ClineApiReqInfo = JSON.parse(previousRequest.text)
+				const totalTokens = (tokensIn || 0) + (tokensOut || 0) + (cacheWrites || 0) + (cacheReads || 0)
+				let contextWindow = this.api.getModel().info.contextWindow || 128_000
+				// FIXME: hack to get anyone using openai compatible with deepseek to have the proper context window instead of the default 128k. We need a way for the user to specify the context window for models they input through openai compatible
+				if (this.api instanceof OpenAiHandler && this.api.getModel().id.toLowerCase().includes("deepseek")) {
+					contextWindow = 64_000
+				}
+				let maxAllowedSize: number
+				switch (contextWindow) {
+					case 64_000: // deepseek models
+						maxAllowedSize = contextWindow - 27_000
+						break
+					case 128_000: // most models
+						maxAllowedSize = contextWindow - 30_000
+						break
+					case 200_000: // claude models
+						maxAllowedSize = contextWindow - 40_000
+						break
+					default:
+						maxAllowedSize = Math.max(contextWindow - 40_000, contextWindow * 0.8) // for deepseek, 80% of 64k meant only ~10k buffer which was too small and resulted in users getting context window errors.
+				}
 
-			// no need for timeout here, as there's no timestamp to compare to
-			this.providerRef.deref()?.conversationTelemetryService.captureMessage(this.taskId, systemMessage, {
-				apiProvider: this.apiProvider,
-				model: this.api.getModel().id,
-				tokensIn: 0,
-				tokensOut: 0,
-			})
+				// This is the most reliable way to know when we're close to hitting the context window.
+				if (totalTokens >= maxAllowedSize) {
+					// Since the user may switch between models with different context windows, truncating half may not be enough (ie if switching from claude 200k to deepseek 64k, half truncation will only remove 100k tokens, but we need to remove much more)
+					// So if totalTokens/2 is greater than maxAllowedSize, we truncate 3/4 instead of 1/2
+					// FIXME: truncating the conversation in a way that is optimal for prompt caching AND takes into account multi-context window complexity is something we need to improve
+					const keep = totalTokens / 2 > maxAllowedSize ? "quarter" : "half"
+
+					// NOTE: it's okay that we overwriteConversationHistory in resume task since we're only ever removing the last user message and not anything in the middle which would affect this range
+					this.conversationHistoryDeletedRange = getNextTruncationRange(
+						this.apiConversationHistory,
+						this.conversationHistoryDeletedRange,
+						keep,
+					)
+					await this.saveClineMessages() // saves task history item which we use to keep track of conversation history deleted range
+					// await this.overwriteApiConversationHistory(truncatedMessages)
+				}
+			}
 		}
 
-		const contextManagementMetadata = this.contextManager.getNewContextMessagesAndMetadata(
+		// conversationHistoryDeletedRange is updated only when we're close to hitting the context window, so we don't continuously break the prompt cache
+		const truncatedConversationHistory = getTruncatedMessages(
 			this.apiConversationHistory,
-			this.clineMessages,
-			this.api,
 			this.conversationHistoryDeletedRange,
-			previousApiReqIndex,
 		)
 
-		if (contextManagementMetadata.updatedConversationHistoryDeletedRange) {
-			this.conversationHistoryDeletedRange = contextManagementMetadata.conversationHistoryDeletedRange
-			await this.saveClineMessages() // saves task history item which we use to keep track of conversation history deleted range
-		}
-
-		let stream = this.api.createMessage(systemPrompt, contextManagementMetadata.truncatedConversationHistory)
+		let stream = this.api.createMessage(systemPrompt, truncatedConversationHistory)
 
 		const iterator = stream[Symbol.asyncIterator]()
 
@@ -1398,59 +1409,20 @@ export class Cline {
 			this.isWaitingForFirstChunk = false
 		} catch (error) {
 			const isOpenRouter = this.api instanceof OpenRouterHandler || this.api instanceof ClineHandler
-			const isAnthropic = this.api instanceof AnthropicHandler
-			const isOpenRouterContextWindowError = checkIsOpenRouterContextWindowError(error) && isOpenRouter
-			const isAnthropicContextWindowError = checkIsAnthropicContextWindowError(error) && isAnthropic
-
-			if (isAnthropic && isAnthropicContextWindowError && !this.didAutomaticallyRetryFailedApiRequest) {
-				this.conversationHistoryDeletedRange = this.contextManager.getNextTruncationRange(
-					this.apiConversationHistory,
-					this.conversationHistoryDeletedRange,
-					"quarter", // Force aggressive truncation
-				)
-				await this.saveClineMessages()
-
-				this.didAutomaticallyRetryFailedApiRequest = true
-			} else if (isOpenRouter && !this.didAutomaticallyRetryFailedApiRequest) {
-				if (isOpenRouterContextWindowError) {
-					this.conversationHistoryDeletedRange = this.contextManager.getNextTruncationRange(
-						this.apiConversationHistory,
-						this.conversationHistoryDeletedRange,
-						"quarter", // Force aggressive truncation
-					)
-					await this.saveClineMessages()
-				}
-
+			if (isOpenRouter && !this.didAutomaticallyRetryFailedApiRequest) {
 				console.log("first chunk failed, waiting 1 second before retrying")
-				await setTimeoutPromise(1000)
+				await delay(1000)
 				this.didAutomaticallyRetryFailedApiRequest = true
 			} else {
 				// request failed after retrying automatically once, ask user if they want to retry again
 				// note that this api_req_failed ask is unique in that we only present this option if the api hasn't streamed any content yet (ie it fails on the first chunk due), as it would allow them to hit a retry button. However if the api failed mid-stream, it could be in any arbitrary state where some tools may have executed, so that error is handled differently and requires cancelling the task entirely.
-
-				if (isOpenRouterContextWindowError || isAnthropicContextWindowError) {
-					const truncatedConversationHistory = this.contextManager.getTruncatedMessages(
-						this.apiConversationHistory,
-						this.conversationHistoryDeletedRange,
-					)
-
-					// If the conversation has more than 3 messages, we can truncate again. If not, then the conversation is bricked.
-					// ToDo: Allow the user to change their input if this is the case.
-					if (truncatedConversationHistory.length > 3) {
-						error = new Error("Context window exceeded. Click retry to truncate the conversation and try again.")
-						this.didAutomaticallyRetryFailedApiRequest = false
-					}
-				}
-
 				const errorMessage = this.formatErrorWithStatusCode(error)
 
 				const { response } = await this.ask("api_req_failed", errorMessage)
-
 				if (response !== "yesButtonClicked") {
 					// this will never happen since if noButtonClicked, we will clear current task, aborting this instance
 					throw new Error("API request failed")
 				}
-
 				await this.say("api_req_retried")
 			}
 			// delegate generator output from the recursive call
@@ -1864,7 +1836,7 @@ export class Cline {
 									await this.diffViewProvider.open(relPath)
 								}
 								await this.diffViewProvider.update(newContent, true)
-								await setTimeoutPromise(300) // wait for diff view to update
+								await delay(300) // wait for diff view to update
 								this.diffViewProvider.scrollToFirstDiff()
 								// showOmissionWarning(this.diffViewProvider.originalContent || "", newContent)
 
@@ -1886,7 +1858,7 @@ export class Cline {
 									telemetryService.captureToolUsage(this.taskId, block.name, true, true)
 
 									// we need an artificial delay to let the diagnostics catch up to the changes
-									await setTimeoutPromise(3_500)
+									await delay(3_500)
 								} else {
 									// If auto-approval is enabled but this tool wasn't auto-approved, send notification
 									showNotificationForApprovalIfAutoApprovalEnabled(
@@ -3190,39 +3162,6 @@ export class Cline {
 
 		telemetryService.captureConversationTurnEvent(this.taskId, this.apiProvider, this.api.getModel().id, "user")
 
-		// Capture message data for telemetry,
-		// ONLY if user is opted in, in advanced settings
-		if (this.providerRef.deref()?.conversationTelemetryService.isOptedInToConversationTelemetry()) {
-			// Get the last message from apiConversationHistory
-			const lastMessage = this.apiConversationHistory[this.apiConversationHistory.length - 1]
-
-			// Get the corresponding timestamp from clineMessages
-			// The last message in clineMessages should be the one we just added
-
-			const lastClineMessage = this.clineMessages[this.clineMessages.length - 1]
-			const ts = lastClineMessage.ts
-
-			// Send individual message to telemetry
-			this.providerRef.deref()?.conversationTelemetryService.captureMessage(
-				this.taskId,
-				// Add the timestamp to the message object for telemetry
-				{
-					...lastMessage,
-					ts,
-				},
-				{
-					apiProvider: this.apiProvider,
-					model: this.api.getModel().id,
-					tokensIn: 0,
-					tokensOut: 0,
-				},
-			)
-
-			// Send entire conversation history to cleanup endpoint
-			// This ensures deleted messages are properly handled in telemetry
-			this.providerRef.deref()?.conversationTelemetryService.cleanupTask(this.taskId, this.clineMessages)
-		}
-
 		// since we sent off a placeholder api_req_started message to update the webview while waiting to actually start the API request (to load potential details for example), we need to update the text of that message
 		const lastApiReqIndex = findLastIndex(this.clineMessages, (m) => m.say === "api_req_started")
 		this.clineMessages[lastApiReqIndex].text = JSON.stringify({
@@ -3300,36 +3239,6 @@ export class Cline {
 
 				telemetryService.captureConversationTurnEvent(this.taskId, this.apiProvider, this.api.getModel().id, "assistant")
 
-				// Capture message data for telemetry after assistant response
-				// ONLY if user is opted in, in advanced settings
-				if (this.providerRef.deref()?.conversationTelemetryService.isOptedInToConversationTelemetry()) {
-					// Get the last message from apiConversationHistory
-					const lastMessage = this.apiConversationHistory[this.apiConversationHistory.length - 1]
-
-					// Find the corresponding timestamp from clineMessages
-					// For assistant messages, we need to find the most recent "text" message
-					const lastTextMessage = findLast(this.clineMessages, (m) => m.say === "text")
-
-					// Add the timestamp to the message object for telemetry
-					if (!lastTextMessage) {
-						console.error("No text message found in clineMessages")
-					} else {
-						this.providerRef.deref()?.conversationTelemetryService.captureMessage(
-							this.taskId,
-							{
-								...lastMessage,
-								ts: lastTextMessage.ts,
-							},
-							{
-								apiProvider: this.apiProvider,
-								model: this.api.getModel().id,
-								tokensIn: inputTokens,
-								tokensOut: outputTokens,
-							},
-						)
-					}
-				}
-
 				// signals to provider that it can retrieve the saved messages from disk, as abortTask can not be awaited on in nature
 				this.didFinishAbortingStream = true
 			}
@@ -3479,32 +3388,6 @@ export class Cline {
 					content: [{ type: "text", text: assistantMessage }],
 				})
 
-				// Capture message data for telemetry after assistant response,
-				// ONLY if user is opted in, in advanced settings
-				if (this.providerRef.deref()?.conversationTelemetryService.isOptedInToConversationTelemetry()) {
-					// Get the last message from apiConversationHistory
-					const lastMessage = this.apiConversationHistory[this.apiConversationHistory.length - 1]
-
-					// Find the corresponding timestamp from clineMessages
-					const lastClineMessage = this.clineMessages[this.clineMessages.length - 1]
-
-					if (lastClineMessage) {
-						this.providerRef.deref()?.conversationTelemetryService.captureMessage(
-							this.taskId,
-							{
-								...lastMessage,
-								ts: lastClineMessage.ts,
-							},
-							{
-								apiProvider: this.apiProvider,
-								model: this.api.getModel().id,
-								tokensIn: inputTokens,
-								tokensOut: outputTokens,
-							},
-						)
-					}
-				}
-
 				// NOTE: this comment is here for future reference - this was a workaround for userMessageContent not getting set to true. It was due to it not recursively calling for partial blocks when didRejectTool, so it would get stuck waiting for a partial block to complete before it could continue.
 				// in case the content blocks finished
 				// it may be the api stream finished after the last parsed content block was executed, so  we are able to detect out of bounds and set userMessageContentReady to true (note you should not call presentAssistantMessage since if the last block is completed it will be presented again)
@@ -3628,7 +3511,7 @@ export class Cline {
 
 		if (busyTerminals.length > 0 && this.didEditFile) {
 			//  || this.didEditFile
-			await setTimeoutPromise(300) // delay after saving file to let terminals catch up
+			await delay(300) // delay after saving file to let terminals catch up
 		}
 
 		// let terminalWasBusy = false

src/core/context-management/ContextManager.ts

@@ -1,120 +0,0 @@
-import { Anthropic } from "@anthropic-ai/sdk"
-import { ClineApiReqInfo, ClineMessage } from "../../shared/ExtensionMessage"
-import { ApiHandler } from "../../api"
-import { OpenAiHandler } from "../../api/providers/openai"
-
-export class ContextManager {
-	getNewContextMessagesAndMetadata(
-		apiConversationHistory: Anthropic.Messages.MessageParam[],
-		clineMessages: ClineMessage[],
-		api: ApiHandler,
-		conversationHistoryDeletedRange: [number, number] | undefined,
-		previousApiReqIndex: number,
-	) {
-		let updatedConversationHistoryDeletedRange = false
-
-		// If the previous API request's total token usage is close to the context window, truncate the conversation history to free up space for the new request
-		if (previousApiReqIndex >= 0) {
-			const previousRequest = clineMessages[previousApiReqIndex]
-			if (previousRequest && previousRequest.text) {
-				const { tokensIn, tokensOut, cacheWrites, cacheReads }: ClineApiReqInfo = JSON.parse(previousRequest.text)
-				const totalTokens = (tokensIn || 0) + (tokensOut || 0) + (cacheWrites || 0) + (cacheReads || 0)
-				let contextWindow = api.getModel().info.contextWindow || 128_000
-				// FIXME: hack to get anyone using openai compatible with deepseek to have the proper context window instead of the default 128k. We need a way for the user to specify the context window for models they input through openai compatible
-				if (api instanceof OpenAiHandler && api.getModel().id.toLowerCase().includes("deepseek")) {
-					contextWindow = 64_000
-				}
-				let maxAllowedSize: number
-				switch (contextWindow) {
-					case 64_000: // deepseek models
-						maxAllowedSize = contextWindow - 27_000
-						break
-					case 128_000: // most models
-						maxAllowedSize = contextWindow - 30_000
-						break
-					case 200_000: // claude models
-						maxAllowedSize = contextWindow - 40_000
-						break
-					default:
-						maxAllowedSize = Math.max(contextWindow - 40_000, contextWindow * 0.8) // for deepseek, 80% of 64k meant only ~10k buffer which was too small and resulted in users getting context window errors.
-				}
-
-				// This is the most reliable way to know when we're close to hitting the context window.
-				if (totalTokens >= maxAllowedSize) {
-					// Since the user may switch between models with different context windows, truncating half may not be enough (ie if switching from claude 200k to deepseek 64k, half truncation will only remove 100k tokens, but we need to remove much more)
-					// So if totalTokens/2 is greater than maxAllowedSize, we truncate 3/4 instead of 1/2
-					// FIXME: truncating the conversation in a way that is optimal for prompt caching AND takes into account multi-context window complexity is something we need to improve
-					const keep = totalTokens / 2 > maxAllowedSize ? "quarter" : "half"
-
-					// NOTE: it's okay that we overwriteConversationHistory in resume task since we're only ever removing the last user message and not anything in the middle which would affect this range
-					conversationHistoryDeletedRange = this.getNextTruncationRange(
-						apiConversationHistory,
-						conversationHistoryDeletedRange,
-						keep,
-					)
-
-					updatedConversationHistoryDeletedRange = true
-				}
-			}
-		}
-
-		// conversationHistoryDeletedRange is updated only when we're close to hitting the context window, so we don't continuously break the prompt cache
-		const truncatedConversationHistory = this.getTruncatedMessages(apiConversationHistory, conversationHistoryDeletedRange)
-
-		return {
-			conversationHistoryDeletedRange: conversationHistoryDeletedRange,
-			updatedConversationHistoryDeletedRange: updatedConversationHistoryDeletedRange,
-			truncatedConversationHistory: truncatedConversationHistory,
-		}
-	}
-
-	public getNextTruncationRange(
-		apiMessages: Anthropic.Messages.MessageParam[],
-		currentDeletedRange: [number, number] | undefined,
-		keep: "half" | "quarter",
-	): [number, number] {
-		// Since we always keep the first message, currentDeletedRange[0] will always be 1 (for now until we have a smarter truncation algorithm)
-		const rangeStartIndex = 1
-		const startOfRest = currentDeletedRange ? currentDeletedRange[1] + 1 : 1
-
-		let messagesToRemove: number
-		if (keep === "half") {
-			// Remove half of remaining user-assistant pairs
-			// We first calculate half of the messages then divide by 2 to get the number of pairs.
-			// After flooring, we multiply by 2 to get the number of messages.
-			// Note that this will also always be an even number.
-			messagesToRemove = Math.floor((apiMessages.length - startOfRest) / 4) * 2 // Keep even number
-		} else {
-			// Remove 3/4 of remaining user-assistant pairs
-			// We calculate 3/4ths of the messages then divide by 2 to get the number of pairs.
-			// After flooring, we multiply by 2 to get the number of messages.
-			// Note that this will also always be an even number.
-			messagesToRemove = Math.floor(((apiMessages.length - startOfRest) * 3) / 4 / 2) * 2
-		}
-
-		let rangeEndIndex = startOfRest + messagesToRemove - 1
-
-		// Make sure the last message being removed is a user message, so that the next message after the initial task message is an assistant message. This preservers the user-assistant-user-assistant structure.
-		// NOTE: anthropic format messages are always user-assistant-user-assistant, while openai format messages can have multiple user messages in a row (we use anthropic format throughout cline)
-		if (apiMessages[rangeEndIndex].role !== "user") {
-			rangeEndIndex -= 1
-		}
-
-		// this is an inclusive range that will be removed from the conversation history
-		return [rangeStartIndex, rangeEndIndex]
-	}
-
-	public getTruncatedMessages(
-		messages: Anthropic.Messages.MessageParam[],
-		deletedRange: [number, number] | undefined,
-	): Anthropic.Messages.MessageParam[] {
-		if (!deletedRange) {
-			return messages
-		}
-
-		const [start, end] = deletedRange
-		// the range is inclusive - both start and end indices and everything in between will be removed from the final result.
-		// NOTE: if you try to console log these, don't forget that logging a reference to an array may not provide the same result as logging a slice() snapshot of that array at that exact moment. The following DOES in fact include the latest assistant message.
-		return [...messages.slice(0, start), ...messages.slice(end + 1)]
-	}
-}

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

@@ -1,10 +0,0 @@
-export function checkIsOpenRouterContextWindowError(error: any): boolean {
-	return error.code === 400 && error.message?.includes("context length")
-}
-
-export function checkIsAnthropicContextWindowError(response: any): boolean {
-	return (
-		response?.error?.error?.type === "invalid_request_error" &&
-		response?.error?.error?.message?.includes("prompt is too long")
-	)
-}

src/core/mentions/index.ts

@@ -72,10 +72,7 @@ export async function parseMentions(text: string, cwd: string, urlContentFetcher
 		}
 	}
 
-	// Filter out duplicate mentions while preserving order
-	const uniqueMentions = Array.from(new Set(mentions))
-
-	for (const mention of uniqueMentions) {
+	for (const mention of mentions) {
 		if (mention.startsWith("http")) {
 			let result: string
 			if (launchBrowserError) {

src/core/sliding-window/index.ts

@@ -0,0 +1,97 @@
+import { Anthropic } from "@anthropic-ai/sdk"
+
+/*
+We can't implement a dynamically updating sliding window as it would break prompt cache
+every time. To maintain the benefits of caching, we need to keep conversation history
+static. This operation should be performed as infrequently as possible. If a user reaches
+a 200k context, we can assume that the first half is likely irrelevant to their current task.
+Therefore, this function should only be called when absolutely necessary to fit within
+context limits, not as a continuous process.
+*/
+// export function truncateHalfConversation(
+// 	messages: Anthropic.Messages.MessageParam[],
+// ): Anthropic.Messages.MessageParam[] {
+// 	// API expects messages to be in user-assistant order, and tool use messages must be followed by tool results. We need to maintain this structure while truncating.
+
+// 	// Always keep the first Task message (this includes the project's file structure in environment_details)
+// 	const truncatedMessages = [messages[0]]
+
+// 	// Remove half of user-assistant pairs
+// 	const messagesToRemove = Math.floor(messages.length / 4) * 2 // has to be even number
+
+// 	const remainingMessages = messages.slice(messagesToRemove + 1) // has to start with assistant message since tool result cannot follow assistant message with no tool use
+// 	truncatedMessages.push(...remainingMessages)
+
+// 	return truncatedMessages
+// }
+
+/*
+getNextTruncationRange: Calculates the next range of messages to be "deleted"
+- Takes the full messages array and optional current deleted range
+- Always preserves the first message (task message)
+- Removes 1/2 of remaining messages (rounded down to even number) after current deleted range
+- Returns [startIndex, endIndex] representing inclusive range to delete
+
+getTruncatedMessages: Constructs the truncated array using the deleted range
+- Takes full messages array and optional deleted range
+- Returns new array with messages in deleted range removed
+- Preserves order and structure of remaining messages
+
+The range is represented as [startIndex, endIndex] where both indices are inclusive
+The functions maintain the original array integrity while allowing progressive truncation 
+through the deletedRange parameter
+
+Usage example:
+const messages = [user1, assistant1, user2, assistant2, user3, assistant3];
+let deletedRange = getNextTruncationRange(messages); // [1,2] (assistant1,user2)
+let truncated = getTruncatedMessages(messages, deletedRange); 
+// [user1, assistant2, user3, assistant3]
+
+deletedRange = getNextTruncationRange(messages, deletedRange); // [2,3] (assistant2,user3) 
+truncated = getTruncatedMessages(messages, deletedRange);
+// [user1, assistant3]
+*/
+
+export function getNextTruncationRange(
+	messages: Anthropic.Messages.MessageParam[],
+	currentDeletedRange: [number, number] | undefined = undefined,
+	keep: "half" | "quarter" = "half",
+): [number, number] {
+	// Since we always keep the first message, currentDeletedRange[0] will always be 1 (for now until we have a smarter truncation algorithm)
+	const rangeStartIndex = 1
+	const startOfRest = currentDeletedRange ? currentDeletedRange[1] + 1 : 1
+
+	let messagesToRemove: number
+	if (keep === "half") {
+		// Remove half of user-assistant pairs
+		messagesToRemove = Math.floor((messages.length - startOfRest) / 4) * 2 // Keep even number
+	} else {
+		// Remove 3/4 of user-assistant pairs
+		messagesToRemove = Math.floor((messages.length - startOfRest) / 8) * 3 * 2
+	}
+
+	let rangeEndIndex = startOfRest + messagesToRemove - 1
+
+	// Make sure the last message being removed is a user message, so that the next message after the initial task message is an assistant message. This preservers the user-assistant-user-assistant structure.
+	// NOTE: anthropic format messages are always user-assistant-user-assistant, while openai format messages can have multiple user messages in a row (we use anthropic format throughout cline)
+	if (messages[rangeEndIndex].role !== "user") {
+		rangeEndIndex -= 1
+	}
+
+	// this is an inclusive range that will be removed from the conversation history
+	return [rangeStartIndex, rangeEndIndex]
+}
+
+export function getTruncatedMessages(
+	messages: Anthropic.Messages.MessageParam[],
+	deletedRange: [number, number] | undefined,
+): Anthropic.Messages.MessageParam[] {
+	if (!deletedRange) {
+		return messages
+	}
+
+	const [start, end] = deletedRange
+	// the range is inclusive - both start and end indices and everything in between will be removed from the final result.
+	// NOTE: if you try to console log these, don't forget that logging a reference to an array may not provide the same result as logging a slice() snapshot of that array at that exact moment. The following DOES in fact include the latest assistant message.
+	return [...messages.slice(0, start), ...messages.slice(end + 1)]
+}

src/core/webview/ClineProvider.ts

@@ -14,7 +14,6 @@ import { fetchOpenGraphData, isImageUrl } from "../../integrations/misc/link-pre
 import { selectImages } from "../../integrations/misc/process-images"
 import { getTheme } from "../../integrations/theme/getTheme"
 import WorkspaceTracker from "../../integrations/workspace/WorkspaceTracker"
-import { ClineAccountService } from "../../services/account/ClineAccountService"
 import { McpHub } from "../../services/mcp/McpHub"
 import { UserInfo } from "../../shared/UserInfo"
 import { ApiConfiguration, ApiProvider, ModelInfo } from "../../shared/api"
@@ -37,12 +36,6 @@ import { telemetryService } from "../../services/telemetry/TelemetryService"
 import { TelemetrySetting } from "../../shared/TelemetrySetting"
 import { cleanupLegacyCheckpoints } from "../../integrations/checkpoints/CheckpointMigration"
 import CheckpointTracker from "../../integrations/checkpoints/CheckpointTracker"
-import { getTotalTasksSize } from "../../utils/storage"
-import { ConversationTelemetryService } from "../../services/telemetry/ConversationTelemetryService"
-import { GlobalFileNames } from "../../global-constants"
-import { setTimeout as setTimeoutPromise } from "node:timers/promises"
-import { BrowserSession } from "../../services/browser/BrowserSession"
-import { discoverChromeInstances } from "../../services/browser/browserDiscovery"
 
 /*
 https://github.com/microsoft/vscode-webview-ui-toolkit-samples/blob/main/default/weather-webview/src/providers/WeatherViewProvider.ts
@@ -96,7 +89,6 @@ type GlobalStateKey =
 	| "azureApiVersion"
 	| "openRouterModelId"
 	| "openRouterModelInfo"
-	| "openRouterProviderSorting"
 	| "autoApprovalSettings"
 	| "browserSettings"
 	| "chatSettings"
@@ -105,7 +97,6 @@ type GlobalStateKey =
 	| "previousModeApiProvider"
 	| "previousModeModelId"
 	| "previousModeThinkingBudgetTokens"
-	| "previousModeVsCodeLmModelSelector"
 	| "previousModeModelInfo"
 	| "liteLlmBaseUrl"
 	| "liteLlmModelId"
@@ -117,8 +108,14 @@ type GlobalStateKey =
 	| "asksageApiUrl"
 	| "thinkingBudgetTokens"
 	| "planActSeparateModelsSetting"
-	| "remoteBrowserHost"
-	| "remoteBrowserEnabled"
+
+export const GlobalFileNames = {
+	apiConversationHistory: "api_conversation_history.json",
+	uiMessages: "ui_messages.json",
+	openRouterModels: "openrouter_models.json",
+	mcpSettings: "cline_mcp_settings.json",
+	clineRules: ".clinerules",
+}
 
 export class ClineProvider implements vscode.WebviewViewProvider {
 	public static readonly sideBarId = "claude-dev.SidebarProvider" // used in package.json as the view's id. This value cannot be changed due to how vscode caches views based on their id, and updating the id would break existing instances of the extension.
@@ -129,9 +126,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 	private cline?: Cline
 	workspaceTracker?: WorkspaceTracker
 	mcpHub?: McpHub
-	accountService?: ClineAccountService
-	private latestAnnouncementId = "march-22-2025" // update to some unique identifier when we add a new announcement
-	conversationTelemetryService: ConversationTelemetryService
+	private latestAnnouncementId = "feb-19-2025" // update to some unique identifier when we add a new announcement
 
 	constructor(
 		readonly context: vscode.ExtensionContext,
@@ -141,8 +136,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		ClineProvider.activeInstances.add(this)
 		this.workspaceTracker = new WorkspaceTracker(this)
 		this.mcpHub = new McpHub(this)
-		this.accountService = new ClineAccountService(this)
-		this.conversationTelemetryService = new ConversationTelemetryService(this)
 
 		// Clean up legacy checkpoints
 		cleanupLegacyCheckpoints(this.context.globalStorageUri.fsPath, this.outputChannel).catch((error) => {
@@ -173,8 +166,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		this.workspaceTracker = undefined
 		this.mcpHub?.dispose()
 		this.mcpHub = undefined
-		this.accountService = undefined
-		this.conversationTelemetryService.shutdown()
 		this.outputChannel.appendLine("Disposed all disposables")
 		ClineProvider.activeInstances.delete(this)
 	}
@@ -578,107 +569,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 							await this.postStateToWebview()
 						}
 						break
-					case "remoteBrowserHost":
-						await this.updateGlobalState("remoteBrowserHost", message.text)
-						await this.postStateToWebview()
-						break
-					case "remoteBrowserEnabled":
-						// Store the preference in global state
-						// remoteBrowserEnabled now means "enable remote browser connection"
-						await this.updateGlobalState("remoteBrowserEnabled", message.bool ?? false)
-						// If disabling remote browser connection, clear the remoteBrowserHost
-						if (!message.bool) {
-							await this.updateGlobalState("remoteBrowserHost", undefined)
-						}
-						await this.postStateToWebview()
-						break
-					case "testBrowserConnection":
-						try {
-							const { browserSettings } = await this.getState()
-							const browserSession = new BrowserSession(this.context, browserSettings)
-							// If no text is provided, try auto-discovery
-							if (!message.text) {
-								try {
-									const discoveredHost = await discoverChromeInstances()
-									if (discoveredHost) {
-										// Test the connection to the discovered host
-										const result = await browserSession.testConnection(discoveredHost)
-										// Send the result back to the webview
-										await this.postMessageToWebview({
-											type: "browserConnectionResult",
-											success: result.success,
-											text: `Auto-discovered and tested connection to Chrome at ${discoveredHost}: ${result.message}`,
-											values: { endpoint: result.endpoint },
-										})
-									} else {
-										await this.postMessageToWebview({
-											type: "browserConnectionResult",
-											success: false,
-											text: "No Chrome instances found on the network. Make sure Chrome is running with remote debugging enabled (--remote-debugging-port=9222).",
-										})
-									}
-								} catch (error) {
-									await this.postMessageToWebview({
-										type: "browserConnectionResult",
-										success: false,
-										text: `Error during auto-discovery: ${error instanceof Error ? error.message : String(error)}`,
-									})
-								}
-							} else {
-								// Test the provided URL
-								const result = await browserSession.testConnection(message.text)
-
-								// Send the result back to the webview
-								await this.postMessageToWebview({
-									type: "browserConnectionResult",
-									success: result.success,
-									text: result.message,
-									values: { endpoint: result.endpoint },
-								})
-							}
-						} catch (error) {
-							await this.postMessageToWebview({
-								type: "browserConnectionResult",
-								success: false,
-								text: `Error testing connection: ${error instanceof Error ? error.message : String(error)}`,
-							})
-						}
-						break
-					case "discoverBrowser":
-						try {
-							const discoveredHost = await discoverChromeInstances()
-
-							if (discoveredHost) {
-								// Don't update the remoteBrowserHost state when auto-discovering
-								// This way we don't override the user's preference
-
-								// Test the connection to get the endpoint
-								const { browserSettings } = await this.getState()
-								const browserSession = new BrowserSession(this.context, browserSettings)
-								const result = await browserSession.testConnection(discoveredHost)
-
-								// Send the result back to the webview
-								await this.postMessageToWebview({
-									type: "browserConnectionResult",
-									success: true,
-									text: `Successfully discovered and connected to Chrome at ${discoveredHost}`,
-									values: { endpoint: result.endpoint },
-								})
-							} else {
-								await this.postMessageToWebview({
-									type: "browserConnectionResult",
-									success: false,
-									text: "No Chrome instances found on the network. Make sure Chrome is running with remote debugging enabled (--remote-debugging-port=9222).",
-								})
-							}
-						} catch (error) {
-							await this.postMessageToWebview({
-								type: "browserConnectionResult",
-								success: false,
-								text: `Error discovering browser: ${error instanceof Error ? error.message : String(error)}`,
-							})
-						}
-						break
 					case "togglePlanActMode":
 						if (message.chatSettings) {
 							await this.togglePlanActModeWithChatSettings(message.chatSettings, message.chatContent)
@@ -836,14 +726,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 						await this.handleSignOut()
 						break
 					}
-					case "showAccountViewClicked": {
-						await this.postMessageToWebview({ type: "action", action: "accountButtonClicked" })
-						break
-					}
-					case "fetchUserCreditsData": {
-						await this.fetchUserCreditsData()
-						break
-					}
 					case "showMcpView": {
 						await this.postMessageToWebview({ type: "action", action: "mcpButtonClicked" })
 						break
@@ -934,10 +816,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 						}
 						break
 					}
-					case "requestTotalTasksSize": {
-						this.refreshTotalTasksSize()
-						break
-					}
 					case "restartMcpServer": {
 						try {
 							await this.mcpHub?.restartConnection(message.text!)
@@ -1006,13 +884,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 						})
 						break
 					}
-					case "scrollToSettings": {
-						await this.postMessageToWebview({
-							type: "scrollToSettings",
-							text: message.text,
-						})
-						break
-					}
 					case "telemetrySetting": {
 						if (message.telemetrySetting) {
 							await this.updateTelemetrySetting(message.telemetrySetting)
@@ -1046,7 +917,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 					case "clearAllTaskHistory": {
 						await this.deleteAllTaskHistory()
 						await this.postStateToWebview()
-						this.refreshTotalTasksSize()
 						this.postMessageToWebview({ type: "relinquishControl" })
 						break
 					}
@@ -1077,7 +947,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			previousModeApiProvider: newApiProvider,
 			previousModeModelId: newModelId,
 			previousModeModelInfo: newModelInfo,
-			previousModeVsCodeLmModelSelector: newVsCodeLmModelSelector,
 			previousModeThinkingBudgetTokens: newThinkingBudgetTokens,
 			planActSeparateModelsSetting,
 		} = await this.getState()
@@ -1105,8 +974,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 					await this.updateGlobalState("previousModeModelInfo", apiConfiguration.openRouterModelInfo)
 					break
 				case "vscode-lm":
-					// Important we don't set modelId to this, as it's an object not string (webview expects model id to be a string)
-					await this.updateGlobalState("previousModeVsCodeLmModelSelector", apiConfiguration.vsCodeLmModelSelector)
+					await this.updateGlobalState("previousModeModelId", apiConfiguration.vsCodeLmModelSelector)
 					break
 				case "openai":
 					await this.updateGlobalState("previousModeModelId", apiConfiguration.openAiModelId)
@@ -1127,7 +995,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			}
 
 			// Restore the model used in previous mode
-			if (newApiProvider || newModelId || newThinkingBudgetTokens !== undefined || newVsCodeLmModelSelector) {
+			if (newApiProvider || newModelId || newThinkingBudgetTokens !== undefined) {
 				await this.updateGlobalState("apiProvider", newApiProvider)
 				await this.updateGlobalState("thinkingBudgetTokens", newThinkingBudgetTokens)
 				switch (newApiProvider) {
@@ -1147,7 +1015,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 						await this.updateGlobalState("openRouterModelInfo", newModelInfo)
 						break
 					case "vscode-lm":
-						await this.updateGlobalState("vsCodeLmModelSelector", newVsCodeLmModelSelector)
+						await this.updateGlobalState("vsCodeLmModelSelector", newModelId)
 						break
 					case "openai":
 						await this.updateGlobalState("openAiModelId", newModelId)
@@ -1270,7 +1138,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			azureApiVersion,
 			openRouterModelId,
 			openRouterModelInfo,
-			openRouterProviderSorting,
 			vsCodeLmModelSelector,
 			liteLlmBaseUrl,
 			liteLlmModelId,
@@ -1320,7 +1187,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		await this.updateGlobalState("azureApiVersion", azureApiVersion)
 		await this.updateGlobalState("openRouterModelId", openRouterModelId)
 		await this.updateGlobalState("openRouterModelInfo", openRouterModelInfo)
-		await this.updateGlobalState("openRouterProviderSorting", openRouterProviderSorting)
 		await this.updateGlobalState("vsCodeLmModelSelector", vsCodeLmModelSelector)
 		await this.updateGlobalState("liteLlmBaseUrl", liteLlmBaseUrl)
 		await this.updateGlobalState("liteLlmModelId", liteLlmModelId)
@@ -1442,20 +1308,6 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 		}
 	}
 
-	// Account
-
-	async fetchUserCreditsData() {
-		try {
-			await Promise.all([
-				this.accountService?.fetchBalance(),
-				this.accountService?.fetchUsageTransactions(),
-				this.accountService?.fetchPaymentTransactions(),
-			])
-		} catch (error) {
-			console.error("Failed to fetch user credits data:", error)
-		}
-	}
-
 	// Auth
 
 	public async validateAuthState(state: string | null): Promise<boolean> {
@@ -1494,7 +1346,7 @@ export class ClineProvider implements vscode.WebviewViewProvider {
 			}
 
 			await this.postStateToWebview()
-			// vscode.window.showInformationMessage("Successfully logged in to Cline")
+			vscode.window.showInformationMessage("Successfully logged in to Cline")
 		} catch (error) {
 			console.error("Failed to handle auth callback:", error)
 			vscode.window.showErrorMessage("Failed to log in to Cline")
@@ -1864,104 +1716,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 		return models
 	}
 
-	// Context menus and code actions
-
-	getFileMentionFromPath(filePath: string) {
-		const cwd = vscode.workspace.workspaceFolders?.map((folder) => folder.uri.fsPath).at(0)
-		if (!cwd) {
-			return "@/" + filePath
-		}
-		const relativePath = path.relative(cwd, filePath)
-		return "@/" + relativePath
-	}
-
-	// 'Add to Cline' context menu in editor and code action
-	async addSelectedCodeToChat(code: string, filePath: string, languageId: string, diagnostics?: vscode.Diagnostic[]) {
-		// Ensure the sidebar view is visible
-		await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
-		await setTimeoutPromise(100)
-
-		// Post message to webview with the selected code
-		const fileMention = this.getFileMentionFromPath(filePath)
-
-		let input = `${fileMention}\n\`\`\`\n${code}\n\`\`\``
-		if (diagnostics) {
-			const problemsString = this.convertDiagnosticsToProblemsString(diagnostics)
-			input += `\nProblems:\n${problemsString}`
-		}
-
-		await this.postMessageToWebview({
-			type: "addToInput",
-			text: input,
-		})
-
-		console.log("addSelectedCodeToChat", code, filePath, languageId)
-	}
-
-	// 'Add to Cline' context menu in Terminal
-	async addSelectedTerminalOutputToChat(output: string, terminalName: string) {
-		// Ensure the sidebar view is visible
-		await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
-		await setTimeoutPromise(100)
-
-		// Post message to webview with the selected terminal output
-		// await this.postMessageToWebview({
-		//     type: "addSelectedTerminalOutput",
-		//     output,
-		//     terminalName
-		// })
-
-		await this.postMessageToWebview({
-			type: "addToInput",
-			text: `Terminal output:\n\`\`\`\n${output}\n\`\`\``,
-		})
-
-		console.log("addSelectedTerminalOutputToChat", output, terminalName)
-	}
-
-	// 'Fix with Cline' in code actions
-	async fixWithCline(code: string, filePath: string, languageId: string, diagnostics: vscode.Diagnostic[]) {
-		// Ensure the sidebar view is visible
-		await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
-		await setTimeoutPromise(100)
-
-		const fileMention = this.getFileMentionFromPath(filePath)
-		const problemsString = this.convertDiagnosticsToProblemsString(diagnostics)
-		await this.initClineWithTask(
-			`Fix the following code in ${fileMention}\n\`\`\`\n${code}\n\`\`\`\n\nProblems:\n${problemsString}`,
-		)
-
-		console.log("fixWithCline", code, filePath, languageId, diagnostics, problemsString)
-	}
-
-	convertDiagnosticsToProblemsString(diagnostics: vscode.Diagnostic[]) {
-		let problemsString = ""
-		for (const diagnostic of diagnostics) {
-			let label: string
-			switch (diagnostic.severity) {
-				case vscode.DiagnosticSeverity.Error:
-					label = "Error"
-					break
-				case vscode.DiagnosticSeverity.Warning:
-					label = "Warning"
-					break
-				case vscode.DiagnosticSeverity.Information:
-					label = "Information"
-					break
-				case vscode.DiagnosticSeverity.Hint:
-					label = "Hint"
-					break
-				default:
-					label = "Diagnostic"
-			}
-			const line = diagnostic.range.start.line + 1 // VSCode lines are 0-indexed
-			const source = diagnostic.source ? `${diagnostic.source} ` : ""
-			problemsString += `\n- [${source}${label}] Line ${line}: ${diagnostic.message}`
-		}
-		problemsString = problemsString.trim()
-		return problemsString
-	}
-
 	// Task history
 
 	async getTaskWithId(id: string): Promise<{
@@ -2034,56 +1788,46 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 		// await this.postStateToWebview()
 	}
 
-	async refreshTotalTasksSize() {
-		getTotalTasksSize(this.context.globalStorageUri.fsPath)
-			.then((newTotalSize) => {
-				this.postMessageToWebview({
-					type: "totalTasksSize",
-					totalTasksSize: newTotalSize,
-				})
-			})
-			.catch((error) => {
-				console.error("Error calculating total tasks size:", error)
-			})
-	}
-
 	async deleteTaskWithId(id: string) {
 		console.info("deleteTaskWithId: ", id)
 
-		try {
-			if (id === this.cline?.taskId) {
-				await this.clearTask()
-				console.debug("cleared task")
-			}
-
-			const { taskDirPath, apiConversationHistoryFilePath, uiMessagesFilePath } = await this.getTaskWithId(id)
-
-			const updatedTaskHistory = await this.deleteTaskFromState(id)
-
-			// Delete the task files
-			const apiConversationHistoryFileExists = await fileExistsAtPath(apiConversationHistoryFilePath)
-			if (apiConversationHistoryFileExists) {
-				await fs.unlink(apiConversationHistoryFilePath)
-			}
-			const uiMessagesFileExists = await fileExistsAtPath(uiMessagesFilePath)
-			if (uiMessagesFileExists) {
-				await fs.unlink(uiMessagesFilePath)
-			}
-			const legacyMessagesFilePath = path.join(taskDirPath, "claude_messages.json")
-			if (await fileExistsAtPath(legacyMessagesFilePath)) {
-				await fs.unlink(legacyMessagesFilePath)
-			}
-
-			await fs.rmdir(taskDirPath) // succeeds if the dir is empty
-
-			if (updatedTaskHistory.length === 0) {
-				await this.deleteAllTaskHistory()
-			}
-		} catch (error) {
-			console.debug(`Error deleting task:`, error)
+		if (id === this.cline?.taskId) {
+			await this.clearTask()
+			console.debug("cleared task")
 		}
 
-		this.refreshTotalTasksSize()
+		const { taskDirPath, apiConversationHistoryFilePath, uiMessagesFilePath } = await this.getTaskWithId(id)
+
+		// Delete checkpoints
+		console.info("deleting checkpoints")
+		const taskHistory = ((await this.getGlobalState("taskHistory")) as HistoryItem[] | undefined) || []
+		const historyItem = taskHistory.find((item) => item.id === id)
+		//console.log("historyItem: ", historyItem)
+		// if (historyItem) {
+		// 	try {
+		// 		await CheckpointTracker.deleteCheckpoints(id, historyItem, this.context.globalStorageUri.fsPath)
+		// 	} catch (error) {
+		// 		console.error(`Failed to delete checkpoints for task ${id}:`, error)
+		// 	}
+		// }
+
+		await this.deleteTaskFromState(id)
+
+		// Delete the task files
+		const apiConversationHistoryFileExists = await fileExistsAtPath(apiConversationHistoryFilePath)
+		if (apiConversationHistoryFileExists) {
+			await fs.unlink(apiConversationHistoryFilePath)
+		}
+		const uiMessagesFileExists = await fileExistsAtPath(uiMessagesFilePath)
+		if (uiMessagesFileExists) {
+			await fs.unlink(uiMessagesFilePath)
+		}
+		const legacyMessagesFilePath = path.join(taskDirPath, "claude_messages.json")
+		if (await fileExistsAtPath(legacyMessagesFilePath)) {
+			await fs.unlink(legacyMessagesFilePath)
+		}
+
+		await fs.rmdir(taskDirPath) // succeeds if the dir is empty
 	}
 
 	async deleteTaskFromState(id: string) {
@@ -2094,8 +1838,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 
 		// Notify the webview that the task has been deleted
 		await this.postStateToWebview()
-
-		return updatedTaskHistory
 	}
 
 	async postStateToWebview() {
@@ -2195,11 +1937,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 	*/
 
 	async getState() {
-		// Read settings from VSCode configuration
-		const config = vscode.workspace.getConfiguration("cline")
-		const configRemoteBrowserEnabled = config.get<boolean>("remoteBrowserEnabled")
-		const configRemoteBrowserHost = config.get<string>("remoteBrowserHost")
-
 		const [
 			storedApiProvider,
 			apiModelId,
@@ -2239,7 +1976,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			azureApiVersion,
 			openRouterModelId,
 			openRouterModelInfo,
-			openRouterProviderSorting,
 			lastShownAnnouncementId,
 			customInstructions,
 			taskHistory,
@@ -2253,7 +1989,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			previousModeApiProvider,
 			previousModeModelId,
 			previousModeModelInfo,
-			previousModeVsCodeLmModelSelector,
 			previousModeThinkingBudgetTokens,
 			qwenApiLine,
 			liteLlmApiKey,
@@ -2264,8 +1999,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			thinkingBudgetTokens,
 			sambanovaApiKey,
 			planActSeparateModelsSettingRaw,
-			remoteBrowserEnabled,
-			remoteBrowserHost,
 		] = await Promise.all([
 			this.getGlobalState("apiProvider") as Promise<ApiProvider | undefined>,
 			this.getGlobalState("apiModelId") as Promise<string | undefined>,
@@ -2305,7 +2038,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			this.getGlobalState("azureApiVersion") as Promise<string | undefined>,
 			this.getGlobalState("openRouterModelId") as Promise<string | undefined>,
 			this.getGlobalState("openRouterModelInfo") as Promise<ModelInfo | undefined>,
-			this.getGlobalState("openRouterProviderSorting") as Promise<string | undefined>,
 			this.getGlobalState("lastShownAnnouncementId") as Promise<string | undefined>,
 			this.getGlobalState("customInstructions") as Promise<string | undefined>,
 			this.getGlobalState("taskHistory") as Promise<HistoryItem[] | undefined>,
@@ -2319,7 +2051,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			this.getGlobalState("previousModeApiProvider") as Promise<ApiProvider | undefined>,
 			this.getGlobalState("previousModeModelId") as Promise<string | undefined>,
 			this.getGlobalState("previousModeModelInfo") as Promise<ModelInfo | undefined>,
-			this.getGlobalState("previousModeVsCodeLmModelSelector") as Promise<vscode.LanguageModelChatSelector | undefined>,
 			this.getGlobalState("previousModeThinkingBudgetTokens") as Promise<number | undefined>,
 			this.getGlobalState("qwenApiLine") as Promise<string | undefined>,
 			this.getSecret("liteLlmApiKey") as Promise<string | undefined>,
@@ -2330,8 +2061,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			this.getGlobalState("thinkingBudgetTokens") as Promise<number | undefined>,
 			this.getSecret("sambanovaApiKey") as Promise<string | undefined>,
 			this.getGlobalState("planActSeparateModelsSetting") as Promise<boolean | undefined>,
-			this.getGlobalState("remoteBrowserEnabled") as Promise<boolean | undefined>,
-			this.getGlobalState("remoteBrowserHost") as Promise<string | undefined>,
 		])
 
 		let apiProvider: ApiProvider
@@ -2372,13 +2101,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			await this.updateGlobalState("planActSeparateModelsSetting", planActSeparateModelsSetting)
 		}
 
-		// Merge browser settings with configuration values
-		const mergedBrowserSettings = {
-			...(browserSettings || DEFAULT_BROWSER_SETTINGS),
-			remoteBrowserEnabled: remoteBrowserEnabled ?? configRemoteBrowserEnabled ?? false,
-			remoteBrowserHost: remoteBrowserHost ?? configRemoteBrowserHost ?? "http://localhost:9222",
-		}
-
 		return {
 			apiConfiguration: {
 				apiProvider,
@@ -2420,7 +2142,6 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 				azureApiVersion,
 				openRouterModelId,
 				openRouterModelInfo,
-				openRouterProviderSorting,
 				vsCodeLmModelSelector,
 				o3MiniReasoningEffort,
 				thinkingBudgetTokens,
@@ -2436,13 +2157,12 @@ Here is the project's README to help you get started:\n\n${mcpDetails.readmeCont
 			customInstructions,
 			taskHistory,
 			autoApprovalSettings: autoApprovalSettings || DEFAULT_AUTO_APPROVAL_SETTINGS, // default value can be 0 or empty string
-			browserSettings: mergedBrowserSettings,
+			browserSettings: browserSettings || DEFAULT_BROWSER_SETTINGS,
 			chatSettings: chatSettings || DEFAULT_CHAT_SETTINGS,
 			userInfo,
 			previousModeApiProvider,
 			previousModeModelId,
 			previousModeModelInfo,
-			previousModeVsCodeLmModelSelector,
 			previousModeThinkingBudgetTokens,
 			mcpMarketplaceEnabled,
 			telemetrySetting: telemetrySetting || "unset",

src/dev/commands/tasks.ts

@@ -1,288 +0,0 @@
-import * as vscode from "vscode"
-import * as fs from "fs/promises"
-import * as path from "path"
-import { ClineProvider } from "../../core/webview/ClineProvider"
-import { HistoryItem } from "../../shared/HistoryItem"
-import { ClineMessage } from "../../shared/ExtensionMessage"
-
-/**
- * Registers development-only commands for task manipulation.
- * These are only activated in development mode.
- */
-export function registerTaskCommands(context: vscode.ExtensionContext, provider: ClineProvider): vscode.Disposable[] {
-	return [
-		vscode.commands.registerCommand("cline.dev.createTestTasks", async () => {
-			const count = await vscode.window.showInputBox({
-				title: "Test Tasks",
-				prompt: "How many test tasks to create?",
-				value: "10",
-			})
-
-			if (!count) {
-				return
-			}
-
-			const tasksCount = parseInt(count)
-			const globalStoragePath = context.globalStorageUri.fsPath
-			const tasksDir = path.join(globalStoragePath, "tasks")
-
-			vscode.window.withProgress(
-				{
-					location: vscode.ProgressLocation.Notification,
-					title: `Creating ${tasksCount} test tasks...`,
-					cancellable: false,
-				},
-				async (progress) => {
-					for (let i = 0; i < tasksCount; i++) {
-						// Generate a timestamp to ensure unique IDs
-						const timestamp = Date.now() + i
-						const taskId = `${timestamp}`
-						const taskDir = path.join(tasksDir, taskId)
-
-						await fs.mkdir(taskDir, { recursive: true })
-
-						// Generate a task prompt
-						const taskName = getRandomTaskName(i)
-
-						// Create realistic message sequence
-						const messages = createRealisticMessageSequence(timestamp, taskName, i)
-
-						// Create API conversation history file
-						await fs.writeFile(
-							path.join(taskDir, "api_conversation_history.json"),
-							JSON.stringify(
-								[
-									{
-										role: "user",
-										content: [{ type: "text", text: `<task>\n${taskName}\n</task>` }],
-									},
-									{
-										role: "assistant",
-										content: [
-											{
-												type: "text",
-												text: `I'll help you ${taskName.toLowerCase()}. Let me break this down into steps.`,
-											},
-										],
-									},
-								],
-								null,
-								2,
-							),
-						)
-
-						// Create UI messages file with realistic message sequence
-						await fs.writeFile(path.join(taskDir, "ui_messages.json"), JSON.stringify(messages, null, 2))
-
-						// Create history item to be shown in the HistoryView
-						const historyItem: HistoryItem = {
-							id: taskId,
-							ts: timestamp,
-							task: taskName,
-							tokensIn: Math.floor(100 + Math.random() * 900), // Random token count from 100-1000
-							tokensOut: Math.floor(200 + Math.random() * 1800), // Random token count from 200-2000
-							cacheWrites: i % 3 === 0 ? Math.floor(50 + Math.random() * 150) : undefined, // Only add cache writes to every 3rd task
-							cacheReads: i % 3 === 0 ? Math.floor(20 + Math.random() * 80) : undefined, // Only add cache reads to every 3rd task
-							totalCost: Number((0.0001 + Math.random() * 0.01).toFixed(5)), // Random cost from $0.0001 to $0.0101
-							size: 1024 * 1024, // 1MB
-						}
-
-						// Update task history in global state
-						await provider.updateTaskHistory(historyItem)
-
-						progress.report({ increment: 100 / tasksCount })
-					}
-
-					// Update the UI to show the new tasks
-					await provider.postStateToWebview()
-
-					vscode.window.showInformationMessage(`Created ${tasksCount} test tasks`)
-				},
-			)
-		}),
-	]
-}
-
-/**
- * Creates a realistic sequence of messages that would occur in a typical task
- */
-function createRealisticMessageSequence(baseTimestamp: number, taskPrompt: string, taskIndex: number): ClineMessage[] {
-	// Use an incrementing timestamp to ensure messages appear in sequence
-	let timestamp = baseTimestamp
-	const getNextTimestamp = () => {
-		timestamp += 1000 // Add 1 second between messages
-		return timestamp
-	}
-
-	// Variables to make different test tasks look unique
-	const fileName = getRandomFileName(taskIndex)
-	const commitHash = `commit${taskIndex}${Math.floor(Math.random() * 1000000).toString(16)}`
-
-	// Create a realistic message sequence
-	const messages: ClineMessage[] = [
-		// Initial task message - uses "say" with "text" which is the format used in Cline.ts
-		{
-			ts: baseTimestamp,
-			type: "say",
-			say: "text",
-			text: taskPrompt,
-		},
-
-		// API request started
-		{
-			ts: getNextTimestamp(),
-			type: "say",
-			say: "api_req_started",
-			text: JSON.stringify({
-				request: `<task>\n${taskPrompt}\n</task>`,
-				tokensIn: Math.floor(100 + Math.random() * 200),
-				tokensOut: Math.floor(300 + Math.random() * 500),
-			}),
-		},
-
-		// Reasoning message
-		{
-			ts: getNextTimestamp(),
-			type: "say",
-			say: "reasoning",
-			text: `I'll approach this task by breaking it down into manageable steps. First, I'll analyze the requirements, then create a plan, and finally implement the solution systematically.`,
-		},
-
-		// Text response
-		{
-			ts: getNextTimestamp(),
-			type: "say",
-			say: "text",
-			text: `I'll help you with this task. Let me start by creating the necessary files and implementing the core functionality.`,
-		},
-	]
-
-	// Add task-specific messages based on index modulo to create variety
-	const messageType = taskIndex % 5
-
-	if (messageType === 0 || messageType === 2) {
-		// Tool use - file operations
-		messages.push({
-			ts: getNextTimestamp(),
-			type: "say",
-			say: "tool",
-			text: JSON.stringify({
-				tool: "newFileCreated",
-				path: fileName,
-				content: `// Sample code for ${taskPrompt}`,
-			}),
-		})
-	}
-
-	if (messageType === 1 || messageType === 3) {
-		// Command execution
-		messages.push(
-			{
-				ts: getNextTimestamp(),
-				type: "ask",
-				ask: "command",
-				text: `ls -la`,
-			},
-			{
-				ts: getNextTimestamp(),
-				type: "say",
-				say: "command_output",
-				text: `total 24\ndrwxr-xr-x 3 user staff 96 Mar 10 12:34 .\ndrwxr-xr-x 8 user staff 256 Mar 10 12:30 ..\n-rw-r--r-- 1 user staff 158 Mar 10 12:34 ${fileName}`,
-			},
-		)
-	}
-
-	if (messageType === 2 || messageType === 4) {
-		// Browser actions
-		messages.push(
-			{
-				ts: getNextTimestamp(),
-				type: "ask",
-				ask: "browser_action_launch",
-				text: `https://example.com`,
-			},
-			{
-				ts: getNextTimestamp(),
-				type: "say",
-				say: "browser_action_result",
-				text: JSON.stringify({
-					logs: "Page loaded successfully",
-					screenshot:
-						"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==",
-				}),
-			},
-			{
-				ts: getNextTimestamp(),
-				type: "say",
-				say: "browser_action",
-				text: JSON.stringify({
-					action: "close",
-				}),
-			},
-		)
-	}
-
-	// Add checkpoint
-	messages.push({
-		ts: getNextTimestamp(),
-		type: "say",
-		say: "checkpoint_created",
-		lastCheckpointHash: commitHash,
-	})
-
-	// Add completion result (all tasks end with this)
-	messages.push({
-		ts: getNextTimestamp(),
-		type: "say",
-		say: "completion_result",
-		text: `I've completed the task to ${taskPrompt.toLowerCase()}. The implementation includes all the required functionality and meets the specifications. ${"x".repeat(1024 * 1024)}`, // 1MB file
-		lastCheckpointHash: commitHash,
-	})
-
-	return messages
-}
-
-/**
- * Returns a random task name for test data
- */
-function getRandomTaskName(index: number): string {
-	const tasks = [
-		"Create a simple todo application",
-		"Build a weather forecast widget",
-		"Implement a markdown parser",
-		"Design a responsive landing page",
-		"Develop a currency converter",
-		"Create a file upload component",
-		"Build a data visualization dashboard",
-		"Implement a search functionality",
-		"Create a user authentication system",
-		"Design a dark mode toggle",
-		"Build a countdown timer",
-		"Create a drag and drop interface",
-		"Implement form validation",
-		"Design a multi-step wizard",
-		"Create a notification system",
-	]
-
-	return tasks[index % tasks.length] + ` (Test ${index + 1})`
-}
-
-/**
- * Returns a random file name for test data
- */
-function getRandomFileName(index: number): string {
-	const files = [
-		"index.html",
-		"styles.css",
-		"script.js",
-		"app.jsx",
-		"main.ts",
-		"utils.py",
-		"config.json",
-		"server.js",
-		"data.csv",
-		"README.md",
-	]
-
-	return files[index % files.length]
-}

src/extension.ts

@@ -1,6 +1,6 @@
 // The module 'vscode' contains the VS Code extensibility API
 // Import the module and reference it with the alias vscode in your code below
-import { setTimeout as setTimeoutPromise } from "node:timers/promises"
+import delay from "delay"
 import * as vscode from "vscode"
 import { ClineProvider } from "./core/webview/ClineProvider"
 import { Logger } from "./services/logging/Logger"
@@ -32,8 +32,6 @@ export function activate(context: vscode.ExtensionContext) {
 
 	const sidebarProvider = new ClineProvider(context, outputChannel)
 
-	vscode.commands.executeCommand("setContext", "cline.isDevMode", IS_DEV && IS_DEV === "true")
-
 	context.subscriptions.push(
 		vscode.window.registerWebviewViewProvider(ClineProvider.sideBarId, sidebarProvider, {
 			webviewOptions: { retainContextWhenHidden: true },
@@ -90,7 +88,7 @@ export function activate(context: vscode.ExtensionContext) {
 		tabProvider.resolveWebviewView(panel)
 
 		// Lock the editor group so clicking on files doesn't open them over the panel
-		await setTimeoutPromise(100)
+		await delay(100)
 		await vscode.commands.executeCommand("workbench.action.lockEditorGroup")
 	}
 
@@ -117,20 +115,14 @@ export function activate(context: vscode.ExtensionContext) {
 	)
 
 	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.accountButtonClicked", () => {
+		vscode.commands.registerCommand("cline.accountLoginClicked", () => {
 			sidebarProvider.postMessageToWebview({
 				type: "action",
-				action: "accountButtonClicked",
+				action: "accountLoginClicked",
 			})
 		}),
 	)
 
-	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.openDocumentation", () => {
-			vscode.env.openExternal(vscode.Uri.parse("https://docs.cline.bot/"))
-		}),
-	)
-
 	/*
 	We use the text document content provider API to show the left side for diff view by creating a virtual document for the original content. This makes it readonly so users know to edit the right side if they want to keep their changes.
 
@@ -195,165 +187,6 @@ export function activate(context: vscode.ExtensionContext) {
 	}
 	context.subscriptions.push(vscode.window.registerUriHandler({ handleUri }))
 
-	// Register size testing commands in development mode
-	if (IS_DEV && IS_DEV === "true") {
-		// Use dynamic import to avoid loading the module in production
-		import("./dev/commands/tasks")
-			.then((module) => {
-				const devTaskCommands = module.registerTaskCommands(context, sidebarProvider)
-				context.subscriptions.push(...devTaskCommands)
-				Logger.log("Cline dev task commands registered")
-			})
-			.catch((error) => {
-				Logger.log("Failed to register dev task commands: " + error)
-			})
-	}
-
-	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.addToChat", async (range?: vscode.Range, diagnostics?: vscode.Diagnostic[]) => {
-			const editor = vscode.window.activeTextEditor
-			if (!editor) {
-				return
-			}
-
-			// Use provided range if available, otherwise use current selection
-			// (vscode command passes an argument in the first param by default, so we need to ensure it's a Range object)
-			const textRange = range instanceof vscode.Range ? range : editor.selection
-			const selectedText = editor.document.getText(textRange)
-
-			if (!selectedText) {
-				return
-			}
-
-			// Get the file path and language ID
-			const filePath = editor.document.uri.fsPath
-			const languageId = editor.document.languageId
-
-			// Send to sidebar provider
-			await sidebarProvider.addSelectedCodeToChat(
-				selectedText,
-				filePath,
-				languageId,
-				Array.isArray(diagnostics) ? diagnostics : undefined,
-			)
-		}),
-	)
-
-	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.addTerminalOutputToChat", async () => {
-			const terminal = vscode.window.activeTerminal
-			if (!terminal) {
-				return
-			}
-
-			// Save current clipboard content
-			const tempCopyBuffer = await vscode.env.clipboard.readText()
-
-			try {
-				// Copy the *existing* terminal selection (without selecting all)
-				await vscode.commands.executeCommand("workbench.action.terminal.copySelection")
-
-				// Get copied content
-				let terminalContents = (await vscode.env.clipboard.readText()).trim()
-
-				// Restore original clipboard content
-				await vscode.env.clipboard.writeText(tempCopyBuffer)
-
-				if (!terminalContents) {
-					// No terminal content was copied (either nothing selected or some error)
-					return
-				}
-
-				// [Optional] Any additional logic to process multi-line content can remain here
-				// For example:
-				/*
-				const lines = terminalContents.split("\n")
-				const lastLine = lines.pop()?.trim()
-				if (lastLine) {
-					let i = lines.length - 1
-					while (i >= 0 && !lines[i].trim().startsWith(lastLine)) {
-						i--
-					}
-					terminalContents = lines.slice(Math.max(i, 0)).join("\n")
-				}
-				*/
-
-				// Send to sidebar provider
-				await sidebarProvider.addSelectedTerminalOutputToChat(terminalContents, terminal.name)
-			} catch (error) {
-				// Ensure clipboard is restored even if an error occurs
-				await vscode.env.clipboard.writeText(tempCopyBuffer)
-				console.error("Error getting terminal contents:", error)
-				vscode.window.showErrorMessage("Failed to get terminal contents")
-			}
-		}),
-	)
-
-	// Register code action provider
-	context.subscriptions.push(
-		vscode.languages.registerCodeActionsProvider(
-			"*",
-			new (class implements vscode.CodeActionProvider {
-				public static readonly providedCodeActionKinds = [vscode.CodeActionKind.QuickFix]
-
-				provideCodeActions(
-					document: vscode.TextDocument,
-					range: vscode.Range,
-					context: vscode.CodeActionContext,
-				): vscode.CodeAction[] {
-					// Expand range to include surrounding 3 lines
-					const expandedRange = new vscode.Range(
-						Math.max(0, range.start.line - 3),
-						0,
-						Math.min(document.lineCount - 1, range.end.line + 3),
-						document.lineAt(Math.min(document.lineCount - 1, range.end.line + 3)).text.length,
-					)
-
-					const addAction = new vscode.CodeAction("Add to Cline", vscode.CodeActionKind.QuickFix)
-					addAction.command = {
-						command: "cline.addToChat",
-						title: "Add to Cline",
-						arguments: [expandedRange, context.diagnostics],
-					}
-
-					const fixAction = new vscode.CodeAction("Fix with Cline", vscode.CodeActionKind.QuickFix)
-					fixAction.command = {
-						command: "cline.fixWithCline",
-						title: "Fix with Cline",
-						arguments: [expandedRange, context.diagnostics],
-					}
-
-					// Only show actions when there are errors
-					if (context.diagnostics.length > 0) {
-						return [addAction, fixAction]
-					} else {
-						return []
-					}
-				}
-			})(),
-			{
-				providedCodeActionKinds: [vscode.CodeActionKind.QuickFix],
-			},
-		),
-	)
-
-	// Register the command handler
-	context.subscriptions.push(
-		vscode.commands.registerCommand("cline.fixWithCline", async (range: vscode.Range, diagnostics: any[]) => {
-			const editor = vscode.window.activeTextEditor
-			if (!editor) {
-				return
-			}
-
-			const selectedText = editor.document.getText(range)
-			const filePath = editor.document.uri.fsPath
-			const languageId = editor.document.languageId
-
-			// Send to sidebar provider with diagnostics
-			await sidebarProvider.fixWithCline(selectedText, filePath, languageId, diagnostics)
-		}),
-	)
-
 	return createClineAPI(outputChannel, sidebarProvider)
 }
 

src/global-constants.ts

@@ -1,8 +0,0 @@
-// NOTE: These are here temporarily until we find a better home for them
-export const GlobalFileNames = {
-	apiConversationHistory: "api_conversation_history.json",
-	uiMessages: "ui_messages.json",
-	openRouterModels: "openrouter_models.json",
-	mcpSettings: "cline_mcp_settings.json",
-	clineRules: ".clinerules",
-}

src/integrations/checkpoints/CheckpointTracker.ts

@@ -164,7 +164,6 @@ class CheckpointTracker {
 			console.info(`Creating checkpoint commit with message: ${commitMessage}`)
 			const result = await git.commit(commitMessage, {
 				"--allow-empty": null,
-				"--no-verify": null,
 			})
 			const commitHash = result.commit || ""
 			console.warn(`Checkpoint commit created.`)

src/integrations/editor/DiffViewProvider.ts

@@ -158,6 +158,7 @@ export class DiffViewProvider {
 			await updatedDocument.save()
 		}
 
+		// await delay(100)
 		// get text after save in case there is any auto-formatting done by the editor
 		const postSaveContent = updatedDocument.getText()
 

src/integrations/misc/link-preview.ts

@@ -63,6 +63,7 @@ export async function fetchOpenGraphData(url: string): Promise<OpenGraphData> {
 			type: data.ogType,
 		}
 	} catch (error) {
+		console.error(`Error fetching Open Graph data for ${url}:`, error)
 		// Return basic information based on the URL
 		try {
 			const urlObj = new URL(url)
@@ -99,7 +100,8 @@ export async function isImageUrl(url: string): Promise<boolean> {
 		const contentType = response.headers["content-type"]
 		return contentType && contentType.startsWith("image/")
 	} catch (error) {
+		console.error(`Error checking if URL is an image: ${url}`, error)
 		// If we can't determine, fall back to checking the file extension
-		return /\.(jpg|jpeg|png|gif|webp|bmp|svg|tiff|tif|avif)$/i.test(url)
+		return /\.(jpg|jpeg|png|gif|webp|svg)$/i.test(url)
 	}
 }

src/services/account/ClineAccountService.ts

@@ -1,118 +0,0 @@
-import axios, { AxiosRequestConfig, AxiosResponse } from "axios"
-import { ClineProvider } from "../../core/webview/ClineProvider"
-import type { BalanceResponse, PaymentTransaction, UsageTransaction } from "../../shared/ClineAccount"
-
-export class ClineAccountService {
-	private readonly baseUrl = "https://api.cline.bot/v1"
-	private providerRef: WeakRef<ClineProvider>
-
-	constructor(provider: ClineProvider) {
-		this.providerRef = new WeakRef(provider)
-	}
-
-	/**
-	 * Get the user's Cline Account key from the apiConfiguration
-	 */
-	private async getClineApiKey(): Promise<string | undefined> {
-		const provider = this.providerRef.deref()
-		if (!provider) {
-			return undefined
-		}
-
-		const { apiConfiguration } = await provider.getStateToPostToWebview()
-		return apiConfiguration?.clineApiKey
-	}
-
-	/**
-	 * Helper function to make authenticated requests to the Cline API
-	 * @param endpoint The API endpoint to call (without the base URL)
-	 * @param config Additional axios request configuration
-	 * @returns The API response data
-	 * @throws Error if the API key is not found or the request fails
-	 */
-	private async authenticatedRequest<T>(endpoint: string, config: AxiosRequestConfig = {}): Promise<T> {
-		const clineApiKey = await this.getClineApiKey()
-
-		if (!clineApiKey) {
-			throw new Error("Cline API key not found")
-		}
-
-		const url = `${this.baseUrl}${endpoint}`
-		const requestConfig: AxiosRequestConfig = {
-			...config,
-			headers: {
-				Authorization: `Bearer ${clineApiKey}`,
-				"Content-Type": "application/json",
-				...config.headers,
-			},
-		}
-
-		const response: AxiosResponse<T> = await axios.get(url, requestConfig)
-
-		if (!response.data) {
-			throw new Error(`Invalid response from ${endpoint} API`)
-		}
-
-		return response.data
-	}
-
-	/**
-	 * Fetches the user's current credit balance
-	 */
-	async fetchBalance(): Promise<BalanceResponse | undefined> {
-		try {
-			const data = await this.authenticatedRequest<BalanceResponse>("/user/credits/balance")
-
-			// Post to webview
-			await this.providerRef.deref()?.postMessageToWebview({
-				type: "userCreditsBalance",
-				userCreditsBalance: data,
-			})
-
-			return data
-		} catch (error) {
-			console.error("Failed to fetch balance:", error)
-			return undefined
-		}
-	}
-
-	/**
-	 * Fetches the user's usage transactions
-	 */
-	async fetchUsageTransactions(): Promise<UsageTransaction[] | undefined> {
-		try {
-			const data = await this.authenticatedRequest<UsageTransaction[]>("/user/credits/usage")
-
-			// Post to webview
-			await this.providerRef.deref()?.postMessageToWebview({
-				type: "userCreditsUsage",
-				userCreditsUsage: data,
-			})
-
-			return data
-		} catch (error) {
-			console.error("Failed to fetch usage transactions:", error)
-			return undefined
-		}
-	}
-
-	/**
-	 * Fetches the user's payment transactions
-	 */
-	async fetchPaymentTransactions(): Promise<PaymentTransaction[] | undefined> {
-		try {
-			const data = await this.authenticatedRequest<PaymentTransaction[]>("/user/credits/payments")
-
-			// Post to webview
-			await this.providerRef.deref()?.postMessageToWebview({
-				type: "userCreditsPayments",
-				userCreditsPayments: data,
-			})
-
-			return data
-		} catch (error) {
-			console.error("Failed to fetch payment transactions:", error)
-			return undefined
-		}
-	}
-}

src/services/browser/BrowserSession.ts

@@ -1,16 +1,14 @@
 import * as vscode from "vscode"
 import * as fs from "fs/promises"
 import * as path from "path"
-import { Browser, Page, ScreenshotOptions, TimeoutError, launch, connect } from "puppeteer-core"
+import { Browser, Page, ScreenshotOptions, TimeoutError, launch } from "puppeteer-core"
 // @ts-ignore
 import PCR from "puppeteer-chromium-resolver"
 import pWaitFor from "p-wait-for"
-import { setTimeout as setTimeoutPromise } from "node:timers/promises"
-import axios from "axios"
+import delay from "delay"
 import { fileExistsAtPath } from "../../utils/fs"
 import { BrowserActionResult } from "../../shared/ExtensionMessage"
 import { BrowserSettings } from "../../shared/BrowserSettings"
-import { discoverChromeInstances, testBrowserConnection } from "./browserDiscovery"
 // import * as chromeLauncher from "chrome-launcher"
 
 interface PCRStats {
@@ -18,15 +16,13 @@ interface PCRStats {
 	executablePath: string
 }
 
-const DEBUG_PORT = 9222 // Chrome's default debugging port
+// const DEBUG_PORT = 9222 // Chrome's default debugging port
 
 export class BrowserSession {
 	private context: vscode.ExtensionContext
 	private browser?: Browser
 	private page?: Page
 	private currentMousePosition?: string
-	private cachedWebSocketEndpoint?: string
-	private lastConnectionAttempt: number = 0
 	browserSettings: BrowserSettings
 
 	constructor(context: vscode.ExtensionContext, browserSettings: BrowserSettings) {
@@ -34,11 +30,6 @@ export class BrowserSession {
 		this.browserSettings = browserSettings
 	}
 
-	// Tests remote browser connection
-	async testConnection(host: string): Promise<{ success: boolean; message: string; endpoint?: string }> {
-		return testBrowserConnection(host)
-	}
-
 	private async ensureChromiumExists(): Promise<PCRStats> {
 		const globalStoragePath = this.context?.globalStorageUri?.fsPath
 		if (!globalStoragePath) {
@@ -64,6 +55,16 @@ export class BrowserSession {
 		return stats
 	}
 
+	// private async checkExistingChromeDebugger(): Promise<boolean> {
+	// 	try {
+	// 		// Try to connect to existing debugger
+	// 		const response = await fetch(`http://localhost:${DEBUG_PORT}/json/version`)
+	// 		return response.ok
+	// 	} catch {
+	// 		return false
+	// 	}
+	// }
+
 	// async relaunchChromeDebugMode() {
 	// 	const result = await vscode.window.showWarningMessage(
 	// 		"This will close your existing Chrome tabs and relaunch Chrome in debug mode. Are you sure?",
@@ -102,30 +103,29 @@ export class BrowserSession {
 	// 	return installation
 	// }
 
+	// /**
+	//  * Helper to detect user’s default Chrome data dir.
+	//  * Adjust for OS if needed.
+	//  */
+	// private getDefaultChromeUserDataDir(): string {
+	// 	const homedir = require("os").homedir()
+	// 	switch (process.platform) {
+	// 		case "win32":
+	// 			return path.join(homedir, "AppData", "Local", "Google", "Chrome", "User Data")
+	// 		case "darwin":
+	// 			return path.join(homedir, "Library", "Application Support", "Google", "Chrome")
+	// 		default:
+	// 			return path.join(homedir, ".config", "google-chrome")
+	// 	}
+	// }
+
 	async launchBrowser() {
+		console.log("launch browser called")
 		if (this.browser) {
+			// throw new Error("Browser already launched")
 			await this.closeBrowser() // this may happen when the model launches a browser again after having used it already before
 		}
 
-		if (this.browserSettings.remoteBrowserEnabled) {
-			console.log(`launch browser called -- remote host mode (headless: ${this.browserSettings.headless})`)
-			try {
-				await this.launchRemoteBrowser()
-				// Don't create a new page here, as we'll create it in launchRemoteBrowser
-				return
-			} catch (error) {
-				console.error("Failed to launch remote browser, falling back to local mode:", error)
-				await this.launchLocalBrowser()
-			}
-		} else {
-			console.log(`launch browser called -- local mode (headless: ${this.browserSettings.headless})`)
-			await this.launchLocalBrowser()
-		}
-
-		this.page = await this.browser?.newPage()
-	}
-
-	async launchLocalBrowser() {
 		const stats = await this.ensureChromiumExists()
 		this.browser = await stats.puppeteer.launch({
 			args: [
@@ -135,102 +135,34 @@ export class BrowserSession {
 			defaultViewport: this.browserSettings.viewport,
 			headless: this.browserSettings.headless,
 		})
-	}
 
-	async launchRemoteBrowser() {
-		let remoteBrowserHost = this.browserSettings.remoteBrowserHost
-		let browserWSEndpoint: string | undefined = this.cachedWebSocketEndpoint
-		let reconnectionAttempted = false
+		// if (this.browserSettings.chromeType === "system") {
+		// 	const userDataDir = this.getDefaultChromeUserDataDir()
+		// 	this.browser = await stats.puppeteer.launch({
+		// 		args: [`--user-data-dir=${userDataDir}`, "--profile-directory=Default"],
+		// 		executablePath: await this.getSystemChromeExecutablePath(),
+		// 		defaultViewport: this.browserSettings.viewport,
+		// 		headless: this.browserSettings.headless,
+		// 	})
+		// } else {
+		// 	this.browser = await stats.puppeteer.launch({
+		// 		args: [
+		// 			"--user-agent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36",
+		// 		],
+		// 		executablePath: stats.executablePath,
+		// 		defaultViewport: this.browserSettings.viewport,
+		// 		headless: this.browserSettings.headless,
+		// 	})
+		// }
 
-		const getViewport = () => {
-			const size = (this.context.globalState.get("browserViewportSize") as string | undefined) || "900x600"
-			const [width, height] = size.split("x").map(Number)
-			return { width, height }
-		}
-
-		// First try auto-discovery if no host is provided
-		if (!remoteBrowserHost) {
-			try {
-				console.log("No remote browser host provided, trying auto-discovery")
-				const discoveredHost = await discoverChromeInstances()
-
-				if (discoveredHost) {
-					console.log(`Auto-discovered Chrome at ${discoveredHost}`)
-					remoteBrowserHost = discoveredHost
-				}
-			} catch (error) {
-				console.log(`Auto-discovery failed: ${error}`)
-			}
-		}
-
-		// Try to connect with cached endpoint first if it exists and is recent (less than 1 hour old)
-		if (browserWSEndpoint && Date.now() - this.lastConnectionAttempt < 3600000) {
-			try {
-				console.log(`Attempting to connect using cached WebSocket endpoint: ${browserWSEndpoint}`)
-				this.browser = await connect({
-					browserWSEndpoint,
-					defaultViewport: getViewport(),
-				})
-				this.page = await this.browser?.newPage()
-				return
-			} catch (error) {
-				console.log(`Failed to connect using cached endpoint: ${error}`)
-				// Clear the cached endpoint since it's no longer valid
-				this.cachedWebSocketEndpoint = undefined
-				// User wants to give up after one reconnection attempt
-				if (remoteBrowserHost) {
-					reconnectionAttempted = true
-				}
-			}
-		}
-
-		// Try to connect with host (either user-provided or auto-discovered)
-		if (remoteBrowserHost) {
-			try {
-				// Fetch the WebSocket endpoint from the Chrome DevTools Protocol
-				const versionUrl = `${remoteBrowserHost.replace(/\/$/, "")}/json/version`
-				console.log(`Fetching WebSocket endpoint from ${versionUrl}`)
-
-				const response = await axios.get(versionUrl)
-				browserWSEndpoint = response.data.webSocketDebuggerUrl
-
-				if (!browserWSEndpoint) {
-					throw new Error("Could not find webSocketDebuggerUrl in the response")
-				}
-
-				console.log(`Found WebSocket browser endpoint: ${browserWSEndpoint}`)
-
-				// Cache the successful endpoint
-				this.cachedWebSocketEndpoint = browserWSEndpoint
-				this.lastConnectionAttempt = Date.now()
-
-				this.browser = await connect({
-					browserWSEndpoint,
-					defaultViewport: getViewport(),
-				})
-				this.page = await this.browser?.newPage()
-				return
-			} catch (error) {
-				console.log(`Failed to connect to remote browser: ${error}`)
-			}
-		}
-
-		// If we get here, all connection attempts failed
-		throw new Error(
-			"Failed to connect to remote browser. Make sure Chrome is running with remote debugging enabled (--remote-debugging-port=9222).",
-		)
+		// (latest version of puppeteer does not add headless to user agent)
+		this.page = await this.browser?.newPage()
 	}
 
 	async closeBrowser(): Promise<BrowserActionResult> {
 		if (this.browser || this.page) {
-			if (this.browserSettings.remoteBrowserEnabled && this.browser) {
-				await this.browser.disconnect().catch(() => {})
-				console.log("disconnected from remote browser...")
-			} else {
-				await this.browser?.close().catch(() => {})
-				console.log("closed local browser...")
-			}
-
+			console.log("closing browser...")
+			await this.browser?.close().catch(() => {})
 			this.browser = undefined
 			this.page = undefined
 			this.currentMousePosition = undefined
@@ -363,7 +295,7 @@ export class BrowserSession {
 			}
 
 			lastHTMLSize = currentHTMLSize
-			await setTimeoutPromise(checkDurationMsecs)
+			await delay(checkDurationMsecs)
 		}
 	}
 
@@ -382,7 +314,7 @@ export class BrowserSession {
 			this.currentMousePosition = coordinate
 
 			// Small delay to check if click triggered any network activity
-			await setTimeoutPromise(100)
+			await delay(100)
 
 			if (hasNetworkActivity) {
 				// If we detected network activity, wait for navigation/loading
@@ -414,7 +346,7 @@ export class BrowserSession {
 					behavior: "auto",
 				})
 			})
-			await setTimeoutPromise(300)
+			await delay(300)
 		})
 	}
 
@@ -426,7 +358,7 @@ export class BrowserSession {
 					behavior: "auto",
 				})
 			})
-			await setTimeoutPromise(300)
+			await delay(300)
 		})
 	}
 }

src/services/browser/browserDiscovery.ts

@@ -1,245 +0,0 @@
-import * as vscode from "vscode"
-import * as os from "os"
-import * as net from "net"
-import axios from "axios"
-
-/**
- * Check if a port is open on a given host
- */
-export async function isPortOpen(host: string, port: number, timeout = 1000): Promise<boolean> {
-	return new Promise((resolve) => {
-		const socket = new net.Socket()
-		let status = false
-
-		// Set timeout
-		socket.setTimeout(timeout)
-
-		// Handle successful connection
-		socket.on("connect", () => {
-			status = true
-			socket.destroy()
-		})
-
-		// Handle any errors
-		socket.on("error", () => {
-			socket.destroy()
-		})
-
-		// Handle timeout
-		socket.on("timeout", () => {
-			socket.destroy()
-		})
-
-		// Handle close
-		socket.on("close", () => {
-			resolve(status)
-		})
-
-		// Attempt to connect
-		socket.connect(port, host)
-	})
-}
-
-/**
- * Try to connect to Chrome at a specific IP address
- */
-export async function tryConnect(ipAddress: string): Promise<{ endpoint: string; ip: string } | null> {
-	try {
-		console.log(`Trying to connect to Chrome at: http://${ipAddress}:9222/json/version`)
-		const response = await axios.get(`http://${ipAddress}:9222/json/version`, { timeout: 1000 })
-		const data = response.data
-		return { endpoint: data.webSocketDebuggerUrl, ip: ipAddress }
-	} catch (error) {
-		return null
-	}
-}
-
-/**
- * Execute a shell command and return stdout and stderr
- */
-export async function executeShellCommand(command: string): Promise<{ stdout: string; stderr: string }> {
-	return new Promise<{ stdout: string; stderr: string }>((resolve) => {
-		const cp = require("child_process")
-		cp.exec(command, (err: any, stdout: string, stderr: string) => {
-			resolve({ stdout, stderr })
-		})
-	})
-}
-
-/**
- * Get Docker gateway IP
- */
-export async function getDockerGatewayIP(): Promise<string | null> {
-	try {
-		if (process.platform === "linux") {
-			try {
-				// this looks sketchy: command cross-platform availability -Andrei
-				const { stdout } = await executeShellCommand("ip route | grep default | awk '{print $3}'")
-				return stdout.trim()
-			} catch (error) {
-				console.log("Could not determine Docker gateway IP:", error)
-			}
-		}
-		return null
-	} catch (error) {
-		console.log("Could not determine Docker gateway IP:", error)
-		return null
-	}
-}
-
-/**
- * Get Docker host IP
- */
-export async function getDockerHostIP(): Promise<string | null> {
-	try {
-		// Try to resolve host.docker.internal (works on Docker Desktop)
-		return new Promise((resolve) => {
-			const dns = require("dns")
-			dns.lookup("host.docker.internal", (err: any, address: string) => {
-				if (err) {
-					resolve(null)
-				} else {
-					resolve(address)
-				}
-			})
-		})
-	} catch (error) {
-		console.log("Could not determine Docker host IP:", error)
-		return null
-	}
-}
-
-/**
- * Scan a network range for Chrome debugging port
- */
-export async function scanNetworkForChrome(baseIP: string): Promise<string | null> {
-	if (!baseIP || !baseIP.match(/^\d+\.\d+\.\d+\./)) {
-		return null
-	}
-
-	// Extract the network prefix (e.g., "192.168.65.")
-	const networkPrefix = baseIP.split(".").slice(0, 3).join(".") + "."
-
-	// Common Docker host IPs to try first
-	const priorityIPs = [
-		networkPrefix + "1", // Common gateway
-		networkPrefix + "2", // Common host
-		networkPrefix + "254", // Common host in some Docker setups
-	]
-
-	console.log(`Scanning priority IPs in network ${networkPrefix}*`)
-
-	// Check priority IPs first
-	for (const ip of priorityIPs) {
-		const isOpen = await isPortOpen(ip, 9222)
-		if (isOpen) {
-			console.log(`Found Chrome debugging port open on ${ip}`)
-			return ip
-		}
-	}
-
-	return null
-}
-
-/**
- * Discover Chrome instances on the network
- */
-export async function discoverChromeInstances(): Promise<string | null> {
-	// Get all network interfaces
-	const networkInterfaces = os.networkInterfaces()
-	const ipAddresses = []
-
-	// Always try localhost first
-	ipAddresses.push("localhost")
-	ipAddresses.push("127.0.0.1")
-
-	// Try to get Docker gateway IP
-	const gatewayIP = await getDockerGatewayIP()
-	if (gatewayIP) {
-		console.log("Found Docker gateway IP:", gatewayIP)
-		ipAddresses.push(gatewayIP)
-	}
-
-	// Try to get Docker host IP
-	const hostIP = await getDockerHostIP()
-	if (hostIP) {
-		console.log("Found Docker host IP:", hostIP)
-		ipAddresses.push(hostIP)
-	}
-
-	// Add all local IP addresses from network interfaces
-	const localIPs: string[] = []
-	Object.values(networkInterfaces).forEach((interfaces) => {
-		if (!interfaces) return
-		interfaces.forEach((iface) => {
-			// Only consider IPv4 addresses
-			if (iface.family === "IPv4" || iface.family === (4 as any)) {
-				localIPs.push(iface.address)
-			}
-		})
-	})
-
-	// Add local IPs to the list
-	ipAddresses.push(...localIPs)
-
-	// Scan network for Chrome debugging port
-	for (const ip of localIPs) {
-		const chromeIP = await scanNetworkForChrome(ip)
-		if (chromeIP && !ipAddresses.includes(chromeIP)) {
-			console.log("Found potential Chrome host via network scan:", chromeIP)
-			ipAddresses.push(chromeIP)
-		}
-	}
-
-	// Remove duplicates
-	const uniqueIPs = [...new Set(ipAddresses)]
-	console.log("IP Addresses to try:", uniqueIPs)
-
-	// Try connecting to each IP address
-	for (const ip of uniqueIPs) {
-		const connection = await tryConnect(ip)
-		if (connection) {
-			console.log(`Successfully connected to Chrome at: ${connection.ip}`)
-			// Store the successful IP for future use
-			console.log(`✅ Found Chrome at ${connection.ip} - You can hardcode this IP if needed`)
-
-			// Return the host URL and endpoint
-			return `http://${connection.ip}:9222`
-		}
-	}
-
-	return null
-}
-
-/**
- * Test connection to a remote browser
- */
-export async function testBrowserConnection(host: string): Promise<{ success: boolean; message: string; endpoint?: string }> {
-	try {
-		// Fetch the WebSocket endpoint from the Chrome DevTools Protocol
-		const versionUrl = `${host.replace(/\/$/, "")}/json/version`
-		console.log(`Testing connection to ${versionUrl}`)
-
-		const response = await axios.get(versionUrl, { timeout: 3000 })
-		const browserWSEndpoint = response.data.webSocketDebuggerUrl
-
-		if (!browserWSEndpoint) {
-			return {
-				success: false,
-				message: "Could not find webSocketDebuggerUrl in the response",
-			}
-		}
-
-		return {
-			success: true,
-			message: "Successfully connected to Chrome browser",
-			endpoint: browserWSEndpoint,
-		}
-	} catch (error) {
-		console.error(`Failed to connect to remote browser: ${error}`)
-		return {
-			success: false,
-			message: `Failed to connect: ${error instanceof Error ? error.message : String(error)}`,
-		}
-	}
-}

src/services/glob/list-files.ts

@@ -4,7 +4,6 @@ import * as path from "path"
 import { arePathsEqual } from "../../utils/path"
 
 export async function listFiles(dirPath: string, recursive: boolean, limit: number): Promise<[string[], boolean]> {
-	// First resolve the path normally - path.resolve doesn't care about glob special characters
 	const absolutePath = path.resolve(dirPath)
 	// Do not allow listing files in root or home directory, which cline tends to want to do when the user's prompt is vague.
 	const root = process.platform === "win32" ? path.parse(absolutePath).root : "/"
@@ -49,7 +48,6 @@ export async function listFiles(dirPath: string, recursive: boolean, limit: numb
 	}
 
 	// * globs all files in one dir, ** globs files in nested directories
-	// For non-recursive listing, we still use a simple pattern
 	const filePaths = recursive ? await globbyLevelByLevel(limit, options) : (await globby("*", options)).slice(0, limit)
 
 	return [filePaths, filePaths.length >= limit]
@@ -82,11 +80,7 @@ async function globbyLevelByLevel(limit: number, options?: Options) {
 				}
 				results.add(file)
 				if (file.endsWith("/")) {
-					// Escape parentheses in the path to prevent glob pattern interpretation
-					// This is crucial for NextJS folder naming conventions which use parentheses like (auth), (dashboard)
-					// Without escaping, glob treats parentheses as special pattern grouping characters
-					const escapedFile = file.replace(/\(/g, "\\(").replace(/\)/g, "\\)")
-					queue.push(`${escapedFile}*`)
+					queue.push(`${file}*`)
 				}
 			}
 		}

src/services/mcp/McpHub.ts

@@ -8,13 +8,13 @@ import {
 	ReadResourceResultSchema,
 } from "@modelcontextprotocol/sdk/types.js"
 import chokidar, { FSWatcher } from "chokidar"
-import { setTimeout as setTimeoutPromise } from "node:timers/promises"
+import delay from "delay"
 import deepEqual from "fast-deep-equal"
 import * as fs from "fs/promises"
 import * as path from "path"
 import * as vscode from "vscode"
 import { z } from "zod"
-import { ClineProvider } from "../../core/webview/ClineProvider"
+import { ClineProvider, GlobalFileNames } from "../../core/webview/ClineProvider"
 import {
 	DEFAULT_MCP_TIMEOUT_SECONDS,
 	McpMode,
@@ -29,7 +29,6 @@ import {
 import { fileExistsAtPath } from "../../utils/fs"
 import { arePathsEqual } from "../../utils/path"
 import { secondsToMs } from "../../utils/time"
-import { GlobalFileNames } from "../../global-constants"
 export type McpConnection = {
 	server: McpServer
 	client: Client
@@ -415,7 +414,7 @@ export class McpHub {
 			connection.server.status = "connecting"
 			connection.server.error = ""
 			await this.notifyWebviewOfServerChanges()
-			await setTimeoutPromise(500) // artificial delay to show user that server is restarting
+			await delay(500) // artificial delay to show user that server is restarting
 			try {
 				await this.deleteConnection(serverName)
 				// Try to connect again using existing config

src/services/telemetry/ConversationTelemetryService.ts

@@ -1,312 +0,0 @@
-import { context, SpanKind, trace } from "@opentelemetry/api"
-import { OTLPTraceExporter } from "@opentelemetry/exporter-trace-otlp-http"
-import { Resource } from "@opentelemetry/resources"
-import { SimpleSpanProcessor } from "@opentelemetry/sdk-trace-base"
-import { NodeTracerProvider } from "@opentelemetry/sdk-trace-node"
-import { ATTR_SERVICE_NAME, ATTR_SERVICE_VERSION } from "@opentelemetry/semantic-conventions"
-import { Anthropic } from "@anthropic-ai/sdk"
-import * as vscode from "vscode"
-import { ClineProvider } from "../../core/webview/ClineProvider"
-
-export type TelemetryChatMessage = {
-	role: "user" | "assistant" | "system"
-	ts: number
-	content: Anthropic.Messages.MessageParam["content"]
-}
-
-interface ConversationMetadata {
-	apiProvider?: string
-	model?: string
-	tokensIn: number
-	tokensOut: number
-}
-
-const { IS_DEV } = process.env
-
-/**
-Cline Telemetry (currently only available in DEV builds)
-
-Advanced Setting to opt-in to LLM observability, allowing you to share message data, code, and more extensive telemetry to help improve prompts used in Cline, train our models, and understand failure states more accurately.
-
-"cline.conversationTelemetry": {
-	"type": "boolean",
-	"default": false,
-	"markdownDescription": "Share message data, code, and more extensive telemetry. This data may be used to improve prompts used in Cline, train models, and understand failure states more accurately. [Learn more](https://docs.cline.bot/more-info/llm-observability)"
-}
- */
-
-export class ConversationTelemetryService {
-	private providerRef: WeakRef<ClineProvider>
-	private distinctId: string = vscode.env.machineId
-	private apiEndpoint: string = "https://api.cline.bot/v1/traces"
-	private tracerProvider: NodeTracerProvider | undefined
-	private tracer: any
-	private messageIndices: Map<string, number> = new Map()
-
-	constructor(provider: ClineProvider) {
-		this.providerRef = new WeakRef(provider)
-	}
-
-	private async getClineApiKey(): Promise<string | undefined> {
-		const provider = this.providerRef.deref()
-		if (!provider) {
-			return undefined
-		}
-		const { apiConfiguration } = await provider.getStateToPostToWebview()
-		return apiConfiguration?.clineApiKey
-	}
-
-	public isOptedInToConversationTelemetry(): boolean {
-		// First check global telemetry level - telemetry should only be enabled when level is "all"
-		const telemetryLevel = vscode.workspace.getConfiguration("telemetry").get<string>("telemetryLevel", "all")
-		const isGlobalTelemetryEnabled = telemetryLevel === "all"
-
-		// User has to manually opt in to conversation telemetry in Advanced Settings
-		const isConversationTelemetryEnabled =
-			vscode.workspace.getConfiguration("cline").get<boolean>("conversationTelemetry") ?? false
-
-		// Currently only enabled in dev environment
-		const isDevEnvironment = !!IS_DEV
-
-		return isDevEnvironment && isGlobalTelemetryEnabled && isConversationTelemetryEnabled
-	}
-
-	private async initializeTracer() {
-		try {
-			// Create a resource that identifies our service
-			const resource = new Resource({
-				[ATTR_SERVICE_NAME]: "cline-extension",
-				[ATTR_SERVICE_VERSION]: "1.0.0",
-			})
-
-			const clineApiKey = await this.getClineApiKey()
-
-			console.log("[ConversationTelemetry] Initializing OpenTelemetry tracer...")
-
-			// Configure the OTLP exporter
-			const headers: Record<string, string> = {
-				"Content-Type": "application/json",
-			}
-
-			// Add API key to headers if available
-			if (clineApiKey) {
-				headers["Authorization"] = `Bearer ${clineApiKey}`
-			}
-
-			const exporter = new OTLPTraceExporter({
-				url: this.apiEndpoint,
-				headers,
-			})
-
-			// Create the span processor
-			const spanProcessor = new SimpleSpanProcessor(exporter as any)
-
-			// Create the trace provider with the span processor in the config
-			this.tracerProvider = new NodeTracerProvider({
-				resource,
-				spanProcessors: [spanProcessor as any],
-			})
-
-			// Register the provider
-			this.tracerProvider.register()
-
-			// Get a tracer
-			this.tracer = trace.getTracer("cline-conversation-tracer")
-
-			console.log("[ConversationTelemetry] OpenTelemetry tracer initialized successfully")
-		} catch (error) {
-			console.error("[ConversationTelemetry] Failed to initialize OpenTelemetry tracer:", error)
-		}
-	}
-
-	/**
-	 * Captures a message in the conversation as an OpenTelemetry span
-	 * ONLY HAPPENS IF USER IS OPTED INTO CONVERSATION TELEMETRY IN ADVANCED SETTINGS
-	 */
-	public async captureMessage(taskId: string, message: TelemetryChatMessage, metadata: ConversationMetadata) {
-		// Do NOT capture message if user has not explicitly opted in
-		if (!this.isOptedInToConversationTelemetry()) {
-			return
-		}
-
-		if (!this.tracer) {
-			await this.initializeTracer()
-		}
-
-		try {
-			// Convert taskId to a valid trace ID (must be 32 hex chars)
-			const traceId = this.generateTraceIdFromTimestamp(taskId)
-
-			// Convert message timestamp to a valid span ID (must be 16 hex chars)
-			if (!message.ts && message.ts !== 0) {
-				throw new Error("Message timestamp is required")
-			}
-
-			const timestamp = message.ts
-			const spanId = this.generateSpanIdFromTimestamp(timestamp)
-
-			// Create a span context with our IDs
-			const spanContext = trace.setSpanContext(context.active(), {
-				traceId,
-				spanId,
-				isRemote: false,
-				traceFlags: 1, // Sampled
-			})
-
-			// Start a new span with the context
-			const span = this.tracer.startSpan(
-				`message.${message.role}`,
-				{
-					kind: SpanKind.CLIENT,
-					startTime: this.millisecondsToHrTime(timestamp), // Convert to nanoseconds
-				},
-				spanContext,
-			)
-
-			// Get the message index for this task
-			const messageIndex = this.getNextMessageIndex(taskId)
-
-			// Add attributes to the span
-			span.setAttribute("task.id", taskId)
-			span.setAttribute("user.id", this.distinctId)
-			span.setAttribute("message.role", message.role)
-			span.setAttribute("message.timestamp", timestamp)
-			span.setAttribute("message.index", messageIndex)
-
-			const c = message.content
-
-			// Add Braintrust-compatible attributes
-			span.setAttribute("gen_ai.request.model", metadata.model)
-
-			if (message.role === "user") {
-				span.setAttribute("gen_ai.prompt", this.extractContent(message))
-			} else if (message.role === "assistant") {
-				span.setAttribute("gen_ai.completion", this.extractContent(message))
-				span.setAttribute("gen_ai.usage.prompt_tokens", metadata.tokensIn)
-				span.setAttribute("gen_ai.usage.completion_tokens", metadata.tokensOut)
-			} else if (message.role === "system") {
-				span.setAttribute("gen_ai.system_prompt", this.extractContent(message))
-			}
-
-			// Add custom metadata in Braintrust format
-			span.setAttribute("braintrust.metadata.api_provider", metadata.apiProvider)
-			span.setAttribute("braintrust.metadata.ts", message.ts)
-
-			// End the span immediately since messages are discrete events
-			span.end(this.millisecondsToHrTime(timestamp)) // Convert to nanoseconds
-
-			console.log(`[ConversationTelemetry] Captured ${message.role} message for task ${taskId}`, { span })
-		} catch (error) {
-			console.error("[ConversationTelemetry] Error capturing message:", error)
-		}
-	}
-
-	/**
-	 * Convert a decimal timestamp to a valid trace ID (32 hex chars)
-	 */
-	private generateTraceIdFromTimestamp(timestamp: string): string {
-		// Pad with zeros and convert to hex
-		const hex = BigInt(timestamp).toString(16).padStart(32, "0")
-		return hex.substring(0, 32) // Ensure it's exactly 32 chars
-	}
-
-	/**
-	 * Converts milliseconds to high-resolution time format expected by OpenTelemetry
-	 * Returns [seconds, nanoseconds]
-	 */
-	private millisecondsToHrTime(milliseconds: number): [number, number] {
-		return [
-			Math.floor(milliseconds / 1000), // seconds
-			(milliseconds % 1000) * 1000000, // nanoseconds (remainder in ms * 10^6)
-		]
-	}
-
-	/**
-	 * Convert a decimal timestamp to a valid span ID (16 hex chars)
-	 */
-	private generateSpanIdFromTimestamp(timestamp: number): string {
-		// Pad with zeros and convert to hex
-		const hex = BigInt(timestamp).toString(16).padStart(16, "0")
-		return hex.substring(0, 16) // Ensure it's exactly 16 chars
-	}
-
-	/**
-	 * Helper to extract content from different message formats
-	 */
-	private extractContent(message: TelemetryChatMessage): string {
-		if (typeof message.content === "string") {
-			return message.content
-		}
-
-		return message.content
-			.map((block) => (block.type === "text" ? block.text : null))
-			.filter(Boolean)
-			.join("\n")
-	}
-
-	/**
-	 * Track message indices per task
-	 */
-	private getNextMessageIndex(taskId: string): number {
-		const currentIndex = this.messageIndices.get(taskId) || 0
-		this.messageIndices.set(taskId, currentIndex + 1)
-		return currentIndex
-	}
-
-	/**
-	 * Sends conversation data to cleanup endpoint to remove deleted messages from telemetry
-	 * ONLY HAPPENS IF USER IS OPTED INTO CONVERSATION TELEMETRY IN ADVANCED SETTINGS
-	 */
-	public async cleanupTask(taskId: string, conversationData: any): Promise<void> {
-		// Do NOT send data if user has not explicitly opted in
-		if (!this.isOptedInToConversationTelemetry()) {
-			return
-		}
-
-		const clineApiKey = await this.getClineApiKey()
-		if (!clineApiKey) {
-			return
-		}
-
-		try {
-			// Configure the headers with API key
-			const headers: Record<string, string> = {
-				"Content-Type": "application/json",
-			}
-
-			// Add API key to headers
-			headers["Authorization"] = `Bearer ${clineApiKey}`
-
-			// Send the data to the cleanup endpoint
-			const cleanupEndpoint = `${this.apiEndpoint.replace("/traces", "/traces/cleanup")}`
-
-			// Use fetch API to send the data
-			const response = await fetch(cleanupEndpoint, {
-				method: "POST",
-				headers,
-				body: JSON.stringify({
-					taskId: taskId,
-					conversationData,
-					userId: this.distinctId,
-				}),
-			})
-
-			if (!response.ok) {
-				throw new Error(`Failed to send cleanup data: ${response.status} ${response.statusText}`)
-			}
-
-			console.log(`[ConversationTelemetry] Cleanup data sent for task ${taskId}`)
-		} catch (error) {
-			console.error("[ConversationTelemetry] Error sending cleanup data:", error)
-		}
-	}
-
-	/**
-	 * Shutdown the tracer provider
-	 */
-	public async shutdown(): Promise<void> {
-		if (this.tracerProvider) {
-			await this.tracerProvider.shutdown()
-		}
-	}
-}

src/shared/BrowserSettings.ts

@@ -8,8 +8,6 @@ export interface BrowserSettings {
 	headless: boolean
 	// Chrome installation to use
 	// chromeType: "chromium" | "system"
-	remoteBrowserHost?: string
-	remoteBrowserEnabled?: boolean
 }
 
 export const DEFAULT_BROWSER_SETTINGS: BrowserSettings = {
@@ -18,8 +16,6 @@ export const DEFAULT_BROWSER_SETTINGS: BrowserSettings = {
 		height: 600,
 	},
 	headless: true,
-	remoteBrowserEnabled: false,
-	remoteBrowserHost: undefined,
 	// chromeType: "chromium",
 }
 

src/shared/ClineAccount.ts

@@ -1,18 +0,0 @@
-export interface BalanceResponse {
-	currentBalance: number
-}
-
-export interface UsageTransaction {
-	spentAt: string
-	credits: string
-	modelProvider: string
-	model: string
-	promptTokens: string
-	completionTokens: string
-}
-
-export interface PaymentTransaction {
-	paidAt: string
-	amountCents: string
-	credits: string
-}

src/shared/ExtensionMessage.ts

@@ -8,7 +8,6 @@ import { ChatSettings } from "./ChatSettings"
 import { HistoryItem } from "./HistoryItem"
 import { McpServer, McpMarketplaceCatalog, McpMarketplaceItem, McpDownloadResponse } from "./mcp"
 import { TelemetrySetting } from "./TelemetrySetting"
-import type { BalanceResponse, UsageTransaction, PaymentTransaction } from "../shared/ClineAccount"
 
 // webview will hold state
 export interface ExtensionMessage {
@@ -35,13 +34,6 @@ export interface ExtensionMessage {
 		| "openGraphData"
 		| "isImageUrlResult"
 		| "didUpdateSettings"
-		| "userCreditsBalance"
-		| "userCreditsUsage"
-		| "userCreditsPayments"
-		| "totalTasksSize"
-		| "addToInput"
-		| "browserConnectionResult"
-		| "scrollToSettings"
 	text?: string
 	action?:
 		| "chatButtonClicked"
@@ -51,7 +43,6 @@ export interface ExtensionMessage {
 		| "didBecomeVisible"
 		| "accountLoginClicked"
 		| "accountLogoutClicked"
-		| "accountButtonClicked"
 	invoke?: Invoke
 	state?: ExtensionState
 	images?: string[]
@@ -78,12 +69,6 @@ export interface ExtensionMessage {
 	}
 	url?: string
 	isImage?: boolean
-	userCreditsBalance?: BalanceResponse
-	userCreditsUsage?: UsageTransaction[]
-	userCreditsPayments?: PaymentTransaction[]
-	totalTasksSize?: number | null
-	success?: boolean
-	values?: Record<string, any>
 }
 
 export type Invoke = "sendMessage" | "primaryButtonClick" | "secondaryButtonClick"
@@ -93,28 +78,27 @@ export type Platform = "aix" | "darwin" | "freebsd" | "linux" | "openbsd" | "sun
 export const DEFAULT_PLATFORM = "unknown"
 
 export interface ExtensionState {
+	version: string
 	apiConfiguration?: ApiConfiguration
-	autoApprovalSettings: AutoApprovalSettings
-	browserSettings: BrowserSettings
-	remoteBrowserHost?: string
-	chatSettings: ChatSettings
+	customInstructions?: string
+	uriScheme?: string
+	currentTaskItem?: HistoryItem
 	checkpointTrackerErrorMessage?: string
 	clineMessages: ClineMessage[]
-	currentTaskItem?: HistoryItem
-	customInstructions?: string
-	mcpMarketplaceEnabled?: boolean
-	planActSeparateModelsSetting: boolean
-	platform: Platform
-	shouldShowAnnouncement: boolean
 	taskHistory: HistoryItem[]
-	telemetrySetting: TelemetrySetting
-	uriScheme?: string
+	shouldShowAnnouncement: boolean
+	autoApprovalSettings: AutoApprovalSettings
+	browserSettings: BrowserSettings
+	chatSettings: ChatSettings
+	platform: Platform
 	userInfo?: {
 		displayName: string | null
 		email: string | null
 		photoURL: string | null
 	}
-	version: string
+	mcpMarketplaceEnabled?: boolean
+	telemetrySetting: TelemetrySetting
+	planActSeparateModelsSetting: boolean
 	vscMachineId: string
 }
 

src/shared/WebviewMessage.ts

@@ -34,11 +34,6 @@ export interface WebviewMessage {
 		| "deleteMcpServer"
 		| "autoApprovalSettings"
 		| "browserSettings"
-		| "remoteBrowserHost"
-		| "remoteBrowserEnabled"
-		| "discoverBrowser"
-		| "testBrowserConnection"
-		| "browserConnectionResult"
 		| "togglePlanActMode"
 		| "checkpointDiff"
 		| "checkpointRestore"
@@ -50,7 +45,6 @@ export interface WebviewMessage {
 		| "getLatestState"
 		| "accountLoginClicked"
 		| "accountLogoutClicked"
-		| "showAccountViewClicked"
 		| "authStateChanged"
 		| "authCallback"
 		| "fetchMcpMarketplace"
@@ -67,10 +61,7 @@ export interface WebviewMessage {
 		| "invoke"
 		| "updateSettings"
 		| "clearAllTaskHistory"
-		| "fetchUserCreditsData"
 		| "optionsResponse"
-		| "requestTotalTasksSize"
-		| "scrollToSettings"
 	// | "relaunchChromeDebugMode"
 	text?: string
 	disabled?: boolean

src/shared/api.ts

@@ -31,7 +31,6 @@ export interface ApiHandlerOptions {
 	openRouterApiKey?: string
 	openRouterModelId?: string
 	openRouterModelInfo?: ModelInfo
-	openRouterProviderSorting?: string
 	awsAccessKey?: string
 	awsSecretKey?: string
 	awsSessionToken?: string
@@ -159,33 +158,6 @@ export const anthropicModels = {
 export type BedrockModelId = keyof typeof bedrockModels
 export const bedrockDefaultModelId: BedrockModelId = "anthropic.claude-3-7-sonnet-20250219-v1:0"
 export const bedrockModels = {
-	"amazon.nova-pro-v1:0": {
-		maxTokens: 5000,
-		contextWindow: 300_000,
-		supportsImages: true,
-		supportsComputerUse: false,
-		supportsPromptCache: false,
-		inputPrice: 0.8,
-		outputPrice: 3.2,
-	},
-	"amazon.nova-lite-v1:0": {
-		maxTokens: 5000,
-		contextWindow: 300_000,
-		supportsImages: true,
-		supportsComputerUse: false,
-		supportsPromptCache: false,
-		inputPrice: 0.06,
-		outputPrice: 0.24,
-	},
-	"amazon.nova-micro-v1:0": {
-		maxTokens: 5000,
-		contextWindow: 128_000,
-		supportsImages: false,
-		supportsComputerUse: false,
-		supportsPromptCache: false,
-		inputPrice: 0.035,
-		outputPrice: 0.14,
-	},
 	"anthropic.claude-3-7-sonnet-20250219-v1:0": {
 		maxTokens: 8192,
 		contextWindow: 200_000,
@@ -605,19 +577,11 @@ export const openAiNativeModels = {
 		outputPrice: 0.6,
 		cacheReadsPrice: 0.075,
 	},
-	"chatgpt-4o-latest": {
-		maxTokens: 16_384,
-		contextWindow: 128_000,
-		supportsImages: true,
-		supportsPromptCache: false,
-		inputPrice: 5,
-		outputPrice: 15,
-	},
 	"gpt-4.5-preview": {
 		maxTokens: 16_384,
 		contextWindow: 128_000,
 		supportsImages: true,
-		supportsPromptCache: true,
+		supportsPromptCache: false,
 		inputPrice: 75,
 		outputPrice: 150,
 	},
@@ -1124,14 +1088,6 @@ export const mistralModels = {
 		inputPrice: 0.1,
 		outputPrice: 0.1,
 	},
-	"mistral-small-latest": {
-		maxTokens: 131_000,
-		contextWindow: 131_000,
-		supportsImages: true,
-		supportsPromptCache: false,
-		inputPrice: 0.1,
-		outputPrice: 0.3,
-	},
 	"mistral-small-2501": {
 		maxTokens: 32_000,
 		contextWindow: 32_000,
@@ -1399,12 +1355,4 @@ export const sambanovaModels = {
 		inputPrice: 0,
 		outputPrice: 0,
 	},
-	"QwQ-32B": {
-		maxTokens: 4096,
-		contextWindow: 16_000,
-		supportsImages: false,
-		supportsPromptCache: false,
-		inputPrice: 0.5,
-		outputPrice: 1.0,
-	},
 } as const satisfies Record<string, ModelInfo>

src/utils/storage.ts

@@ -1,21 +0,0 @@
-import path from "path"
-import getFolderSize from "get-folder-size"
-
-/**
- * Gets the total size of tasks and checkpoints directories
- * @param storagePath The base storage path (typically globalStorageUri.fsPath)
- * @returns The total size in bytes, or null if calculation fails
- */
-export async function getTotalTasksSize(storagePath: string): Promise<number | null> {
-	const tasksDir = path.join(storagePath, "tasks")
-	const checkpointsDir = path.join(storagePath, "checkpoints")
-
-	try {
-		const tasksSize = await getFolderSize.loose(tasksDir)
-		const checkpointsSize = await getFolderSize.loose(checkpointsDir)
-		return tasksSize + checkpointsSize
-	} catch (error) {
-		console.error("Failed to calculate total task size:", error)
-		return null
-	}
-}

webview-ui/package-lock.json

@@ -21,7 +21,6 @@
 				"posthog-js": "^1.224.0",
 				"pretty-bytes": "^6.1.1",
 				"react": "^18.3.1",
-				"react-countup": "^6.5.3",
 				"react-dom": "^18.3.1",
 				"react-remark": "^2.1.0",
 				"react-textarea-autosize": "^8.5.7",
@@ -50,7 +49,7 @@
 				"tailwindcss": "^4.0.12",
 				"typescript": "^5.7.3",
 				"typescript-eslint": "^8.18.2",
-				"vite": "^6.2.1",
+				"vite": "^6.1.1",
 				"vitest": "^3.0.5"
 			}
 		},
@@ -4178,12 +4177,6 @@
 				"layout-base": "^1.0.0"
 			}
 		},
-		"node_modules/countup.js": {
-			"version": "2.8.0",
-			"resolved": "https://registry.npmjs.org/countup.js/-/countup.js-2.8.0.tgz",
-			"integrity": "sha512-f7xEhX0awl4NOElHulrl4XRfKoNH3rB+qfNSZZyjSZhaAoUk6elvhH+MNxMmlmuUJ2/QNTWPSA7U4mNtIAKljQ==",
-			"license": "MIT"
-		},
 		"node_modules/cross-spawn": {
 			"version": "7.0.6",
 			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -7102,18 +7095,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/react-countup": {
-			"version": "6.5.3",
-			"resolved": "https://registry.npmjs.org/react-countup/-/react-countup-6.5.3.tgz",
-			"integrity": "sha512-udnqVQitxC7QWADSPDOxVWULkLvKUWrDapn5i53HE4DPRVgs+Y5rr4bo25qEl8jSh+0l2cToJgGMx+clxPM3+w==",
-			"license": "MIT",
-			"dependencies": {
-				"countup.js": "^2.8.0"
-			},
-			"peerDependencies": {
-				"react": ">= 16.3.0"
-			}
-		},
 		"node_modules/react-dom": {
 			"version": "18.3.1",
 			"resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
@@ -8378,9 +8359,9 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "6.2.1",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.1.tgz",
-			"integrity": "sha512-n2GnqDb6XPhlt9B8olZPrgMD/es/Nd1RdChF6CBD/fHW6pUyUTt2sQW2fPRX5GiD9XEa6+8A6A4f2vT6pSsE7Q==",
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-6.2.0.tgz",
+			"integrity": "sha512-7dPxoo+WsT/64rDcwoOjk76XHj+TqNTIvHKcuMQ1k4/SeHDaQt5GFAeLYzrimZrMpn/O6DtdI03WUjdxuPM0oQ==",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {

webview-ui/package.json

@@ -25,7 +25,6 @@
 		"posthog-js": "^1.224.0",
 		"pretty-bytes": "^6.1.1",
 		"react": "^18.3.1",
-		"react-countup": "^6.5.3",
 		"react-dom": "^18.3.1",
 		"react-remark": "^2.1.0",
 		"react-textarea-autosize": "^8.5.7",
@@ -54,7 +53,7 @@
 		"tailwindcss": "^4.0.12",
 		"typescript": "^5.7.3",
 		"typescript-eslint": "^8.18.2",
-		"vite": "^6.2.1",
+		"vite": "^6.1.1",
 		"vitest": "^3.0.5"
 	}
 }

webview-ui/src/App.tsx

@@ -42,7 +42,7 @@ const AppContent = () => {
 						setShowMcp(true)
 						setShowAccount(false)
 						break
-					case "accountButtonClicked":
+					case "accountLoginClicked":
 						setShowSettings(false)
 						setShowHistory(false)
 						setShowMcp(false)
@@ -96,7 +96,6 @@ const AppContent = () => {
 						showHistoryView={() => {
 							setShowSettings(false)
 							setShowMcp(false)
-							setShowAccount(false)
 							setShowHistory(true)
 						}}
 						isHidden={showSettings || showHistory || showMcp || showAccount}

webview-ui/src/assets/ClineLogoWhite.tsx

@@ -1,11 +0,0 @@
-import { SVGProps } from "react"
-
-const ClineLogoWhite = (props: SVGProps<SVGSVGElement>) => (
-	<svg xmlns="http://www.w3.org/2000/svg" width="47" height="50" viewBox="0 0 47 50" fill="none" {...props}>
-		<path
-			d="M46.4075 28.1192L43.5011 22.3166V18.9747C43.5011 13.4354 39.0302 8.94931 33.5162 8.94931H28.5491C28.9086 8.21513 29.106 7.3898 29.106 6.5189C29.106 3.44039 26.6149 0.949219 23.5363 0.949219C20.4578 0.949219 17.9667 3.44039 17.9667 6.5189C17.9667 7.3898 18.1641 8.21513 18.5236 8.94931H13.5565C8.04249 8.94931 3.57155 13.4354 3.57155 18.9747V22.3166L0.604424 28.104C0.305687 28.6863 0.305687 29.3799 0.604424 29.9622L3.57155 35.6838V39.0256C3.57155 44.5649 8.04249 49.0511 13.5565 49.0511H33.5162C39.0302 49.0511 43.5011 44.5649 43.5011 39.0256V35.6838L46.4024 29.942C46.691 29.3698 46.691 28.6964 46.4075 28.1192ZM20.4983 32.8483C20.4983 35.3648 18.4578 37.4053 15.9413 37.4053C13.4248 37.4053 11.3843 35.3648 11.3843 32.8483V24.747C11.3843 22.2305 13.4248 20.19 15.9413 20.19C18.4578 20.19 20.4983 22.2305 20.4983 24.747V32.8483ZM35.182 32.8483C35.182 35.3648 33.1415 37.4053 30.625 37.4053C28.1085 37.4053 26.068 35.3648 26.068 32.8483V24.747C26.068 22.2305 28.1085 20.19 30.625 20.19C33.1415 20.19 35.182 22.2305 35.182 24.747V32.8483Z"
-			fill="white"
-		/>
-	</svg>
-)
-export default ClineLogoWhite

webview-ui/src/components/account/AccountView.tsx

@@ -1,12 +1,8 @@
-import { VSCodeButton, VSCodeDivider, VSCodeLink } from "@vscode/webview-ui-toolkit/react"
-import { memo, useEffect, useState } from "react"
+import { VSCodeButton, VSCodeDivider } from "@vscode/webview-ui-toolkit/react"
+import { memo } from "react"
 import { useFirebaseAuth } from "../../context/FirebaseAuthContext"
 import { vscode } from "../../utils/vscode"
 import VSCodeButtonLink from "../common/VSCodeButtonLink"
-import ClineLogoWhite from "../../assets/ClineLogoWhite"
-import CountUp from "react-countup"
-import CreditsHistoryTable from "./CreditsHistoryTable"
-import { UsageTransaction, PaymentTransaction } from "../../../../src/shared/ClineAccount"
 
 type AccountViewProps = {
 	onDone: () => void
@@ -14,13 +10,38 @@ type AccountViewProps = {
 
 const AccountView = ({ onDone }: AccountViewProps) => {
 	return (
-		<div className="fixed inset-0 flex flex-col overflow-hidden pt-[10px] pl-[20px]">
-			<div className="flex justify-between items-center mb-[17px] pr-[17px]">
-				<h3 className="text-[var(--vscode-foreground)] m-0">Account</h3>
+		<div
+			style={{
+				position: "fixed",
+				top: 0,
+				left: 0,
+				right: 0,
+				bottom: 0,
+				padding: "10px 0px 0px 20px",
+				display: "flex",
+				flexDirection: "column",
+				overflow: "hidden",
+			}}>
+			<div
+				style={{
+					display: "flex",
+					justifyContent: "space-between",
+					alignItems: "center",
+					marginBottom: "17px",
+					paddingRight: 17,
+				}}>
+				<h3 style={{ color: "var(--vscode-foreground)", margin: 0 }}>Cline Account</h3>
 				<VSCodeButton onClick={onDone}>Done</VSCodeButton>
 			</div>
-			<div className="flex-grow overflow-hidden pr-[8px] flex flex-col">
-				<div className="h-full mb-[5px]">
+			<div
+				style={{
+					flexGrow: 1,
+					overflowY: "scroll",
+					paddingRight: 8,
+					display: "flex",
+					flexDirection: "column",
+				}}>
+				<div style={{ marginBottom: 5 }}>
 					<ClineAccountView />
 				</div>
 			</div>
@@ -30,37 +51,6 @@ const AccountView = ({ onDone }: AccountViewProps) => {
 
 export const ClineAccountView = () => {
 	const { user, handleSignOut } = useFirebaseAuth()
-	const [balance, setBalance] = useState(0)
-	const [isLoading, setIsLoading] = useState(true)
-	const [usageData, setUsageData] = useState<UsageTransaction[]>([])
-	const [paymentsData, setPaymentsData] = useState<PaymentTransaction[]>([])
-
-	// Listen for balance and transaction data updates from the extension
-	useEffect(() => {
-		const handleMessage = (event: MessageEvent) => {
-			const message = event.data
-			if (message.type === "userCreditsBalance" && message.userCreditsBalance) {
-				setBalance(message.userCreditsBalance.currentBalance)
-			} else if (message.type === "userCreditsUsage" && message.userCreditsUsage) {
-				setUsageData(message.userCreditsUsage.usageTransactions)
-			} else if (message.type === "userCreditsPayments" && message.userCreditsPayments) {
-				setPaymentsData(message.userCreditsPayments.paymentTransactions)
-			}
-			setIsLoading(false)
-		}
-
-		window.addEventListener("message", handleMessage)
-
-		// Fetch all account data when component mounts
-		if (user) {
-			setIsLoading(true)
-			vscode.postMessage({ type: "fetchUserCreditsData" })
-		}
-
-		return () => {
-			window.removeEventListener("message", handleMessage)
-		}
-	}, [user])
 
 	const handleLogin = () => {
 		vscode.postMessage({ type: "accountLoginClicked" })
@@ -73,96 +63,108 @@ export const ClineAccountView = () => {
 		handleSignOut()
 	}
 	return (
-		<div className="h-full flex flex-col">
+		<div style={{ maxWidth: "600px" }}>
 			{user ? (
-				<div className="flex flex-col pr-3 h-full">
-					<div className="flex flex-col w-full">
-						<div className="flex items-center mb-6 flex-wrap gap-y-4">
-							{user.photoURL ? (
-								<img src={user.photoURL} alt="Profile" className="size-16 rounded-full mr-4" />
-							) : (
-								<div className="size-16 rounded-full bg-[var(--vscode-button-background)] flex items-center justify-center text-2xl text-[var(--vscode-button-foreground)] mr-4">
-									{user.displayName?.[0] || user.email?.[0] || "?"}
+				<div
+					style={{
+						padding: "8px 10px",
+						border: "1px solid var(--vscode-input-border)",
+						borderRadius: "2px",
+						backgroundColor: "var(--vscode-dropdown-background)",
+					}}>
+					<div
+						style={{
+							display: "flex",
+							alignItems: "center",
+							gap: "8px",
+						}}>
+						{user.photoURL ? (
+							<img
+								src={user.photoURL}
+								alt="Profile"
+								style={{
+									width: 38,
+									height: 38,
+									borderRadius: "50%",
+								}}
+							/>
+						) : (
+							<div
+								style={{
+									width: 38,
+									height: 38,
+									borderRadius: "50%",
+									backgroundColor: "var(--vscode-button-background)",
+									display: "flex",
+									alignItems: "center",
+									justifyContent: "center",
+									fontSize: "20px",
+									color: "var(--vscode-button-foreground)",
+								}}>
+								{user.displayName?.[0] || user.email?.[0] || "?"}
+							</div>
+						)}
+						<div
+							style={{
+								display: "flex",
+								flexDirection: "column",
+								gap: "4px",
+							}}>
+							{user.displayName && (
+								<div
+									style={{
+										fontSize: "13px",
+										fontWeight: "bold",
+										color: "var(--vscode-foreground)",
+									}}>
+									{user.displayName}
 								</div>
 							)}
-
-							<div className="flex flex-col">
-								{user.displayName && (
-									<h2 className="text-[var(--vscode-foreground)] m-0 mb-1 text-lg font-medium">
-										{user.displayName}
-									</h2>
-								)}
-
-								{user.email && (
-									<div className="text-sm text-[var(--vscode-descriptionForeground)]">{user.email}</div>
-								)}
+							{user.email && (
+								<div
+									style={{
+										fontSize: "13px",
+										color: "var(--vscode-descriptionForeground)",
+									}}>
+									{user.email}
+								</div>
+							)}
+							<div style={{ display: "flex", gap: "8px", flexWrap: "wrap" }}>
+								<VSCodeButtonLink
+									href="https://app.cline.bot/credits"
+									appearance="primary"
+									style={{
+										transform: "scale(0.85)",
+										transformOrigin: "left center",
+										width: "fit-content",
+										marginTop: 2,
+										marginBottom: 0,
+										marginRight: -12,
+									}}>
+									Account
+								</VSCodeButtonLink>
+								<VSCodeButton
+									appearance="secondary"
+									onClick={handleLogout}
+									style={{
+										transform: "scale(0.85)",
+										transformOrigin: "left center",
+										width: "fit-content",
+										marginTop: 2,
+										marginBottom: 0,
+										marginRight: -12,
+									}}>
+									Log out
+								</VSCodeButton>
 							</div>
 						</div>
 					</div>
-
-					<div className="w-full flex gap-2 flex-col min-[225px]:flex-row">
-						<div className="w-full min-[225px]:w-1/2">
-							<VSCodeButtonLink href="https://app.cline.bot/credits" appearance="primary" className="w-full">
-								Dashboard
-							</VSCodeButtonLink>
-						</div>
-						<VSCodeButton appearance="secondary" onClick={handleLogout} className="w-full min-[225px]:w-1/2">
-							Log out
-						</VSCodeButton>
-					</div>
-
-					<VSCodeDivider className="w-full my-6" />
-
-					<div className="w-full flex flex-col items-center">
-						<div className="text-sm text-[var(--vscode-descriptionForeground)] mb-3">CURRENT BALANCE</div>
-
-						<div className="text-4xl font-bold text-[var(--vscode-foreground)] mb-6 flex items-center gap-2">
-							{isLoading ? (
-								<div className="text-[var(--vscode-descriptionForeground)]">Loading...</div>
-							) : (
-								<>
-									<span>$</span>
-									<CountUp end={balance} duration={0.66} decimals={2} />
-									<VSCodeButton
-										appearance="icon"
-										className="mt-1"
-										onClick={() => vscode.postMessage({ type: "fetchUserCreditsData" })}>
-										<span className="codicon codicon-refresh"></span>
-									</VSCodeButton>
-								</>
-							)}
-						</div>
-
-						<div className="w-full">
-							<VSCodeButtonLink href="https://app.cline.bot/credits/#buy" className="w-full">
-								Add Credits
-							</VSCodeButtonLink>
-						</div>
-					</div>
-
-					<VSCodeDivider className="mt-6 mb-3 w-full" />
-
-					<div className="flex-grow flex flex-col min-h-0 pb-[0px]">
-						<CreditsHistoryTable isLoading={isLoading} usageData={usageData} paymentsData={paymentsData} />
-					</div>
 				</div>
 			) : (
-				<div className="flex flex-col items-center pr-3 max-w-[400px]">
-					<ClineLogoWhite className="size-16 mb-4" />
-
-					<p style={{}}>
-						Sign up for an account to get access to the latest models, billing dashboard to view usage and credits,
-						and more upcoming features.
-					</p>
-
-					<VSCodeButton onClick={handleLogin} className="w-full mb-4">
-						Sign up with Cline
+				<div style={{}}>
+					<VSCodeButton onClick={handleLogin} style={{ marginTop: 0 }}>
+						Sign Up with Cline
 					</VSCodeButton>
-
-					<p className="text-[var(--vscode-descriptionForeground)] text-xs text-center m-0">
-						By continuing, you agree to the <VSCodeLink href="https://cline.bot/tos">Terms of Service</VSCodeLink> and{" "}
-						<VSCodeLink href="https://cline.bot/privacy">Privacy Policy.</VSCodeLink>
-					</p>
 				</div>
 			)}
 		</div>

webview-ui/src/components/account/CreditsHistoryTable.tsx

@@ -1,114 +0,0 @@
-import { VSCodeDataGrid, VSCodeDataGridRow, VSCodeDataGridCell } from "@vscode/webview-ui-toolkit/react"
-import { useState } from "react"
-import { TabButton } from "../mcp/McpView"
-import { UsageTransaction, PaymentTransaction } from "../../../../src/shared/ClineAccount"
-import { formatDollars, formatTimestamp } from "../../utils/format"
-
-interface CreditsHistoryTableProps {
-	isLoading: boolean
-	usageData: UsageTransaction[]
-	paymentsData: PaymentTransaction[]
-}
-
-const CreditsHistoryTable = ({ isLoading, usageData, paymentsData }: CreditsHistoryTableProps) => {
-	const [activeTab, setActiveTab] = useState<"usage" | "payments">("usage")
-
-	return (
-		<div className="flex flex-col flex-grow h-full">
-			{/* Tabs container */}
-			<div className="flex border-b border-[var(--vscode-panel-border)]">
-				<TabButton isActive={activeTab === "usage"} onClick={() => setActiveTab("usage")}>
-					USAGE HISTORY
-				</TabButton>
-				<TabButton isActive={activeTab === "payments"} onClick={() => setActiveTab("payments")}>
-					PAYMENTS HISTORY
-				</TabButton>
-			</div>
-
-			{/* Content container */}
-			<div className="mt-[15px] mb-[0px] rounded-md overflow-auto flex-grow">
-				{isLoading ? (
-					<div className="flex justify-center items-center p-4">
-						<div className="text-[var(--vscode-descriptionForeground)]">Loading...</div>
-					</div>
-				) : (
-					<>
-						{activeTab === "usage" && (
-							<>
-								{usageData.length > 0 ? (
-									<VSCodeDataGrid>
-										<VSCodeDataGridRow row-type="header">
-											<VSCodeDataGridCell cell-type="columnheader" grid-column="1">
-												Date
-											</VSCodeDataGridCell>
-											<VSCodeDataGridCell cell-type="columnheader" grid-column="2">
-												Model
-											</VSCodeDataGridCell>
-											{/* <VSCodeDataGridCell cell-type="columnheader" grid-column="3">
-												Tokens Used
-											</VSCodeDataGridCell> */}
-											<VSCodeDataGridCell cell-type="columnheader" grid-column="3">
-												Credits Used
-											</VSCodeDataGridCell>
-										</VSCodeDataGridRow>
-
-										{usageData.map((row, index) => (
-											<VSCodeDataGridRow key={index}>
-												<VSCodeDataGridCell grid-column="1">
-													{formatTimestamp(row.spentAt)}
-												</VSCodeDataGridCell>
-												<VSCodeDataGridCell grid-column="2">{`${row.modelProvider}/${row.model}`}</VSCodeDataGridCell>
-												{/* <VSCodeDataGridCell grid-column="3">{`${row.promptTokens} → ${row.completionTokens}`}</VSCodeDataGridCell> */}
-												<VSCodeDataGridCell grid-column="3">{`$${Number(row.credits).toFixed(7)}`}</VSCodeDataGridCell>
-											</VSCodeDataGridRow>
-										))}
-									</VSCodeDataGrid>
-								) : (
-									<div className="flex justify-center items-center p-4">
-										<div className="text-[var(--vscode-descriptionForeground)]">No usage history</div>
-									</div>
-								)}
-							</>
-						)}
-
-						{activeTab === "payments" && (
-							<>
-								{paymentsData.length > 0 ? (
-									<VSCodeDataGrid>
-										<VSCodeDataGridRow row-type="header">
-											<VSCodeDataGridCell cell-type="columnheader" grid-column="1">
-												Date
-											</VSCodeDataGridCell>
-											<VSCodeDataGridCell cell-type="columnheader" grid-column="2">
-												Total Cost
-											</VSCodeDataGridCell>
-											<VSCodeDataGridCell cell-type="columnheader" grid-column="3">
-												Credits
-											</VSCodeDataGridCell>
-										</VSCodeDataGridRow>
-
-										{paymentsData.map((row, index) => (
-											<VSCodeDataGridRow key={index}>
-												<VSCodeDataGridCell grid-column="1">
-													{formatTimestamp(row.paidAt)}
-												</VSCodeDataGridCell>
-												<VSCodeDataGridCell grid-column="2">{`$${formatDollars(parseInt(row.amountCents))}`}</VSCodeDataGridCell>
-												<VSCodeDataGridCell grid-column="3">{`${row.credits}`}</VSCodeDataGridCell>
-											</VSCodeDataGridRow>
-										))}
-									</VSCodeDataGrid>
-								) : (
-									<div className="flex justify-center items-center p-4">
-										<div className="text-[var(--vscode-descriptionForeground)]">No payment history</div>
-									</div>
-								)}
-							</>
-						)}
-					</>
-				)}
-			</div>
-		</div>
-	)
-}
-
-export default CreditsHistoryTable

webview-ui/src/components/browser/BrowserSettingsMenu.tsx

@@ -1,38 +1,235 @@
-import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
-import React, { useRef } from "react"
+import { VSCodeButton, VSCodeCheckbox, VSCodeDropdown, VSCodeOption } from "@vscode/webview-ui-toolkit/react"
+import React, { useRef, useState } from "react"
+import { useClickAway } from "react-use"
+import styled from "styled-components"
+import { BROWSER_VIEWPORT_PRESETS } from "../../../../src/shared/BrowserSettings"
 import { useExtensionState } from "../../context/ExtensionStateContext"
 import { vscode } from "../../utils/vscode"
+import { CODE_BLOCK_BG_COLOR } from "../common/CodeBlock"
 
 interface BrowserSettingsMenuProps {
+	disabled?: boolean
 	maxWidth?: number
 }
 
-export const BrowserSettingsMenu: React.FC<BrowserSettingsMenuProps> = ({ maxWidth }) => {
+export const BrowserSettingsMenu: React.FC<BrowserSettingsMenuProps> = ({ disabled = false, maxWidth }) => {
 	const { browserSettings } = useExtensionState()
+	const [showMenu, setShowMenu] = useState(false)
+	const [hasMouseEntered, setHasMouseEntered] = useState(false)
 	const containerRef = useRef<HTMLDivElement>(null)
+	const menuRef = useRef<HTMLDivElement>(null)
 
-	const openBrowserSettings = () => {
-		// First open the settings panel
-		vscode.postMessage({
-			type: "openSettings",
-		})
+	useClickAway(containerRef, () => {
+		if (showMenu) {
+			setShowMenu(false)
+			setHasMouseEntered(false)
+		}
+	})
 
-		// After a short delay, send a message to scroll to browser settings
-		setTimeout(() => {
-			vscode.postMessage({
-				type: "scrollToSettings",
-				text: "browser-settings-section",
-			})
-		}, 300) // Give the settings panel time to open
+	const handleMouseEnter = () => {
+		setHasMouseEntered(true)
 	}
 
+	const handleMouseLeave = () => {
+		if (hasMouseEntered) {
+			setShowMenu(false)
+			setHasMouseEntered(false)
+		}
+	}
+
+	const handleControlsMouseLeave = (e: React.MouseEvent) => {
+		const menuElement = menuRef.current
+
+		if (menuElement && showMenu) {
+			const menuRect = menuElement.getBoundingClientRect()
+
+			// If mouse is moving towards the menu, don't close it
+			if (
+				e.clientY >= menuRect.top &&
+				e.clientY <= menuRect.bottom &&
+				e.clientX >= menuRect.left &&
+				e.clientX <= menuRect.right
+			) {
+				return
+			}
+		}
+
+		setShowMenu(false)
+		setHasMouseEntered(false)
+	}
+
+	const handleViewportChange = (event: Event) => {
+		const target = event.target as HTMLSelectElement
+		const selectedSize = BROWSER_VIEWPORT_PRESETS[target.value as keyof typeof BROWSER_VIEWPORT_PRESETS]
+		if (selectedSize) {
+			vscode.postMessage({
+				type: "browserSettings",
+				browserSettings: {
+					...browserSettings,
+					viewport: selectedSize,
+				},
+			})
+		}
+	}
+
+	const updateHeadless = (headless: boolean) => {
+		vscode.postMessage({
+			type: "browserSettings",
+			browserSettings: {
+				...browserSettings,
+				headless,
+			},
+		})
+	}
+
+	// const updateChromeType = (chromeType: BrowserSettings["chromeType"]) => {
+	// 	vscode.postMessage({
+	// 		type: "browserSettings",
+	// 		browserSettings: {
+	// 			...browserSettings,
+	// 			chromeType,
+	// 		},
+	// 	})
+	// }
+
+	// const relaunchChromeDebugMode = () => {
+	// 	vscode.postMessage({
+	// 		type: "relaunchChromeDebugMode",
+	// 	})
+	// }
+
 	return (
-		<div ref={containerRef} style={{ position: "relative", marginTop: "-1px" }}>
-			<VSCodeButton appearance="icon" onClick={openBrowserSettings}>
+		<div ref={containerRef} style={{ position: "relative", marginTop: "-1px" }} onMouseLeave={handleControlsMouseLeave}>
+			<VSCodeButton appearance="icon" onClick={() => setShowMenu(!showMenu)} disabled={disabled}>
 				<i className="codicon codicon-settings-gear" style={{ fontSize: "14.5px" }} />
 			</VSCodeButton>
+			{showMenu && (
+				<SettingsMenu ref={menuRef} maxWidth={maxWidth} onMouseEnter={handleMouseEnter} onMouseLeave={handleMouseLeave}>
+					<SettingsGroup>
+						{/* <SettingsHeader>Headless Mode</SettingsHeader> */}
+						<VSCodeCheckbox
+							style={{ marginBottom: "8px", marginTop: -1 }}
+							checked={browserSettings.headless}
+							onChange={(e) => updateHeadless((e.target as HTMLInputElement).checked)}>
+							Run in headless mode
+						</VSCodeCheckbox>
+						<SettingsDescription>When enabled, Chrome will run in the background.</SettingsDescription>
+					</SettingsGroup>
+
+					{/* <SettingsGroup>
+						<SettingsHeader>Chrome Executable</SettingsHeader>
+						<VSCodeDropdown
+							style={{ width: "100%", marginBottom: "8px" }}
+							value={browserSettings.chromeType}
+							onChange={(e) =>
+								updateChromeType((e.target as HTMLSelectElement).value as BrowserSettings["chromeType"])
+							}>
+							<VSCodeOption value="chromium">Chromium (Auto-downloaded)</VSCodeOption>
+							<VSCodeOption value="system">System Chrome</VSCodeOption>
+						</VSCodeDropdown>
+						<SettingsDescription>
+							{browserSettings.chromeType === "system" ? (
+								<>
+									Cline will use your personal browser. You must{" "}
+									<VSCodeLink
+										href="#"
+										style={{ fontSize: "inherit" }}
+										onClick={(e: React.MouseEvent) => {
+											e.preventDefault()
+											relaunchChromeDebugMode()
+										}}>
+										relaunch Chrome in debug mode
+									</VSCodeLink>{" "}
+									to use this setting.
+								</>
+							) : (
+								"Cline will use a Chromium browser bundled with the extension."
+							)}
+						</SettingsDescription>
+					</SettingsGroup> */}
+
+					<SettingsGroup>
+						<SettingsHeader>Viewport Size</SettingsHeader>
+						<VSCodeDropdown
+							style={{ width: "100%" }}
+							value={
+								Object.entries(BROWSER_VIEWPORT_PRESETS).find(
+									([_, size]) =>
+										size.width === browserSettings.viewport.width &&
+										size.height === browserSettings.viewport.height,
+								)?.[0]
+							}
+							onChange={(event) => handleViewportChange(event as Event)}>
+							{Object.entries(BROWSER_VIEWPORT_PRESETS).map(([name]) => (
+								<VSCodeOption key={name} value={name}>
+									{name}
+								</VSCodeOption>
+							))}
+						</VSCodeDropdown>
+					</SettingsGroup>
+				</SettingsMenu>
+			)}
 		</div>
 	)
 }
 
+const SettingsMenu = styled.div<{ maxWidth?: number }>`
+	position: absolute;
+	top: calc(100% + 8px);
+	right: -2px;
+	background: ${CODE_BLOCK_BG_COLOR};
+	border: 1px solid var(--vscode-editorGroup-border);
+	padding: 8px;
+	border-radius: 3px;
+	z-index: 1000;
+	width: calc(100vw - 57px);
+	min-width: 0px;
+	max-width: ${(props) => (props.maxWidth ? `${props.maxWidth - 23}px` : "100vw")};
+
+	// Add invisible padding to create a safe hover zone
+	&::before {
+		content: "";
+		position: absolute;
+		top: -14px; // Same as margin-top in the parent's top property
+		left: 0;
+		right: -6px;
+		height: 14px;
+	}
+
+	&::after {
+		content: "";
+		position: absolute;
+		top: -6px;
+		right: 6px;
+		width: 10px;
+		height: 10px;
+		background: ${CODE_BLOCK_BG_COLOR};
+		border-left: 1px solid var(--vscode-editorGroup-border);
+		border-top: 1px solid var(--vscode-editorGroup-border);
+		transform: rotate(45deg);
+		z-index: 1; // Ensure arrow stays above the padding
+	}
+`
+
+const SettingsGroup = styled.div`
+	&:not(:last-child) {
+		margin-bottom: 8px;
+		// padding-bottom: 8px;
+		border-bottom: 1px solid var(--vscode-editorGroup-border);
+	}
+`
+
+const SettingsHeader = styled.div`
+	font-size: 11px;
+	font-weight: 600;
+	margin-bottom: 6px;
+	color: var(--vscode-foreground);
+`
+
+const SettingsDescription = styled.div<{ isLast?: boolean }>`
+	font-size: 11px;
+	color: var(--vscode-descriptionForeground);
+	margin-bottom: ${(props) => (props.isLast ? "0" : "8px")};
+`
+
 export default BrowserSettingsMenu

webview-ui/src/components/chat/Announcement.tsx

@@ -31,22 +31,34 @@ const Announcement = ({ version, hideAnnouncement }: AnnouncementProps) => {
 			</h3>
 			<ul style={{ margin: "0 0 8px", paddingLeft: "12px" }}>
 				<li>
-					<b>Add to Cline:</b> Right-click selected text in any file or terminal to quickly add context to your current
-					task! Plus, when you see a lightbulb icon, select 'Fix with Cline' to have Cline fix errors in your code.
+					<b>Introducing MCP Marketplace:</b> Discover and install the best MCP servers right from the extension, with
+					new servers added regularly! Get started by going to the{" "}
+					<span className="codicon codicon-extensions" style={{ marginRight: "4px", fontSize: 10 }}></span>
+					<VSCodeLink
+						onClick={() => {
+							vscode.postMessage({ type: "showMcpView" })
+						}}>
+						MCP Servers tab
+					</VSCodeLink>
+					.
 				</li>
 				<li>
-					<b>Billing Dashboard:</b> Track your remaining credits and transaction history right in the extension with a{" "}
-					<span className="codicon codicon-account" style={{ fontSize: 11 }}></span> Cline account!
+					<b>Mermaid diagrams in Plan mode!</b> Cline can now visualize his plans using flowcharts, sequences,
+					entity-relationships, and more. When he explains his approach using mermaid, you'll see a diagram right in
+					chat that you can click to expand.
 				</li>
 				<li>
-					<b>Faster Inference:</b> Cline/OpenRouter users can sort underlying providers used by throughput, price, and
-					latency. Sorting by throughput will output faster generations (at a higher cost).
+					Use <code>@terminal</code> to reference terminal contents, and <code>@git</code> to reference working changes
+					and commits!
 				</li>
 				<li>
-					<b>Enhanced MCP Support:</b> Dynamic image loading with GIF support, and a new delete button to clean up
-					failed servers.
+					New visual indicator for checkpoints after edits & commands, and automatic checkpoint at the start of each
+					task.
 				</li>
 			</ul>
+			<VSCodeLink href="https://x.com/sdrzn/status/1892262424881090721" style={{ display: "inline" }}>
+				See a demo of the changes here!
+			</VSCodeLink>
 			{/*<ul style={{ margin: "0 0 8px", paddingLeft: "12px" }}>
 				 <li>
 					OpenRouter now supports prompt caching! They also have much higher rate limits than other providers,

webview-ui/src/components/chat/BrowserSessionRow.tsx

@@ -307,7 +307,7 @@ const BrowserSessionRow = memo((props: BrowserSessionRowProps) => {
 							{displayState.url || "http"}
 						</div>
 					</div>
-					<BrowserSettingsMenu maxWidth={maxWidth} />
+					<BrowserSettingsMenu disabled={!shouldShowSettings} maxWidth={maxWidth} />
 				</div>
 
 				{/* Screenshot Area */}

webview-ui/src/components/chat/ChatErrorBoundary.tsx

@@ -1,130 +0,0 @@
-import React from "react"
-
-interface ChatErrorBoundaryProps {
-	children: React.ReactNode
-	errorTitle?: string
-	errorBody?: string
-	height?: string
-}
-
-interface ChatErrorBoundaryState {
-	hasError: boolean
-	error: Error | null
-}
-
-/**
- * A reusable error boundary component specifically designed for chat widgets.
- * It provides a consistent error UI with customizable title and body text.
- */
-export class ChatErrorBoundary extends React.Component<ChatErrorBoundaryProps, ChatErrorBoundaryState> {
-	constructor(props: ChatErrorBoundaryProps) {
-		super(props)
-		this.state = { hasError: false, error: null }
-	}
-
-	static getDerivedStateFromError(error: Error) {
-		return { hasError: true, error }
-	}
-
-	componentDidCatch(error: Error, errorInfo: React.ErrorInfo) {
-		console.error("Error in ChatErrorBoundary:", error.message)
-		console.error("Component stack:", errorInfo.componentStack)
-	}
-
-	render() {
-		const { errorTitle, errorBody, height } = this.props
-
-		if (this.state.hasError) {
-			return (
-				<div
-					style={{
-						padding: "10px",
-						color: "var(--vscode-errorForeground)",
-						height: height || "auto",
-						maxWidth: "512px",
-						overflow: "auto",
-						border: "1px solid var(--vscode-editorError-foreground)",
-						borderRadius: "4px",
-						backgroundColor: "var(--vscode-inputValidation-errorBackground, rgba(255, 0, 0, 0.1))",
-					}}>
-					<h3 style={{ margin: "0 0 8px 0" }}>{errorTitle || "Something went wrong displaying this content"}</h3>
-					<p style={{ margin: "0" }}>{errorBody || `Error: ${this.state.error?.message || "Unknown error"}`}</p>
-				</div>
-			)
-		}
-
-		return this.props.children
-	}
-}
-
-/**
- * A demo component that throws an error after a delay.
- * This is useful for testing error boundaries during development
- */
-interface ErrorAfterDelayProps {
-	numSecondsToWait?: number
-}
-
-interface ErrorAfterDelayState {
-	tickCount: number
-}
-
-export class ErrorAfterDelay extends React.Component<ErrorAfterDelayProps, ErrorAfterDelayState> {
-	private intervalID: NodeJS.Timeout | null = null
-
-	constructor(props: ErrorAfterDelayProps) {
-		super(props)
-		this.state = {
-			tickCount: 0,
-		}
-	}
-
-	componentDidMount() {
-		const secondsToWait = this.props.numSecondsToWait ?? 5
-
-		this.intervalID = setInterval(() => {
-			if (this.state.tickCount >= secondsToWait) {
-				if (this.intervalID) {
-					clearInterval(this.intervalID)
-				}
-				// Error boundaries don't catch async code :(
-				// So this only works by throwing inside of a setState
-				this.setState(() => {
-					throw new Error("This is an error for testing the error boundary")
-				})
-			} else {
-				this.setState({
-					tickCount: this.state.tickCount + 1,
-				})
-			}
-		}, 1000)
-	}
-
-	componentWillUnmount() {
-		if (this.intervalID) {
-			clearInterval(this.intervalID)
-		}
-	}
-
-	render() {
-		// Add a small visual indicator that this component will cause an error
-		return (
-			<div
-				style={{
-					position: "absolute",
-					top: 0,
-					right: 0,
-					background: "rgba(255, 0, 0, 0.5)",
-					color: "var(--vscode-errorForeground)",
-					padding: "2px 5px",
-					fontSize: "12px",
-					borderRadius: "0 0 0 4px",
-					zIndex: 100,
-				}}>
-				Error in {this.state.tickCount}/{this.props.numSecondsToWait ?? 5} seconds
-			</div>
-		)
-	}
-}
-
-export default ChatErrorBoundary

webview-ui/src/components/chat/ChatRow.tsx

@@ -22,14 +22,13 @@ import { CheckpointControls, CheckpointOverlay } from "../common/CheckpointContr
 import CodeAccordian, { cleanPathPrefix } from "../common/CodeAccordian"
 import CodeBlock, { CODE_BLOCK_BG_COLOR } from "../common/CodeBlock"
 import MarkdownBlock from "../common/MarkdownBlock"
+import SuccessButton from "../common/SuccessButton"
 import Thumbnails from "../common/Thumbnails"
 import McpResourceRow from "../mcp/McpResourceRow"
 import McpToolRow from "../mcp/McpToolRow"
-import McpResponseDisplay from "../mcp/McpResponseDisplay"
 import CreditLimitError from "./CreditLimitError"
 import { OptionsButtons } from "./OptionsButtons"
 import { highlightMentions } from "./TaskHeader"
-import SuccessButton from "../common/SuccessButton"
 
 const ChatRowContainer = styled.div`
 	padding: 10px 6px 10px 15px;
@@ -793,8 +792,30 @@ export const ChatRowContent = ({ message, isExpanded, onToggleExpand, lastModifi
 					)
 				case "api_req_finished":
 					return null // we should never see this message type
+				// case "mcp_server_response":
+				// 	return <McpResponseDisplay responseText={message.text || ""} />
 				case "mcp_server_response":
-					return <McpResponseDisplay responseText={message.text || ""} />
+					return (
+						<>
+							<div style={{ paddingTop: 0 }}>
+								<div
+									style={{
+										marginBottom: "4px",
+										opacity: 0.8,
+										fontSize: "12px",
+										textTransform: "uppercase",
+									}}>
+									Response
+								</div>
+								<CodeAccordian
+									code={message.text}
+									language="json"
+									isExpanded={true}
+									onToggleExpand={onToggleExpand}
+								/>
+							</div>
+						</>
+					)
 				case "text":
 					return (
 						<div>
@@ -1020,8 +1041,8 @@ export const ChatRowContent = ({ message, isExpanded, onToggleExpand, lastModifi
 											})
 										}}
 										style={{
-											cursor: seeNewChangesDisabled ? "wait" : "pointer",
 											width: "100%",
+											cursor: seeNewChangesDisabled ? "wait" : "pointer",
 										}}>
 										<i className="codicon codicon-new-file" style={{ marginRight: 6 }} />
 										See new changes

webview-ui/src/components/chat/ChatView.tsx

@@ -453,18 +453,6 @@ const ChatView = ({ isHidden, showAnnouncement, hideAnnouncement, showHistoryVie
 						setSelectedImages((prevImages) => [...prevImages, ...newImages].slice(0, MAX_IMAGES_PER_MESSAGE))
 					}
 					break
-				case "addToInput":
-					setInputValue((prevValue) => {
-						const newText = message.text ?? ""
-						return prevValue ? `${prevValue}\n${newText}` : newText
-					})
-					// Add scroll to bottom after state update
-					setTimeout(() => {
-						if (textAreaRef.current) {
-							textAreaRef.current.scrollTop = textAreaRef.current.scrollHeight
-						}
-					}, 0)
-					break
 				case "invoke":
 					switch (message.invoke!) {
 						case "sendMessage":

webview-ui/src/components/chat/CreditLimitError.tsx

@@ -30,7 +30,7 @@ const CreditLimitError: React.FC<CreditLimitErrorProps> = ({ currentBalance, tot
 			</div>
 
 			<VSCodeButtonLink
-				href="https://app.cline.bot/credits/#buy"
+				href="https://app.cline.bot/credits"
 				style={{
 					width: "100%",
 					marginBottom: "8px",

webview-ui/src/components/chat/TaskHeader.tsx

@@ -52,13 +52,6 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
 		}
 	}, [checkpointTrackerErrorMessage])
 
-	// Reset isTextExpanded when task is collapsed
-	useEffect(() => {
-		if (!isTaskExpanded) {
-			setIsTextExpanded(false)
-		}
-	}, [isTaskExpanded])
-
 	/*
 	When dealing with event listeners in React components that depend on state variables, we face a challenge. We want our listener to always use the most up-to-date version of a callback function that relies on current state, but we don't want to constantly add and remove event listeners as that function updates. This scenario often arises with resize listeners or other window events. Simply adding the listener in a useEffect with an empty dependency array risks using stale state, while including the callback in the dependencies can lead to unnecessary re-registrations of the listener. There are react hook libraries that provide a elegant solution to this problem by utilizing the useRef hook to maintain a reference to the latest callback function without triggering re-renders or effect re-runs. This approach ensures that our event listener always has access to the most current state while minimizing performance overhead and potential memory leaks from multiple listener registrations. 
 	Sources
@@ -101,22 +94,19 @@ const TaskHeader: React.FC<TaskHeaderProps> = ({
 	}, [isTextExpanded, windowHeight])
 
 	useEffect(() => {
-		if (isTaskExpanded && textRef.current && textContainerRef.current) {
-			// Use requestAnimationFrame to ensure DOM is fully updated
-			requestAnimationFrame(() => {
-				// Check if refs are still valid
-				if (textRef.current && textContainerRef.current) {
-					let textContainerHeight = textContainerRef.current.clientHeight
-					if (!textContainerHeight) {
-						textContainerHeight = textContainerRef.current.getBoundingClientRect().height
-					}
-					const isOverflowing = textRef.current.scrollHeight > textContainerHeight
-
-					setShowSeeMore(isOverflowing)
-				}
-			})
+		if (textRef.current && textContainerRef.current) {
+			let textContainerHeight = textContainerRef.current.clientHeight
+			if (!textContainerHeight) {
+				textContainerHeight = textContainerRef.current.getBoundingClientRect().height
+			}
+			const isOverflowing = textRef.current.scrollHeight > textContainerHeight
+			// necessary to show see more button again if user resizes window to expand and then back to collapse
+			if (!isOverflowing) {
+				setIsTextExpanded(false)
+			}
+			setShowSeeMore(isOverflowing)
 		}
-	}, [task.text, windowWidth, isTaskExpanded])
+	}, [task.text, windowWidth])
 
 	const isCostAvailable = useMemo(() => {
 		const openAiCompatHasPricing =

webview-ui/src/components/common/DangerButton.tsx

@@ -1,23 +1,30 @@
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
+import styled from "styled-components"
+
+const StyledButton = styled(VSCodeButton)`
+	--danger-button-bg: #c42b2b;
+	--danger-button-hover: #a82424;
+	--danger-button-active: #8f1f1f;
+
+	background-color: var(--danger-button-bg) !important;
+	border-color: var(--danger-button-bg) !important;
+	color: #ffffff !important;
+
+	&:hover {
+		background-color: var(--danger-button-hover) !important;
+		border-color: var(--danger-button-hover) !important;
+	}
+
+	&:active {
+		background-color: var(--danger-button-active) !important;
+		border-color: var(--danger-button-active) !important;
+	}
+`
 
 interface DangerButtonProps extends React.ComponentProps<typeof VSCodeButton> {}
 
 const DangerButton: React.FC<DangerButtonProps> = (props) => {
-	return (
-		<VSCodeButton
-			{...props}
-			className={`
-				!bg-[#c42b2b] 
-				!border-[#c42b2b] 
-				!text-white
-				hover:!bg-[#a82424] 
-				hover:!border-[#a82424]
-				active:!bg-[#8f1f1f] 
-				active:!border-[#8f1f1f]
-				${props.className || ""}
-			`}
-		/>
-	)
+	return <StyledButton {...props} />
 }
 
 export default DangerButton

webview-ui/src/components/common/SuccessButton.tsx

@@ -1,25 +1,30 @@
 import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
+import styled from "styled-components"
 
-interface SuccessButtonTWProps extends React.ComponentProps<typeof VSCodeButton> {}
+const StyledButton = styled(VSCodeButton)`
+	--success-button-bg: #176f2c;
+	--success-button-hover: #197f31;
+	--success-button-active: #156528;
 
-const SuccessButtonTW: React.FC<SuccessButtonTWProps> = (props) => {
-	return (
-		<VSCodeButton
-			{...props}
-			className={`
-				!bg-[#176f2c] 
-				!border-[#176f2c] 
-				!text-white
-				hover:!bg-[#197f31] 
-				hover:!border-[#197f31]
-				active:!bg-[#156528] 
-				active:!border-[#156528]
-				${props.className || ""}
-			`
-				.replace(/\s+/g, " ")
-				.trim()}
-		/>
-	)
+	background-color: var(--success-button-bg) !important;
+	border-color: var(--success-button-bg) !important;
+	color: #ffffff !important;
+
+	&:hover {
+		background-color: var(--success-button-hover) !important;
+		border-color: var(--success-button-hover) !important;
+	}
+
+	&:active {
+		background-color: var(--success-button-active) !important;
+		border-color: var(--success-button-active) !important;
+	}
+`
+
+interface SuccessButtonProps extends React.ComponentProps<typeof VSCodeButton> {}
+
+const SuccessButton: React.FC<SuccessButtonProps> = (props) => {
+	return <StyledButton {...props} />
 }
 
-export default SuccessButtonTW
+export default SuccessButton

webview-ui/src/components/history/HistoryView.tsx

@@ -6,9 +6,9 @@ import { memo, useMemo, useState, useEffect, useCallback } from "react"
 import Fuse, { FuseResult } from "fuse.js"
 import { formatLargeNumber } from "../../utils/format"
 import { formatSize } from "../../utils/size"
+import DangerButton from "../common/DangerButton"
 import { ExtensionMessage } from "../../../../src/shared/ExtensionMessage"
 import { useEvent } from "react-use"
-import DangerButton from "../common/DangerButton"
 
 type HistoryViewProps = {
 	onDone: () => void
@@ -17,7 +17,7 @@ type HistoryViewProps = {
 type SortOption = "newest" | "oldest" | "mostExpensive" | "mostTokens" | "mostRelevant"
 
 const HistoryView = ({ onDone }: HistoryViewProps) => {
-	const { taskHistory, totalTasksSize } = useExtensionState()
+	const { taskHistory } = useExtensionState()
 	const [searchQuery, setSearchQuery] = useState("")
 	const [sortOption, setSortOption] = useState<SortOption>("newest")
 	const [lastNonRelevantSort, setLastNonRelevantSort] = useState<SortOption | null>("newest")
@@ -28,12 +28,8 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 			setDeleteAllDisabled(false)
 		}
 	}, [])
-	useEvent("message", handleMessage)
 
-	// Request total tasks size when component mounts
-	useEffect(() => {
-		vscode.postMessage({ type: "requestTotalTasksSize" })
-	}, [])
+	useEvent("message", handleMessage)
 
 	useEffect(() => {
 		if (searchQuery && sortOption !== "mostRelevant" && !lastNonRelevantSort) {
@@ -475,7 +471,7 @@ const HistoryView = ({ onDone }: HistoryViewProps) => {
 							setDeleteAllDisabled(true)
 							vscode.postMessage({ type: "clearAllTaskHistory" })
 						}}>
-						Delete All History{totalTasksSize !== null ? ` (${formatSize(totalTasksSize)})` : ""}
+						Delete All History
 					</DangerButton>
 				</div>
 			</div>

webview-ui/src/components/mcp/ImagePreview.tsx

@@ -1,336 +0,0 @@
-import React, { useEffect, useRef } from "react"
-import { vscode } from "../../utils/vscode"
-import DOMPurify from "dompurify"
-import { getSafeHostname, formatUrlForOpening, checkIfImageUrl } from "./McpRichUtil"
-import ChatErrorBoundary from "../chat/ChatErrorBoundary"
-
-interface ImagePreviewProps {
-	url: string
-}
-
-// Use a class component to ensure complete isolation between instances
-class ImagePreview extends React.Component<
-	ImagePreviewProps,
-	{
-		loading: boolean
-		error: string | null
-		fetchStartTime: number
-	}
-> {
-	private imgRef = React.createRef<HTMLImageElement>()
-	private timeoutId: NodeJS.Timeout | null = null
-	private heartbeatId: NodeJS.Timeout | null = null
-
-	constructor(props: ImagePreviewProps) {
-		super(props)
-		this.state = {
-			loading: true,
-			error: null,
-			fetchStartTime: Date.now(),
-		}
-	}
-
-	// Track aspect ratio for proper display
-	private aspectRatio: number = 1
-
-	componentDidMount() {
-		// Set up a timeout to handle cases where the image never loads or errors
-		this.timeoutId = setTimeout(() => {
-			console.log(`Image load timeout for ${this.props.url}`)
-			if (this.state.loading) {
-				this.setState({
-					loading: false,
-					error: `Timeout loading image: ${this.props.url}`,
-				})
-			}
-		}, 15000)
-
-		// Set up a heartbeat to update the UI with elapsed time
-		this.heartbeatId = setInterval(() => {
-			if (this.state.loading) {
-				this.forceUpdate() // Just update the component to show new elapsed time
-			}
-		}, 1000)
-
-		// First, check the content type to verify it's actually an image
-		this.checkContentType(this.props.url)
-	}
-
-	// Check if the URL is an image using content type verification
-	checkContentType(url: string) {
-		// Always verify content type, even for URLs that look like images by extension
-		checkIfImageUrl(url)
-			.then((isImage) => {
-				if (isImage) {
-					console.log(`URL is confirmed as image: ${url}`)
-					this.loadImage(url)
-				} else {
-					console.log(`URL is not an image: ${url}`)
-					this.handleImageError()
-				}
-			})
-			.catch((error) => {
-				console.log(`Error checking if URL is an image: ${error}`)
-				// Don't fallback to direct image loading on error
-				// Instead, report the error so the URL can be handled as a non-image
-				this.handleImageError()
-			})
-	}
-
-	// Load the image after content type check or as fallback
-	loadImage(url: string) {
-		const isSvg = /\.svg(\?.*)?$/i.test(url)
-
-		// For SVG files, we don't need to calculate aspect ratio as they're vector-based
-		if (isSvg) {
-			console.log(`SVG image detected, skipping aspect ratio calculation: ${url}`)
-			// Default aspect ratio for SVGs
-			this.aspectRatio = 1
-			this.handleImageLoad()
-			return
-		}
-
-		// Create a test image to check if the URL loads and get dimensions
-		const testImg = new Image()
-
-		testImg.onload = () => {
-			console.log(`Test image loaded successfully: ${url}`)
-
-			// Calculate aspect ratio for proper display
-			if (testImg.width > 0 && testImg.height > 0) {
-				this.aspectRatio = testImg.width / testImg.height
-			}
-
-			this.handleImageLoad()
-		}
-
-		testImg.onerror = () => {
-			console.log(`Test image failed to load: ${url}`)
-			this.handleImageError()
-		}
-
-		// Force CORS mode to be anonymous to avoid CORS issues
-		testImg.crossOrigin = "anonymous"
-	}
-
-	componentWillUnmount() {
-		this.cleanup()
-	}
-
-	private cleanup() {
-		if (this.timeoutId) {
-			clearTimeout(this.timeoutId)
-			this.timeoutId = null
-		}
-
-		if (this.heartbeatId) {
-			clearInterval(this.heartbeatId)
-			this.heartbeatId = null
-		}
-	}
-
-	// Handle image load event
-	handleImageLoad = () => {
-		console.log(`Image loaded successfully: ${this.props.url}`)
-		this.setState({ loading: false })
-		this.cleanup()
-	}
-
-	// Handle image error event
-	handleImageError = () => {
-		console.log(`Image failed to load: ${this.props.url}`)
-		this.setState({
-			loading: false,
-			error: `Failed to load image: ${this.props.url}`,
-		})
-		this.cleanup()
-	}
-
-	render() {
-		const { url } = this.props
-		const { loading, error, fetchStartTime } = this.state
-
-		// Calculate elapsed time for loading state
-		const elapsedSeconds = loading ? Math.floor((Date.now() - fetchStartTime) / 1000) : 0
-
-		// Fallback display while loading
-		if (loading) {
-			return (
-				<div
-					className="image-preview-loading"
-					style={{
-						padding: "12px",
-						display: "flex",
-						flexDirection: "column",
-						alignItems: "center",
-						justifyContent: "center",
-						border: "1px solid var(--vscode-editorWidget-border, rgba(127, 127, 127, 0.3))",
-						borderRadius: "4px",
-						height: "128px",
-						maxWidth: "512px",
-					}}>
-					<div style={{ display: "flex", alignItems: "center", marginBottom: "8px" }}>
-						<div
-							className="loading-spinner"
-							style={{
-								marginRight: "8px",
-								width: "16px",
-								height: "16px",
-								border: "2px solid rgba(127, 127, 127, 0.3)",
-								borderTopColor: "var(--vscode-textLink-foreground, #3794ff)",
-								borderRadius: "50%",
-								animation: "spin 1s linear infinite",
-							}}
-						/>
-						<style>
-							{`
-								@keyframes spin {
-									to { transform: rotate(360deg); }
-								}
-							`}
-						</style>
-						Loading image from {getSafeHostname(url)}...
-					</div>
-					{elapsedSeconds > 3 && (
-						<div style={{ fontSize: "11px", color: "var(--vscode-descriptionForeground)" }}>
-							{elapsedSeconds > 60
-								? `Waiting for ${Math.floor(elapsedSeconds / 60)}m ${elapsedSeconds % 60}s...`
-								: `Waiting for ${elapsedSeconds}s...`}
-						</div>
-					)}
-					{/* Hidden image that we'll use to detect load/error events */}
-					{/\.svg(\?.*)?$/i.test(url) ? (
-						<object
-							type="image/svg+xml"
-							data={DOMPurify.sanitize(url)}
-							style={{ display: "none" }}
-							onLoad={this.handleImageLoad}
-							onError={this.handleImageError}
-						/>
-					) : (
-						<img
-							src={DOMPurify.sanitize(url)}
-							alt=""
-							ref={this.imgRef}
-							onLoad={this.handleImageLoad}
-							onError={this.handleImageError}
-							style={{ display: "none" }}
-						/>
-					)}
-				</div>
-			)
-		}
-
-		// Handle error state
-		if (error) {
-			return (
-				<div
-					className="image-preview-error"
-					style={{
-						padding: "12px",
-						border: "1px solid var(--vscode-editorWidget-border, rgba(127, 127, 127, 0.3))",
-						borderRadius: "4px",
-						color: "var(--vscode-errorForeground)",
-					}}
-					onClick={() => {
-						vscode.postMessage({
-							type: "openInBrowser",
-							url: DOMPurify.sanitize(url),
-						})
-					}}>
-					<div style={{ fontWeight: "bold" }}>Failed to load image</div>
-					<div style={{ fontSize: "12px", marginTop: "4px" }}>{getSafeHostname(url)}</div>
-					<div style={{ fontSize: "11px", marginTop: "8px", color: "var(--vscode-textLink-foreground)" }}>
-						Click to open in browser
-					</div>
-				</div>
-			)
-		}
-
-		// Render the image
-		return (
-			<div
-				className="image-preview"
-				style={{
-					margin: "10px 0",
-					maxWidth: "100%",
-					cursor: "pointer",
-				}}
-				onClick={() => {
-					vscode.postMessage({
-						type: "openInBrowser",
-						url: DOMPurify.sanitize(formatUrlForOpening(url)),
-					})
-				}}>
-				{/\.svg(\?.*)?$/i.test(url) ? (
-					// Special handling for SVG images
-					<object
-						type="image/svg+xml"
-						data={DOMPurify.sanitize(url)}
-						style={{
-							width: "85%",
-							height: "auto",
-							borderRadius: "4px",
-						}}
-						aria-label={`SVG from ${getSafeHostname(url)}`}>
-						{/* Fallback if object tag fails */}
-						<img
-							src={DOMPurify.sanitize(url)}
-							alt={`SVG from ${getSafeHostname(url)}`}
-							style={{
-								width: "85%",
-								height: "auto",
-								borderRadius: "4px",
-							}}
-						/>
-					</object>
-				) : (
-					<img
-						src={DOMPurify.sanitize(url)}
-						alt={`Image from ${getSafeHostname(url)}`}
-						style={{
-							width: "85%",
-							height: "auto",
-							borderRadius: "4px",
-							// Use contain only for very extreme aspect ratios, otherwise use cover
-							objectFit: this.aspectRatio > 3 || this.aspectRatio < 0.33 ? "contain" : "cover",
-						}}
-						loading="eager"
-						onLoad={(e) => {
-							// Double-check aspect ratio from the actual loaded image
-							const img = e.currentTarget
-							if (img.naturalWidth > 0 && img.naturalHeight > 0) {
-								const newAspectRatio = img.naturalWidth / img.naturalHeight
-
-								// Update object-fit based on actual aspect ratio
-								// Use contain only for very extreme aspect ratios, otherwise use cover
-								if (newAspectRatio > 3 || newAspectRatio < 0.33) {
-									img.style.objectFit = "contain"
-								} else {
-									img.style.objectFit = "cover"
-								}
-							}
-						}}
-					/>
-				)}
-			</div>
-		)
-	}
-}
-
-// Create a wrapper component that memoizes the ImagePreview to prevent unnecessary re-renders
-const MemoizedImagePreview = React.memo(
-	(props: ImagePreviewProps) => <ImagePreview {...props} />,
-	(prevProps, nextProps) => prevProps.url === nextProps.url, // Only re-render if URL changes
-)
-
-// Wrap the ImagePreview component with an error boundary
-const ImagePreviewWithErrorBoundary: React.FC<ImagePreviewProps> = (props) => {
-	return (
-		<ChatErrorBoundary errorTitle="Something went wrong displaying this image">
-			<MemoizedImagePreview {...props} />
-		</ChatErrorBoundary>
-	)
-}
-
-export default ImagePreviewWithErrorBoundary

webview-ui/src/components/mcp/LinkPreview.tsx

@@ -1,8 +1,6 @@
 import React, { useEffect, useState } from "react"
 import { vscode } from "../../utils/vscode"
 import DOMPurify from "dompurify"
-import { getSafeHostname, normalizeRelativeUrl } from "./McpRichUtil"
-import ChatErrorBoundary from "../chat/ChatErrorBoundary"
 
 interface OpenGraphData {
 	title?: string
@@ -17,376 +15,174 @@ interface LinkPreviewProps {
 	url: string
 }
 
-// Error types for better UI feedback
-type ErrorType = "timeout" | "network" | "general" | null
+const LinkPreview: React.FC<LinkPreviewProps> = ({ url }) => {
+	const [loading, setLoading] = useState(true)
+	const [error, setError] = useState<string | null>(null)
+	const [ogData, setOgData] = useState<OpenGraphData | null>(null)
 
-// Use a class component to ensure complete isolation between instances
-class LinkPreview extends React.Component<
-	LinkPreviewProps,
-	{
-		loading: boolean
-		error: ErrorType
-		errorMessage: string | null
-		ogData: OpenGraphData | null
-		hasCompletedFetch: boolean // Track if fetch has completed (success or error)
-		fetchStartTime: number // Track when the fetch started
-	}
-> {
-	private messageListener: ((event: MessageEvent) => void) | null = null
-	private timeoutId: NodeJS.Timeout | null = null
-	private heartbeatId: NodeJS.Timeout | null = null
+	useEffect(() => {
+		const fetchOpenGraphData = async () => {
+			try {
+				setLoading(true)
 
-	constructor(props: LinkPreviewProps) {
-		super(props)
-		this.state = {
-			loading: true,
-			error: null,
-			errorMessage: null,
-			ogData: null,
-			hasCompletedFetch: false,
-			fetchStartTime: 0,
-		}
-	}
+				// Send a message to the extension to fetch Open Graph data
+				vscode.postMessage({
+					type: "fetchOpenGraphData",
+					text: url,
+				})
 
-	componentDidMount() {
-		// Only fetch if we haven't completed a fetch yet
-		if (!this.state.hasCompletedFetch) {
-			this.fetchOpenGraphData()
-		}
-	}
-
-	componentWillUnmount() {
-		this.cleanup()
-	}
-
-	// Prevent updates if fetch has completed
-	shouldComponentUpdate(nextProps: LinkPreviewProps, nextState: any) {
-		// If URL changes, allow update
-		if (nextProps.url !== this.props.url) {
-			return true
-		}
-
-		// If we've completed a fetch and state hasn't changed, prevent update
-		if (
-			this.state.hasCompletedFetch &&
-			this.state.loading === nextState.loading &&
-			this.state.error === nextState.error &&
-			this.state.ogData === nextState.ogData
-		) {
-			return false
-		}
-
-		return true
-	}
-
-	private cleanup() {
-		// Clean up event listeners and timeouts
-		if (this.messageListener) {
-			window.removeEventListener("message", this.messageListener)
-			this.messageListener = null
-		}
-
-		if (this.timeoutId) {
-			clearTimeout(this.timeoutId)
-			this.timeoutId = null
-		}
-
-		if (this.heartbeatId) {
-			clearInterval(this.heartbeatId)
-			this.heartbeatId = null
-		}
-	}
-
-	private fetchOpenGraphData() {
-		try {
-			// Record fetch start time
-			const startTime = Date.now()
-			this.setState({ fetchStartTime: startTime })
-
-			// Send a message to the extension to fetch Open Graph data
-			vscode.postMessage({
-				type: "fetchOpenGraphData",
-				text: this.props.url,
-			})
-
-			// Set up a listener for the response
-			this.messageListener = (event: MessageEvent) => {
-				const message = event.data
-				if (message.type === "openGraphData" && message.url === this.props.url) {
-					// Check if there was an error in the response
-					if (message.error) {
-						this.setState({
-							error: "network",
-							errorMessage: message.error,
-							loading: false,
-							hasCompletedFetch: true,
-						})
-					} else {
-						this.setState({
-							ogData: message.openGraphData,
-							loading: false,
-							hasCompletedFetch: true, // Mark as completed
-						})
+				// Set up a listener for the response
+				const messageListener = (event: MessageEvent) => {
+					const message = event.data
+					if (message.type === "openGraphData" && message.url === url) {
+						setOgData(message.openGraphData)
+						setLoading(false)
+						window.removeEventListener("message", messageListener)
 					}
-					this.cleanup()
 				}
-			}
 
-			window.addEventListener("message", this.messageListener)
+				window.addEventListener("message", messageListener)
 
-			// Instead of a fixed timeout, use a heartbeat to update the loading message
-			// with the elapsed time, but don't actually timeout
-			this.heartbeatId = setInterval(() => {
-				const elapsedSeconds = Math.floor((Date.now() - startTime) / 1000)
-				if (elapsedSeconds > 0) {
-					this.forceUpdate() // Just update the component to show new elapsed time
+				// Clean up the listener if the component unmounts
+				return () => {
+					window.removeEventListener("message", messageListener)
 				}
-			}, 1000)
-		} catch (err) {
-			this.setState({
-				error: "general",
-				errorMessage: err instanceof Error ? err.message : "Unknown error occurred",
-				loading: false,
-				hasCompletedFetch: true, // Mark as completed on error
-			})
-			this.cleanup()
-		}
-	}
-
-	render() {
-		const { url } = this.props
-		const { loading, error, errorMessage, ogData, fetchStartTime } = this.state
-
-		// Calculate elapsed time for loading state
-		const elapsedSeconds = loading ? Math.floor((Date.now() - fetchStartTime) / 1000) : 0
-
-		// Fallback display while loading
-		if (loading) {
-			return (
-				<div
-					className="link-preview-loading"
-					style={{
-						display: "flex",
-						flexDirection: "column",
-						alignItems: "center",
-						justifyContent: "center",
-						border: "1px solid var(--vscode-editorWidget-border, rgba(127, 127, 127, 0.3))",
-						borderRadius: "4px",
-						height: "128px",
-						maxWidth: "512px",
-					}}>
-					<div style={{ display: "flex", alignItems: "center", marginBottom: "8px" }}>
-						<div
-							className="loading-spinner"
-							style={{
-								marginRight: "8px",
-								width: "16px",
-								height: "16px",
-								border: "2px solid rgba(127, 127, 127, 0.3)",
-								borderTopColor: "var(--vscode-textLink-foreground, #3794ff)",
-								borderRadius: "50%",
-								animation: "spin 1s linear infinite",
-							}}
-						/>
-						<style>
-							{`
-								@keyframes spin {
-									to { transform: rotate(360deg); }
-								}
-							`}
-						</style>
-						Loading preview for {getSafeHostname(url)}...
-					</div>
-					{elapsedSeconds > 5 && (
-						<div style={{ fontSize: "11px", color: "var(--vscode-descriptionForeground)" }}>
-							{elapsedSeconds > 60
-								? `Waiting for ${Math.floor(elapsedSeconds / 60)}m ${elapsedSeconds % 60}s...`
-								: `Waiting for ${elapsedSeconds}s...`}
-						</div>
-					)}
-				</div>
-			)
-		}
-
-		// Handle different error states with specific messages
-		if (error) {
-			let errorDisplay = "Unable to load preview"
-
-			if (error === "timeout") {
-				errorDisplay = "Preview request timed out"
-			} else if (error === "network") {
-				errorDisplay = "Network error loading preview"
+			} catch (err) {
+				setError("Failed to fetch preview data")
+				setLoading(false)
 			}
-
-			return (
-				<div
-					className="link-preview-error"
-					style={{
-						padding: "12px",
-						border: "1px solid var(--vscode-editorWidget-border, rgba(127, 127, 127, 0.3))",
-						borderRadius: "4px",
-						color: "var(--vscode-errorForeground)",
-						height: "128px",
-						maxWidth: "512px",
-						overflow: "auto",
-					}}
-					onClick={() => {
-						vscode.postMessage({
-							type: "openInBrowser",
-							url: DOMPurify.sanitize(url),
-						})
-					}}>
-					<div style={{ fontWeight: "bold" }}>{errorDisplay}</div>
-					<div style={{ fontSize: "12px", marginTop: "4px" }}>{getSafeHostname(url)}</div>
-					{errorMessage && <div style={{ fontSize: "11px", marginTop: "4px", opacity: 0.8 }}>{errorMessage}</div>}
-					<div style={{ fontSize: "11px", marginTop: "8px", color: "var(--vscode-textLink-foreground)" }}>
-						Click to open in browser
-					</div>
-				</div>
-			)
 		}
 
-		// Create a fallback object if ogData is null
-		const data = ogData || {
-			title: getSafeHostname(url),
-			description: "No description available",
-			siteName: getSafeHostname(url),
-			url: url,
-		}
+		// Fetch Open Graph data immediately when component mounts
+		fetchOpenGraphData()
+	}, [url])
 
-		// Render the Open Graph preview
+	// Fallback display while loading
+	if (loading) {
 		return (
 			<div
-				className="link-preview"
+				className="link-preview-loading"
 				style={{
+					padding: "12px",
 					display: "flex",
+					alignItems: "center",
+					justifyContent: "center",
 					border: "1px solid var(--vscode-editorWidget-border, rgba(127, 127, 127, 0.3))",
 					borderRadius: "4px",
-					overflow: "hidden",
-					cursor: "pointer",
-					height: "128px",
-					maxWidth: "512px",
-				}}
-				onClick={() => {
-					vscode.postMessage({
-						type: "openInBrowser",
-						url: DOMPurify.sanitize(url),
-					})
 				}}>
-				{data.image && (
-					<div className="link-preview-image" style={{ width: "128px", height: "128px", flexShrink: 0 }}>
-						<img
-							src={DOMPurify.sanitize(normalizeRelativeUrl(data.image, url))}
-							alt=""
-							style={{
-								width: "100%",
-								height: "100%",
-								objectFit: "contain", // Use contain for link preview thumbnails to handle logos
-								objectPosition: "center", // Center the image
-							}}
-							onLoad={(e) => {
-								// Check aspect ratio to determine if we should use contain or cover
-								const img = e.currentTarget
-								if (img.naturalWidth > 0 && img.naturalHeight > 0) {
-									const aspectRatio = img.naturalWidth / img.naturalHeight
-
-									// Use contain for extreme aspect ratios (logos), cover for photos
-									if (aspectRatio > 2.5 || aspectRatio < 0.4) {
-										img.style.objectFit = "contain"
-									} else {
-										img.style.objectFit = "cover"
-									}
-								}
-							}}
-							onError={(e) => {
-								console.log(`Image could not be loaded: ${data.image}`)
-								// Hide the broken image
-								;(e.target as HTMLImageElement).style.display = "none"
-							}}
-						/>
-					</div>
-				)}
-
 				<div
-					className="link-preview-content"
+					className="loading-spinner"
 					style={{
-						flex: 1,
-						padding: "12px",
-						display: "flex",
-						flexDirection: "column",
-						overflow: "hidden",
-						height: "100%", // Ensure full height
-					}}>
-					{/* Top section with title and URL - top aligned */}
-					<div className="link-preview-top">
-						<div
-							className="link-preview-title"
-							style={{
-								fontWeight: "bold",
-								marginBottom: "4px",
-								whiteSpace: "nowrap",
-								overflow: "hidden",
-								textOverflow: "ellipsis",
-							}}>
-							{data.title || "No title"}
-						</div>
-
-						<div
-							className="link-preview-url"
-							style={{
-								fontSize: "12px",
-								color: "var(--vscode-textLink-foreground, #3794ff)",
-								marginBottom: "8px", // Increased for better separation
-								whiteSpace: "nowrap",
-								overflow: "hidden",
-								textOverflow: "ellipsis",
-							}}>
-							{data.siteName || getSafeHostname(url)}
-						</div>
-					</div>
-
-					{/* Description with space-around in the remaining space */}
-					<div
-						className="link-preview-description-container"
-						style={{
-							flex: 1, // Take up remaining space
-							display: "flex",
-							flexDirection: "column",
-							justifyContent: "space-around", // Space around in the remaining area
-						}}>
-						<div
-							className="link-preview-description"
-							style={{
-								fontSize: "12px",
-								color: "var(--vscode-descriptionForeground, rgba(204, 204, 204, 0.7))",
-								overflow: "hidden",
-								display: "-webkit-box",
-								WebkitLineClamp: 3,
-								WebkitBoxOrient: "vertical",
-								textOverflow: "ellipsis",
-							}}>
-							{data.description || "No description available"}
-						</div>
-					</div>
-				</div>
+						marginRight: "8px",
+						width: "16px",
+						height: "16px",
+						border: "2px solid rgba(127, 127, 127, 0.3)",
+						borderTopColor: "var(--vscode-textLink-foreground, #3794ff)",
+						borderRadius: "50%",
+						animation: "spin 1s linear infinite",
+					}}
+				/>
+				<style>
+					{`
+            @keyframes spin {
+              to { transform: rotate(360deg); }
+            }
+          `}
+				</style>
+				Loading preview for {new URL(url).hostname}...
 			</div>
 		)
 	}
-}
 
-// Create a wrapper component that memoizes the LinkPreview to prevent unnecessary re-renders
-const MemoizedLinkPreview = React.memo(
-	(props: LinkPreviewProps) => <LinkPreview {...props} />,
-	(prevProps, nextProps) => prevProps.url === nextProps.url, // Only re-render if URL changes
-)
+	// Create a fallback object if ogData is null
+	const data = ogData || {
+		title: new URL(url).hostname,
+		description: "No description available",
+		siteName: new URL(url).hostname,
+		url: url,
+	}
 
-// Wrap the LinkPreview component with an error boundary
-const LinkPreviewWithErrorBoundary: React.FC<LinkPreviewProps> = (props) => {
+	// Render the Open Graph preview
 	return (
-		<ChatErrorBoundary errorTitle="Something went wrong displaying this link preview">
-			<MemoizedLinkPreview {...props} />
-		</ChatErrorBoundary>
+		<div
+			className="link-preview"
+			style={{
+				display: "flex",
+				border: "1px solid var(--vscode-editorWidget-border, rgba(127, 127, 127, 0.3))",
+				borderRadius: "4px",
+				overflow: "hidden",
+				cursor: "pointer",
+			}}
+			onClick={() => {
+				vscode.postMessage({
+					type: "openInBrowser",
+					url: DOMPurify.sanitize(url),
+				})
+			}}>
+			{data.image && (
+				<div className="link-preview-image" style={{ width: "128px", height: "128px", flexShrink: 0 }}>
+					<img
+						src={DOMPurify.sanitize(data.image)}
+						alt=""
+						style={{
+							width: "100%",
+							height: "100%",
+							objectFit: "cover",
+						}}
+					/>
+				</div>
+			)}
+
+			<div
+				className="link-preview-content"
+				style={{
+					flex: 1,
+					padding: "12px",
+					display: "flex",
+					flexDirection: "column",
+					overflow: "hidden",
+				}}>
+				<div
+					className="link-preview-title"
+					style={{
+						fontWeight: "bold",
+						marginBottom: "4px",
+						whiteSpace: "nowrap",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+					}}>
+					{data.title || "No title"}
+				</div>
+
+				<div
+					className="link-preview-url"
+					style={{
+						fontSize: "12px",
+						color: "var(--vscode-textLink-foreground, #3794ff)",
+						marginBottom: "8px",
+						whiteSpace: "nowrap",
+						overflow: "hidden",
+						textOverflow: "ellipsis",
+					}}>
+					{data.siteName || new URL(url).hostname}
+				</div>
+
+				<div
+					className="link-preview-description"
+					style={{
+						fontSize: "12px",
+						color: "var(--vscode-descriptionForeground, rgba(204, 204, 204, 0.7))",
+						overflow: "hidden",
+						display: "-webkit-box",
+						WebkitLineClamp: 3,
+						WebkitBoxOrient: "vertical",
+						textOverflow: "ellipsis",
+					}}>
+					{data.description || "No description available"}
+				</div>
+			</div>
+		</div>
 	)
 }
 
-export default LinkPreviewWithErrorBoundary
+export default LinkPreview

webview-ui/src/components/mcp/McpResponseDisplay.tsx

@@ -1,23 +1,180 @@
 import React, { useEffect, useState, useCallback } from "react"
-import LinkPreview from "./LinkPreview"
-import ImagePreview from "./ImagePreview"
 import { vscode } from "../../utils/vscode"
-import DOMPurify from "dompurify"
+import LinkPreview from "./LinkPreview"
 import styled from "styled-components"
 import { CODE_BLOCK_BG_COLOR } from "../common/CodeBlock"
-import ChatErrorBoundary from "../chat/ChatErrorBoundary"
-import {
-	safeCreateUrl,
-	isUrl,
-	getSafeHostname,
-	isLocalhostUrl,
-	normalizeRelativeUrl,
-	formatUrlForOpening,
-	checkIfImageUrl,
-} from "./McpRichUtil"
+import DOMPurify from "dompurify"
 
-// Maximum number of URLs to process in total, per response
-export const MAX_URLS = 50
+// We'll use the backend isImageUrl function for HEAD requests
+// This is a client-side fallback for data URLs and obvious image extensions
+const isImageUrlSync = (str: string): boolean => {
+	// Check for data URLs which are definitely images
+	if (str.startsWith("data:image/")) {
+		return true
+	}
+
+	// Check for common image file extensions
+	return str.match(/\.(jpg|jpeg|png|gif|webp)$/i) !== null
+}
+
+export const isUrl = (str: string): boolean => {
+	// Basic URL validation
+	const urlPattern = /^(https?:\/\/)?([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,}(\/[^\s]*)?$/
+	return urlPattern.test(str)
+}
+
+// Function to check if a URL is an image using HEAD request
+export const checkIfImageUrl = async (url: string): Promise<boolean> => {
+	// For data URLs, we can check synchronously
+	if (url.startsWith("data:image/")) {
+		return true
+	}
+
+	// For http/https URLs, we need to send a message to the extension
+	if (url.startsWith("http")) {
+		try {
+			// Create a promise that will resolve when we get a response
+			return new Promise((resolve) => {
+				// Set up a one-time listener for the response
+				const messageListener = (event: MessageEvent) => {
+					const message = event.data
+					if (message.type === "isImageUrlResult" && message.url === url) {
+						window.removeEventListener("message", messageListener)
+						resolve(message.isImage)
+					}
+				}
+
+				window.addEventListener("message", messageListener)
+
+				// Send the request to the extension
+				vscode.postMessage({
+					type: "checkIsImageUrl",
+					text: url,
+				})
+
+				// Set a timeout to avoid hanging indefinitely
+				setTimeout(() => {
+					window.removeEventListener("message", messageListener)
+					// Fall back to extension check
+					resolve(isImageUrlSync(url))
+				}, 3000)
+			})
+		} catch (error) {
+			console.error("Error checking if URL is an image:", error)
+			return isImageUrlSync(url)
+		}
+	}
+
+	// Fall back to extension check for other URLs
+	return isImageUrlSync(url)
+}
+
+// No longer needed as our regex directly extracts the URL part
+
+// Helper to ensure URL is in a format that can be opened
+export const formatUrlForOpening = (url: string): string => {
+	// If it's a data URI, return as is
+	if (url.startsWith("data:image/")) {
+		return url
+	}
+
+	// If it's a regular URL but doesn't have a protocol, add https://
+	if (!url.startsWith("http://") && !url.startsWith("https://")) {
+		return `https://${url}`
+	}
+
+	return url
+}
+
+// Find all URLs (both image and regular) in an object
+export const findUrls = async (obj: any): Promise<{ imageUrls: string[]; regularUrls: string[] }> => {
+	const imageUrls: string[] = []
+	const regularUrls: string[] = []
+	const pendingChecks: Promise<void>[] = []
+
+	if (typeof obj === "object" && obj !== null) {
+		for (const value of Object.values(obj)) {
+			if (typeof value === "string") {
+				// First check with synchronous method
+				if (isImageUrlSync(value)) {
+					imageUrls.push(value)
+				} else if (isUrl(value)) {
+					// For URLs that don't obviously look like images, we'll check asynchronously
+					const checkPromise = checkIfImageUrl(value).then((isImage) => {
+						if (isImage) {
+							imageUrls.push(value)
+						} else {
+							regularUrls.push(value)
+						}
+					})
+					pendingChecks.push(checkPromise)
+				}
+			} else if (typeof value === "object") {
+				const nestedUrlsPromise = findUrls(value).then((nestedUrls) => {
+					imageUrls.push(...nestedUrls.imageUrls)
+					regularUrls.push(...nestedUrls.regularUrls)
+				})
+				pendingChecks.push(nestedUrlsPromise)
+			}
+		}
+	}
+
+	// Wait for all async checks to complete
+	await Promise.all(pendingChecks)
+
+	return { imageUrls, regularUrls }
+}
+
+// Extract URLs from text using regex
+export const extractUrlsFromText = async (text: string): Promise<{ imageUrls: string[]; regularUrls: string[] }> => {
+	const imageUrls: string[] = []
+	const regularUrls: string[] = []
+	const pendingChecks: Promise<void>[] = []
+
+	// Match URLs with image: prefix and extract just the URL part
+	const imageMatches = text.match(/image:\s*(https?:\/\/[^\s]+)/g)
+	if (imageMatches) {
+		// Extract just the URL part from matches with image: prefix
+		const extractedUrls = imageMatches
+			.map((match) => {
+				const urlMatch = /image:\s*(https?:\/\/[^\s]+)/.exec(match)
+				return urlMatch ? urlMatch[1] : null
+			})
+			.filter(Boolean) as string[]
+
+		imageUrls.push(...extractedUrls)
+	}
+
+	// Match all URLs (including those that might be in the middle of paragraphs)
+	const urlMatches = text.match(/https?:\/\/[^\s]+/g)
+	if (urlMatches) {
+		// Filter out URLs that are already in imageUrls
+		const filteredUrls = urlMatches.filter((url) => !imageUrls.includes(url))
+
+		// Check each URL to see if it's an image
+		for (const url of filteredUrls) {
+			// First check with synchronous method
+			if (isImageUrlSync(url)) {
+				imageUrls.push(url)
+			} else {
+				// For URLs that don't obviously look like images, we'll check asynchronously
+				const checkPromise = checkIfImageUrl(url).then((isImage) => {
+					if (isImage) {
+						imageUrls.push(url)
+					} else {
+						regularUrls.push(url)
+					}
+				})
+				pendingChecks.push(checkPromise)
+			}
+		}
+	}
+
+	// Wait for all async checks to complete
+	await Promise.all(pendingChecks)
+
+	return { imageUrls, regularUrls }
+}
 
 const ResponseHeader = styled.div`
 	display: flex;
@@ -114,7 +271,7 @@ interface McpResponseDisplayProps {
 // Represents a URL found in the text with its position and metadata
 interface UrlMatch {
 	url: string // The actual URL
-	fullMatch: string // The full matched text
+	fullMatch: string // The full matched text (including any prefix like "image:")
 	index: number // Position in the text
 	isImage: boolean // Whether this URL is an image
 	isProcessed: boolean // Whether we've already processed this URL (to avoid duplicates)
@@ -125,159 +282,59 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 	const [displayMode, setDisplayMode] = useState<"rich" | "plain">(() => {
 		// Get saved preference from localStorage, default to 'rich'
 		const savedMode = localStorage.getItem("mcpDisplayMode")
-		return savedMode === "plain" ? "plain" : "rich"
+		return (savedMode === "plain" ? "plain" : "rich") as "rich" | "plain"
 	})
 	const [urlMatches, setUrlMatches] = useState<UrlMatch[]>([])
-	const [error, setError] = useState<string | null>(null)
-	// Add a counter state for forcing re-renders to make toggling run smoother
-	const [forceUpdateCounter, setForceUpdateCounter] = useState(0)
 
 	const toggleDisplayMode = useCallback(() => {
 		const newMode = displayMode === "rich" ? "plain" : "rich"
-
-		// Force an immediate re-render
-		setForceUpdateCounter((prev) => prev + 1)
-
-		// Update display mode and save preference
 		setDisplayMode(newMode)
 		localStorage.setItem("mcpDisplayMode", newMode)
-
-		// If switching to plain mode, cancel any ongoing processing
-		if (newMode === "plain") {
-			console.log("Switching to plain mode - cancelling URL processing")
-			setUrlMatches([]) // Clear any existing matches when switching to plain mode
-		} else {
-			// If switching to rich mode, the useEffect will re-run and fetch data
-			console.log("Switching to rich mode - will start URL processing")
-		}
 	}, [displayMode])
 
 	// Find all URLs in the text and determine if they're images
 	useEffect(() => {
-		// Skip all processing if in plain mode
-		if (displayMode === "plain") {
-			setIsLoading(false)
-			setUrlMatches([]) // Clear any existing matches when in plain mode
-			return
-		}
-
-		// Use a direct boolean for cancellation that's scoped to this effect run
-		let processingCanceled = false
-
 		const processResponse = async () => {
-			console.log("Processing MCP response for URL extraction")
 			setIsLoading(true)
-			setError(null)
 
 			try {
 				const text = responseText || ""
 				const matches: UrlMatch[] = []
-				const urlRegex = /https?:\/\/[^\s<>"']+/g
+
+				const urlRegex = /https?:\/\/[^\s]+/g
 				let urlMatch: RegExpExecArray | null
-				let urlCount = 0
 
-				// First pass: Extract all URLs and immediately make them available for rendering
-				while ((urlMatch = urlRegex.exec(text)) !== null && urlCount < MAX_URLS) {
-					// Get the original URL from the match - never modify the original URL text
+				while ((urlMatch = urlRegex.exec(text)) !== null) {
 					const url = urlMatch[0]
-
-					// Skip invalid URLs
-					if (!isUrl(url)) {
-						console.log("Skipping invalid URL:", url)
-						continue
-					}
-
-					// Skip localhost URLs to prevent security issues
-					if (isLocalhostUrl(url)) {
-						console.log("Skipping localhost URL:", url)
-						continue
-					}
+					const fullMatch = url
 
 					matches.push({
 						url,
-						fullMatch: url,
+						fullMatch,
 						index: urlMatch.index,
 						isImage: false, // Will check later
 						isProcessed: false,
 					})
-
-					urlCount++
 				}
 
-				console.log(`Found ${matches.length} URLs in text, will check if they are images`)
-
-				// Set matches immediately so UI can start rendering with loading states
-				setUrlMatches(matches.sort((a, b) => a.index - b.index))
-
-				// Mark loading as complete to show content immediately
-				setIsLoading(false)
-
-				// Process image checks in the background - one at a time to avoid network flooding
-				const processImageChecks = async () => {
-					console.log(`Starting sequential URL processing for ${matches.length} URLs`)
-
-					for (let i = 0; i < matches.length; i++) {
-						// Skip already processed URLs (from extension check)
-						if (matches[i].isProcessed) continue
-
-						// Check if processing has been canceled (switched to plain mode)
-						if (processingCanceled) {
-							console.log("URL processing canceled - display mode changed to plain")
-							return
-						}
-
-						const match = matches[i]
-						console.log(`Processing URL ${i + 1} of ${matches.length}: ${match.url}`)
-
-						try {
-							// Process each URL individually
-							const isImage = await checkIfImageUrl(match.url)
-
-							// Skip if processing has been canceled
-							if (processingCanceled) return
-
-							// Update the match in place
-							match.isImage = isImage
-							match.isProcessed = true
-
-							// Update state after each URL to show progress
-							// Create a new array to ensure React detects the state change
-							setUrlMatches([...matches])
-						} catch (err) {
-							console.log(`URL check error: ${match.url}`, err)
-							match.isProcessed = true
-
-							// Update state even on error
-							if (!processingCanceled) {
-								setUrlMatches([...matches])
-							}
-						}
-
-						// Delay between URL processing to avoid overwhelming the network
-						if (!processingCanceled && i < matches.length - 1) {
-							await new Promise((resolve) => setTimeout(resolve, 100))
-						}
-					}
-
-					console.log(`URL processing complete. Found ${matches.filter((m) => m.isImage).length} image URLs`)
+				// Check if URLs are images
+				for (const match of matches) {
+					match.isImage = await checkIfImageUrl(match.url)
 				}
 
-				// Start the background processing
-				processImageChecks()
+				// Sort by position in the text
+				matches.sort((a, b) => a.index - b.index)
+
+				setUrlMatches(matches)
 			} catch (error) {
-				setError("Failed to process response content. Switch to plain text mode to view safely.")
+				console.error("Error processing MCP response:", error)
+			} finally {
 				setIsLoading(false)
 			}
 		}
 
 		processResponse()
-
-		// Cleanup function to cancel processing if component unmounts or dependencies change
-		return () => {
-			processingCanceled = true
-			console.log("Cleaning up URL processing")
-		}
-	}, [responseText, displayMode, forceUpdateCounter])
+	}, [responseText])
 
 	// Function to render content based on display mode
 	const renderContent = () => {
@@ -286,26 +343,15 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 			return <UrlText>{responseText}</UrlText>
 		}
 
-		// Show error message if there was an error
-		if (error) {
-			return (
-				<>
-					<div style={{ color: "var(--vscode-errorForeground)", marginBottom: "10px" }}>{error}</div>
-					<UrlText>{responseText}</UrlText>
-				</>
-			)
-		}
-
 		// For rich display mode, show the text with embedded content
-		if (!isLoading) {
-			// We already know displayMode is "rich" if we get here
+		if (displayMode === "rich" && !isLoading) {
 			// Create an array of text segments and embedded content
 			const segments: JSX.Element[] = []
 			let lastIndex = 0
 			let segmentIndex = 0
 
-			// Track embed count for logging
-			let embedCount = 0
+			// Reset the processed flag for all URLs
+			const processedUrls = new Set<string>()
 
 			// Add the text before the first URL
 			if (urlMatches.length === 0) {
@@ -329,51 +375,38 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 					const urlEndIndex = index + fullMatch.length
 
 					// Add embedded content after the URL
-					// For images, use the ImagePreview component
 					if (match.isImage) {
 						segments.push(
-							<div key={`embed-image-${url}-${segmentIndex++}`}>
-								{/* Use formatUrlForOpening for network calls but preserve original URL in display */}
-								<ImagePreview url={formatUrlForOpening(url)} />
+							<div key={`embed-${segmentIndex++}`} style={{ margin: "10px 0" }}>
+								<img
+									src={DOMPurify.sanitize(url)}
+									alt={`Image for ${url}`}
+									style={{
+										width: "85%",
+										height: "auto",
+										borderRadius: "4px",
+										cursor: "pointer",
+									}}
+									onClick={() => {
+										const formattedUrl = formatUrlForOpening(url)
+										vscode.postMessage({
+											type: "openInBrowser",
+											url: DOMPurify.sanitize(formattedUrl),
+										})
+									}}
+								/>
+							</div>,
+						)
+					} else if (!processedUrls.has(url)) {
+						// For non-image URLs, only show the preview once
+						segments.push(
+							<div key={`embed-${segmentIndex++}`} style={{ margin: "10px 0" }}>
+								<LinkPreview url={formatUrlForOpening(url)} />
 							</div>,
 						)
-						embedCount++
-						// console.log(`Added image embed for ${url}, embed count: ${embedCount}`);
-					} else if (match.isProcessed) {
-						// For non-image URLs or URLs we haven't processed yet, show link preview
-						try {
-							// Skip localhost URLs
-							if (!isLocalhostUrl(url)) {
-								// Use a unique key that includes the URL to ensure each preview is isolated
-								segments.push(
-									<div key={`embed-${url}-${segmentIndex++}`} style={{ margin: "10px 0" }}>
-										{/* Already using formatUrlForOpening for link previews */}
-										<LinkPreview url={formatUrlForOpening(url)} />
-									</div>,
-								)
 
-								embedCount++
-								// console.log(`Added link preview for ${url}, embed count: ${embedCount}`);
-							}
-						} catch (e) {
-							console.log("Link preview could not be created")
-							// Show error message for failed link preview
-							segments.push(
-								<div
-									key={`embed-error-${segmentIndex++}`}
-									style={{
-										margin: "10px 0",
-										padding: "8px",
-										color: "var(--vscode-errorForeground)",
-										border: "1px solid var(--vscode-editorError-foreground)",
-										borderRadius: "4px",
-										height: "128px", // Fixed height
-										overflow: "auto", // Allow scrolling if content overflows
-									}}>
-									Failed to create preview for: {url}
-								</div>,
-							)
-						}
+						// Mark this URL as processed
+						processedUrls.add(url)
 					}
 
 					// Update lastIndex for next segment
@@ -409,7 +442,7 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 			</ResponseContainer>
 		)
 	} catch (error) {
-		console.log("Error rendering MCP response - falling back to plain text")
+		console.error("Error parsing MCP response:", error)
 		return (
 			<ResponseContainer>
 				<ResponseHeader>
@@ -424,13 +457,4 @@ const McpResponseDisplay: React.FC<McpResponseDisplayProps> = ({ responseText })
 	}
 }
 
-// Wrap the entire McpResponseDisplay component with an error boundary
-const McpResponseDisplayWithErrorBoundary: React.FC<McpResponseDisplayProps> = (props) => {
-	return (
-		<ChatErrorBoundary>
-			<McpResponseDisplay {...props} />
-		</ChatErrorBoundary>
-	)
-}
-
-export default McpResponseDisplayWithErrorBoundary
+export default McpResponseDisplay

webview-ui/src/components/mcp/McpRichUtil.ts

@@ -1,183 +0,0 @@
-import { vscode } from "../../utils/vscode"
-
-// Safely create a URL object with error handling and ensure HTTPS
-export const safeCreateUrl = (url: string): URL | null => {
-	try {
-		// Convert HTTP to HTTPS for security
-		if (url.startsWith("http://")) {
-			url = url.replace("http://", "https://")
-		}
-
-		return new URL(url)
-	} catch (e) {
-		// If the URL doesn't have a protocol, add https://
-		if (!url.startsWith("https://")) {
-			try {
-				return new URL(`https://${url}`)
-			} catch (e) {
-				console.log(`Invalid URL: ${url}`)
-				return null
-			}
-		}
-		console.log(`Invalid URL: ${url}`)
-		return null
-	}
-}
-
-// Check if a string is a valid URL
-export const isUrl = (str: string): boolean => {
-	return safeCreateUrl(str) !== null
-}
-
-// Get hostname safely
-export const getSafeHostname = (url: string): string => {
-	try {
-		const urlObj = safeCreateUrl(url)
-		return urlObj ? urlObj.hostname : "unknown-host"
-	} catch (e) {
-		return "unknown-host"
-	}
-}
-
-// Check if a URL is a localhost URL by examining the hostname
-export const isLocalhostUrl = (url: string): boolean => {
-	try {
-		const hostname = getSafeHostname(url)
-		return (
-			hostname === "localhost" ||
-			hostname === "127.0.0.1" ||
-			hostname === "0.0.0.0" ||
-			hostname.startsWith("192.168.") ||
-			hostname.startsWith("10.") ||
-			hostname.endsWith(".local")
-		)
-	} catch (e) {
-		// If we can't parse the URL, assume it's not localhost
-		return false
-	}
-}
-
-// Function to normalize relative URLs by combining with a base URL
-export const normalizeRelativeUrl = (relativeUrl: string, baseUrl: string): string => {
-	// If it's already an absolute URL or a data URL, return as is
-	if (relativeUrl.startsWith("http://") || relativeUrl.startsWith("https://") || relativeUrl.startsWith("data:")) {
-		return relativeUrl
-	}
-
-	try {
-		// Parse the base URL
-		const baseUrlObj = safeCreateUrl(baseUrl)
-		if (!baseUrlObj) {
-			return relativeUrl // If we can't parse the base URL, return original
-		}
-
-		// Handle different types of relative paths
-		if (relativeUrl.startsWith("//")) {
-			// Protocol-relative URL
-			return `${baseUrlObj.protocol}${relativeUrl}`
-		} else if (relativeUrl.startsWith("/")) {
-			// Root-relative URL
-			return `${baseUrlObj.protocol}//${baseUrlObj.host}${relativeUrl}`
-		} else {
-			// Path-relative URL
-			// Get the directory part of the URL
-			let basePath = baseUrlObj.pathname
-			if (!basePath.endsWith("/")) {
-				// If the path doesn't end with a slash, remove the file part
-				basePath = basePath.substring(0, basePath.lastIndexOf("/") + 1)
-			}
-			return `${baseUrlObj.protocol}//${baseUrlObj.host}${basePath}${relativeUrl}`
-		}
-	} catch (error) {
-		console.log(`Error normalizing relative URL: ${error}`)
-		return relativeUrl // Return original on error
-	}
-}
-
-// Helper to ensure URL is in a format that can be opened
-export const formatUrlForOpening = (url: string): string => {
-	// If it's a data URI, return as is
-	if (url.startsWith("data:image/")) {
-		return url
-	}
-
-	// Use safeCreateUrl to validate and format the URL
-	const urlObj = safeCreateUrl(url)
-	if (urlObj) {
-		return urlObj.href
-	}
-
-	console.log(`Invalid URL format: ${url}`)
-	// Return a safe fallback that won't crash
-	return "about:blank"
-}
-
-// Function to check if a URL is an image using HEAD request
-export const checkIfImageUrl = async (url: string): Promise<boolean> => {
-	// For data URLs, we can check synchronously
-	if (url.startsWith("data:image/")) {
-		return true
-	}
-
-	// Create a secure URL for the check but don't modify the original URL
-	let secureUrl = url
-	// Convert HTTP to HTTPS for security in the network request only
-	if (secureUrl.startsWith("http://")) {
-		secureUrl = secureUrl.replace("http://", "https://")
-		console.log(`Using HTTPS version for image check: ${secureUrl}`)
-	}
-
-	// Validate URL before proceeding
-	if (!isUrl(url)) {
-		console.log("Invalid URL format:", url)
-		return false
-	}
-
-	// For https URLs, we need to send a message to the extension
-	if (url.startsWith("https")) {
-		try {
-			// Create a promise that will resolve when we get a response
-			return new Promise((resolve) => {
-				let timeoutId: ReturnType<typeof setTimeout> | undefined = undefined
-
-				// Set up a one-time listener for the response
-				const messageListener = (event: MessageEvent) => {
-					const message = event.data
-					if (message.type === "isImageUrlResult" && message.url === url) {
-						window.removeEventListener("message", messageListener)
-						resolve(message.isImage)
-						if (timeoutId) {
-							clearTimeout(timeoutId)
-						}
-					}
-				}
-
-				window.addEventListener("message", messageListener)
-
-				// Send the request to the extension
-				vscode.postMessage({
-					type: "checkIsImageUrl",
-					text: url,
-				})
-
-				// Set a timeout to avoid hanging indefinitely
-				timeoutId = setTimeout(() => {
-					window.removeEventListener("message", messageListener)
-					console.log("Hit timeout waiting for checkIsImageUrl")
-					resolve(false)
-				}, 3000)
-			})
-		} catch (error) {
-			console.log("Error checking if URL is an image:", url)
-			// Don't fall back to extension check on error
-			// Instead, return false to indicate it's not an image
-			return false
-		}
-	}
-
-	// Don't fall back to extension check for other URLs
-	// Only data URLs (handled above) are guaranteed to be images
-	// For all other URLs, we need proper content type verification
-	console.log(`URL protocol not supported for image check: ${url}`)
-	return false
-}

webview-ui/src/components/mcp/McpView.tsx

@@ -13,10 +13,10 @@ import { DEFAULT_MCP_TIMEOUT_SECONDS, McpServer } from "../../../../src/shared/m
 import { useExtensionState } from "../../context/ExtensionStateContext"
 import { getMcpServerDisplayName } from "../../utils/mcp"
 import { vscode } from "../../utils/vscode"
+import DangerButton from "../common/DangerButton"
 import McpMarketplaceView from "./marketplace/McpMarketplaceView"
 import McpResourceRow from "./McpResourceRow"
 import McpToolRow from "./McpToolRow"
-import DangerButton from "../common/DangerButton"
 
 type McpViewProps = {
 	onDone: () => void
@@ -387,13 +387,6 @@ const ServerRow = ({ server }: { server: McpServer }) => {
 						}}>
 						{server.status === "connecting" ? "Retrying..." : "Retry Connection"}
 					</VSCodeButton>
-
-					<DangerButton
-						style={{ width: "calc(100% - 20px)", margin: "0 10px 10px 10px" }}
-						disabled={isDeleting}
-						onClick={handleDelete}>
-						{isDeleting ? "Deleting..." : "Delete Server"}
-					</DangerButton>
 				</div>
 			) : (
 				isExpanded && (
@@ -485,9 +478,12 @@ const ServerRow = ({ server }: { server: McpServer }) => {
 						</VSCodeButton>
 
 						<DangerButton
-							style={{ width: "calc(100% - 14px)", margin: "5px 7px 3px 7px" }}
+							onClick={handleDelete}
 							disabled={isDeleting}
-							onClick={handleDelete}>
+							style={{
+								width: "calc(100% - 14px)",
+								margin: "5px 7px 3px 7px",
+							}}>
 							{isDeleting ? "Deleting..." : "Delete Server"}
 						</DangerButton>
 					</div>

webview-ui/src/components/mcp/RICH_MCP_TESTING.md

@@ -1,683 +0,0 @@
-# How To Test Rich MCP Responses
-
-Use the `echo` MCP server to read back one of the test cases below into an MCP response.
-https://github.com/Garoth/echo-mcp
-
-Manually check the embeds, images, and whatever other enhancements for proper rendering.
-Remember that toggling Rich MCP off should cancel pending fetches. If the toggle was
-set to Plain, then the image/link previews should never be fetched until it's enabled.
-Remember that rich display mode will only load the first n URLs, currently set to 50
-
-## Main Test Case
-
-Working Image URLs
-
-jpg: https://yavuzceliker.github.io/sample-images/image-205.jpg
-webp: https://seenandheard.app/assets/img/face-2.webp
-svg: https://seenandheard.app/assets/img/logo-white.svg
-
-Looks like Image URL but is website
-
-site: https://github.com/google/pprof/blob/main/doc/images/webui/flame-multi.png
-raw png: https://raw.githubusercontent.com/google/pprof/refs/heads/main/doc/images/webui/flame-multi.png
-
-Gif:
-
-https://upload.wikimedia.org/wikipedia/commons/thumb/d/d0/01_Das_Sandberg-Modell.gif/750px-01_Das_Sandberg-Modell.gif
-
-Normal Working URLs for OG Embeds
-
-https://www.google.com
-https://www.blogger.com
-https://youtube.com
-https://linkedin.com
-https://support.google.com
-https://cloudflare.com
-https://microsoft.com
-https://apple.com
-https://en.wikipedia.org
-https://play.google.com
-https://wordpress.org
-
-Attack URLs & Unsupported Formats
-
-data:text/html,<h1>Hello World</h1>
-data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==
-javascript:alert('XSS')
-mailto:user@example.com
-tel:+1-234-567-8901
-sms:+1-234-567-8901?body=Hello
-https://www.example.com/path/to/file.html?param=<script>alert('XSS')</script>
-https://www.example.com/path/to/file.html?param=<img src="x" onerror="alert('XSS')">
-https://www.example.com/path/to/file.html?param=javascript:alert('XSS')
-https://www.example.com/path/to/file.html?param=data:text/html,<script>alert('XSS')</script>
-https://www.example.com/path/to/file.html?param=data:image/svg+xml,<svg onload="alert('XSS')">
-https://www.example.com/path/to/file.html?param=<iframe src="javascript:alert('XSS')">
-https://www.example.com/path/to/file.html?param=<a href="javascript:alert('XSS')">Click me</a>
-
-Broken & Weird Edge Cases
-
-https://tectum.io/blog/dex-tools/
-http://0.0.0.0:8025/img.png
-https://localhost:8080/img.jpg
-http://localhost:8080/
-https://localhost/
-http://httpbin.org/#/ 
-https://snthonstcrgrfonhenth.com/nthshtf
-http://domain/.well-known/acme-challenge/token
-https://<strong>dextools</strong>.apiable.io/(Only
-
-## Generated Links Test Case
-
-1. https://www.google.com
-2. http://example.com/path/to/resource?query=value#fragment
-3. https://images.unsplash.com/photo-1575936123452-b67c3203c357
-4. file:///home/user/document.txt
-5. https://user:password@example.com:8080/path
-6. http://192.168.1.1:8080
-7. https://www.example.com/path with spaces/file.html
-8. ftp://ftp.example.com/pub/file.zip
-9. https://www.example.com/index.php?id=1&name=test
-10. https://subdomain.example.co.uk/path
-11. https://www.example.com/path/to/image.jpg
-12. https://www.example.com:8443/secure
-13. http://localhost:3000
-14. https://www.example.com/path/to/file.pdf#page=10
-15. https://www.example.com/search?q=query+with+spaces
-16. https://www.example.com/path/to/file.html#section-2
-17. https://www.example.com/path/to/file.php?id=123&action=view
-18. https://www.example.com/path/to/file.html?param1=value1&param2=value2#fragment
-19. https://www.example.com/path/to/file.html?param=value with spaces
-20. https://www.example.com/path/to/file.html?param=value%20with%20encoded%20spaces
-21. https://www.example.com/path/to/file.html?param=value+with+plus+signs
-22. https://www.example.com/path/to/file.html?param=special@characters!
-23. https://www.example.com/path/to/file.html?param=special%40characters%21
-24. https://www.example.com/path/to/file.html?param=value&param=duplicate
-25. https://www.example.com/path/to/file.html?param=
-26. https://www.example.com/path/to/file.html?=value
-27. https://www.example.com/path/to/file.html?
-28. https://www.example.com/path/to/file.html#
-29. https://www.example.com/path/to/file.html#fragment1#fragment2
-30. https://www.example.com/path/to/file.html?param1=value1#fragment?param2=value2
-31. https://www.example.com/index.html#!hashbang
-32. https://www.example.com/path/to/file.html?param=value#fragment=value
-33. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment
-34. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment=value
-35. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment?param3=value3
-36. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment&param3=value3
-37. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment#fragment2
-38. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment/path
-39. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment?param3=value3&param4=value4
-40. https://www.example.com/path/to/file.html?param=value&param2=value2#fragment&param3=value3&param4=value4
-41. data:text/html,<h1>Hello World</h1>
-42. data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mP8z8BQDwAEhQGAhKmMIQAAAABJRU5ErkJggg==
-43. javascript:alert('XSS')
-44. mailto:user@example.com
-45. tel:+1-234-567-8901
-46. sms:+1-234-567-8901?body=Hello
-47. https://www.example.com/path/to/file.html?param=<script>alert('XSS')</script>
-48. https://www.example.com/path/to/file.html?param=<img src="x" onerror="alert('XSS')">
-49. https://www.example.com/path/to/file.html?param=javascript:alert('XSS')
-50. https://www.example.com/path/to/file.html?param=data:text/html,<script>alert('XSS')</script>
-51. https://www.example.com/path/to/file.html?param=data:image/svg+xml,<svg onload="alert('XSS')">
-52. https://www.example.com/path/to/file.html?param=<iframe src="javascript:alert('XSS')">
-53. https://www.example.com/path/to/file.html?param=<a href="javascript:alert('XSS')">Click me</a>
-54. https://www.example.com/path/to/file.html?param=<img src="x" onerror="alert('XSS')">
-55. https://www.example.com/path/to/file.html?param=<svg><script>alert('XSS')</script></svg>
-56. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-57. https://www.example.com/path/to/file.html?param=<img src="x" onerror="alert('XSS')">
-58. https://www.example.com/path/to/file.html?param=<body onload="alert('XSS')">
-59. https://www.example.com/path/to/file.html?param=<input autofocus onfocus="alert('XSS')">
-60. https://www.example.com/path/to/file.html?param=<video src="x" onerror="alert('XSS')">
-61. https://www.example.com/path/to/file.html?param=<audio src="x" onerror="alert('XSS')">
-62. https://www.example.com/path/to/file.html?param=<iframe srcdoc="<script>alert('XSS')</script>">
-63. https://www.example.com/path/to/file.html?param=<math><maction actiontype="statusline#" xlink:href="javascript:alert('XSS')">Click
-64. https://www.example.com/path/to/file.html?param=<form action="javascript:alert('XSS')"><input type="submit">
-65. https://www.example.com/path/to/file.html?param=<isindex action="javascript:alert('XSS')" type="image">
-66. https://www.example.com/path/to/file.html?param=<object data="javascript:alert('XSS')">
-67. https://www.example.com/path/to/file.html?param=<embed src="javascript:alert('XSS')">
-68. https://www.example.com/path/to/file.html?param=<svg><script>alert('XSS')</script>
-69. https://www.example.com/path/to/file.html?param=<marquee onstart="alert('XSS')">
-70. https://www.example.com/path/to/file.html?param=<div style="background-image: url(javascript:alert('XSS'))">
-71. https://www.example.com/path/to/file.html?param=<link rel="stylesheet" href="javascript:alert('XSS')">
-72. https://www.example.com/path/to/file.html?param=<table background="javascript:alert('XSS')">
-73. https://www.example.com/path/to/file.html?param=<div style="width: expression(alert('XSS'))">
-74. https://www.example.com/path/to/file.html?param=<style>@import "javascript:alert('XSS')";</style>
-75. https://www.example.com/path/to/file.html?param=<meta http-equiv="refresh" content="0;url=javascript:alert('XSS')">
-76. https://www.example.com/path/to/file.html?param=<iframe src="data:text/html,<script>alert('XSS')</script>">
-77. https://www.example.com/path/to/file.html?param=<svg><set attributeName="onload" to="alert('XSS')" />
-78. https://www.example.com/path/to/file.html?param=<script>alert('XSS')</script>
-79. https://www.example.com/path/to/file.html?param=<img src="x" onerror="alert('XSS')">
-80. https://www.example.com/path/to/file.html?param=<svg><animate xlink:href="#xss" attributeName="href" values="javascript:alert('XSS')" />
-81. https://www.example.com/path/to/file.html?param=<svg><a><animate attributeName="href" values="javascript:alert('XSS')" />
-82. https://www.example.com/path/to/file.html?param=<svg><a xlink:href="javascript:alert('XSS')"><text x="20" y="20">XSS</text></a>
-83. https://www.example.com/path/to/file.html?param=<svg><a><animate attributeName="href" values="javascript:alert('XSS')" /><text x="20" y="20">XSS</text></a>
-84. https://www.example.com/path/to/file.html?param=<svg><discard onbegin="alert('XSS')" />
-85. https://www.example.com/path/to/file.html?param=<svg><script>alert('XSS')</script></svg>
-86. https://www.example.com/path/to/file.html?param=<svg><script>alert('XSS')</script>
-87. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-88. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-89. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-90. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-91. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-92. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-93. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-94. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-95. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-96. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-97. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-98. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-99. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-100. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-101. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-102. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-103. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-104. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-105. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-106. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-107. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-108. https://www.example.com/path/to/file.html?param=<svg><animate onbegin="alert('XSS')" attributeName="x" />
-
-
-## Popular URLs by Popularity Test Case
-
-1. https://www.google.com
-2. https://www.blogger.com
-3. https://youtube.com
-4. https://linkedin.com
-5. https://support.google.com
-6. https://cloudflare.com
-7. https://microsoft.com
-8. https://apple.com
-9. https://en.wikipedia.org
-10. https://play.google.com
-11. https://wordpress.org
-12. https://docs.google.com
-13. https://mozilla.org
-14. https://maps.google.com
-15. https://youtu.be
-16. https://drive.google.com
-17. https://bp.blogspot.com
-18. https://sites.google.com
-19. https://googleusercontent.com
-20. https://accounts.google.com
-21. https://t.me
-22. https://europa.eu
-23. https://plus.google.com
-24. https://whatsapp.com
-25. https://adobe.com
-26. https://facebook.com
-27. https://policies.google.com
-28. https://uol.com.br
-29. https://istockphoto.com
-30. https://vimeo.com
-31. https://vk.com
-32. https://github.com
-33. https://amazon.com
-34. https://search.google.com
-35. https://bbc.co.uk
-36. https://google.de
-37. https://live.com
-38. https://gravatar.com
-39. https://nih.gov
-40. https://dan.com
-41. https://files.wordpress.com
-42. https://www.yahoo.com
-43. https://cnn.com
-44. https://dropbox.com
-45. https://wikimedia.org
-46. https://creativecommons.org
-47. https://google.com.br
-48. https://line.me
-49. https://googleblog.com
-50. https://opera.com
-51. https://es.wikipedia.org
-52. https://globo.com
-53. https://brandbucket.com
-54. https://myspace.com
-55. https://slideshare.net
-56. https://paypal.com
-57. https://tiktok.com
-58. https://netvibes.com
-59. https://theguardian.com
-60. https://who.int
-61. https://goo.gl
-62. https://medium.com
-63. https://tools.google.com
-64. https://draft.blogger.com
-65. https://pt.wikipedia.org
-66. https://fr.wikipedia.org
-67. https://www.weebly.com
-68. https://news.google.com
-69. https://developers.google.com
-70. https://w3.org
-71. https://mail.google.com
-72. https://gstatic.com
-73. https://jimdofree.com
-74. https://cpanel.net
-75. https://imdb.com
-76. https://wa.me
-77. https://feedburner.com
-78. https://enable-javascript.com
-79. https://nytimes.com
-80. https://workspace.google.com
-81. https://ok.ru
-82. https://google.es
-83. https://dailymotion.com
-84. https://afternic.com
-85. https://bloomberg.com
-86. https://amazon.de
-87. https://photos.google.com
-88. https://wiley.com
-89. https://aliexpress.com
-90. https://indiatimes.com
-91. https://youronlinechoices.com
-92. https://elpais.com
-93. https://tinyurl.com
-94. https://yadi.sk
-95. https://spotify.com
-96. https://huffpost.com
-97. https://ru.wikipedia.org
-98. https://google.fr
-99. https://webmd.com
-100. https://samsung.com
-101. https://independent.co.uk
-102. https://amazon.co.jp
-103. https://get.google.com
-104. https://amazon.co.uk
-105. https://4shared.com
-106. https://telegram.me
-107. https://planalto.gov.br
-108. https://businessinsider.com
-109. https://ig.com.br
-110. https://issuu.com
-111. https://www.gov.br
-112. https://wsj.com
-113. https://hugedomains.com
-114. https://picasaweb.google.com
-115. https://usatoday.com
-116. https://scribd.com
-117. https://www.gov.uk
-118. https://storage.googleapis.com
-119. https://huffingtonpost.com
-120. https://bbc.com
-121. https://estadao.com.br
-122. https://nature.com
-123. https://mediafire.com
-124. https://washingtonpost.com
-125. https://forms.gle
-126. https://namecheap.com
-127. https://forbes.com
-128. https://mirror.co.uk
-129. https://soundcloud.com
-130. https://fb.com
-131. https://marketingplatform.google
-132. https://domainmarket.com
-133. https://ytimg.com
-134. https://terra.com.br
-135. https://google.co.uk
-136. https://shutterstock.com
-137. https://dailymail.co.uk
-138. https://reg.ru
-139. https://t.co
-140. https://cdc.gov
-141. https://thesun.co.uk
-142. https://wp.com
-143. https://cnet.com
-144. https://instagram.com
-145. https://researchgate.net
-146. https://google.it
-147. https://fandom.com
-148. https://office.com
-149. https://list-manage.com
-150. https://msn.com
-151. https://un.org
-152. https://de.wikipedia.org
-153. https://ovh.com
-154. https://mail.ru
-155. https://bing.com
-156. https://news.yahoo.com
-157. https://myaccount.google.com
-158. https://hatena.ne.jp
-159. https://shopify.com
-160. https://adssettings.google.com
-161. https://bit.ly
-162. https://reuters.com
-163. https://booking.com
-164. https://discord.com
-165. https://buydomains.com
-166. https://nasa.gov
-167. https://aboutads.info
-168. https://time.com
-169. https://abril.com.br
-170. https://change.org
-171. https://nginx.org
-172. https://twitter.com
-173. https://www.wikipedia.org
-174. https://archive.org
-175. https://cbsnews.com
-176. https://networkadvertising.org
-177. https://telegraph.co.uk
-178. https://pinterest.com
-179. https://google.co.jp
-180. https://pixabay.com
-181. https://zendesk.com
-182. https://cpanel.com
-183. https://vistaprint.com
-184. https://sky.com
-185. https://windows.net
-186. https://alicdn.com
-187. https://google.ca
-188. https://lemonde.fr
-189. https://newyorker.com
-190. https://webnode.page
-191. https://surveymonkey.com
-192. https://translate.google.com
-193. https://calendar.google.com
-194. https://amazonaws.com
-195. https://academia.edu
-196. https://apache.org
-197. https://imageshack.us
-198. https://akamaihd.net
-199. https://nginx.com
-200. https://discord.gg
-201. https://thetimes.co.uk
-202. https://search.yahoo.com
-203. https://amazon.fr
-204. https://yelp.com
-205. https://berkeley.edu
-206. https://google.ru
-207. https://sedoparking.com
-208. https://cbc.ca
-209. https://unesco.org
-210. https://ggpht.com
-211. https://privacyshield.gov
-212. https://www.over-blog.com
-213. https://clarin.com
-214. https://www.wix.com
-215. https://whitehouse.gov
-216. https://icann.org
-217. https://gnu.org
-218. https://yandex.ru
-219. https://francetvinfo.fr
-220. https://gmail.com
-221. https://mozilla.com
-222. https://ziddu.com
-223. https://guardian.co.uk
-224. https://twitch.tv
-225. https://sedo.com
-226. https://foxnews.com
-227. https://rambler.ru
-228. https://books.google.com
-229. https://stanford.edu
-230. https://wikihow.com
-231. https://it.wikipedia.org
-232. https://20minutos.es
-233. https://sfgate.com
-234. https://liveinternet.ru
-235. https://ja.wikipedia.org
-236. https://000webhost.com
-237. https://espn.com
-238. https://eventbrite.com
-239. https://disney.com
-240. https://statista.com
-241. https://addthis.com
-242. https://pinterest.fr
-243. https://lavanguardia.com
-244. https://vkontakte.ru
-245. https://doubleclick.net
-246. https://bp2.blogger.com
-247. https://skype.com
-248. https://sciencedaily.com
-249. https://bloglovin.com
-250. https://insider.com
-251. https://pl.wikipedia.org
-252. https://sputniknews.com
-253. https://id.wikipedia.org
-254. https://doi.org
-255. https://nypost.com
-256. https://elmundo.es
-257. https://abcnews.go.com
-258. https://ipv4.google.com
-259. https://deezer.com
-260. https://express.co.uk
-261. https://detik.com
-262. https://mystrikingly.com
-263. https://rakuten.co.jp
-264. https://amzn.to
-265. https://arxiv.org
-266. https://alibaba.com
-267. https://fb.me
-268. https://wikia.com
-269. https://t-online.de
-270. https://telegra.ph
-271. https://mega.nz
-272. https://usnews.com
-273. https://plos.org
-274. https://naver.com
-275. https://ibm.com
-276. https://smh.com.au
-277. https://dw.com
-278. https://google.nl
-279. https://lefigaro.fr
-280. https://bp1.blogger.com
-281. https://picasa.google.com
-282. https://theatlantic.com
-283. https://nydailynews.com
-284. https://themeforest.net
-285. https://rtve.es
-286. https://newsweek.com
-287. https://ovh.net
-288. https://ca.gov
-289. https://goodreads.com
-290. https://economist.com
-291. https://target.com
-292. https://marca.com
-293. https://kickstarter.com
-294. https://hindustantimes.com
-295. https://weibo.com
-296. https://finance.yahoo.com
-297. https://huawei.com
-298. https://e-monsite.com
-299. https://hubspot.com
-300. https://npr.org
-301. https://netflix.com
-302. https://gizmodo.com
-303. https://netlify.app
-304. https://yandex.com
-305. https://mashable.com
-306. https://cnil.fr
-307. https://latimes.com
-308. https://steampowered.com
-309. https://rt.com
-310. https://photobucket.com
-311. https://quora.com
-312. https://nbcnews.com
-313. https://android.com
-314. https://instructables.com
-315. https://www.canalblog.com
-316. https://www.livejournal.com
-317. https://ouest-france.fr
-318. https://tripadvisor.com
-319. https://ovhcloud.com
-320. https://pexels.com
-321. https://oracle.com
-322. https://yahoo.co.jp
-323. https://addtoany.com
-324. https://sakura.ne.jp
-325. https://cointernet.com.co
-326. https://twimg.com
-327. https://britannica.com
-328. https://php.net
-329. https://standard.co.uk
-330. https://groups.google.com
-331. https://cnbc.com
-332. https://loc.gov
-333. https://qq.com
-334. https://buzzfeed.com
-335. https://godaddy.com
-336. https://ikea.com
-337. https://disqus.com
-338. https://taringa.net
-339. https://ea.com
-340. https://dropcatch.com
-341. https://techcrunch.com
-342. https://canva.com
-343. https://offset.com
-344. https://ebay.com
-345. https://zoom.us
-346. https://cambridge.org
-347. https://unsplash.com
-348. https://playstation.com
-349. https://people.com
-350. https://springer.com
-351. https://psychologytoday.com
-352. https://sendspace.com
-353. https://home.pl
-354. https://rapidshare.com
-355. https://prezi.com
-356. https://photos1.blogger.com
-357. https://thenai.org
-358. https://ftc.gov
-359. https://google.pl
-360. https://ted.com
-361. https://secureserver.net
-362. https://code.google.com
-363. https://plesk.com
-364. https://aol.com
-365. https://biglobe.ne.jp
-366. https://hp.com
-367. https://canada.ca
-368. https://linktr.ee
-369. https://hollywoodreporter.com
-370. https://ietf.org
-371. https://clickbank.net
-372. https://harvard.edu
-373. https://amazon.es
-374. https://oup.com
-375. https://timeweb.ru
-376. https://engadget.com
-377. https://vice.com
-378. https://cornell.edu
-379. https://dreamstime.com
-380. https://tmz.com
-381. https://gofundme.com
-382. https://pbs.org
-383. https://stackoverflow.com
-384. https://abc.net.au
-385. https://sciencedirect.com
-386. https://ft.com
-387. https://variety.com
-388. https://alexa.com
-389. https://abc.es
-390. https://walmart.com
-391. https://gooyaabitemplates.com
-392. https://redbull.com
-393. https://ssl-images-amazon.com
-394. https://theverge.com
-395. https://spiegel.de
-396. https://about.com
-397. https://nationalgeographic.com
-398. https://bandcamp.com
-399. https://m.wikipedia.org
-400. https://zippyshare.com
-401. https://wired.com
-402. https://freepik.com
-403. https://outlook.com
-404. https://mit.edu
-405. https://sapo.pt
-406. https://goo.ne.jp
-407. https://java.com
-408. https://google.co.th
-409. https://scmp.com
-410. https://mayoclinic.org
-411. https://scholastic.com
-412. https://nba.com
-413. https://reverbnation.com
-414. https://depositfiles.com
-415. https://video.google.com
-416. https://howstuffworks.com
-417. https://cbslocal.com
-418. https://merriam-webster.com
-419. https://focus.de
-420. https://admin.ch
-421. https://gfycat.com
-422. https://com.com
-423. https://narod.ru
-424. https://boston.com
-425. https://sony.com
-426. https://justjared.com
-427. https://bitly.com
-428. https://jstor.org
-429. https://amebaownd.com
-430. https://g.co
-431. https://gsmarena.com
-432. https://lexpress.fr
-433. https://reddit.com
-434. https://usgs.gov
-435. https://bigcommerce.com
-436. https://gettyimages.com
-437. https://ign.com
-438. https://justgiving.com
-439. https://techradar.com
-440. https://weather.com
-441. https://amazon.ca
-442. https://justice.gov
-443. https://sciencemag.org
-444. https://pcmag.com
-445. https://theconversation.com
-446. https://foursquare.com
-447. https://flickr.com
-448. https://giphy.com
-449. https://tvtropes.org
-450. https://fifa.com
-451. https://upenn.edu
-452. https://digg.com
-453. https://bestfreecams.club
-454. https://histats.com
-455. https://salesforce.com
-456. https://blog.google
-457. https://apnews.com
-458. https://theglobeandmail.com
-459. https://m.me
-460. https://europapress.es
-461. https://washington.edu
-462. https://thefreedictionary.com
-463. https://jhu.edu
-464. https://euronews.com
-465. https://liberation.fr
-466. https://ads.google.com
-467. https://trustpilot.com
-468. https://google.com.tw
-469. https://softonic.com
-470. https://kakao.com
-471. https://storage.canalblog.com
-472. https://interia.pl
-473. https://metro.co.uk
-474. https://viglink.com
-475. https://last.fm
-476. https://blackberry.com
-477. https://public-api.wordpress.com
-478. https://sina.com.cn
-479. https://unicef.org
-480. https://archives.gov
-481. https://nps.gov
-482. https://utexas.edu
-483. https://biblegateway.com
-484. https://usda.gov
-485. https://indiegogo.com
-486. https://nikkei.com
-487. https://radiofrance.fr
-488. https://repubblica.it
-489. https://substack.com
-490. https://ap.org
-491. https://nicovideo.jp
-492. https://joomla.org
-493. https://news.com.au
-494. https://allaboutcookies.org
-495. https://mailchimp.com
-496. https://stores.jp
-497. https://intel.com
-498. https://bp0.blogger.com
-499. https://box.com
-499. https://nhk.or.jp

webview-ui/src/components/settings/ApiOptions.tsx

@@ -51,8 +51,8 @@ import { useExtensionState } from "../../context/ExtensionStateContext"
 import { vscode } from "../../utils/vscode"
 import { getAsVar, VSC_DESCRIPTION_FOREGROUND } from "../../utils/vscStyles"
 import VSCodeButtonLink from "../common/VSCodeButtonLink"
-import OpenRouterModelPicker, { ModelDescriptionMarkdown, OPENROUTER_MODEL_PICKER_Z_INDEX } from "./OpenRouterModelPicker"
-import { ClineAccountInfoCard } from "./ClineAccountInfoCard"
+import OpenRouterModelPicker, { ModelDescriptionMarkdown } from "./OpenRouterModelPicker"
+import AccountView, { ClineAccountView } from "../account/AccountView"
 
 interface ApiOptionsProps {
 	showModelOptions: boolean
@@ -62,9 +62,9 @@ interface ApiOptionsProps {
 }
 
 // This is necessary to ensure dropdown opens downward, important for when this is used in popup
-const DROPDOWN_Z_INDEX = OPENROUTER_MODEL_PICKER_Z_INDEX + 2 // Higher than the OpenRouterModelPicker's and ModelSelectorTooltip's z-index
+const DROPDOWN_Z_INDEX = 1001 // Higher than the OpenRouterModelPicker's and ModelSelectorTooltip's z-index
 
-export const DropdownContainer = styled.div<{ zIndex?: number }>`
+const DropdownContainer = styled.div<{ zIndex?: number }>`
 	position: relative;
 	z-index: ${(props) => props.zIndex || DROPDOWN_Z_INDEX};
 
@@ -95,7 +95,6 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 	const [awsEndpointSelected, setAwsEndpointSelected] = useState(!!apiConfiguration?.awsBedrockEndpoint)
 	const [modelConfigurationSelected, setModelConfigurationSelected] = useState(false)
 	const [isDescriptionExpanded, setIsDescriptionExpanded] = useState(false)
-	const [providerSortingSelected, setProviderSortingSelected] = useState(!!apiConfiguration?.openRouterProviderSorting)
 
 	const handleInputChange = (field: keyof ApiConfiguration) => (event: any) => {
 		setApiConfiguration({
@@ -216,8 +215,8 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 			</DropdownContainer>
 
 			{selectedProvider === "cline" && (
-				<div style={{ marginBottom: 14, marginTop: 4 }}>
-					<ClineAccountInfoCard />
+				<div style={{ marginBottom: 8, marginTop: 4 }}>
+					<ClineAccountView />
 				</div>
 			)}
 
@@ -568,7 +567,7 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 							<VSCodeOption value="ap-south-1">ap-south-1</VSCodeOption>
 							<VSCodeOption value="ap-northeast-1">ap-northeast-1</VSCodeOption>
 							<VSCodeOption value="ap-northeast-2">ap-northeast-2</VSCodeOption>
-							<VSCodeOption value="ap-northeast-3">ap-northeast-3</VSCodeOption>
+							{/* <VSCodeOption value="ap-northeast-3">ap-northeast-3</VSCodeOption> */}
 							<VSCodeOption value="ap-southeast-1">ap-southeast-1</VSCodeOption>
 							<VSCodeOption value="ap-southeast-2">ap-southeast-2</VSCodeOption>
 							<VSCodeOption value="ca-central-1">ca-central-1</VSCodeOption>
@@ -577,7 +576,7 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 							<VSCodeOption value="eu-west-1">eu-west-1</VSCodeOption>
 							<VSCodeOption value="eu-west-2">eu-west-2</VSCodeOption>
 							<VSCodeOption value="eu-west-3">eu-west-3</VSCodeOption>
-							<VSCodeOption value="eu-north-1">eu-north-1</VSCodeOption>
+							{/* <VSCodeOption value="eu-north-1">eu-north-1</VSCodeOption> */}
 							{/* <VSCodeOption value="me-south-1">me-south-1</VSCodeOption> */}
 							<VSCodeOption value="sa-east-1">sa-east-1</VSCodeOption>
 							<VSCodeOption value="us-gov-east-1">us-gov-east-1</VSCodeOption>
@@ -676,7 +675,7 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 						placeholder="Enter Project ID...">
 						<span style={{ fontWeight: 500 }}>Google Cloud Project ID</span>
 					</VSCodeTextField>
-					<DropdownContainer zIndex={DROPDOWN_Z_INDEX - 1} className="dropdown-container">
+					<DropdownContainer zIndex={DROPDOWN_Z_INDEX - 2} className="dropdown-container">
 						<label htmlFor="vertex-region-dropdown">
 							<span style={{ fontWeight: 500 }}>Google Cloud Region</span>
 						</label>
@@ -1354,57 +1353,6 @@ const ApiOptions = ({ showModelOptions, apiErrorMessage, modelIdErrorMessage, is
 				</p>
 			)}
 
-			{(selectedProvider === "openrouter" || selectedProvider === "cline") && showModelOptions && (
-				<>
-					<VSCodeCheckbox
-						style={{ marginTop: -10 }}
-						checked={providerSortingSelected}
-						onChange={(e: any) => {
-							const isChecked = e.target.checked === true
-							setProviderSortingSelected(isChecked)
-							if (!isChecked) {
-								setApiConfiguration({
-									...apiConfiguration,
-									openRouterProviderSorting: "",
-								})
-							}
-						}}>
-						Sort underlying provider routing
-					</VSCodeCheckbox>
-
-					{providerSortingSelected && (
-						<div style={{ marginBottom: -6 }}>
-							<DropdownContainer className="dropdown-container" zIndex={OPENROUTER_MODEL_PICKER_Z_INDEX + 1}>
-								<VSCodeDropdown
-									style={{ width: "100%", marginTop: 3 }}
-									value={apiConfiguration?.openRouterProviderSorting}
-									onChange={(e: any) => {
-										setApiConfiguration({
-											...apiConfiguration,
-											openRouterProviderSorting: e.target.value,
-										})
-									}}>
-									<VSCodeOption value="">Default</VSCodeOption>
-									<VSCodeOption value="price">Price</VSCodeOption>
-									<VSCodeOption value="throughput">Throughput</VSCodeOption>
-									<VSCodeOption value="latency">Latency</VSCodeOption>
-								</VSCodeDropdown>
-							</DropdownContainer>
-							<p style={{ fontSize: "12px", marginTop: 3, color: "var(--vscode-descriptionForeground)" }}>
-								{!apiConfiguration?.openRouterProviderSorting &&
-									"Default behavior is to load balance requests across providers (like AWS, Google Vertex, Anthropic), prioritizing price while considering provider uptime"}
-								{apiConfiguration?.openRouterProviderSorting === "price" &&
-									"Sort providers by price, prioritizing the lowest cost provider"}
-								{apiConfiguration?.openRouterProviderSorting === "throughput" &&
-									"Sort providers by throughput, prioritizing the provider with the highest throughput (may increase cost)"}
-								{apiConfiguration?.openRouterProviderSorting === "latency" &&
-									"Sort providers by response time, prioritizing the provider with the lowest latency"}
-							</p>
-						</div>
-					)}
-				</>
-			)}
-
 			{selectedProvider !== "openrouter" &&
 				selectedProvider !== "cline" &&
 				selectedProvider !== "openai" &&

webview-ui/src/components/settings/BrowserSettingsSection.tsx

@@ -1,239 +0,0 @@
-import React, { useState, useEffect } from "react"
-import { VSCodeButton, VSCodeCheckbox, VSCodeDropdown, VSCodeOption, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
-import { BROWSER_VIEWPORT_PRESETS } from "../../../../src/shared/BrowserSettings"
-import { useExtensionState } from "../../context/ExtensionStateContext"
-import { vscode } from "../../utils/vscode"
-
-export const BrowserSettingsSection: React.FC = () => {
-	const { browserSettings } = useExtensionState()
-	const [testingConnection, setTestingConnection] = useState(false)
-	const [testResult, setTestResult] = useState<{ success: boolean; message: string } | null>(null)
-
-	// Listen for browser connection test results
-	useEffect(() => {
-		const handleMessage = (event: MessageEvent) => {
-			const message = event.data
-			if (message.type === "browserConnectionResult") {
-				setTestResult({
-					success: message.success,
-					message: message.text,
-				})
-				setTestingConnection(false)
-			}
-		}
-
-		window.addEventListener("message", handleMessage)
-		return () => window.removeEventListener("message", handleMessage)
-	}, [])
-
-	const handleViewportChange = (event: Event) => {
-		const target = event.target as HTMLSelectElement
-		const selectedSize = BROWSER_VIEWPORT_PRESETS[target.value as keyof typeof BROWSER_VIEWPORT_PRESETS]
-		if (selectedSize) {
-			vscode.postMessage({
-				type: "browserSettings",
-				browserSettings: {
-					...browserSettings,
-					viewport: selectedSize,
-				},
-			})
-		}
-	}
-
-	const updateHeadless = (headless: boolean) => {
-		vscode.postMessage({
-			type: "browserSettings",
-			browserSettings: {
-				...browserSettings,
-				headless,
-			},
-		})
-	}
-
-	const updateRemoteBrowserEnabled = (enabled: boolean) => {
-		vscode.postMessage({
-			type: "remoteBrowserEnabled",
-			bool: enabled,
-		})
-
-		// If disabling, clear the host
-		if (!enabled) {
-			vscode.postMessage({
-				type: "remoteBrowserHost",
-				text: undefined,
-			})
-		}
-	}
-
-	const updateRemoteBrowserHost = (host: string | undefined) => {
-		vscode.postMessage({
-			type: "remoteBrowserHost",
-			text: host,
-		})
-	}
-
-	const testConnection = () => {
-		setTestingConnection(true)
-		setTestResult(null)
-		vscode.postMessage({
-			type: "testBrowserConnection",
-			text: browserSettings.remoteBrowserHost,
-		})
-	}
-
-	const discoverBrowser = () => {
-		setTestingConnection(true)
-		setTestResult(null)
-		vscode.postMessage({
-			type: "discoverBrowser",
-		})
-	}
-
-	return (
-		<div
-			id="browser-settings-section"
-			style={{ marginBottom: 20, borderTop: "1px solid var(--vscode-panel-border)", paddingTop: 15 }}>
-			<h3 style={{ color: "var(--vscode-foreground)", margin: "0 0 10px 0", fontSize: "14px" }}>Browser Settings</h3>
-
-			<div style={{ marginBottom: 15 }}>
-				<div style={{ marginBottom: 8 }}>
-					<label style={{ fontWeight: "500", display: "block", marginBottom: 5 }}>Viewport Size</label>
-					<VSCodeDropdown
-						style={{ width: "100%" }}
-						value={
-							Object.entries(BROWSER_VIEWPORT_PRESETS).find(([_, size]) => {
-								const typedSize = size as { width: number; height: number }
-								return (
-									typedSize.width === browserSettings.viewport.width &&
-									typedSize.height === browserSettings.viewport.height
-								)
-							})?.[0]
-						}
-						onChange={(event) => handleViewportChange(event as Event)}>
-						{Object.entries(BROWSER_VIEWPORT_PRESETS).map(([name]) => (
-							<VSCodeOption key={name} value={name}>
-								{name}
-							</VSCodeOption>
-						))}
-					</VSCodeDropdown>
-				</div>
-				<p
-					style={{
-						fontSize: "12px",
-						color: "var(--vscode-descriptionForeground)",
-						margin: 0,
-					}}>
-					Set the size of the browser viewport for screenshots and interactions.
-				</p>
-			</div>
-
-			<div style={{ marginBottom: 15 }}>
-				<VSCodeCheckbox
-					style={{ marginBottom: "8px" }}
-					checked={browserSettings.headless}
-					onChange={(e) => updateHeadless((e.target as HTMLInputElement).checked)}>
-					Run in headless mode
-				</VSCodeCheckbox>
-				<p
-					style={{
-						fontSize: "12px",
-						color: "var(--vscode-descriptionForeground)",
-						margin: "0 0 0 20px",
-					}}>
-					When enabled, Chrome will run in the background without a visible window.
-				</p>
-			</div>
-
-			<div style={{ marginBottom: 15 }}>
-				<div style={{ marginBottom: 8 }}>
-					<label style={{ fontWeight: "500", display: "block", marginBottom: 5 }}>Chrome Executable Path</label>
-					<VSCodeTextField
-						style={{ width: "100%" }}
-						placeholder="Path to Chrome executable"
-						onChange={(e: any) => {
-							const value = e.target.value
-							// Update VSCode configuration directly
-							vscode.postMessage({
-								type: "openExtensionSettings",
-								text: "chromeExecutablePath",
-							})
-						}}
-					/>
-				</div>
-				<p
-					style={{
-						fontSize: "12px",
-						color: "var(--vscode-descriptionForeground)",
-						margin: 0,
-					}}>
-					Path to Chrome executable for browser use functionality. If not set, the extension will attempt to find it
-					automatically.
-				</p>
-			</div>
-
-			<div style={{ marginBottom: 15 }}>
-				<div style={{ marginBottom: 8 }}>
-					<VSCodeCheckbox
-						checked={browserSettings.remoteBrowserEnabled}
-						onChange={(e) => updateRemoteBrowserEnabled((e.target as HTMLInputElement).checked)}>
-						Use remote browser connection
-					</VSCodeCheckbox>
-				</div>
-				<p
-					style={{
-						fontSize: "12px",
-						color: "var(--vscode-descriptionForeground)",
-						margin: "0 0 8px 20px",
-					}}>
-					Connect to a Chrome browser running with remote debugging enabled (--remote-debugging-port=9222). This allows
-					Cline to use your existing browser session with all authentication cookies.
-				</p>
-
-				{browserSettings.remoteBrowserEnabled && (
-					<div style={{ marginLeft: 20 }}>
-						<div style={{ display: "flex", gap: "5px", marginBottom: 8 }}>
-							<VSCodeTextField
-								value={browserSettings.remoteBrowserHost || ""}
-								placeholder="http://localhost:9222"
-								style={{ flexGrow: 1 }}
-								onChange={(e: any) => updateRemoteBrowserHost(e.target.value || undefined)}
-							/>
-							<VSCodeButton
-								disabled={testingConnection}
-								onClick={browserSettings.remoteBrowserHost ? testConnection : discoverBrowser}>
-								{testingConnection ? "Testing..." : "Test Connection"}
-							</VSCodeButton>
-						</div>
-
-						{testResult && (
-							<div
-								style={{
-									padding: "8px",
-									marginBottom: "8px",
-									backgroundColor: testResult.success ? "rgba(0, 128, 0, 0.1)" : "rgba(255, 0, 0, 0.1)",
-									color: testResult.success
-										? "var(--vscode-terminal-ansiGreen)"
-										: "var(--vscode-terminal-ansiRed)",
-									borderRadius: "3px",
-									fontSize: "11px",
-								}}>
-								{testResult.message}
-							</div>
-						)}
-
-						<p
-							style={{
-								fontSize: "12px",
-								color: "var(--vscode-descriptionForeground)",
-								margin: 0,
-							}}>
-							Enter the DevTools Protocol host address or leave empty to auto-discover Chrome instances.
-						</p>
-					</div>
-				)}
-			</div>
-		</div>
-	)
-}
-
-export default BrowserSettingsSection

webview-ui/src/components/settings/ClineAccountInfoCard.tsx

@@ -1,70 +0,0 @@
-import { VSCodeButton } from "@vscode/webview-ui-toolkit/react"
-import { useFirebaseAuth } from "../../context/FirebaseAuthContext"
-import { vscode } from "../../utils/vscode"
-
-export const ClineAccountInfoCard = () => {
-	const { user, handleSignOut } = useFirebaseAuth()
-
-	const handleLogin = () => {
-		vscode.postMessage({ type: "accountLoginClicked" })
-	}
-
-	const handleLogout = () => {
-		// First notify extension to clear API keys and state
-		vscode.postMessage({ type: "accountLogoutClicked" })
-		// Then sign out of Firebase
-		handleSignOut()
-	}
-
-	const handleShowAccount = () => {
-		vscode.postMessage({ type: "showAccountViewClicked" })
-	}
-
-	return (
-		<div className="max-w-[600px]">
-			{user ? (
-				<VSCodeButton appearance="secondary" onClick={handleShowAccount}>
-					View Billing & Usage
-				</VSCodeButton>
-			) : (
-				// <div className="p-2 rounded-[2px] bg-[var(--vscode-dropdown-background)]">
-				// 	<div className="flex items-center gap-3">
-				// 		{user.photoURL ? (
-				// 			<img src={user.photoURL} alt="Profile" className="w-[38px] h-[38px] rounded-full flex-shrink-0" />
-				// 		) : (
-				// 			<div className="w-[38px] h-[38px] rounded-full bg-[var(--vscode-button-background)] flex items-center justify-center text-xl text-[var(--vscode-button-foreground)] flex-shrink-0">
-				// 				{user.displayName?.[0] || user.email?.[0] || "?"}
-				// 			</div>
-				// 		)}
-				// 		<div className="flex flex-col gap-1 flex-1 overflow-hidden">
-				// 			{user.displayName && (
-				// 				<div className="text-[13px] font-bold text-[var(--vscode-foreground)] break-words">
-				// 					{user.displayName}
-				// 				</div>
-				// 			)}
-				// 			{user.email && (
-				// 				<div className="text-[13px] text-[var(--vscode-descriptionForeground)] break-words overflow-hidden text-ellipsis">
-				// 					{user.email}
-				// 				</div>
-				// 			)}
-				// 			<div className="flex gap-2 flex-wrap mt-1">
-
-				// 				<VSCodeButton
-				// 					appearance="secondary"
-				// 					onClick={handleLogout}
-				// 					className="scale-[0.85] origin-left w-fit mt-0.5 mb-0 -mr-3">
-				// 					Log out
-				// 				</VSCodeButton>
-				// 			</div>
-				// 		</div>
-				// 	</div>
-				// </div>
-				<div>
-					<VSCodeButton onClick={handleLogin} className="mt-0">
-						Sign Up with Cline
-					</VSCodeButton>
-				</div>
-			)}
-		</div>
-	)
-}

webview-ui/src/components/settings/OpenRouterModelPicker.tsx

@@ -1,4 +1,4 @@
-import { VSCodeCheckbox, VSCodeDropdown, VSCodeLink, VSCodeOption, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
+import { VSCodeLink, VSCodeTextField } from "@vscode/webview-ui-toolkit/react"
 import Fuse from "fuse.js"
 import React, { KeyboardEvent, memo, useEffect, useMemo, useRef, useState } from "react"
 import { useRemark } from "react-remark"
@@ -8,7 +8,7 @@ import { openRouterDefaultModelId } from "../../../../src/shared/api"
 import { useExtensionState } from "../../context/ExtensionStateContext"
 import { vscode } from "../../utils/vscode"
 import { highlight } from "../history/HistoryView"
-import { DropdownContainer, ModelInfoView, normalizeApiConfiguration } from "./ApiOptions"
+import { ModelInfoView, normalizeApiConfiguration } from "./ApiOptions"
 import { CODE_BLOCK_BG_COLOR } from "../common/CodeBlock"
 import ThinkingBudgetSlider from "./ThinkingBudgetSlider"
 
@@ -222,7 +222,6 @@ const OpenRouterModelPicker: React.FC<OpenRouterModelPickerProps> = ({ isPopup }
 					{showBudgetSlider && (
 						<ThinkingBudgetSlider apiConfiguration={apiConfiguration} setApiConfiguration={setApiConfiguration} />
 					)}
-
 					<ModelInfoView
 						selectedModelId={selectedModelId}
 						modelInfo={selectedModelInfo}

webview-ui/src/components/settings/SettingsView.tsx

@@ -11,11 +11,11 @@ import { memo, useCallback, useEffect, useState } from "react"
 import { useExtensionState } from "../../context/ExtensionStateContext"
 import { validateApiConfiguration, validateModelId } from "../../utils/validate"
 import { vscode } from "../../utils/vscode"
+import SettingsButton from "../common/SettingsButton"
 import ApiOptions from "./ApiOptions"
 import { TabButton } from "../mcp/McpView"
 import { useEvent } from "react-use"
 import { ExtensionMessage } from "../../../../src/shared/ExtensionMessage"
-import BrowserSettingsSection from "./BrowserSettingsSection"
 const { IS_DEV } = process.env
 
 type SettingsViewProps = {
@@ -32,7 +32,6 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 		telemetrySetting,
 		setTelemetrySetting,
 		chatSettings,
-		remoteBrowserHost,
 		planActSeparateModelsSetting,
 		setPlanActSeparateModelsSetting,
 	} = useExtensionState()
@@ -114,24 +113,6 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 						setPendingTabChange(null)
 					}
 					break
-				case "scrollToSettings":
-					setTimeout(() => {
-						const elementId = message.text
-						if (elementId) {
-							const element = document.getElementById(elementId)
-							if (element) {
-								element.scrollIntoView({ behavior: "smooth" })
-
-								element.style.transition = "background-color 0.5s ease"
-								element.style.backgroundColor = "var(--vscode-textPreformat-background)"
-
-								setTimeout(() => {
-									element.style.backgroundColor = "transparent"
-								}, 1200)
-							}
-						}
-					}, 300)
-					break
 			}
 		},
 		[pendingTabChange],
@@ -298,9 +279,6 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 					</p>
 				</div>
 
-				{/* Browser Settings Section */}
-				<BrowserSettingsSection />
-
 				{IS_DEV && (
 					<>
 						<div style={{ marginTop: "10px", marginBottom: "4px" }}>Debug</div>
@@ -318,6 +296,22 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 					</>
 				)}
 
+				<div
+					style={{
+						marginTop: "auto",
+						paddingRight: 8,
+						display: "flex",
+						justifyContent: "center",
+					}}>
+					<SettingsButton
+						onClick={() => vscode.postMessage({ type: "openExtensionSettings" })}
+						style={{
+							margin: "0 0 16px 0",
+						}}>
+						<i className="codicon codicon-settings-gear" />
+						Advanced Settings
+					</SettingsButton>
+				</div>
 				<div
 					style={{
 						textAlign: "center",
@@ -325,7 +319,6 @@ const SettingsView = ({ onDone }: SettingsViewProps) => {
 						fontSize: "12px",
 						lineHeight: "1.2",
 						padding: "0 8px 15px 0",
-						marginTop: "auto",
 					}}>
 					<p
 						style={{

webview-ui/src/components/welcome/WelcomeView.tsx

@@ -6,7 +6,6 @@ import { useExtensionState } from "../../context/ExtensionStateContext"
 import { validateApiConfiguration } from "../../utils/validate"
 import { vscode } from "../../utils/vscode"
 import ApiOptions from "../settings/ApiOptions"
-import ClineLogoWhite from "../../assets/ClineLogoWhite"
 
 const WelcomeView = () => {
 	const { apiConfiguration } = useExtensionState()
@@ -47,7 +46,7 @@ const WelcomeView = () => {
 				}}>
 				<h2>Hi, I'm Cline</h2>
 				<div style={{ display: "flex", justifyContent: "center", margin: "20px 0" }}>
-					<ClineLogoWhite className="size-16" />
+					<ClineLogo />
 				</div>
 				<p>
 					I can do all kinds of tasks thanks to breakthroughs in{" "}
@@ -92,4 +91,22 @@ const WelcomeView = () => {
 	)
 }
 
+const ClineLogo: React.FC<{ style?: React.CSSProperties }> = ({ style }) => {
+	// (can't use svgs in vsc extensions)
+	const logoBase64 =
+		"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADoAAAA8CAYAAAA34qk1AAAAAXNSR0IArs4c6QAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAOqADAAQAAAABAAAAPAAAAAAs615UAAAGuElEQVRoBd1aW2hcRRj+5yRp4242m0tbSqMitSLaaFGLUXvDB0HUmlYRFXxQQRG0iFXxwctDfWgDKlgREYRWkaJPGsULUjX6IFRbkwZaaL1AUWI1JnvJ7ibpJmf8ZrNnc86ZmXPJZtM9DhzOzH+b/zszZ+af/xxGS1A4543pPD3OON1LjK5Al8txnWFEXzYQ9bW0sLO1dgN91baMTfD1DYzeRS/XaXoawwN4IplgH2j4i0KuKdDUJL+EzdIwPE34ecuJHmpvYQf95BbKrxlQTFeWydPXcOzmgM5lZg3q7oyxPwPKhxIzQkmHEE7naCfEg4IUlpMNJu0J0UUo0ZoBZYzuCOXJnPD2BegEUqkZUPS+NpAHTqEVo6Pc9312qgRr1RLobDAXnFLFFbQgPacVuVU7oJx+kbvzpmBlHFnDWMFbamHcqoFidTVwNbkvZtAnYV3ijD522ym3EVdUV0JtL+jUSE3QpgaDdmDf24qrCwZWwYWqHQkAIyVG3CQaQoDRf26Svli1iuUC6JVEAgMdz/Pt6GAfFK4MarzGcmnY35uM037G2JRfX75Az3Ieby7Qe8TpLj9j54XP6Ffsv72JBDvp1b8n0FyOr55B4A0DG7yM1AEvCx/ubmthh3W+aIHifVyeydEAThs36JTrjJ5t4HSjbmS1qy5Avh4hkOKZtyJW7v+D8wtUA6AEOp7jVwHkIyqFuqZxWpfI05MqH5VTNzPB+7Gn3alSiAAtMztNF3d2MvHeVoo0oqkUbwPI2yoS0askG5fJ/ktAjSa6Hdgao4dv3mMMVO98a64mAQX5WrdQBNtS2kYCirBuTQSBuV2WMEhAoSFi16iX+AjnMTsIFdClCNDtPtSk3vSv86ChAhq24wLSJi+ZJm3Bsp5EdLIe0/9B7FsnwhqC/CET21oTozVFRl2iDtqipEGlfTSd4wMwvg1XkDJIM3RPWxv7zS0sQshsnvoAWrmBO+QZ5SD3QHuc9Tvo5UaqwHcyk95H0zEdVbIWrThJrStXsgmrrRrRZovpc8/rQAo9HJ2mW+P0FKoi5elXntWBFIrtMfYRjojP+Rmx85ubyYHDATSV59dA+Hq7gq6O6bpPNZJ2eYDl2JEftdMU9WPJGL2toDtIrS30JghDDqJHA3GvI4R1AMWZcw90pemssocM/LcqupvW1sx+B+2Mm25rD5QeiI2gqgoZOPadiqekcdptzyhWgGYKvAeGAudicwkaVHagInK9LPr8WaWioiGNErxPos6mGO2y7FSAcpNetogB7jxMtg5Doc3tYGXV8iQ/OFUWF4mnInB62hrVEtDxLN8CuVtUshGndVijWgJqGKFGM1rYy6NqlA7ZwffNaIGc81aM6v0GIpmgwUEUQZZ85py2GlgM/hexrdcoYGVHzj3M3uRlrZ55nL438Dl9CMv/D/XsZ5W+pc0iHZrbR016vkpjdauOUPW1jg6WKQFtT7ABeBok+F4oILwm2jL3sLXseQaMBJYta6VmppCfRqko4jNfmFFl6Sm+dt4F7xocXKeV4HSpludmsBCyQpfRq1baswI0GWNH4NCnbtvadpE2ank2Bs6lIqO4wUZyVNFnIDslJRZClmisWKD9VmcVoIKAoPlF3HAG9i+YAbvE91I/yWyOHoOM42zo0tkeZHZkMvwyeBYm3/yK9uCNFfg4jB1xOaJsYhPejP+InlEyy8Rsll+OFb3PSwa8OA7wB/DQmnRy4C0zG+kg+IEzDIZJ79jtySPCaNou4FPvy+T4gfFxnnTL4RD/sGnQj6AHcW4rHtpPqRyXprhIBoB3FEf4m9x9eLWnp5048Io4S8ickaWcxzI+iDk/jNzOhVgENqIu5VYtYY873h46CaeOlWWEHfGTpDwgHkYEy50zWqxPD3ExlWF/s0gDVFEEoG6A667ChlJV9aRmlZIRI7r/V1IB/TtimGR3kbVwZ0AkoJh5f8maEaNwGnF7LAGFwFG3UATb1mJWcV0COnuOPge3WJGIYgU/XLndloCKSB9Bw2duwQi1U8Wp0mA5XJaACi6W3RdwE3taFMtee+hnAVAC7UywE9gP37KEInQ/jV/m3lD5q93eRXyZLtA3CL02qRTrkJZBfNvT2spOqXxTjqgQxLeOc41m6f8/aQVTGTrPtDQisx06kMI3LVDBxO9m/0zEaQuqH4p2nZZTYiTLWRKti55AhdZFjE3iZ8L7MMdvRXNYa2npGeOIiXfjnbwaI3nar3vtO6pSxHvLspPUgw9SvdiCtuGU0gW51biWqeQXkSZ2gFFcI3D4OHLR/ZMx+sod5nn19x8Bu+YF5eP/fAAAAABJRU5ErkJggg=="
+
+	return (
+		<img
+			src={logoBase64}
+			style={{
+				width: "57px",
+				height: "60px",
+				...style,
+			}}
+			alt="Cline Logo"
+		/>
+	)
+}
+
 export default WelcomeView

webview-ui/src/context/ExtensionStateContext.tsx

@@ -20,13 +20,11 @@ interface ExtensionStateContextType extends ExtensionState {
 	mcpServers: McpServer[]
 	mcpMarketplaceCatalog: McpMarketplaceCatalog
 	filePaths: string[]
-	totalTasksSize: number | null
 	setApiConfiguration: (config: ApiConfiguration) => void
 	setCustomInstructions: (value?: string) => void
 	setTelemetrySetting: (value: TelemetrySetting) => void
 	setShowAnnouncement: (value: boolean) => void
 	setPlanActSeparateModelsSetting: (value: boolean) => void
-	setRemoteBrowserEnabled: (value: boolean) => void
 }
 
 const ExtensionStateContext = createContext<ExtensionStateContextType | undefined>(undefined)
@@ -54,7 +52,6 @@ export const ExtensionStateContextProvider: React.FC<{
 	const [openRouterModels, setOpenRouterModels] = useState<Record<string, ModelInfo>>({
 		[openRouterDefaultModelId]: openRouterDefaultModelInfo,
 	})
-	const [totalTasksSize, setTotalTasksSize] = useState<number | null>(null)
 
 	const [openAiModels, setOpenAiModels] = useState<string[]>([])
 	const [mcpServers, setMcpServers] = useState<McpServer[]>([])
@@ -140,10 +137,6 @@ export const ExtensionStateContextProvider: React.FC<{
 				}
 				break
 			}
-			case "totalTasksSize": {
-				setTotalTasksSize(message.totalTasksSize ?? null)
-				break
-			}
 		}
 	}, [])
 
@@ -163,7 +156,6 @@ export const ExtensionStateContextProvider: React.FC<{
 		mcpServers,
 		mcpMarketplaceCatalog,
 		filePaths,
-		totalTasksSize,
 		setApiConfiguration: (value) =>
 			setState((prevState) => ({
 				...prevState,
@@ -189,14 +181,6 @@ export const ExtensionStateContextProvider: React.FC<{
 				...prevState,
 				shouldShowAnnouncement: value,
 			})),
-		setRemoteBrowserEnabled: (value) =>
-			setState((prevState) => ({
-				...prevState,
-				browserSettings: {
-					...prevState.browserSettings,
-					remoteBrowserEnabled: value,
-				},
-			})),
 	}
 
 	return <ExtensionStateContext.Provider value={contextValue}>{children}</ExtensionStateContext.Provider>

webview-ui/src/utils/format.ts

@@ -10,27 +10,3 @@ export function formatLargeNumber(num: number): string {
 	}
 	return num.toString()
 }
-
-// Helper to format cents as dollars with 2 decimal places
-export function formatDollars(cents?: number): string {
-	if (cents === undefined) {
-		return ""
-	}
-
-	return (cents / 100).toFixed(2)
-}
-
-export function formatTimestamp(timestamp: string): string {
-	const date = new Date(timestamp)
-
-	const dateFormatter = new Intl.DateTimeFormat("en-US", {
-		month: "2-digit",
-		day: "2-digit",
-		year: "2-digit",
-		hour: "numeric",
-		minute: "2-digit",
-		hour12: true,
-	})
-
-	return dateFormatter.format(date)
-}