sync: cline merge v3.26.6

.changeset/popular-pillows-complain.md

@@ -0,0 +1,5 @@
+---
+"hai-build-code-generator": minor
+---
+
+Merged changes from Cline 3.26.6 (see [changelog](https://github.com/cline/cline/blob/main/CHANGELOG.md#3266)).

.github/workflows/test.yml

@@ -71,13 +71,7 @@ jobs:
             - name: Install xvfb on Linux
               if: runner.os == 'Linux'
               run: sudo apt-get update && sudo apt-get install -y xvfb
-
-            - name: Install local modules on windows
-              if: runner.os == 'Windows' && steps.root-cache.outputs.cache-hit == 'true'
-              run: |
-                  npm install eslint-plugin-eslint-rules 
-                  cd webview-ui/ && npm install eslint-plugin-eslint-rules
-
+
             - name: Set up NPM on Windows
               if: runner.os == 'Windows'
               run: |
@@ -86,26 +80,25 @@ jobs:
             - name: Type Check
               run: npm run check-types
 
-            - name: ESLint Check
+            - name: Lint Check
               run: npm run lint
 
-            - name: Prettier / Format Check
+            - name: Format Check
               run: npm run format
 
             # Build the extension before running tests
             - name: Build Tests and Extension
               run: npm run pretest
 
-            # Unit Tests disabled due to module system conflicts between backend and webview-ui
-            # - name: Unit Tests
-            #   run: npm run test:unit
+            - name: Unit Tests
+              run: npm run test:unit
 
             # Run extension tests with coverage
-            - name: Extension Tests with Coverage
+            - name: Extension Integration Tests with Coverage
               id: extension_coverage
               continue-on-error: true
               run: |
-                  node ./scripts/test-ci.js > extension_coverage.txt 2>&1
+                  node ./scripts/test-ci.js 2>&1 | tee extension_coverage.txt
                   # Default the encoding to UTF-8 - It's not the default on Windows
                   PYTHONUTF8=1 PYTHONPATH=.github/scripts python -m coverage_check extract-coverage extension_coverage.txt --type=extension --github-output --verbose
 
@@ -117,7 +110,7 @@ jobs:
                   cd webview-ui
                   # Ensure coverage dependency is installed
                   npm install --no-save @vitest/coverage-v8
-                  npm run test:coverage > webview_coverage.txt 2>&1
+                  npm run test:coverage 2>&1 | tee webview_coverage.txt
                   cd ..
                   # Default the encoding to UTF-8 - It's not the default on Windows
                   PYTHONUTF8=1 PYTHONPATH=.github/scripts python -m coverage_check extract-coverage webview-ui/webview_coverage.txt --type=webview --github-output --verbose
@@ -132,21 +125,19 @@ jobs:
                   path: |
                       extension_coverage.txt
                       webview-ui/webview_coverage.txt
-                  retention-period: workflow # Artifacts are automatically deleted when the workflow completes
 
             # Set the check as failed if any of the tests failed
-            - name: Print test results and check for failures
+            - name: Check for test failures
               run: |
-                  echo "Extension Tests Result: ${{ steps.extension_coverage.outcome }}"
-                  cat extension_coverage.txt
-
-                  echo "Webview Tests Result: ${{ steps.webview_coverage.outcome }}"
-                  cat webview-ui/webview_coverage.txt
-
                   # Check if any of the test steps failed
                   # https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/accessing-contextual-information-about-workflow-runs#steps-context
+                  if [ "${{ steps.extension_coverage.outcome }}" != "success" ]; then
+                      echo "Extension Integration Tests failed, see previous step for test output."
+                  fi
+                  if [ "${{ steps.webview_coverage.outcome }}" != "success" ]; then
+                      echo "Webview Tests failed, see previous step for test output."
+                  fi
                   if [ "${{ steps.extension_coverage.outcome }}" != "success" ] || [ "${{ steps.webview_coverage.outcome }}" != "success" ]; then
-                      echo "Tests failed."
                       exit 1
                   fi
 

.gitignore

@@ -33,7 +33,11 @@ webview-ui/src/services/grpc-client.ts
 # E2E Tests
 test-results
 
+## CLI pre-release  ##
+/cli
+
 # TAG:HAI
 .hai/
 .hai.config
 .haiignore
+

.hairules/workflows/git-branch-analysis.md

@@ -6,28 +6,14 @@ Analyze the current branch's changes against main to provide informed insights a
 ## Step 1: Gather Git Information
 <important>Do not return any text or conversation other than what is necessary to run these commands</important>
 
-**First, check the expected output size:**
-   ```shell
-   (git branch --show-current && echo "=== STATUS ===" && git status --porcelain | cat && echo "=== COMMIT MESSAGES ===" && git log main..HEAD --oneline | cat && echo "=== CHANGED FILES ===" && git diff main --name-only | cat && echo "=== FULL DIFF ===" && git diff main | cat) | wc -l
-   ```
-
-**If the expected line count is greater than 500 lines, use the file-based approach:**
-   ```shell
-   git branch --show-current > hai-git-analysis.temp && echo "=== STATUS ===" >> hai-git-analysis.temp && git status --porcelain >> hai-git-analysis.temp && echo "=== COMMIT MESSAGES ===" >> hai-git-analysis.temp && git log main..HEAD --oneline >> hai-git-analysis.temp && echo "=== CHANGED FILES ===" >> hai-git-analysis.temp && git diff main --name-only >> hai-git-analysis.temp && echo "=== FULL DIFF ===" >> hai-git-analysis.temp && git diff main >> hai-git-analysis.temp
-   ```
-
-   Then, read the file using the read_file tool. After you have read the file but before you proceed with subsequent steps, delete it:
-   ```shell
-   rm hai-git-analysis.temp
-   ```
-
-**If the expected line count is 500 lines or fewer, use the direct approach:**
-   ```shell
-   git branch --show-current && echo "=== STATUS ===" && git status --porcelain | cat && echo "=== COMMIT MESSAGES ===" && git log main..HEAD --oneline | cat && echo "=== CHANGED FILES ===" && git diff main --name-only | cat && echo "=== FULL DIFF ===" && git diff main | cat
-   ```
-
-<important>If using the direct approach, pipe outputs through `cat` to avoid interactive terminals. If the user's shell is not bash/zsh, adjust the command and chaining
- syntax accordingly.</important>
+**Run the following command to get the latest changes (bash):**
+```bash
+B=$(for c in main master origin/main origin/master; do git rev-parse --verify -q "$c" >/dev/null && echo "$c" && break; done); B=${B:-HEAD}; r(){ git branch --show-current; printf "=== STATUS ===\n"; git status --porcelain | cat; printf "=== COMMIT MESSAGES ===\n"; git log "$B"..HEAD --oneline | cat; printf "=== CHANGED FILES ===\n"; git diff "$B" --name-only | cat; printf "=== FULL DIFF ===\n"; git diff "$B" | cat; }; L=$(r | wc -l); if [ "$L" -gt 500 ]; then r > hai-git-analysis.temp && echo "::OUTPUT_FILE=hai-git-analysis.temp"; else r; fi
+```
+
+```powershell
+$B=$null;foreach($c in 'main','master','origin/main','origin/master'){git rev-parse --verify -q $c *> $null;if($LASTEXITCODE -eq 0){$B=$c;break}};if(-not $B){$B='HEAD'};function r([string]$b){git rev-parse --abbrev-ref HEAD; '=== STATUS ==='; git status --porcelain | cat; '=== COMMIT MESSAGES ==='; git log "$b"..HEAD --oneline | cat; '=== CHANGED FILES ==='; git diff "$b" --name-only | cat; '=== FULL DIFF ==='; git diff "$b" | cat};$out=r $B|Out-String;$lines=($out -split "`r?`n").Count;if($lines -gt 500){$out|Set-Content -NoNewline hai-git-analysis.temp; '::OUTPUT_FILE=hai-git-analysis.temp'}else{$out}
+```
 
 ## Step 2: Silent, Structured Analysis Phase
 - Analyze all git output without providing commentary or narration

.hairules/workflows/pr-review.md

@@ -219,6 +219,9 @@ EOF
 
 ## Basic PR Commands
 ```bash
+# Get current PR number
+gh pr view --json number -q .number
+
 # List open PRs
 gh pr list
 
@@ -328,7 +331,7 @@ Hey, the PR looks good overall but I'm concerned about removing those timeouts.
 Could you add back the timeouts after focusing the sidebar? Something like:
 
 ```typescript
-await vscode.commands.executeCommand("claude-dev.SidebarProvider.focus")
+await vscode.commands.executeCommand("hai.SidebarProvider.focus")
 await setTimeoutPromise(100)  // Give UI time to update
 visibleWebview = WebviewProvider.getSidebarInstance()
 ```

.husky/pre-commit

@@ -1,17 +1 @@
-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..."
-npx lint-staged --verbose || {
-     echo "❌ Prettier failed. Please fix the errors and try committing again."
-     exit 1
- }
-
-echo "✅ All checks passed!"
+lint-staged --no-stash

.mocharc.json

@@ -1,6 +1,15 @@
 {
-	"extension": ["ts"],
-	"spec": ["src/**/__tests__/*.ts", "eslint-rules/__tests__/**/*.test.ts"],
-	"require": ["ts-node/register", "source-map-support/register", "./src/test/requires.ts"],
+	"extension": [
+		"ts"
+	],
+	"spec": [
+		"src/**/__tests__/*.ts",
+		"eslint-rules/__tests__/**/*.test.ts"
+	],
+	"require": [
+		"ts-node/register",
+		"source-map-support/register",
+		"./src/test/requires.ts"
+	],
 	"recursive": true
 }

.vscode/extensions.json

@@ -2,9 +2,9 @@
 	// See http://go.microsoft.com/fwlink/?LinkId=827846
 	// for the documentation about the extensions.json format
 	"recommendations": [
-		"dbaeumer.vscode-eslint",
 		"connor4312.esbuild-problem-matchers",
 		"ms-vscode.extension-test-runner",
-		"bradlc.vscode-tailwindcss"
+		"bradlc.vscode-tailwindcss",
+		"biomejs.biome"
 	]
 }

.vscode/launch.json

@@ -9,8 +9,14 @@
 			"name": "Run Extension (production)",
 			"type": "extensionHost",
 			"request": "launch",
-			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-workspace-trust", "${workspaceFolder}"],
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--disable-workspace-trust",
+				"${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
 			"preLaunchTask": "${defaultBuildTask}",
 			"env": {
 				"IS_DEV": "true",
@@ -21,8 +27,14 @@
 			"name": "Run Extension (staging)",
 			"type": "extensionHost",
 			"request": "launch",
-			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-workspace-trust", "${workspaceFolder}"],
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--disable-workspace-trust",
+				"${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
 			"preLaunchTask": "${defaultBuildTask}",
 			"env": {
 				"IS_DEV": "true",
@@ -33,8 +45,14 @@
 			"name": "Run Extension (local)",
 			"type": "extensionHost",
 			"request": "launch",
-			"args": ["--extensionDevelopmentPath=${workspaceFolder}", "--disable-workspace-trust", "${workspaceFolder}"],
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
+			"args": [
+				"--extensionDevelopmentPath=${workspaceFolder}",
+				"--disable-workspace-trust",
+				"${workspaceFolder}"
+			],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
 			"preLaunchTask": "${defaultBuildTask}",
 			"env": {
 				"IS_DEV": "true",
@@ -54,7 +72,9 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"${workspaceFolder}"
 			],
-			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/dist/**/*.js"
+			],
 			"preLaunchTask": "clean-tmp-user",
 			"internalConsoleOptions": "openOnSessionStart",
 			"postDebugTask": "stop",
@@ -68,11 +88,18 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Run hai-core service",
-			"skipFiles": ["<node_internals>/**"],
+			"skipFiles": [
+				"<node_internals>/**"
+			],
 			"sourceMaps": true,
-			"resolveSourceMapLocations": ["${workspaceFolder}/**", "!**/node_modules/**"],
+			"resolveSourceMapLocations": [
+				"${workspaceFolder}/**",
+				"!**/node_modules/**"
+			],
 			"cwd": "${workspaceFolder}/dist-standalone",
-			"outFiles": ["${workspaceFolder}/dist-standalone/**/*.js"],
+			"outFiles": [
+				"${workspaceFolder}/dist-standalone/**/*.js"
+			],
 			"preLaunchTask": "compile-standalone",
 			"env": {
 				// Turns on grpc debug log.