Merge branch 'main' into releases

Author: 4pmtong

.github/workflows/build-view.yml

@@ -12,6 +12,7 @@ jobs:
     timeout-minutes: 120
 
     strategy:
+      fail-fast: false
       matrix:
         include:
           - os: macos-latest
@@ -39,6 +40,22 @@ jobs:
         run: |
           rm -rf node_modules
           rm -rf release
+          rm -rf dist out build .vite
+          rm -rf node_modules/.cache || true
+
+      # Clean build outputs on GitHub-hosted runners to avoid stale artifacts in current job
+      - name: Clean build outputs (non-Windows)
+        if: "!contains(matrix.os, 'self-hosted') && runner.os != 'Windows'"
+        run: |
+          rm -rf release dist out .vite
+          rm -rf node_modules/.cache || true
+
+      - name: Clean build outputs (Windows)
+        if: "!contains(matrix.os, 'self-hosted') && runner.os == 'Windows'"
+        shell: pwsh
+        run: |
+          Remove-Item -Recurse -Force release, dist, out, .vite -ErrorAction SilentlyContinue
+          Remove-Item -Recurse -Force node_modules/.cache -ErrorAction SilentlyContinue
 
       - name: Setup Node.js
         if: "!contains(matrix.os, 'self-hosted')"
@@ -92,6 +109,20 @@ jobs:
           echo "LLVM_DIR=$(brew --prefix llvm@20)/lib/cmake/llvm" >> $GITHUB_ENV
           echo "CMAKE_PREFIX_PATH=$(brew --prefix llvm@20)/lib/cmake/llvm" >> $GITHUB_ENV
 
+      # Prebuild separately on macOS so signing/package issues are isolated
+      - name: Build Release Files (macOS prebuild)
+        if: runner.os == 'macOS'
+        timeout-minutes: 45
+        run: |
+          npm run prebuild
+        env:
+          VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
+          VITE_PROXY_URL: ${{ secrets.VITE_PROXY_URL }}
+          VITE_STACK_PROJECT_ID: ${{ secrets.VITE_STACK_PROJECT_ID }}
+          VITE_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.VITE_STACK_PUBLISHABLE_CLIENT_KEY }}
+          VITE_STACK_SECRET_SERVER_KEY: ${{ secrets.VITE_STACK_SECRET_SERVER_KEY }}
+          USE_NPM_INSTALL_BUN: 'true'
+
       # Step for macOS builds with signing
       - name: Build Release Files (macOS with signing)
         if: runner.os == 'macOS'
@@ -104,15 +135,28 @@ jobs:
           fi
           ulimit -n 65536 2>/dev/null || ulimit -n 10240 2>/dev/null || true
           echo "File descriptor limit: $(ulimit -n) (hard: $(ulimit -Hn 2>/dev/null || echo 'N/A'))"
-          npm run prebuild
-          npx electron-builder --mac --${{ matrix.arch }} --publish never
+
+          set +e
+          npx electron-builder --mac dmg --${{ matrix.arch }} --publish never
+          BUILD_EXIT=$?
+
+          if [ $BUILD_EXIT -ne 0 ]; then
+            echo "First attempt failed with exit code $BUILD_EXIT"
+            echo "Retrying once in 5 seconds..."
+            sleep 5
+            npx electron-builder --mac dmg --${{ matrix.arch }} --publish never
+            BUILD_EXIT=$?
+          fi
+
+          exit $BUILD_EXIT
         env:
           CSC_LINK: ${{ secrets.CERT_P12 }}
           CSC_KEY_PASSWORD: ${{ secrets.CERT_PASSWORD }}
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_APP_SPECIFIC_PASSWORD: ${{ secrets.APPLE_APP_SPECIFIC_PASSWORD }}
           APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
           VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
+          VITE_PROXY_URL: ${{ secrets.VITE_PROXY_URL }}
           VITE_STACK_PROJECT_ID: ${{ secrets.VITE_STACK_PROJECT_ID }}
           VITE_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.VITE_STACK_PUBLISHABLE_CLIENT_KEY }}
           VITE_STACK_SECRET_SERVER_KEY: ${{ secrets.VITE_STACK_SECRET_SERVER_KEY }}
@@ -127,6 +171,7 @@ jobs:
           npx electron-builder --win --${{ matrix.arch }} --publish never
         env:
           VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
+          VITE_PROXY_URL: ${{ secrets.VITE_PROXY_URL }}
           VITE_STACK_PROJECT_ID: ${{ secrets.VITE_STACK_PROJECT_ID }}
           VITE_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.VITE_STACK_PUBLISHABLE_CLIENT_KEY }}
           VITE_STACK_SECRET_SERVER_KEY: ${{ secrets.VITE_STACK_SECRET_SERVER_KEY }}
@@ -141,6 +186,7 @@ jobs:
           npx electron-builder --linux --${{ matrix.arch }} --publish never
         env:
           VITE_BASE_URL: ${{ secrets.VITE_BASE_URL }}
