Merge branch 'main' into attach-files-new-task

Author: daniel-lxs

.changeset/config.json

@@ -2,7 +2,7 @@
 	"$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
 	"changelog": "./changelog-config.js",
 	"commit": false,
-	"fixed": [],
+	"fixed": [["roo-cline"]],
 	"linked": [],
 	"access": "restricted",
 	"baseBranch": "main",

.github/scripts/overwrite_changeset_changelog.py

@@ -13,27 +13,6 @@ env:
   PNPM_VERSION: 10.8.1
 
 jobs:
-  compile:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@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 }}
-          cache: 'pnpm'
-      - name: Install dependencies
-        run: pnpm install
-      - name: Check types
-        run: pnpm check-types
-      - name: Lint
-        run: pnpm lint
-
   check-translations:
     runs-on: ubuntu-latest
     steps:
@@ -72,11 +51,8 @@ jobs:
       - name: Run knip checks
         run: pnpm knip
 
-  test-extension:
-    runs-on: ${{ matrix.os }}
-    strategy:
-      matrix:
-        os: [ubuntu-latest, windows-latest]
+  compile:
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -91,11 +67,12 @@ jobs:
           cache: 'pnpm'
       - name: Install dependencies
         run: pnpm install
-      - name: Run unit tests
-        working-directory: src
-        run: pnpm test
+      - name: Lint
+        run: pnpm lint
+      - name: Check types
+        run: pnpm check-types
 
-  test-webview:
+  platform-unit-test:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -115,16 +92,8 @@ jobs:
       - name: Install dependencies
         run: pnpm install
       - name: Run unit tests
-        working-directory: webview-ui
         run: pnpm test
 
-  unit-test:
-    needs: [test-extension, test-webview]
-    runs-on: ubuntu-latest
-    steps:
-      - name: NO-OP
-        run: echo "All unit tests passed."
-
   check-openrouter-api-key:
     runs-on: ubuntu-latest
     outputs:
@@ -164,3 +133,10 @@ jobs:
       - name: Run integration tests
         working-directory: apps/vscode-e2e
         run: xvfb-run -a pnpm test:ci
+
+  unit-test:
+    needs: [platform-unit-test] # [platform-unit-test, integration-test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: NO-OP
+        run: echo "All tests passed."

.github/workflows/code-qa.yml

@@ -45,15 +45,22 @@ jobs:
         run: |
           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
-          echo "$package" | grep -q "extension/dist/extension.js" || exit 1
-          echo "$package" | grep -q "extension/webview-ui/audio/celebration.wav" || exit 1
-          echo "$package" | grep -q "extension/webview-ui/build/assets/index.js" || exit 1
-          echo "$package" | grep -q "extension/assets/codicons/codicon.ttf" || exit 1
-          echo "$package" | grep -q "extension/assets/vscode-material-icons/icons/3d.svg" || exit 1
-          echo "$package" | grep -q ".env" || exit 1
+
+          # Save VSIX contents to a temporary file to avoid broken pipe issues.
+          unzip -l bin/roo-cline-${current_package_version}.vsix > /tmp/roo-code-vsix-contents.txt
+
+          # Check for required files.
+          grep -q "extension/package.json" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q "extension/package.nls.json" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q "extension/dist/extension.js" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q "extension/webview-ui/audio/celebration.wav" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q "extension/webview-ui/build/assets/index.js" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q "extension/assets/codicons/codicon.ttf" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q "extension/assets/vscode-material-icons/icons/3d.svg" /tmp/roo-code-vsix-contents.txt || exit 1
+          grep -q ".env" /tmp/roo-code-vsix-contents.txt || exit 1
+          
+          # Clean up temporary file.
+          rm /tmp/roo-code-vsix-contents.txt
       - name: Create and Push Git Tag
         run: |
           current_package_version=$(node -p "require('./src/package.json').version")

.github/workflows/marketplace-publish.yml

