Sync Release/v0.6.6 into dev

.github/workflows/autoqa-template.yml

@@ -82,13 +82,13 @@ jobs:
             # Find the exe file in the artifact
             $exeFile = Get-ChildItem -Path "${{ runner.temp }}/windows-artifact" -Recurse -Filter "*.exe" | Select-Object -First 1
             if ($exeFile) {
-              Write-Host "✅ Found local installer: $($exeFile.FullName)"
+              Write-Host "[SUCCESS] Found local installer: $($exeFile.FullName)"
               Copy-Item -Path $exeFile.FullName -Destination "$env:TEMP\jan-installer.exe" -Force
-              Write-Host "✅ Installer copied to: $env:TEMP\jan-installer.exe"
+              Write-Host "[SUCCESS] Installer copied to: $env:TEMP\jan-installer.exe"
               # Don't set JAN_APP_PATH here - let the install script set it to the correct installed app path
               echo "IS_NIGHTLY=${{ inputs.is_nightly }}" >> $env:GITHUB_ENV
             } else {
-              Write-Error "❌ No .exe file found in artifact"
+              Write-Error "[FAILED] No .exe file found in artifact"
               exit 1
             }
           } else {
@@ -127,6 +127,37 @@ jobs:
         run: |
           .\scripts\run_tests.ps1 -JanAppPath "$env:JAN_APP_PATH" -ProcessName "$env:JAN_PROCESS_NAME" -RpToken "$env:RP_TOKEN"
 
+      - name: Collect Jan logs for artifact upload
+        if: always()
+        shell: powershell
+        run: |
+          $logDirs = @(
+            "$env:APPDATA\Jan-nightly\data\logs",
+            "$env:APPDATA\Jan\data\logs"
+          )
+          $dest = "autoqa\jan-logs"
+          mkdir $dest -Force | Out-Null
+          foreach ($dir in $logDirs) {
+            if (Test-Path $dir) {
+              Copy-Item "$dir\*.log" $dest -Force -ErrorAction SilentlyContinue
+            }
+          }
+
+      - name: Upload screen recordings
+        if: always()
+        uses: actions/upload-artifact@v4
+        continue-on-error: true
+        with:
+          name: ${{ inputs.is_nightly && 'jan-nightly' || 'jan' }}-recordings-${{ github.run_number }}-${{ runner.os }}
+          path: autoqa/recordings/
+
+      - name: Upload Jan logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.is_nightly && 'jan-nightly' || 'jan' }}-logs-${{ github.run_number }}-${{ runner.os }}
+          path: autoqa/jan-logs/
+
       - name: Cleanup after tests
         if: always()
         shell: powershell
@@ -196,9 +227,9 @@ jobs:
             # Find the deb file in the artifact
             DEB_FILE=$(find "${{ runner.temp }}/ubuntu-artifact" -name "*.deb" -type f | head -1)
             if [ -n "$DEB_FILE" ]; then
-              echo "✅ Found local installer: $DEB_FILE"
+              echo "[SUCCESS] Found local installer: $DEB_FILE"
               cp "$DEB_FILE" "/tmp/jan-installer.deb"
-              echo "✅ Installer copied to: /tmp/jan-installer.deb"
+              echo "[SUCCESS] Installer copied to: /tmp/jan-installer.deb"
               echo "JAN_APP_PATH=/tmp/jan-installer.deb" >> $GITHUB_ENV
               echo "IS_NIGHTLY=${{ inputs.is_nightly }}" >> $GITHUB_ENV
               if [ "${{ inputs.is_nightly }}" = "true" ]; then
@@ -207,7 +238,7 @@ jobs:
                 echo "JAN_PROCESS_NAME=Jan" >> $GITHUB_ENV
               fi
             else
-              echo "❌ No .deb file found in artifact"
+              echo "[FAILED] No .deb file found in artifact"
               exit 1
             fi
           else
