Merge remote-tracking branch 'origin/main' into feat/model-error-ux

Author: a7m-1st

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -12,7 +12,7 @@ body:
     id: version
     attributes:
       label: What version of eigent are you using?
-      placeholder: E.g., 0.0.85
+      placeholder: E.g., 0.0.86
     validations:
       required: true
 

.github/workflows/build.yml

@@ -116,7 +116,7 @@ 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 build -- --arch ${{ matrix.arch }}
+          npm run build -- --${{ matrix.arch }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           CSC_LINK: ${{ secrets.CERT_P12 }}
@@ -125,6 +125,7 @@ jobs:
           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 }}
@@ -134,10 +135,11 @@ jobs:
       - name: Build Release Files (Windows without signing)
         if: runner.os == 'Windows'
         timeout-minutes: 90
-        run: npm run build -- --arch ${{ matrix.arch }}
+        run: npm run build -- --${{ matrix.arch }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           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 }}
@@ -151,6 +153,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           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 }}
@@ -344,7 +347,7 @@ jobs:
           files: |
             gh-release-assets/*
 
-      # Extract version from tag (e.g., v0.0.85 -> 0.0.85)
+      # Extract version from tag (e.g., v0.0.85 -> 0.0.86)
       - name: Extract version
         if: startsWith(github.ref, 'refs/tags/')
         id: version

README.md

@@ -37,7 +37,7 @@ Built on [CAMEL-AI][camel-site]'s acclaimed open-source project, our system intr
 - ✅ **Zero Setup** - No technical configuration required
 - ✅ **Multi-Agent Coordination** - Handle complex multi-agent workflows
 - ✅ **Enterprise Feature** - SSO/Access control
-- ✅ **Local Deploymen**t
+- ✅ **Local Deployment**
 - ✅ **Open Source**
 - ✅ **Custom Model Support**
 - ✅ **MCP Integration**
@@ -70,7 +70,7 @@ Built on [CAMEL-AI][camel-site]'s acclaimed open-source project, our system intr
 - [🗺️ Roadmap - Open Source Cowork](#%EF%B8%8F-roadmap---open-source-Cowork)
 - [📖 Contributing](#-contributing)
   - [Main Contributors](#main-contributors)
-  - [Distinguished amabssador](#distinguished-amabssador)
+  - [Distinguished ambassador](#distinguished-ambassador)
 - [Ecosystem](#ecosystem)
 - [📄 Open Source License](#-open-source-license)
 - [🌐 Community & contact](#-community--contact)

backend/app/agent/toolkit/terminal_toolkit.py

@@ -41,7 +41,7 @@
 
 # App version - should match electron app version
 # TODO: Consider getting this from a shared config
-APP_VERSION = "0.0.85"
+APP_VERSION = "0.0.86"
 
 
 def get_terminal_base_venv_path() -> str:

electron/main/utils/process.ts

@@ -12,7 +12,7 @@
 // limitations under the License.
 // ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. =========
 
-import { execSync, spawn } from 'child_process';
+import { execFileSync, execSync, spawn } from 'child_process';
 import { app } from 'electron';
 import log from 'electron-log';
 import fs from 'fs';
@@ -111,6 +111,24 @@ export async function getBinaryPath(name?: string): Promise<string> {
     }
   }
 
+  // In dev: prefer system PATH uv (e.g. Homebrew) for speed - reuses existing cache
+  if (!app.isPackaged && name === 'uv') {
+    try {
+      const whichCmd = process.platform === 'win32' ? 'where.exe' : 'which';
+      const found = execFileSync(whichCmd, [name], {
+        encoding: 'utf-8',
+        stdio: ['pipe', 'pipe', 'pipe'],
+      }).trim();
+      const systemPath = found.split(/\r?\n/)[0]?.trim();
+      if (systemPath && fs.existsSync(systemPath)) {
+        log.info(`[DEV] Using system uv from PATH: ${systemPath}`);
+        return systemPath;
+      }
+    } catch {
+      // Not found on PATH, fall through to .eigent/bin
+    }
+  }
+
   const binariesDir = path.join(os.homedir(), '.eigent', 'bin');
 
   // Ensure .eigent/bin directory exists
@@ -943,7 +961,8 @@ export function ensureNpmWrappersForBrowserToolkit(
   const eigentBinDir = path.join(os.homedir(), '.eigent', 'bin');
   fs.mkdirSync(eigentBinDir, { recursive: true });
 
-  const wrapperVersion = '1';
+  // Store wrapper target so wrappers are recreated when venv path changes (e.g. app upgrade)
+  const wrapperVersion = `wrapper:${pythonPath}`;
   const versionFile = path.join(eigentBinDir, '.npm_wrapper_version');
   const storedVersion = fs.existsSync(versionFile)
     ? fs.readFileSync(versionFile, 'utf-8').trim()
@@ -958,10 +977,14 @@ export function ensureNpmWrappersForBrowserToolkit(
     process.platform === 'win32' ? 'npx.cmd' : 'npx'
   );
 
+  // Recreate wrappers when: version changed, wrappers missing, or existing shebang points to wrong Python
   const needsUpdate =
     storedVersion !== wrapperVersion ||
     !fs.existsSync(npmWrapper) ||
-    !fs.existsSync(npxWrapper);
+    !fs.existsSync(npxWrapper) ||
+    (process.platform !== 'win32' &&
+      fs.existsSync(npmWrapper) &&
+      !fs.readFileSync(npmWrapper, 'utf-8').startsWith(`#!${pythonPath}`));
 
   if (needsUpdate) {
     try {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eigent",
-  "version": "0.0.85",
+  "version": "0.0.86",
   "main": "dist-electron/main/index.js",
   "description": "Eigent",
   "author": "Eigent.AI",

server/app/controller/user/user_controller.py

@@ -77,7 +77,7 @@ def get_privacy(session: Session = Depends(session), auth: Auth = Depends(auth_m
         return UserPrivacySettings.default_settings()
 
     logger.debug("Privacy settings retrieved", extra={"user_id": user_id})
-    return model.pricacy_setting
+    return UserPrivacySettings(**model.pricacy_setting).to_response()
 
 
 @router.put("/user/privacy", name="update user privacy")
@@ -97,7 +97,7 @@ def put_privacy(data: UserPrivacySettings, session: Session = Depends(session),
         model.save(session)
         logger.info("Privacy settings created", extra={"user_id": user_id})
 
-    return model.pricacy_setting
+    return UserPrivacySettings(**model.pricacy_setting).to_response()
 
 
 @router.get("/user/current_credits", name="get user current credits")

server/app/model/user/privacy.py

@@ -1,16 +1,18 @@
-# ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. =========
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 # ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. =========
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ========= Copyright 2025-2026 @ Eigent.ai All Rights Reserved. =========
+
+from typing import ClassVar
 
 from pydantic import BaseModel
 from sqlalchemy import JSON
@@ -31,6 +33,21 @@ class UserPrivacySettings(BaseModel):
     access_your_address: bool | None = False
     password_storage: bool | None = False
 
+    # Fields that must all be True for the user to proceed
+    REQUIRED_FIELDS: ClassVar[list[str]] = [
+        'take_screenshot',
+        'access_local_software',
+        'access_your_address',
+        'password_storage',
+    ]
+
     @classmethod
     def default_settings(cls) -> dict:
-        return cls().model_dump()
+        instance = cls()
+        return {**instance.model_dump(), "all_required_granted": instance.all_required_granted()}
+
+    def all_required_granted(self) -> bool:
+        return all(getattr(self, f) for f in self.REQUIRED_FIELDS)
+
+    def to_response(self) -> dict:
+        return {**self.model_dump(), "all_required_granted": self.all_required_granted()}

server/tests/user.http

@@ -0,0 +1,80 @@
+### ============================================
+### Eigent Server API Tests
+### ============================================
+### VSCode Extension: "REST Client" by Huachao Mao
+### Extension ID: humao.rest-client
+### ============================================
+
+@baseUrl = http://localhost:3001/api
+@token = YOUR_TOKEN_HERE
+
+### ──────────────────────────────────────────
+### Auth (no token required)
+### ──────────────────────────────────────────
+
+### Register a new user
+POST {{baseUrl}}/register
+Content-Type: application/json
+
+{
+  "email": "test@example.com",
+  "password": "testpassword123"
+}
+
+### Login
+# @name login
+POST {{baseUrl}}/login
+Content-Type: application/json
+
+{
+  "email": "test@example.com",
+  "password": "testpassword123"
+}
+
+### Save token from login response (use this after running login)
+@authToken = {{login.response.body.token}}
+
+### ──────────────────────────────────────────
+### User
+### ──────────────────────────────────────────
+
+### Get current user info
+GET {{baseUrl}}/user
+Authorization: Bearer {{authToken}}
+
+### ──────────────────────────────────────────
+### Privacy Settings
+### ──────────────────────────────────────────
+
+### Get privacy settings
+GET {{baseUrl}}/user/privacy
+Authorization: Bearer {{authToken}}
+
+### Update privacy settings
+PUT {{baseUrl}}/user/privacy
+Authorization: Bearer {{authToken}}
+Content-Type: application/json
+
+{
+  "take_screenshot": true,
+  "access_local_software": false,
+  "access_your_address": false,
+  "password_storage": false
+}
+
+### Update only help_improve
+PUT {{baseUrl}}/user/privacy
+Authorization: Bearer {{authToken}}
+Content-Type: application/json
+
+{
+  "help_improve": true
+}
+
+### ──────────────────────────────────────────
+### User Stats
+### ──────────────────────────────────────────
+
+### Get user stats
+GET {{baseUrl}}/user/stat
+Authorization: Bearer {{authToken}}