Merge branch 'feat/3676-mcp-reload-on-enable' of https://github.com/seedlord/Roo-Code into feat/3676-mcp-reload

Author: seedlord

.changeset/changelog-config.js

@@ -1,5 +1,3 @@
-// Half-works to simplify the format but needs 'overwrite_changeset_changelog.py' in GHA to finish formatting
-
 const getReleaseLine = async (changeset) => {
 	const [firstLine] = changeset.summary
 		.split("\n")

.changeset/sweet-turtles-wink.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Fix OpenRouter names

.github/scripts/overwrite_changeset_changelog.py

@@ -0,0 +1,82 @@
+"""
+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
+
+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"
+    prev_version_pattern = f"## [{PREV_VERSION}]\n"
+    print(f"latest version: {VERSION}")
+    print(f"prev_version: {PREV_VERSION}")
+
+    notes_start_index = changelog_text.find(version_pattern) + 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")
+        # 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:]
+        )
+        updated_changelog = updated_changelog.replace(
+            f"## {VERSION}", f"## [{VERSION}]"
+        )
+        return updated_changelog
+
+
+with open(CHANGELOG_PATH, "r") as f:
+    changelog_content = f.read()
+
+new_changelog = overwrite_changelog_section(changelog_content, NEW_CONTENT)
+print(
+    "----------------------------------------------------------------------------------"
+)
+print(new_changelog)
+print(
+    "----------------------------------------------------------------------------------"
+)
+# Write back to CHANGELOG.md
+with open(CHANGELOG_PATH, "w") as f:
+    f.write(new_changelog)
+
+print(f"{CHANGELOG_PATH} updated successfully!")

.github/workflows/changeset-release.yml

@@ -60,7 +60,7 @@ jobs:
         with:
           commit: "changeset version bump"
           title: "Changeset version bump"
-          version: pnpm --filter roo-cline version-packages # This performs the changeset version bump
+          version: pnpm changeset:version # This performs the changeset version bump
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -100,25 +100,6 @@ jobs:
           fetch-depth: 0
           ref: ${{ steps.checkout-ref.outputs.git_ref }}
 
-      # Get current and previous versions to edit changelog entry
-      - name: Get version
-        id: get_version
-        run: |
-          VERSION=$(git show HEAD:package.json | jq -r '.version')
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-          PREV_VERSION=$(git show origin/main:package.json | jq -r '.version')
-          echo "prev_version=$PREV_VERSION" >> $GITHUB_OUTPUT
-          echo "version=$VERSION"
-          echo "prev_version=$PREV_VERSION"
-
-      # Update CHANGELOG.md with proper format
-      - name: Update Changelog Format
-        if: ${{ !contains(github.event.pull_request.labels.*.name, 'changelog-ready') }}
-        env:
-          VERSION: ${{ steps.get_version.outputs.version }}
-          PREV_VERSION: ${{ steps.get_version.outputs.prev_version }}
-        run: python .github/scripts/overwrite_changeset_changelog.py
-
       # Commit and push changelog updates
       - name: Push Changelog updates
         if: ${{ !contains(github.event.pull_request.labels.*.name, 'changelog-ready') }}

.github/workflows/code-qa.yml

@@ -159,8 +159,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install
       - name: Create .env.local file
-        working-directory: e2e
+        working-directory: apps/vscode-e2e
         run: echo "OPENROUTER_API_KEY=${{ secrets.OPENROUTER_API_KEY }}" > .env.local
       - name: Run integration tests
-        working-directory: e2e
+        working-directory: apps/vscode-e2e
         run: xvfb-run -a pnpm test:ci

.github/workflows/marketplace-publish.yml

@@ -7,6 +7,7 @@ on:
 env:
   GIT_REF: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || 'main' }}
   NODE_VERSION: 20.18.1
+  PNPM_VERSION: 10.8.1
 
 jobs:
   publish-extension:
@@ -19,23 +20,31 @@ jobs:
         contains(github.event.pull_request.title, 'Changeset version bump') ) ||
         github.event_name == 'workflow_dispatch'
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
         with:
           ref: ${{ env.GIT_REF }}
-      - uses: actions/setup-node@v4
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+        with:
+          version: ${{ env.PNPM_VERSION }}
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ env.NODE_VERSION }}
-      - run: |
+          cache: 'pnpm'
+      - name: Install dependencies
+        run: pnpm install
+      - name: Configure Git
+        run: |
           git config user.name "github-actions[bot]"
           git config user.email "github-actions[bot]@users.noreply.github.com"
-      - name: Install Dependencies
-        run: pnpm install
       - name: Create .env file
         run: echo "POSTHOG_API_KEY=${{ secrets.POSTHOG_API_KEY }}" >> .env
       - name: Package Extension
         run: |
-          current_package_version=$(node -p "require('./package.json').version")
-          pnpm vsix
+          current_package_version=$(node -p "require('./src/package.json').version")
+          pnpm build
           package=$(unzip -l bin/roo-cline-${current_package_version}.vsix)
           echo "$package" | grep -q "extension/package.json" || exit 1
           echo "$package" | grep -q "extension/package.nls.json" || exit 1
@@ -47,23 +56,23 @@ jobs:
           echo "$package" | grep -q ".env" || exit 1
       - name: Create and Push Git Tag
         run: |
-          current_package_version=$(node -p "require('./package.json').version")
+          current_package_version=$(node -p "require('./src/package.json').version")
           git tag -a "v${current_package_version}" -m "Release v${current_package_version}"
-          git push origin "v${current_package_version}"
+          git push origin "v${current_package_version}" --no-verify
           echo "Successfully created and pushed git tag v${current_package_version}"
       - name: Publish Extension
         env:
           VSCE_PAT: ${{ secrets.VSCE_PAT }}
           OVSX_PAT: ${{ secrets.OVSX_PAT }}
         run: |
-          current_package_version=$(node -p "require('./package.json').version")
-          pnpm publish:marketplace
+          current_package_version=$(node -p "require('./src/package.json').version")
+          pnpm --filter roo-cline publish:marketplace
           echo "Successfully published version $current_package_version to VS Code Marketplace"
       - name: Create GitHub Release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          current_package_version=$(node -p "require('./package.json').version")
+          current_package_version=$(node -p "require('./src/package.json').version")
 
           # Extract changelog for current version
           echo "Extracting changelog for version ${current_package_version}"

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Roo Code Changelog
 
+## [3.18.1] - 2025-05-22
+
+- Add support for Claude Sonnet 4 and Claude Opus 4 models with thinking variants in Anthropic, Bedrock, and Vertex (thanks @shariqriazz!)
+- Fix README gif display in all localized versions
+- Fix referer URL
+- Switch codebase to a monorepo and create an automated "nightly" build
+
 ## [3.18.0] - 2025-05-21
 
 - Add support for Gemini 2.5 Flash preview models (thanks @shariqriazz and @daniel-lxs!)
@@ -1116,7 +1123,7 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
 
 ## [2.2.16]
 
-- Incorporate Premshay's [PR](https://github.com/RooCodeInc/Roo-Cline/pull/60) to add support for Amazon Nova and Meta Llama Models via Bedrock (3, 3.1, 3.2) and unified Bedrock calls using BedrockClient and Bedrock Runtime API
+- Incorporate Premshay's [PR](https://github.com/RooCodeInc/Roo-Code/pull/60) to add support for Amazon Nova and Meta Llama Models via Bedrock (3, 3.1, 3.2) and unified Bedrock calls using BedrockClient and Bedrock Runtime API
 
 ## [2.2.14 - 2.2.15]
 
@@ -1188,7 +1195,7 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
 
 ## [2.1.15]
 
-- Incorporate dbasclpy's [PR](https://github.com/RooCodeInc/Roo-Cline/pull/54) to add support for gemini-exp-1206
+- Incorporate dbasclpy's [PR](https://github.com/RooCodeInc/Roo-Code/pull/54) to add support for gemini-exp-1206
 - Make it clear that diff editing is very experimental
 
 ## [2.1.14]
@@ -1198,15 +1205,15 @@ Join us at https://www.reddit.com/r/RooCode to share your custom modes and be pa
 
 ## [2.1.13]
 
-- Fix https://github.com/RooCodeInc/Roo-Cline/issues/50 where sound effects were not respecting settings
+- Fix https://github.com/RooCodeInc/Roo-Code/issues/50 where sound effects were not respecting settings
 
 ## [2.1.12]
 
 - Incorporate JoziGila's [PR](https://github.com/cline/cline/pull/158) to add support for editing through diffs
 
 ## [2.1.11]
 
-- Incorporate lloydchang's [PR](https://github.com/RooCodeInc/Roo-Cline/pull/42) to add support for OpenRouter compression
+- Incorporate lloydchang's [PR](https://github.com/RooCodeInc/Roo-Code/pull/42) to add support for OpenRouter compression
 
 ## [2.1.10]
 

README.md

@@ -14,7 +14,7 @@ English • [Català](locales/ca/README.md) • [Deutsch](locales/de/README.md)
 <div align="center">
   <h1>Roo Code (prev. Roo Cline)</h1>
   <p align="center">
-  <img src="https://media.githubusercontent.com/media/RooCodeInc/Roo-Code/main/assets/docs/demo.gif" width="100%" />
+  <img src="https://media.githubusercontent.com/media/RooCodeInc/Roo-Code/main/src/assets/docs/demo.gif" width="100%" />
   </p>
   <p>Connect with developers, contribute ideas, and stay ahead with the latest AI-powered coding tools.</p>