@@ -252,13 +283,35 @@ jobs:
         run: |
           ./scripts/run_tests.sh "$JAN_APP_PATH" "$JAN_PROCESS_NAME" "$RP_TOKEN" "ubuntu"
 
+      - name: Collect Jan logs for artifact upload
+        if: always()
+        run: |
+          mkdir -p autoqa/jan-logs
+          cp ~/.local/share/Jan-nightly/data/logs/*.log autoqa/jan-logs/ 2>/dev/null || true
+          cp ~/.local/share/Jan/data/logs/*.log autoqa/jan-logs/ 2>/dev/null || true
+
+      - name: Upload screen recordings
+        if: always()
+        uses: actions/upload-artifact@v4
+        continue-on-error: true
+        with:
+          name: ${{ inputs.is_nightly && 'jan-nightly' || 'jan' }}-recordings-${{ github.run_number }}-${{ runner.os }}
+          path: autoqa/recordings/
+
+      - name: Upload Jan logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.is_nightly && 'jan-nightly' || 'jan' }}-logs-${{ github.run_number }}-${{ runner.os }}
+          path: autoqa/jan-logs/
+
       - name: Cleanup after tests
         if: always()
         run: |
           ./autoqa/scripts/ubuntu_post_cleanup.sh "$IS_NIGHTLY"
 
   macos:
-    runs-on: macos-selfhosted-15-arm64
+    runs-on: macos-selfhosted-15-arm64-cua
     timeout-minutes: 60
 
     env:
@@ -296,9 +349,9 @@ jobs:
             # Find the dmg file in the artifact
             DMG_FILE=$(find "${{ runner.temp }}/macos-artifact" -name "*.dmg" -type f | head -1)
             if [ -n "$DMG_FILE" ]; then
-              echo "✅ Found local installer: $DMG_FILE"
+              echo "[SUCCESS] Found local installer: $DMG_FILE"
               cp "$DMG_FILE" "/tmp/jan-installer.dmg"
-              echo "✅ Installer copied to: /tmp/jan-installer.dmg"
+              echo "[SUCCESS] Installer copied to: /tmp/jan-installer.dmg"
               echo "JAN_APP_PATH=/tmp/jan-installer.dmg" >> $GITHUB_ENV
               echo "IS_NIGHTLY=${{ inputs.is_nightly }}" >> $GITHUB_ENV
               if [ "${{ inputs.is_nightly }}" = "true" ]; then
@@ -307,7 +360,7 @@ jobs:
                 echo "PROCESS_NAME=Jan" >> $GITHUB_ENV
               fi
             else
-              echo "❌ No .dmg file found in artifact"
+              echo "[FAILED] No .dmg file found in artifact"
               exit 1
             fi
           else
@@ -349,7 +402,7 @@ jobs:
           else
             echo "Homebrew not available, checking if tkinter works..."
             python3 -c "import tkinter" || {
-              echo "⚠️ tkinter not available and Homebrew not found"
+              echo "[WARNING] tkinter not available and Homebrew not found"
               echo "This may cause issues with mouse control"
             }
           fi
@@ -362,7 +415,7 @@ jobs:
           echo "Installing Python dependencies..."
           pip install --upgrade pip
           pip install -r requirements.txt
-          echo "✅ Python dependencies installed"
+          echo "[SUCCESS] Python dependencies installed"
 
       - name: Setup ReportPortal environment
         run: |
@@ -390,6 +443,28 @@ jobs:
 
           ./scripts/run_tests.sh "$JAN_APP_PATH" "$PROCESS_NAME" "$RP_TOKEN" "macos"
 
+      - name: Collect Jan logs for artifact upload
+        if: always()
+        run: |
+          mkdir -p autoqa/jan-logs
+          cp ~/Library/Application\ Support/Jan-nightly/data/logs/*.log autoqa/jan-logs/ 2>/dev/null || true
+          cp ~/Library/Application\ Support/Jan/data/logs/*.log autoqa/jan-logs/ 2>/dev/null || true
+
+      - name: Upload screen recordings
+        if: always()
+        uses: actions/upload-artifact@v4
+        continue-on-error: true
+        with:
+          name: ${{ inputs.is_nightly && 'jan-nightly' || 'jan' }}-recordings-${{ github.run_number }}-${{ runner.os }}
+          path: autoqa/recordings/
+
+      - name: Upload Jan logs
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: ${{ inputs.is_nightly && 'jan-nightly' || 'jan' }}-logs-${{ github.run_number }}-${{ runner.os }}
+          path: autoqa/jan-logs/
+
       - name: Cleanup after tests
         if: always()
         run: |

.github/workflows/jan-linter-and-test.yml

@@ -68,10 +68,10 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ref-lcov.info
-          path: coverage/merged/lcov.info
+          path: coverage/lcov.info
 
   test-on-macos:
-    runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'macos-latest' || 'macos-selfhosted-12-arm64' }}
+    runs-on: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository) && 'macos-latest' || 'macos-selfhosted-15-arm64' }}
     if: github.event_name == 'pull_request' || github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     steps:
       - name: Getting the repo
@@ -251,7 +251,7 @@ jobs:
         uses: barecheck/code-coverage-action@v1
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          lcov-file: './coverage/merged/lcov.info'
+          lcov-file: './coverage/lcov.info'
           base-lcov-file: './lcov.info'
           send-summary-comment: true
           show-annotations: 'warning'

.github/workflows/template-tauri-build-linux-x64.yml

@@ -106,9 +106,7 @@ jobs:
           mv /tmp/tauri.conf.json ./src-tauri/tauri.conf.json         
           if [ "${{ inputs.channel }}" != "stable" ]; then
             jq '.bundle.linux.deb.files = {"usr/bin/bun": "resources/bin/bun",
-                                           "usr/lib/Jan-${{ inputs.channel }}/binaries": "binaries/deps",  
-                                           "usr/lib/Jan-${{ inputs.channel }}/binaries/engines": "binaries/engines", 
-                                           "usr/lib/Jan-${{ inputs.channel }}/binaries/libvulkan.so": "binaries/libvulkan.so"}' ./src-tauri/tauri.linux.conf.json > /tmp/tauri.linux.conf.json
+                                           "usr/lib/Jan-${{ inputs.channel }}/resources/lib/libvulkan.so": "resources/lib/libvulkan.so"}' ./src-tauri/tauri.linux.conf.json > /tmp/tauri.linux.conf.json
             mv /tmp/tauri.linux.conf.json ./src-tauri/tauri.linux.conf.json
           fi
           jq --arg version "${{ inputs.new_version }}" '.version = $version' web-app/package.json > /tmp/package.json

.github/workflows/template-tauri-build-windows-x64.yml

@@ -178,9 +178,6 @@ jobs:
       - name: Build app
         shell: bash
         run: |
-          curl -L -o ./src-tauri/binaries/vcomp140.dll https://catalog.jan.ai/vcomp140.dll
-          curl -L -o ./src-tauri/binaries/msvcp140_codecvt_ids.dll https://catalog.jan.ai/msvcp140_codecvt_ids.dll
-          ls ./src-tauri/binaries
           make build
         env:
           AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}

Makefile

@@ -30,9 +30,8 @@ endif
 	yarn build:extensions
 
 dev: install-and-build
-	yarn install:cortex
 	yarn download:bin
-	yarn copy:lib
+	yarn download:lib
 	yarn dev
 
 # Linting
@@ -41,6 +40,8 @@ lint: install-and-build
 
 # Testing
 test: lint
+	yarn download:bin
+	yarn download:lib
 	yarn test
 
 # Builds and publishes the app
@@ -49,7 +50,7 @@ build-and-publish: install-and-build
 
 # Build
 build: install-and-build
-	yarn copy:lib
+	yarn download:lib
 	yarn build
 
 clean:
@@ -81,19 +82,19 @@ else ifeq ($(shell uname -s),Linux)
 	rm -rf "~/.cache/jan*"
 	rm -rf "./.cache"
 else
-	find . -name "node_modules" -type d -prune -exec rm -rf '{}' +
-	find . -name ".next" -type d -exec rm -rf '{}' +
-	find . -name "dist" -type d -exec rm -rf '{}' +
-	find . -name "build" -type d -exec rm -rf '{}' +
-	find . -name "out" -type d -exec rm -rf '{}' +
-	find . -name ".turbo" -type d -exec rm -rf '{}' +
-	find . -name ".yarn" -type d -exec rm -rf '{}' +
-	find . -name "package-lock.json" -type f -exec rm -rf '{}' +
-	rm -rf ./pre-install/*.tgz
-	rm -rf ./extensions/*/*.tgz
-	rm -rf ./electron/pre-install/*.tgz
-	rm -rf ./src-tauri/resources
-	rm -rf ./src-tauri/target
-	rm -rf ~/jan/extensions
-	rm -rf ~/Library/Caches/jan*
+	find . -name "node_modules" -type d -prune -exec rm -rfv '{}' +
+	find . -name ".next" -type d -exec rm -rfv '{}' +
+	find . -name "dist" -type d -exec rm -rfv '{}' +
+	find . -name "build" -type d -exec rm -rfv '{}' +
+	find . -name "out" -type d -exec rm -rfv '{}' +
+	find . -name ".turbo" -type d -exec rm -rfv '{}' +
+	find . -name ".yarn" -type d -exec rm -rfv '{}' +
+	find . -name "package-lock.json" -type f -exec rm -rfv '{}' +
+	rm -rfv ./pre-install/*.tgz
+	rm -rfv ./extensions/*/*.tgz
+	rm -rfv ./electron/pre-install/*.tgz
+	rm -rfv ./src-tauri/resources
+	rm -rfv ./src-tauri/target
+	rm -rfv ~/jan/extensions
+	rm -rfv ~/Library/Caches/jan*
 endif

autoqa/main.py

@@ -449,17 +449,17 @@ async def main():
                 # Update counters and log result
                 if test_passed:
                     test_results["passed"] += 1
-                    logger.info(f"✅ Test {i} PASSED: {test_data['path']}")
+                    logger.info(f"[SUCCESS] Test {i} PASSED: {test_data['path']}")
                 else:
                     test_results["failed"] += 1
-                    logger.error(f"❌ Test {i} FAILED: {test_data['path']}")
+                    logger.error(f"[FAILED] Test {i} FAILED: {test_data['path']}")
 
                 # Debug log for troubleshooting
-                logger.info(f"🔍 Debug - Test result: type={type(test_result)}, value={test_result}, success_field={test_result.get('success', 'N/A') if isinstance(test_result, dict) else 'N/A'}, final_passed={test_passed}")
+                logger.info(f"[INFO] Debug - Test result: type={type(test_result)}, value={test_result}, success_field={test_result.get('success', 'N/A') if isinstance(test_result, dict) else 'N/A'}, final_passed={test_passed}")
 
             except Exception as e:
                 test_results["failed"] += 1
-                logger.error(f"❌ Test {i} FAILED with exception: {test_data['path']} - {e}")
+                logger.error(f"[FAILED] Test {i} FAILED with exception: {test_data['path']} - {e}")
 
             # Add delay between tests
             if i < len(test_files):
@@ -477,10 +477,10 @@ async def main():
         logger.info("=" * 50)
 
         if test_results["failed"] > 0:
-            logger.error(f"❌ Test execution completed with {test_results['failed']} failures!")
+            logger.error(f"[FAILED] Test execution completed with {test_results['failed']} failures!")
             final_exit_code = 1
         else:
-            logger.info("✅ All tests completed successfully!")
+            logger.info("[SUCCESS] All tests completed successfully!")
             final_exit_code = 0
 
     except KeyboardInterrupt: