Merge main

Author: cte

.changeset/curvy-cows-cry.md

@@ -0,0 +1,11 @@
+---
+"roo-cline": patch
+---
+
+fix: ensure consistent line endings in git fallback strategy
+
+Fixed a cross-platform issue where tests would fail on GitHub Windows runners but pass on local Windows machines due to line ending differences. The fix ensures consistent line ending handling by:
+
+1. Normalizing CRLF to LF when reading files in the git fallback strategy
+2. Disabling Git's automatic line ending conversion using core.autocrlf setting
+3. Maintaining consistent line ending usage throughout the text operations

.github/workflows/code-qa.yml

@@ -62,7 +62,10 @@ jobs:
         run: npm run knip
 
   test-extension:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -73,11 +76,16 @@ jobs:
           cache: 'npm'
       - name: Install dependencies
         run: npm run install:all
+      - name: Compile (to build and copy WASM files)
+        run: npm run compile
       - name: Run unit tests
         run: npx jest --silent
 
   test-webview:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

README.md

@@ -19,6 +19,12 @@ module.exports = {
 		],
 	},
 	testMatch: ["**/__tests__/**/*.test.ts"],
+	// Platform-specific test configuration
+	testPathIgnorePatterns: [
+		// Skip platform-specific tests based on environment
+		...(process.platform === "win32" ? [".*\\.bash\\.test\\.ts$"] : [".*\\.cmd\\.test\\.ts$"]),
+		// PowerShell tests are conditionally skipped in the test files themselves using the setupFilesAfterEnv
+	],
 	moduleNameMapper: {
 		"^vscode$": "<rootDir>/src/__mocks__/vscode.js",
 		"@modelcontextprotocol/sdk$": "<rootDir>/src/__mocks__/@modelcontextprotocol/sdk/index.js",
@@ -39,4 +45,5 @@ module.exports = {
 	modulePathIgnorePatterns: [".vscode-test"],
 	reporters: [["jest-simple-dot-reporter", {}]],
 	setupFiles: ["<rootDir>/src/__mocks__/jest.setup.ts"],
+	setupFilesAfterEnv: ["<rootDir>/src/integrations/terminal/__tests__/setupTerminalTests.ts"],
 }