+          VITE_PROXY_URL: ${{ secrets.VITE_PROXY_URL }}
           VITE_STACK_PROJECT_ID: ${{ secrets.VITE_STACK_PROJECT_ID }}
           VITE_STACK_PUBLISHABLE_CLIENT_KEY: ${{ secrets.VITE_STACK_PUBLISHABLE_CLIENT_KEY }}
           VITE_STACK_SECRET_SERVER_KEY: ${{ secrets.VITE_STACK_SECRET_SERVER_KEY }}
@@ -195,6 +241,7 @@ jobs:
           path: |
             release/*.AppImage
           retention-days: 5
+
   merge-release:
     needs: build
     runs-on: ubuntu-latest

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
       # Note: dorny/paths-filter fetches file info via GitHub API, no checkout needed
       - name: Check Not Allowed File Changes
-        uses: dorny/paths-filter@v3
+        uses: dorny/paths-filter@v4
         id: filter_not_allowed
         with:
           list-files: json

backend/app/controller/tool_controller.py

@@ -15,6 +15,7 @@
 import logging
 import os
 import shutil
+import threading
 import time
 
 from fastapi import APIRouter, HTTPException
@@ -779,15 +780,13 @@ def is_port_in_use(port):
             bufsize=1,  # Line buffered
         )
 
-        # Create async task to log Electron output
-        async def log_electron_output():
+        def log_electron_output():
             for line in iter(process.stdout.readline, ""):
                 if line:
                     logger.info(f"[ELECTRON OUTPUT] {line.strip()}")
 
-        import asyncio
-
-        asyncio.create_task(log_electron_output())
+        log_thread = threading.Thread(target=log_electron_output, daemon=True)
+        log_thread.start()
 
         # Wait a bit for Electron to start
         import asyncio

backend/app/router.py

@@ -73,6 +73,11 @@ def register_routers(app: FastAPI, prefix: str = "") -> None:
         },
     ]
 
+    app.include_router(health_controller.router, tags=["Health"])
+    logger.info(
+        "Registered Health router at root level for Docker health checks"
+    )
+
     for config in routers_config:
         app.include_router(
             config["router"], prefix=prefix, tags=config["tags"]

electron/main/index.ts

@@ -50,11 +50,7 @@ import {
   getInstallationStatus,
   PromiseReturnType,
 } from './install-deps';
-import {
-  setRoundedCorners,
-  setTransparentTitlebar,
-  setVibrancy,
-} from './native/macos-window';
+import { setRoundedCorners } from './native/macos-window';
 import { registerUpdateIpcHandlers, update } from './update';
 import {
   getEmailFolderPath,
@@ -2741,8 +2737,7 @@ async function createWindow() {
   );
 
   // Platform-specific window configuration
-  // Windows: Use native frame for better native feel, solid background
-  // macOS: Use frameless with transparency and vibrancy effects
+  // Windows: native frame and solid background. macOS/Linux: frameless; macOS corner radius via native hook.
   win = new BrowserWindow({
     title: 'Eigent',
     width: 1200,
@@ -2754,12 +2749,16 @@ async function createWindow() {
     show: false, // Don't show until content is ready to avoid white screen
     // Only use transparency on macOS and Linux (not supported well on Windows)
     transparent: !isWindows,
-    // Solid background on Windows (respect dark/light mode), fully transparent on macOS for native vibrancy
+    // Solid on Windows; macOS solid without vibrancy; Linux unchanged semi-transparent tint
     backgroundColor: isWindows
       ? nativeTheme.shouldUseDarkColors
         ? '#1e1e1e'
         : '#ffffff'
-      : '#00000000',
+      : isMac
+        ? nativeTheme.shouldUseDarkColors
+          ? '#1e1e1e'
+          : '#f5f5f5'
+        : '#f5f5f580',
     // macOS-specific title bar styling
     titleBarStyle: isMac ? 'hidden' : undefined,
     trafficLightPosition: isMac ? { x: 10, y: 10 } : undefined,
@@ -2783,23 +2782,13 @@ async function createWindow() {
     },
   });
 
-  // Apply native macOS effects
   if (process.platform === 'darwin') {
     win.once('ready-to-show', () => {
       if (win && !win.isDestroyed()) {
         try {
-          // Apply vibrancy with HUDWindow material (or others like 'Sidebar', 'UnderWindowBackground')
-          setVibrancy(win, 'HUDWindow');
-
-          // Apply rounded corners
           setRoundedCorners(win, 20);
-
-          // Make titlebar transparent
-          setTransparentTitlebar(win);
-
-          log.info('[MacOS] Applied native visual effects');
         } catch (error) {
-          log.error('[MacOS] Failed to apply native visual effects:', error);
+          log.error('[MacOS] Failed to apply rounded corners:', error);
         }
       }
     });