Merge remote-tracking branch 'origin/main' into feature/2122-editor-focus

Author: felixAnhalt

.changeset/new-shoes-flow.md

@@ -0,0 +1,5 @@
+---
+"roo-cline": patch
+---
+
+Add thinking controls for Requesty

.changeset/thick-streets-give.md

@@ -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/scripts/overwrite_changeset_changelog.py

@@ -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"

.github/workflows/code-qa.yml

@@ -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,

.husky/pre-commit

@@ -1,5 +1,14 @@
 # Roo Code Changelog
 
+## [3.18.4] - 2025-05-25
+
+- Fix codebase indexing settings saving and Ollama indexing (thanks @daniel-lxs!)
+- Fix handling BOM when user rejects apply_diff (thanks @avtc!)
+- Fix wrongfully clearing input on auto-approve (thanks @Ruakij!)
+- Fix correct spawnSync parameters for pnpm check in bootstrap.mjs (thanks @ChuKhaLi!)
+- Update xAI models and default model ID (thanks @PeterDaveHello!)
+- Add metadata to create message (thanks @dtrugman!)
+
 ## [3.18.3] - 2025-05-24
 
 - Add reasoning support for Claude 4 and Gemini 2.5 Flash on OpenRouter, plus a fix for o1-pro