@@ -16,14 +16,6 @@ else
   fi
 fi
 
-$pnpm_cmd --filter roo-cline generate-types
-
-if [ -n "$(git diff --name-only src/exports/roo-code.d.ts)" ]; then
-  echo "Error: There are unstaged changes to roo-code.d.ts after running 'pnpm --filter roo-cline generate-types'."
-  echo "Please review and stage the changes before committing."
-  exit 1
-fi
-
 # Detect if running on Windows and use npx.cmd, otherwise use npx.
 if [ "$OS" = "Windows_NT" ]; then
   npx_cmd="npx.cmd"

.husky/pre-commit

@@ -3,5 +3,6 @@
 	"useTabs": true,
 	"printWidth": 120,
 	"semi": false,
-	"bracketSameLine": true
+	"bracketSameLine": true,
+	"ignore": ["node_modules", "dist", "build", "out", ".next", ".venv", "pnpm-lock.yaml"]
 }

.prettierignore

@@ -5,7 +5,7 @@
 	"tasks": [
 		{
 			"label": "watch",
-			"dependsOn": ["webview", "watch:tsc", "watch:esbuild"],
+			"dependsOn": ["watch:webview", "watch:bundle", "watch:tsc"],
 			"presentation": {
 				"reveal": "never"
 			},
@@ -15,7 +15,7 @@
 			}
 		},
 		{
-			"label": "webview",
+			"label": "watch:webview",
 			"type": "shell",
 			"command": "pnpm --filter @roo-code/vscode-webview dev",
 			"group": "build",
@@ -37,9 +37,9 @@
 			}
 		},
 		{
-			"label": "watch:esbuild",
+			"label": "watch:bundle",
 			"type": "shell",
-			"command": "pnpm --filter roo-cline watch:esbuild",
+			"command": "npx turbo watch:bundle",
 			"group": "build",
 			"problemMatcher": {
 				"owner": "esbuild",
@@ -61,7 +61,7 @@
 		{
 			"label": "watch:tsc",
 			"type": "shell",
-			"command": "pnpm --filter roo-cline watch:tsc",
+			"command": "npx turbo watch:tsc",
 			"group": "build",
 			"problemMatcher": "$tsc-watch",
 			"isBackground": true,

.prettierrc.json

@@ -1,5 +1,12 @@
 # Roo Code Changelog
 
+## [3.18.5] - 2025-05-27
+
+- Add thinking controls for Requesty (thanks @dtrugman!)
+- Re-enable telemetry
+- Improve zh-TW Traditional Chinese locale (thanks @chrarnoldus)
+- Improve model metadata for LiteLLM
+
 ## [3.18.4] - 2025-05-25
 
 - Fix codebase indexing settings saving and Ollama indexing (thanks @daniel-lxs!)

.vscode/tasks.json

@@ -3,16 +3,16 @@
 	"private": true,
 	"scripts": {
 		"lint": "eslint src --ext=ts --max-warnings=0",
-		"check-types": "tsc --noEmit",
+		"check-types": "tsc -p tsconfig.esm.json --noEmit",
 		"format": "prettier --write src",
-		"test:ci": "pnpm --filter roo-cline build:development && pnpm test:run",
+		"test:ci": "pnpm -w bundle && pnpm --filter @roo-code/vscode-webview build && pnpm test:run",
 		"test:run": "rimraf out && tsc -p tsconfig.json && npx dotenvx run -f .env.local -- node ./out/runTest.js",
 		"clean": "rimraf out .turbo"
 	},
 	"devDependencies": {
 		"@roo-code/config-eslint": "workspace:^",
 		"@roo-code/config-typescript": "workspace:^",
-		"@roo-code/types": "^1.12.0",
+		"@roo-code/types": "workspace:^",
 		"@types/mocha": "^10.0.10",
 		"@types/node": "^22.14.1",
 		"@types/vscode": "^1.95.0",