merge conflicts

Author: celestial-vault

.github/workflows/test.yml

@@ -6,6 +6,12 @@ on:
         branches:
             - main
 
+# Set default permissions for all jobs
+permissions:
+    contents: read # Needed to check out code
+    checks: write # Needed to report test results
+    pull-requests: write # Needed to add comments/annotations to PRs
+
 jobs:
     test:
         runs-on: ubuntu-latest
@@ -51,6 +57,5 @@ jobs:
             - name: Prettier / Format Check
               run: npm run format
 
-            - name: Tests
+            - name: Extension Tests
               run: xvfb-run -a npm run test
-              if: runner.os == 'Linux'

.gitignore

@@ -1,7 +1,10 @@
 out
 dist
 node_modules
+tmp
 .vscode-test/
 *.vsix
 
 .DS_Store
+
+pnpm-lock.yaml

.husky/pre-commit

@@ -0,0 +1,17 @@
+echo "Running pre-commit checks..."
+
+# Run ESLint
+echo "Running ESLint..."
+npm run lint || {
+    echo "❌ ESLint check failed. Please fix the errors and try committing again."
+    exit 1
+}
+
+# Run Prettier
+echo "Running Prettier..."
+npm run format || {
+    echo "❌ Prettier check failed. Run 'npm run format:fix' to automatically fix formatting issues."
+    exit 1
+}
+
+echo "✅ All checks passed!"

.prettierignore

@@ -1,5 +1,5 @@
 dist/
 node_modules
 webview-ui/build/
-CHANGELOG.md
-package-lock.json
+*.md
+package-lock.json

.vscode-test.mjs

@@ -1,8 +1,14 @@
 import { defineConfig } from "@vscode/test-cli"
+import path from "path"
 
 export default defineConfig({
-	files: "out/**/*.test.js",
+	files: "{out/test/**/*.test.js,src/test/suite/**/*.test.js}",
 	mocha: {
+		ui: "bdd",
 		timeout: 20000, // Maximum time (in ms) that a test can run before failing
 	},
+	workspaceFolder: "test-workspace",
+	version: "stable",
+	extensionDevelopmentPath: path.resolve("./"),
+	launchArgs: ["--disable-extensions"],
 })

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Change Log
 
+## [3.2.5]
+
+- Use yellow textfield outline in Plan mode to better distinguish from Act mode
+
+## [3.2.3]
+
+- Add DeepSeek-R1 (deepseek-reasoner) model support with proper parameter handling (thanks @slavakurilyak!)
+
+## [3.2.0]
+
+- Add Plan/Act mode toggle to let you plan tasks with Cline before letting him get to work
+- Easily switch between API providers and models using a new popup menu under the chat field
+- Add VS Code LM API provider to run models provided by other VS Code extensions (e.g. GitHub Copilot). Shoutout to @julesmons, @RaySinner, and @MrUbens for putting this together!
+- Add on/off toggle for MCP servers to disable them when not in use. Thanks @MrUbens!
+- Add Auto-approve option for individual tools in MCP servers. Thanks @MrUbens!
+
+## [3.1.10]
+
+- New icon!
+
 ## [3.1.9]
 
 - Add Mistral API provider with codestral-latest model