myagent-ai 1.5.1 → 1.5.3

package/core/llm.py

@@ -209,12 +209,15 @@ class LLMClient:
     # 客户端初始化
     # ------------------------------------------------------------------
 
+    # 所有使用 OpenAI 兼容接口的提供商
+    _OPENAI_COMPATIBLE_PROVIDERS = ("openai", "custom", "modelscope", "deepseek", "moonshot", "qwen", "dashscope")
+
     def _ensure_client(self):
         """延迟初始化 LLM 客户端"""
         if self._client is not None:
             return
 
-        if self.provider in ("openai", "custom"):
+        if self.provider in self._OPENAI_COMPATIBLE_PROVIDERS:
             self._init_openai()
         elif self.provider == "anthropic":
             self._init_anthropic()
@@ -223,7 +226,9 @@ class LLMClient:
         elif self.provider == "zhipu":
             self._init_zhipu()
         else:
-            raise ValueError(f"不支持的 LLM 提供商: {self.provider}")
+            # 未知提供商默认尝试 OpenAI 兼容接口（大多数 API 都是 OpenAI 兼容的）
+            logger.warning(f"未知 LLM 提供商 '{self.provider}'，尝试 OpenAI 兼容接口")
+            self._init_openai()
 
     def _init_openai(self):
         """初始化 OpenAI / 兼容客户端"""
@@ -375,7 +380,7 @@ class LLMClient:
         request_kwargs.update(kwargs)
 
         try:
-            if self.provider in ("openai", "custom", "zhipu"):
+            if self.provider in self._OPENAI_COMPATIBLE_PROVIDERS or self.provider == "zhipu":
                 response = await self._run_with_retry(self._chat_openai, request_kwargs)
             elif self.provider == "anthropic":
                 response = await self._run_with_retry(
@@ -581,7 +586,7 @@ class LLMClient:
         request_kwargs.update(kwargs)
 
         try:
-            if self.provider in ("openai", "custom", "zhipu"):
+            if self.provider in self._OPENAI_COMPATIBLE_PROVIDERS or self.provider == "zhipu":
                 async for chunk in self._stream_openai(request_kwargs):
                     yield chunk
             elif self.provider == "anthropic":

package/core/update_manager.py

@@ -317,7 +317,7 @@ class UpdateManager:
             if not pkg_json.exists():
                 return ""
 
-            pkg_data = json.loads(pkg_json.read_text())
+            pkg_data = json.loads(pkg_json.read_text(encoding="utf-8"))
             pkg_name = pkg_data.get("name", "")
             if not pkg_name:
                 return ""

package/core/version.py

@@ -11,11 +11,11 @@ import subprocess
 from pathlib import Path
 
 # ── 基线版本（与 setup.py / package.json 保持一致） ──
-BASE_VERSION = "1.5.0"
+BASE_VERSION = "1.5.3"
 
 
 def _version_from_git() -> str:
-    """尝试从 git describe 获取版本号"""
+    """尝试从 git describe 获取版本号（必须是 x.y.z 格式）"""
     try:
         result = subprocess.run(
             ["git", "describe", "--tags", "--always", "--dirty"],
@@ -24,8 +24,13 @@ def _version_from_git() -> str:
         )
         tag = result.stdout.strip()
         if tag:
-            # 去掉 'v' 前缀，保留 dirty 标记
-            return tag.lstrip("v")
+            # 去掉 'v' 前缀
+            tag = tag.lstrip("v")
+            # 只接受 x.y.z 格式的版本号，拒绝 commit hash
+            if tag and tag[0].isdigit() and "." in tag:
+                # 去掉 dirty 标记和 build metadata
+                clean = tag.split("-dirty")[0].split("+")[0]
+                return clean
     except Exception:
         pass
     return ""

package/install/install.ps1

@@ -9,7 +9,7 @@ param(
 
 $ErrorActionPreference = "Stop"
 $PKG_NAME = "myagent-ai"
-$PKG_VERSION = "1.5.1"
+$PKG_VERSION = "1.5.3"
 
 # Allow running scripts for the current process
 if ($PSVersionTable.PSVersion.Major -ge 5) {

package/install/install.sh

@@ -21,7 +21,7 @@ NO_DEPS=false
 DRY_RUN=false
 SCRIPT_URL="https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh"
 PKG_NAME="myagent-ai"
-PKG_VERSION="1.5.1"
+PKG_VERSION="1.5.3"
 
 for arg in "$@"; do
   case "$arg" in

package/install/uninstall.ps1

@@ -0,0 +1,142 @@
+# MyAgent Uninstaller for Windows
+# Usage: powershell -c "irm https://raw.githubusercontent.com/ctz168/myagent/main/install/uninstall.ps1 | iex"
+#        powershell -c "& ([scriptblock]::Create((irm https://raw.githubusercontent.com/ctz168/myagent/main/install/uninstall.ps1))) -Purge"
+#        powershell -c "& ([scriptblock]::Create((irm https://raw.githubusercontent.com/ctz168/myagent/main/install/uninstall.ps1))) -Force"
+
+param(
+    [switch]$Purge,
+    [switch]$Force,
+    [switch]$DryRun
+)
+
+$ErrorActionPreference = "Stop"
+$PKG_NAME = "myagent-ai"
+$DATA_DIR = "$env:USERPROFILE\.myagent"
+
+# Allow running scripts for the current process
+if ($PSVersionTable.PSVersion.Major -ge 5) {
+    Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope Process -Force
+}
+
+Write-Host ""
+Write-Host "  MyAgent Uninstaller" -ForegroundColor Cyan
+Write-Host ""
+
+if ($DryRun) {
+    Write-Host "[OK] Dry run" -ForegroundColor Green
+    exit 0
+}
+
+# ── Step 1: 停止运行中的 MyAgent 进程 ──────────────
+Write-Host "[*] Stopping MyAgent processes..." -ForegroundColor Yellow
+
+# 尝试通过 API 优雅关闭
+try {
+    $null = Invoke-WebRequest -Uri "http://127.0.0.1:8767/api/shutdown" -Method POST -UseBasicParsing -TimeoutSec 5 -ErrorAction Stop
+    Write-Host "[OK] MyAgent 服务已优雅关闭" -ForegroundColor Green
+    Start-Sleep -Seconds 2
+} catch {
+    # 服务未运行，继续
+}
+
+# 检查并终止残留进程（Python 进程中含 myagent/main.py 的）
+$procs = @()
+try {
+    $procs += Get-Process -Name "python*" -ErrorAction SilentlyContinue | Where-Object {
+        try {
+            $_.CommandLine -match "myagent|main\.py"
+        } catch {}
+    }
+} catch {}
+try {
+    $procs += Get-Process -Name "node" -ErrorAction SilentlyContinue | Where-Object {
+        try {
+            $_.CommandLine -match "myagent|start\.js"
+        } catch {}
+    }
+} catch {}
+
+if ($procs.Count -gt 0) {
+    Write-Host "  发现 $($procs.Count) 个相关进程" -ForegroundColor Gray
+    foreach ($proc in $procs) {
+        try {
+            Stop-Process -Id $proc.Id -Force -ErrorAction SilentlyContinue
+        } catch {}
+    }
+    Start-Sleep -Seconds 1
+    
+    # 强制终止仍在运行的
+    $procs2 = @()
+    try {
+        $procs2 += Get-Process -Name "python*" -ErrorAction SilentlyContinue | Where-Object {
+            try { $_.CommandLine -match "myagent|main\.py" } catch {}
+        }
+        $procs2 += Get-Process -Name "node" -ErrorAction SilentlyContinue | Where-Object {
+            try { $_.CommandLine -match "myagent|start\.js" } catch {}
+        }
+    } catch {}
+    foreach ($proc in $procs2) {
+        try { Stop-Process -Id $proc.Id -Force -ErrorAction SilentlyContinue } catch {}
+    }
+    Write-Host "[OK] MyAgent 进程已停止" -ForegroundColor Green
+} else {
+    Write-Host "[OK] 没有运行中的 MyAgent 进程" -ForegroundColor Green
+}
+
+# ── Step 2: 卸载 npm 全局包 ─────────────────────
+Write-Host "[*] Uninstalling $PKG_NAME from npm global..." -ForegroundColor Yellow
+
+$installed = $false
+try {
+    $listResult = npm list -g $PKG_NAME 2>$null
+    if ($listResult -match $PKG_NAME) {
+        npm uninstall -g $PKG_NAME
+        Write-Host "[OK] $PKG_NAME 已从 npm 全局卸载" -ForegroundColor Green
+        $installed = $true
+    }
+} catch {}
+
+if (-not $installed) {
+    Write-Host "[i] $PKG_NAME 未通过 npm 全局安装（可能是源码方式安装）" -ForegroundColor Gray
+}
+
+# ── Step 3: 清理可选数据（-Purge） ─────────────
+if ($Purge) {
+    Write-Host ""
+    Write-Host "[*] 清除所有 MyAgent 数据..." -ForegroundColor Yellow
+    
+    if (Test-Path $DATA_DIR) {
+        $size = (Get-ChildItem -Path $DATA_DIR -Recurse -Force -ErrorAction SilentlyContinue |
+                 Measure-Object -Property Length -Sum -ErrorAction SilentlyContinue).Sum
+        $sizeMB = [math]::Round($size / 1MB, 2)
+        Write-Host "  数据目录: $DATA_DIR" -ForegroundColor Gray
+        Write-Host "  数据大小: ${sizeMB} MB" -ForegroundColor Gray
+        
+        Remove-Item -Path $DATA_DIR -Recurse -Force -ErrorAction SilentlyContinue
+        Write-Host "[OK] 数据目录已删除: $DATA_DIR (${sizeMB} MB)" -ForegroundColor Green
+    } else {
+        Write-Host "[i] 数据目录不存在: $DATA_DIR" -ForegroundColor Gray
+    }
+    
+    # 清理可能的日志文件
+    @("$env:USERPROFILE\.myagent.log", "$env:USERPROFILE\myagent.log") | ForEach-Object {
+        if (Test-Path $_) {
+            Remove-Item -Force $_ -ErrorAction SilentlyContinue
+            Write-Host "[i] 已删除日志: $_" -ForegroundColor Gray
+        }
+    }
+    
+    Write-Host "[OK] 所有数据已清除" -ForegroundColor Green
+} else {
+    Write-Host ""
+    Write-Host "[i] 保留数据和虚拟环境: $DATA_DIR" -ForegroundColor Gray
+    Write-Host "[i] 如需彻底清除，请使用: irm ... | iex (添加 -Purge 参数)" -ForegroundColor Gray
+    Write-Host "[i] 或手动删除: Remove-Item -Recurse -Force $DATA_DIR" -ForegroundColor Gray
+}
+
+Write-Host ""
+Write-Host "  卸载完成！" -ForegroundColor Green
+Write-Host ""
+Write-Host "[i] 如需重新安装: npm install -g $PKG_NAME" -ForegroundColor Gray
+Write-Host "[i] 或使用一键安装: irm https://raw.githubusercontent.com/ctz168/myagent/main/install/install.ps1 | iex" -ForegroundColor Gray
+Write-Host ""

package/install/uninstall.sh

@@ -0,0 +1,149 @@
+#!/bin/bash
+set -euo pipefail
+
+# MyAgent Uninstaller for macOS and Linux
+# 卸载脚本
+#
+# 用法:
+#   curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/uninstall.sh | bash
+#   curl -fsSL ... | bash -s -- --purge          # 同时删除数据和虚拟环境
+#   curl -fsSL ... | bash -s -- --dry-run          # 预览模式
+
+BOLD='\033[1m'
+ACCENT='\033[36m'
+INFO='\033[90m'
+SUCCESS='\033[32m'
+WARN='\033[33m'
+ERROR='\033[31m'
+NC='\033[0m'
+
+PURGE=false
+DRY_RUN=false
+FORCE=false
+SCRIPT_URL="https://raw.githubusercontent.com/ctz168/myagent/main/install/uninstall.sh"
+PKG_NAME="myagent-ai"
+DATA_DIR="$HOME/.myagent"
+
+for arg in "$@"; do
+  case "$arg" in
+    --purge)    PURGE=true ;;
+    --dry-run)   DRY_RUN=true ;;
+    --force|-f)  FORCE=true ;;
+    --help|-h)
+      echo "MyAgent Uninstaller"
+      echo ""
+      echo "Usage: curl -fsSL $SCRIPT_URL | bash [-s -- OPTIONS]"
+      echo ""
+      echo "Options:"
+      echo "  --purge     同时删除所有数据（配置、记忆、Agent、虚拟环境等）"
+      echo "  --force     跳过确认提示"
+      echo "  --dry-run   预览卸载过程，不实际执行"
+      echo ""
+      echo "默认只卸载 npm 包，保留数据和虚拟环境。"
+      echo "使用 --purge 可清除所有 MyAgent 相关文件。"
+      exit 0
+      ;;
+    *) echo "Unknown option: $arg (use --help)"; exit 2 ;;
+  esac
+done
+
+info()    { echo -e "${INFO}[i]${NC} $*"; }
+success() { echo -e "${SUCCESS}[✓]${NC} $*"; }
+warn()    { echo -e "${WARN}[!]${NC} $*"; }
+err()     { echo -e "${ERROR}[✗]${NC} $*" >&2; }
+step()    { echo -e "${ACCENT}[*]${NC} $*"; }
+
+echo ""
+echo -e "  ${BOLD}${ACCENT}MyAgent${NC} Uninstaller"
+echo ""
+
+if $DRY_RUN; then
+  success "Dry run mode"
+  info "Will: stop process -> npm uninstall -> optionally purge data"
+  exit 0
+fi
+
+# ── Step 1: 停止运行中的 MyAgent 进程 ──────────────
+step "Stopping MyAgent processes..."
+
+stopped=false
+
+# 尝试通过 API 优雅关闭
+if curl -sf http://127.0.0.1:8767/api/shutdown -X POST >/dev/null 2>&1; then
+  success "MyAgent 服务已优雅关闭"
+  stopped=true
+  sleep 2
+fi
+
+# 检查并终止残留进程
+pids=$(pgrep -f "myagent" 2>/dev/null || true)
+if [ -n "$pids" ]; then
+  info "发现残留进程: $pids"
+  for pid in $pids; do
+    kill "$pid" 2>/dev/null || true
+  done
+  sleep 1
+  # 强制终止
+  pids=$(pgrep -f "myagent" 2>/dev/null || true)
+  if [ -n "$pids" ]; then
+    warn "部分进程需要强制终止"
+    kill -9 $pids 2>/dev/null || true
+  fi
+  success "MyAgent 进程已停止"
+else
+  success "没有运行中的 MyAgent 进程"
+fi
+
+# ── Step 2: 卸载 npm 全局包 ─────────────────────
+step "Uninstalling $PKG_NAME from npm global..."
+
+if npm list -g "$PKG_NAME" >/dev/null 2>&1; then
+  npm uninstall -g "$PKG_NAME"
+  success "$PKG_NAME 已从 npm 全局卸载"
+else
+  info "$PKG_NAME 未通过 npm 全局安装（可能是源码方式安装）"
+fi
+
+# ── Step 3: 清理可选数据（--purge） ─────────────
+if $PURGE; then
+  echo ""
+  step "清除所有 MyAgent 数据..."
+  
+  if [ -d "$DATA_DIR" ]; then
+    info "数据目录: $DATA_DIR"
+    
+    # 统计大小
+    data_size=$(du -sh "$DATA_DIR" 2>/dev/null | cut -f1)
+    info "数据大小: $data_size"
+    
+    rm -rf "$DATA_DIR"
+    success "数据目录已删除: $DATA_DIR ($data_size)"
+  else
+    info "数据目录不存在: $DATA_DIR"
+  fi
+  
+  # 清理可能的日志文件
+  for log_file in \
+    "$HOME/.myagent.log" \
+    "$HOME/myagent.log" \
+    "/tmp/myagent-"*; do
+    if [ -e "$log_file" ]; then
+      rm -f "$log_file"
+      info "已删除日志: $log_file"
+    done
+  2>/dev/null || true
+  
+  success "所有数据已清除"
+else
+  echo ""
+  info "保留数据和虚拟环境: $DATA_DIR"
+  info "如需彻底清除，请使用: curl -fsSL $SCRIPT_URL | bash -s -- --purge"
+  info "或手动删除: rm -rf $DATA_DIR"
+fi
+
+echo ""
+echo -e "  ${BOLD}${SUCCESS}卸载完成！${NC}"
+echo ""
+info "如需重新安装: npm install -g $PKG_NAME"
+info "或使用一键安装: curl -fsSL https://raw.githubusercontent.com/ctz168/myagent/main/install/install.sh | bash"
+echo ""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "myagent-ai",
-  "version": "1.5.1",
+  "version": "1.5.3",
   "description": "本地桌面端执行型AI助手 - Open Interpreter 风格 | Local Desktop Execution-Oriented AI Assistant",
   "main": "main.py",
   "bin": {

package/setup.py

@@ -9,7 +9,7 @@ from pathlib import Path
 _version_path = Path(__file__).parent / "core" / "version.py"
 _version_vars = {}
 exec(_version_path.read_text(), _version_vars)
-__version__ = _version_vars.get("BASE_VERSION", "1.5.1")
+__version__ = _version_vars.get("BASE_VERSION", "1.5.3")
 
 setup(
     name="myagent",

package/start.js

@@ -16,6 +16,7 @@
  *   myagent-ai server     # API 服务模式
  *   myagent-ai setup      # 配置向导
  *   myagent-ai reinstall  # 重新安装依赖到 venv
+ *   myagent-ai uninstall  # 卸载 MyAgent（删除npm包+数据）
  */
 "use strict";
 
@@ -239,8 +240,8 @@ function installDeps(venvPython, venvPip, pkgDir) {
   let missing = [];
   console.log("  \x1b[36m[*]\x1b[0m 检查依赖...");
 
-  // 只检查前 20 个，避免启动太慢（关键依赖都在前面）
-  const checkLimit = Math.min(allModules.length, 20);
+  // 检查所有模块（不超过 30 个），托盘和 GUI 依赖也必须检测
+  const checkLimit = Math.min(allModules.length, 30);
   for (let i = 0; i < checkLimit; i++) {
     const mod = allModules[i];
     try {
@@ -253,7 +254,7 @@ function installDeps(venvPython, venvPip, pkgDir) {
   }
 
   if (missing.length === 0) {
-    console.log(`  \x1b[32m[✓]\x1b[0m ${checkLimit} 个依赖检查通过`);
+    console.log(`  \x1b[32m[✓]\x1b[0m 全部 ${checkLimit} 个依赖检查通过`);
     return;
   }
 
@@ -277,8 +278,9 @@ function installDeps(venvPython, venvPip, pkgDir) {
       });
       console.log("  \x1b[32m[✓]\x1b[0m 依赖安装完成");
       installed = true;
-    } catch (_) {
+    } catch (err) {
       console.log("  \x1b[33m[!]\x1b[0m requirements.txt 安装失败，尝试直接安装核心依赖...");
+      console.log(`  \x1b[90m[i]\x1b[0m 错误: ${err.message}`);
     }
   }
 
@@ -293,6 +295,9 @@ function installDeps(venvPython, venvPip, pkgDir) {
     } catch (_) {
       console.error("  \x1b[31m[✗]\x1b[0m 依赖安装失败，请手动运行:");
       console.error(`    ${venvPython} -m pip install -r "${reqFile}"`);
+      console.error("");
+      console.error("  或使用重新安装命令: myagent-ai reinstall");
+      console.error("");
     }
   }
 }
@@ -308,6 +313,8 @@ function buildArgs(userArgs) {
     case "setup":   return ["main.py", "--setup"];
     case "reinstall":
       return []; // 特殊处理
+    case "uninstall":
+      return []; // 特殊处理
     default:
       return ["main.py", ...userArgs];
   }
@@ -325,6 +332,71 @@ function main() {
     process.exit(1);
   }
 
+  // 特殊命令: uninstall
+  if (userArgs[0] === "uninstall") {
+    const venvDir = getVenvDir();
+    const purgeArg = userArgs.includes("--purge") || userArgs.includes("-p");
+    const dataDir = getDataDir();
+
+    // Step 1: 停止服务
+    console.log("  \x1b[36m[*]\x1b[0m 停止 MyAgent 服务...");
+    try {
+      const http = require("http");
+      const req = http.request({ hostname: "127.0.0.1", port: 8767, path: "/api/shutdown", method: "POST", timeout: 5000 }, () => {
+        // 忽略响应
+      });
+      req.on("error", () => {});
+      req.end();
+      console.log("  \x1b[32m[✓]\x1b[0m 已发送关闭请求");
+      setTimeout(() => {}, 2000);
+    } catch (_) {
+      console.log("  \x1b[90m[i]\x1b[0m 服务未运行");
+    }
+
+    // Step 2: 终止 Python/Node 进程
+    try {
+      if (IS_WIN) {
+        execSync("taskkill /F /IM python.exe /FI \"WINDOWTITLE eq myagent*\"", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 5000 });
+      } else {
+        execSync("pkill -f 'myagent|main.py' 2>/dev/null; sleep 1", { encoding: "utf8", stdio: ["pipe", "pipe", "pipe"], timeout: 10000 });
+      }
+    } catch (_) {}
+    console.log("  \x1b[32m[✓]\x1b[0m 进程已停止");
+
+    // Step 3: npm uninstall
+    console.log("  \x1b[36m[*]\x1b[0m 卸载 npm 全局包...");
+    try {
+      execFileSync("npm", ["uninstall", "-g", PKG_NAME], {
+        encoding: "utf8", stdio: "inherit", timeout: 60000,
+      });
+      console.log("  \x1b[32m[✓]\x1b[0m npm 全局包已卸载");
+    } catch (_) {
+      console.log("  \x1b[90m[i]\x1b[0m npm 全局包未找到");
+    }
+
+    // Step 4: 清理数据（--purge）
+    if (purgeArg) {
+      console.log("");
+      console.log("  \x1b[36m[*]\x1b[0m 清除所有数据...");
+      if (fs.existsSync(dataDir)) {
+        fs.rmSync(dataDir, { recursive: true, force: true });
+        console.log("  \x1b[32m[✓]\x1b[0m 数据目录已删除: " + dataDir);
+      } else {
+        console.log("  \x1b[90m[i]\x1b[0m 数据目录不存在");
+      }
+    } else {
+      console.log("");
+      console.log("  \x1b[90m[i]\x1b[0m 保留数据目录: " + dataDir);
+      console.log("  \x1b[90m[i]\x1b[0m 如需彻底清除: myagent-ai uninstall --purge");
+    }
+
+    console.log("");
+    console.log("  \x1b[32m[✓]\x1b[0m 卸载完成！");
+    console.log("  \x1b[90m[i]\x1b[0m 重新安装: npm install -g myagent-ai");
+    console.log("");
+    return;
+  }
+
   // 特殊命令: reinstall
   if (userArgs[0] === "reinstall") {
     const venvDir = getVenvDir();

package/web/api_server.py

@@ -20,11 +20,68 @@ logger = get_logger("myagent.api")
 def _safe_load_json(filepath, default=None):
     """安全读取 JSON 文件，解析失败返回默认值"""
     try:
-        return json.loads(filepath.read_text())
+        return json.loads(filepath.read_text(encoding="utf-8"))
     except (json.JSONDecodeError, ValueError, OSError):
         logger.warning(f"JSON 文件读取/解析失败: {filepath}")
         return default if default is not None else {}
 
+# 允许上传的文件扩展名
+_KB_ALLOWED_EXTENSIONS = {".md", ".txt", ".json", ".csv", ".py", ".js", ".html", ".htm",
+                           ".xml", ".yaml", ".yml", ".toml", ".ini", ".cfg", ".conf",
+                           ".sh", ".bat", ".ps1", ".log", ".sql", ".r", ".java", ".cpp",
+                           ".c", ".h", ".go", ".rs", ".ts", ".tsx", ".jsx", ".vue", ".svelte"}
+
+async def _read_multipart_files(request):
+    """从 multipart/form-data 请求中读取文件列表，返回 [{"name": str, "content": str}]"""
+    files = []
+    SUPPORTED_EXTENSIONS = _KB_ALLOWED_EXTENSIONS
+    try:
+        reader = await request.multipart()
+        while True:
+            field = await reader.next()
+            if field is None:
+                break
+            if field.name == "files":
+                # 文件字段
+                filename = field.filename or "unknown"
+                # 使用 webkitRelativePath 作为文件名（文件夹上传时浏览器会设置此属性）
+                rel_path = field.headers.get("X-File-Path", "")
+                if rel_path:
+                    filename = rel_path
+                # 安全校验
+                if ".." in filename or filename.startswith("/"):
+                    continue
+                ext = Path(filename).suffix.lower()
+                if ext and ext not in SUPPORTED_EXTENSIONS:
+                    continue
+                # 读取文件内容
+                try:
+                    chunks = []
+                    while True:
+                        chunk = await field.read_chunk()
+                        if not chunk:
+                            break
+                        chunks.append(chunk)
+                    content = b"".join(chunks).decode("utf-8", errors="replace")
+                    files.append({"name": filename, "content": content})
+                except Exception as e:
+                    logger.warning(f"读取上传文件失败 {filename}: {e}")
+    except Exception as e:
+        # 如果不是 multipart 请求，尝试 JSON 格式
+        logger.debug(f"Multipart 读取失败，尝试 JSON: {e}")
+        try:
+            data = await request.json()
+            raw_files = data.get("files", [])
+            if not raw_files:
+                fname = data.get("filename", data.get("name", ""))
+                fcontent = data.get("content", "")
+                if fname and fcontent is not None:
+                    raw_files = [{"name": fname, "content": fcontent}]
+            return raw_files
+        except Exception:
+            pass
+    return files
+
 
 
 CONFIG_HELPER_PROMPT = """你是 MyAgent 的智能配置助手，专门帮助用户完成初始配置和日常配置管理。你的名字叫"配置助手"。
@@ -541,6 +598,10 @@ class ApiServer:
     def _ensure_default_agent(self):
         """确保默认 agent 存在（名为「全权Agent」，目录名保持 default）"""
         ad = self._agent_dir("default")
+        # 先尝试迁移（会自动修复损坏的 config.json）
+        if (ad / "config.json").exists():
+            self._migrate_agent_config("default", "全权Agent")
+        # 迁移后再次检查（损坏文件可能已被删除）
         if not (ad / "config.json").exists():
             ad.mkdir(parents=True, exist_ok=True)
             now = datetime.datetime.now().isoformat()
@@ -557,29 +618,49 @@ class ApiServer:
                 "updated_at": now,
                 "system_prompt": "你是 MyAgent 默认助手，运行在本机模式。请用友好、专业的方式回答用户的问题。",
             }
-            (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
+            (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
             for fn, default in [
                 ("soul.md", "# 全权Agent\n\n## 性格\n专业、友好的AI助手\n"),
                 ("identity.md", "# 全权Agent\n\n## 身份\nMyAgent 默认AI助手\n"),
                 ("user.md", "# 用户信息\n\n## 用户偏好\n<!-- 在此处记录用户偏好 -->\n"),
             ]:
                 if not (ad / fn).exists():
-                    (ad / fn).write_text(default)
+                    (ad / fn).write_text(default, encoding="utf-8")
             logger.info("已创建默认 Agent (全权Agent)")
-        else:
-            # 迁移: 确保旧 default agent 有新字段
-            self._migrate_agent_config("default", "全权Agent")
         self._ensure_config_helper()
 
     def _migrate_agent_config(self, path: str, intended_name: str = None):
-        """为旧 agent config 添加缺失的 id, created_at, updated_at 字段"""
+        """为旧 agent config 添加缺失的 id, created_at, updated_at 字段；JSON 损坏则自动重建"""
         cfg_file = self._agent_dir(path) / "config.json"
         if not cfg_file.exists():
             return
         try:
-            cfg = json.loads(cfg_file.read_text())
+            cfg = json.loads(cfg_file.read_text(encoding="utf-8"))
         except (json.JSONDecodeError, ValueError):
-            logger.warning(f"Agent config JSON 解析失败，跳过迁移: {path}")
+            logger.warning(f"Agent config JSON 解析失败，自动删除重建: {path}")
+            try:
+                cfg_file.unlink()
+            except OSError:
+                pass
+            # 如果是 default 或配置助手，由 _ensure_default_agent / _ensure_config_helper 重建
+            if path in ("default", "配置助手", "p"):
+                return
+            # 其他 agent：创建一个最小 config
+            ad = self._agent_dir(path)
+            if ad.exists():
+                now = datetime.datetime.now().isoformat()
+                cfg = {
+                    "id": uuid.uuid4().hex[:12],
+                    "name": path,
+                    "description": "",
+                    "avatar_emoji": "🤖",
+                    "execution_mode": "sandbox",
+                    "enabled": True,
+                    "created_at": now,
+                    "updated_at": now,
+                }
+                cfg_file.write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
+                logger.info(f"已重建 Agent 配置: {path}")
             return
         changed = False
         now = datetime.datetime.now().isoformat()
@@ -597,11 +678,15 @@ class ApiServer:
             cfg["name"] = intended_name
             changed = True
         if changed:
-            cfg_file.write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
+            cfg_file.write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
 
     def _ensure_config_helper(self):
         """确保系统级「配置助手」agent 存在（不可删除、不可改名、核心字段不可修改）"""
         ad = self._agent_dir("配置助手")
+        # 先尝试迁移（会自动修复损坏的 config.json）
+        if (ad / "config.json").exists():
+            self._migrate_agent_config("配置助手")
+        # 迁移后再次检查（损坏文件可能已被删除）
         if not (ad / "config.json").exists():
             ad.mkdir(parents=True, exist_ok=True)
             now = datetime.datetime.now().isoformat()
@@ -618,14 +703,14 @@ class ApiServer:
                 "updated_at": now,
                 "system_prompt": CONFIG_HELPER_PROMPT,
             }
-            (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
+            (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
             for fn, default in [
                 ("soul.md", "# 配置助手\n\n## 性格\n专业、友好的配置助手\n"),
                 ("identity.md", "# 配置助手\n\n## 身份\nMyAgent 内置智能配置助手\n"),
                 ("user.md", "# 用户信息\n\n## 用户偏好\n<!-- 在此处记录用户偏好 -->\n"),
             ]:
                 if not (ad / fn).exists():
-                    (ad / fn).write_text(default)
+                    (ad / fn).write_text(default, encoding="utf-8")
             logger.info("已创建系统级配置助手 Agent")
         # 创建快捷方式 p -> 配置助手（符号链接）
         p_dir = self._agent_dir("p")
@@ -645,12 +730,15 @@ class ApiServer:
         kb_dir.mkdir(parents=True, exist_ok=True)
         target = kb_dir / "配置使用说明.md"
 
-        # 查找源文件（优先级：项目 docs/ > download/ > 当前目录）
+        # 查找源文件
+        # __file__ = .../myagent-ai/web/api_server.py
+        # parent.parent = .../myagent-ai  (包根目录，docs/ 在这里)
+        pkg_root = Path(__file__).resolve().parent.parent
         source_candidates = [
-            Path(__file__).resolve().parent.parent.parent / "docs" / "配置使用说明.md",
-            Path(__file__).resolve().parent.parent.parent / "download" / "配置使用说明.md",
+            pkg_root / "docs" / "配置使用说明.md",
+            pkg_root.parent / "docs" / "配置使用说明.md",
         ]
-        # 如果通过 npm 安装，docs 可能在包目录下
+        # npm 全局安装时也尝试通过 import 定位
         try:
             import myagent
             pkg_dir = Path(myagent.__file__).resolve().parent
@@ -674,7 +762,7 @@ class ApiServer:
                 if hasattr(self, '_agent_rags') and "配置助手" in self._agent_rags:
                     self._agent_rags["配置助手"].build_index()
         else:
-            logger.warning("未找到 配置使用说明.md 源文件，配置助手知识库未绑定")
+            logger.warning(f"未找到 配置使用说明.md 源文件，已搜索: {[str(c) for c in source_candidates]}")
 
     def _read_agent_config(self, path: str) -> dict | None:
         """读取 agent 配置"""
@@ -682,7 +770,7 @@ class ApiServer:
         if not cfg_file.exists():
             return None
         try:
-            return json.loads(cfg_file.read_text())
+            return json.loads(cfg_file.read_text(encoding="utf-8"))
         except (json.JSONDecodeError, ValueError):
             logger.warning(f"Agent config JSON 解析失败: {path}")
             return None
@@ -691,7 +779,7 @@ class ApiServer:
         """写入 agent 配置"""
         ad = self._agent_dir(path)
         ad.mkdir(parents=True, exist_ok=True)
-        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
+        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
 
     def _deep_merge(self, base: dict, override: dict) -> None:
         """深度合并 override 到 base"""
@@ -756,12 +844,22 @@ class ApiServer:
                 continue
             agent_path = f"{prefix}{d.name}" if not prefix else f"{prefix}/{d.name}"
             # 迁移: 为缺少 id/created_at/updated_at 的旧 agent 补全字段
-            self._migrate_agent_config(agent_path)
-            try:
-                cfg = json.loads(cfg_file.read_text())
-            except (json.JSONDecodeError, ValueError):
-                logger.warning(f"Agent config JSON 解析失败，跳过: {agent_path}")
-                continue
+            # 跳过符号链接目录（如 p -> 配置助手），避免重复处理
+            if d.is_symlink():
+                try:
+                    cfg = json.loads(cfg_file.read_text(encoding="utf-8"))
+                except (json.JSONDecodeError, ValueError):
+                    continue
+            else:
+                self._migrate_agent_config(agent_path)
+                # 迁移可能删除了损坏的文件
+                if not cfg_file.exists():
+                    continue
+                try:
+                    cfg = json.loads(cfg_file.read_text(encoding="utf-8"))
+                except (json.JSONDecodeError, ValueError):
+                    logger.warning(f"Agent config JSON 解析失败，跳过: {agent_path}")
+                    continue
             agent = {"path": agent_path, "name": d.name, **cfg}
             agent["avatar_color"] = cfg.get("avatar_color") or _agent_color(d.name)
             agent["depth"] = agent_path.count("/")
@@ -873,14 +971,14 @@ class ApiServer:
             cfg["work_dir"] = data["work_dir"]
 
         ad.mkdir(parents=True, exist_ok=True)
-        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
+        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
         for fn, default in [
             ("soul.md", f"# {name}\n\n## 性格\n专业AI助手\n"),
             ("identity.md", f"# {name}\n\n## 身份\nAI助手\n"),
             ("user.md", f"# {name} 用户信息\n\n## 用户偏好\n<!-- 在此处记录用户偏好 -->\n"),
         ]:
             if not (ad / fn).exists():
-                (ad / fn).write_text(default)
+                (ad / fn).write_text(default, encoding="utf-8")
 
         logger.info(f"创建 Agent: {name} (sandbox模式)")
         return web.json_response({"ok": True, "path": name, "name": name, "avatar_color": cfg["avatar_color"]})
@@ -933,14 +1031,14 @@ class ApiServer:
             cfg["backup_model_ids"] = [x for x in data["backup_model_ids"] if isinstance(x, str) and x.strip()]
 
         ad.mkdir(parents=True, exist_ok=True)
-        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
+        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
         for fn, default in [
             ("soul.md", f"# {name}\n\n## 上级: {parent_path}\n## 性格\n专业AI助手\n"),
             ("identity.md", f"# {name}\n\n## 身份\n{parent_path} 的子 Agent\n"),
             ("user.md", f"# {name} 用户信息\n\n## 用户偏好\n<!-- 在此处记录用户偏好 -->\n"),
         ]:
             if not (ad / fn).exists():
-                (ad / fn).write_text(default)
+                (ad / fn).write_text(default, encoding="utf-8")
 
         logger.info(f"创建子 Agent: {child_path} (sandbox模式)")
         return web.json_response({"ok": True, "path": child_path, "name": name, "parent": parent_path, "avatar_color": cfg["avatar_color"]})
@@ -957,7 +1055,7 @@ class ApiServer:
             for d in sorted(parent_dir.iterdir()):
                 if d.is_dir() and (d / "config.json").exists():
                     try:
-                        cfg = json.loads((d / "config.json").read_text())
+                        cfg = json.loads((d / "config.json").read_text(encoding="utf-8"))
                     except (json.JSONDecodeError, ValueError):
                         logger.warning(f"Agent config JSON 解析失败，跳过: {parent_path}/{d.name}")
                         continue
@@ -975,12 +1073,12 @@ class ApiServer:
         if not (ad / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)
         try:
-            cfg = json.loads((ad / "config.json").read_text())
+            cfg = json.loads((ad / "config.json").read_text(encoding="utf-8"))
         except (json.JSONDecodeError, ValueError):
             return web.json_response({"error": "config.json 解析失败"}, status=500)
-        soul = (ad / "soul.md").read_text() if (ad / "soul.md").exists() else ""
-        identity = (ad / "identity.md").read_text() if (ad / "identity.md").exists() else ""
-        user = (ad / "user.md").read_text() if (ad / "user.md").exists() else ""
+        soul = (ad / "soul.md").read_text(encoding="utf-8") if (ad / "soul.md").exists() else ""
+        identity = (ad / "identity.md").read_text(encoding="utf-8") if (ad / "identity.md").exists() else ""
+        user = (ad / "user.md").read_text(encoding="utf-8") if (ad / "user.md").exists() else ""
         # 列出子 agent
         children = []
         for d in sorted(ad.iterdir()):
@@ -1014,7 +1112,7 @@ class ApiServer:
         if not (ad / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)
         try:
-            cfg = json.loads((ad / "config.json").read_text())
+            cfg = json.loads((ad / "config.json").read_text(encoding="utf-8"))
         except (json.JSONDecodeError, ValueError):
             return web.json_response({"error": "config.json 解析失败"}, status=500)
 
@@ -1052,10 +1150,10 @@ class ApiServer:
             del data["system"]
         # 自动更新 updated_at
         cfg["updated_at"] = datetime.datetime.now().isoformat()
-        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False))
-        if "soul" in data and not is_system: (ad / "soul.md").write_text(data["soul"])
-        if "identity" in data and not is_system: (ad / "identity.md").write_text(data["identity"])
-        if "user" in data: (ad / "user.md").write_text(data["user"])
+        (ad / "config.json").write_text(json.dumps(cfg, indent=2, ensure_ascii=False), encoding="utf-8")
+        if "soul" in data and not is_system: (ad / "soul.md").write_text(data["soul"], encoding="utf-8")
+        if "identity" in data and not is_system: (ad / "identity.md").write_text(data["identity"], encoding="utf-8")
+        if "user" in data: (ad / "user.md").write_text(data["user"], encoding="utf-8")
         logger.info(f"更新 Agent: {path}")
         return web.json_response({"ok": True})
 
@@ -1089,12 +1187,12 @@ class ApiServer:
         p = self._agent_dir(path) / "soul.md"
         if not p.parent.exists() or not (p.parent / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)
-        return web.json_response({"soul": p.read_text() if p.exists() else ""})
+        return web.json_response({"soul": p.read_text(encoding="utf-8") if p.exists() else ""})
 
     async def handle_set_soul(self, request):
         data = await request.json(); ad = self._agent_dir(request.match_info["name"])
         ad.mkdir(parents=True, exist_ok=True)
-        (ad / "soul.md").write_text(data.get("soul", ""))
+        (ad / "soul.md").write_text(data.get("soul", ""), encoding="utf-8")
         return web.json_response({"ok": True})
 
     async def handle_get_identity(self, request):
@@ -1102,12 +1200,12 @@ class ApiServer:
         p = self._agent_dir(path) / "identity.md"
         if not p.parent.exists() or not (p.parent / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)
-        return web.json_response({"identity": p.read_text() if p.exists() else ""})
+        return web.json_response({"identity": p.read_text(encoding="utf-8") if p.exists() else ""})
 
     async def handle_set_identity(self, request):
         data = await request.json(); ad = self._agent_dir(request.match_info["name"])
         ad.mkdir(parents=True, exist_ok=True)
-        (ad / "identity.md").write_text(data.get("identity", ""))
+        (ad / "identity.md").write_text(data.get("identity", ""), encoding="utf-8")
         return web.json_response({"ok": True})
 
     async def handle_get_user(self, request):
@@ -1115,12 +1213,12 @@ class ApiServer:
         p = self._agent_dir(path) / "user.md"
         if not p.parent.exists() or not (p.parent / "config.json").exists():
             return web.json_response({"error": "not found"}, status=404)
-        return web.json_response({"user": p.read_text() if p.exists() else ""})
+        return web.json_response({"user": p.read_text(encoding="utf-8") if p.exists() else ""})
 
     async def handle_set_user(self, request):
         data = await request.json(); ad = self._agent_dir(request.match_info["name"])
         ad.mkdir(parents=True, exist_ok=True)
-        (ad / "user.md").write_text(data.get("user", ""))
+        (ad / "user.md").write_text(data.get("user", ""), encoding="utf-8")
         return web.json_response({"ok": True})
 
     # --- Executor ---
@@ -1143,7 +1241,7 @@ class ApiServer:
                    "sandbox_image", "sandbox_network", "sandbox_memory"):
             if k in data:
                 exe[k] = data[k]
-        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False))
+        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False), encoding="utf-8")
         # 热更新内存配置
         update_keys = {k: v for k, v in data.items() if hasattr(self.core.config_mgr.config.executor, k)}
         self.core.config_mgr.update_executor(**update_keys)
@@ -1370,7 +1468,7 @@ class ApiServer:
         agent_info = {"name": name, "avatar_color": _agent_color(name)}
         if (ad / "config.json").exists():
             try:
-                agent_info.update(json.loads((ad / "config.json").read_text()))
+                agent_info.update(json.loads((ad / "config.json").read_text(encoding="utf-8")))
             except (json.JSONDecodeError, ValueError):
                 pass
         return web.json_response({**agent_info, "sessions": sessions})
@@ -1427,7 +1525,7 @@ class ApiServer:
         for k in ("provider", "model", "base_url", "temperature", "max_tokens", "timeout", "max_retries"):
             if k in data: llm[k] = data[k]
         if data.get("api_key"): llm["api_key"] = data["api_key"]
-        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False))
+        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False), encoding="utf-8")
         # 2. 热更新内存中的配置
         update_keys = {k: v for k, v in data.items() if k != "api_key" or data.get("api_key")}
         self.core.config_mgr.update_llm(**update_keys)
@@ -1447,8 +1545,41 @@ class ApiServer:
         return web.json_response({"ok": True, "hot_reload": True})
 
     async def handle_test_llm(self, request):
+        """POST /api/llm/test - 测试 LLM 连接，支持使用请求体中的临时配置"""
         try:
-            msg = await self.core.llm.chat([Message(role="user", content="Hi, reply OK")])
+            # 尝试从请求体读取临时配置
+            temp_client = None
+            try:
+                data = await request.json()
+                api_key = data.get("api_key", "")
+                base_url = data.get("base_url", "")
+                model = data.get("model", "")
+                if api_key or base_url or model:
+                    # 使用请求体中的配置创建临时客户端测试
+                    from core.llm import LLMClient
+                    # 推断 provider
+                    provider = "openai"
+                    if "zhipu" in base_url or "bigmodel" in base_url:
+                        provider = "zhipu"
+                    elif "anthropic" in base_url:
+                        provider = "anthropic"
+                    elif "ollama" in base_url or "localhost" in base_url or "127.0.0.1" in base_url:
+                        provider = "ollama"
+                    temp_client = LLMClient(
+                        provider=provider,
+                        api_key=api_key or self.core.llm.api_key if self.core.llm else "",
+                        base_url=base_url or self.core.llm.base_url if self.core.llm else "",
+                        model=model or self.core.llm.model if self.core.llm else "gpt-4",
+                        timeout=30,
+                        max_retries=1,
+                    )
+            except Exception:
+                pass  # 如果没有请求体或解析失败，使用当前配置
+
+            client = temp_client or self.core.llm
+            if not client:
+                return web.json_response({"ok": False, "error": "没有配置 LLM 客户端"})
+            msg = await client.chat([Message(role="user", content="Hi, reply OK")])
             return web.json_response({"ok": True, "response": msg.content[:100] if msg.content else ""})
         except Exception as e:
             return web.json_response({"ok": False, "error": str(e)})
@@ -1609,7 +1740,7 @@ class ApiServer:
         cfg_path = self.core.config_mgr._config_file
         cfg_data = _safe_load_json(cfg_path) if cfg_path.exists() else {}
         cfg_data["disabled_skills"] = disabled
-        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False))
+        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False), encoding="utf-8")
 
     def _load_disabled_skills(self):
         """从配置文件加载禁用技能列表"""
@@ -1632,7 +1763,7 @@ class ApiServer:
         cfg_path = self.core.config_mgr._config_file
         cfg_data = _safe_load_json(cfg_path) if cfg_path.exists() else {}
         cfg_data["workspace"] = path
-        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False))
+        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False), encoding="utf-8")
         return web.json_response({"ok": True})
 
     async def handle_list_workdir(self, request):
@@ -1703,7 +1834,7 @@ class ApiServer:
         for k in ("enabled", "server_url", "max_friends", "auto_accept"):
             if k in data:
                 comm[k] = data[k]
-        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False))
+        cfg_path.write_text(json.dumps(cfg_data, indent=2, ensure_ascii=False), encoding="utf-8")
         # Hot-reload in memory
         if "enabled" in data:
             self.core.config.communication.enabled = data["enabled"]
@@ -2351,7 +2482,7 @@ class ApiServer:
         return web.json_response(files)
 
     async def handle_upload_org_knowledge(self, request):
-        """POST /api/organization/knowledge/upload - 上传文件到组织知识库"""
+        """POST /api/organization/knowledge/upload - 上传文件到组织知识库（支持文件和文件夹上传）"""
         # 权限检查
         agent = request.query.get("agent", "default")
         if not self._check_org_admin(agent):
@@ -2360,16 +2491,9 @@ class ApiServer:
                 status=403,
             )
 
-        data = await request.json()
-        # 支持单个文件或批量文件
-        files = data.get("files", [])
+        files = await _read_multipart_files(request)
         if not files:
-            # 兼容单文件格式
-            filename = data.get("filename", data.get("name", ""))
-            content = data.get("content", "")
-            if not filename or content is None:
-                return web.json_response({"ok": False, "error": "缺少 filename 或 content"}, status=400)
-            files = [{"name": filename, "content": content}]
+            return web.json_response({"ok": False, "error": "没有上传文件"}, status=400)
 
         org_mgr = self._get_org_manager()
         results = []
@@ -2455,16 +2579,11 @@ class ApiServer:
         return web.json_response(files)
 
     async def handle_upload_agent_knowledge(self, request):
-        """POST /api/agents/{name}/knowledge/upload - 上传到 Agent 知识库"""
+        """POST /api/agents/{name}/knowledge/upload - 上传到 Agent 知识库（支持文件和文件夹上传）"""
         agent_path = request.match_info["name"]
-        data = await request.json()
-        files = data.get("files", [])
+        files = await _read_multipart_files(request)
         if not files:
-            filename = data.get("filename", data.get("name", ""))
-            content = data.get("content", "")
-            if not filename or content is None:
-                return web.json_response({"ok": False, "error": "缺少 filename 或 content"}, status=400)
-            files = [{"name": filename, "content": content}]
+            return web.json_response({"ok": False, "error": "没有上传文件"}, status=400)
 
         kb_dir = self._get_agent_knowledge_dir(agent_path)
         kb_dir.mkdir(parents=True, exist_ok=True)
@@ -2473,7 +2592,6 @@ class ApiServer:
             name = f.get("name", "")
             content = f.get("content", "")
             # 安全校验
-            safe_name = Path(name).name
             if ".." in name or name.startswith("/"):
                 results.append({"ok": False, "message": "非法文件名"})
                 continue
@@ -2483,7 +2601,7 @@ class ApiServer:
                 parent.mkdir(parents=True, exist_ok=True)
                 target = parent / parts[-1]
             else:
-                target = kb_dir / safe_name
+                target = kb_dir / Path(name).name
             try:
                 target.write_text(content, encoding="utf-8")
                 results.append({"ok": True, "path": name})
@@ -3198,20 +3316,11 @@ class ApiServer:
         return web.json_response(files)
 
     async def handle_upload_dept_knowledge(self, request):
-        """POST /api/departments/{path}/knowledge/upload - 上传到部门知识库"""
+        """POST /api/departments/{path}/knowledge/upload - 上传到部门知识库（支持文件和文件夹上传）"""
         path = request.match_info["path"]
-        try:
-            data = await request.json()
-        except Exception:
-            return web.json_response({"error": "invalid JSON"}, status=400)
-        files = data.get("files", [])
+        files = await _read_multipart_files(request)
         if not files:
-            # 兼容单文件格式
-            filename = data.get("filename", data.get("name", ""))
-            content = data.get("content", "")
-            if not filename or content is None:
-                return web.json_response({"ok": False, "error": "缺少 filename 或 content"}, status=400)
-            files = [{"name": filename, "content": content}]
+            return web.json_response({"ok": False, "error": "没有上传文件"}, status=400)
         dm = self._get_dept_manager()
         results = []
         for f in files:

package/web/ui/chat.html

@@ -2753,11 +2753,13 @@ function toggleAgentPanel() {
 }
 
 // ── Agent Create/Edit Modal ──
-function showCreateAgentModal() {
+async function showCreateAgentModal() {
+  await loadModels();
   showAgentModal(null, null);
 }
 
-function showCreateChildModal(parentPath) {
+async function showCreateChildModal(parentPath) {
+  await loadModels();
   showAgentModal(null, parentPath);
 }
 
@@ -5264,7 +5266,7 @@ async function setupTestConnection() {
       method: 'POST',
       body: JSON.stringify({ api_key: apiKey, base_url: baseUrl, model: model })
     });
-    if (result.success) {
+    if (result.ok) {
       statusEl.className = 'setup-status show success';
       statusEl.innerHTML = '✅ 连接成功！模型响应正常';
     } else {

package/web/ui/index.html

@@ -217,7 +217,7 @@ async function renderDashboard(){
 // ========== Agents (FULL REWRITE) ==========
 async function renderAgents(){
   const [agents,models,depts]=await Promise.all([api('/api/agents'),api('/api/models'),api('/api/departments')]);
-  allAgentsCache=agents||[];allModelsCache=models||[];allDeptsCache=Array.isArray(depts)?depts:(depts?.tree||[]);
+  allAgentsCache=Array.isArray(agents)?agents:[];allModelsCache=Array.isArray(models)?models:[];allDeptsCache=Array.isArray(depts)?depts:(depts?.tree||[]);
   const deptMap={};(function buildDeptMap(list,pfx){
     for(const d of list||[]){const path=pfx?(pfx+'/'+d.name):d.name;deptMap[path]={name:d.name,path};buildDeptMap(d.children||[],path)}
   })(allDeptsCache,'');
@@ -311,6 +311,7 @@ async function doCreateAgent(){
 
 // Edit Agent Modal
 async function openEditAgentModal(path){
+  window._currentEditAgentPath=path;
   const a=await api(`/api/agents/${encodeURIComponent(path)}`);
   if(a.error){showToast(a.error,'danger');return}
   const isSys=!!a.system;
@@ -432,7 +433,7 @@ async function loadAgentKB(){
   const files=Array.isArray(kb)?kb:(kb?.files||[]);
   let html=`<div class="flex justify-between items-center mb-16">
     <h4 style="font-size:14px;color:var(--text2)">知识库文件 (${files.length})</h4>
-    <button class="btn btn-sm btn-primary" onclick="uploadAgentKB('${escHtml(path)}')">上传文件</button></div>`;
+    <button class="btn btn-sm btn-primary" onclick="uploadAgentKB('${escHtml(path)}',false)">上传文件</button> <button class="btn btn-sm btn-secondary" onclick="uploadAgentKB('${escHtml(path)}',true)">📁 上传文件夹</button></div>`;
   if(files.length===0){html+='<div class="empty">暂无知识库文件</div>';}
   else{html+='<table><tr><th>文件名</th><th>大小</th><th></th></tr>';
     for(const f of files){html+=`<tr><td>${escHtml(f.name||f.filename||'')}</td><td>${f.size||'-'}</td><td><button class="btn btn-sm btn-danger" onclick="deleteAgentKB('${escHtml(path)}','${escHtml(f.name||f.filename||'')}')">删除</button></td></tr>`}
@@ -440,7 +441,25 @@ async function loadAgentKB(){
   $('kbContent').innerHTML=html;
 }
 
-async function uploadAgentKB(path){showToast('请通过 API 上传文件','info')}
+async function uploadAgentKB(path,folderMode){
+  const input=document.createElement('input');input.type='file';input.multiple=true;
+  if(folderMode){input.webkitdirectory=true;}
+  input.onchange=async()=>{
+    const fd=new FormData();
+    for(const f of input.files){
+      if(f.webkitRelativePath){fd.append('files',f,{headers:{'X-File-Path':f.webkitRelativePath}});}
+      else{fd.append('files',f);}
+    }
+    showToast('正在上传...','info');
+    const r=await fetch(API+`/api/agents/${encodeURIComponent(path)}/knowledge/upload`,{method:'POST',body:fd});
+    const data=await r.json();
+    if(data.error){showToast(data.error,'danger');return}
+    const total=data.results?data.results.length:0;
+    const okCount=data.results?data.results.filter(x=>x.ok).length:0;
+    showToast(`上传完成: ${okCount}/${total} 文件成功`,okCount===total?'success':'warning');
+    loadAgentKB(path);
+  };input.click();
+}
 async function deleteAgentKB(path,filename){
   if(!confirm('确认删除 '+filename+'?'))return;
   await api(`/api/agents/${encodeURIComponent(path)}/knowledge?filename=${encodeURIComponent(filename)}`,{method:'DELETE'});
@@ -467,14 +486,6 @@ async function viewSessionMsgs(sid){
   $('sessionsContent').innerHTML=html;
 }
 
-// Monkey-patch openEditAgentModal to store path
-const _origOpenEdit=openEditAgentModal;
-window._currentEditAgentPath='';
-function openEditAgentModal(path){
-  window._currentEditAgentPath=path;
-  _origOpenEdit(path);
-}
-
 function confirmDeleteAgent(path,name){
   showConfirm('删除 Agent','确认删除 Agent "'+escHtml(name)+'" 吗？此操作不可恢复。',async()=>{
     const r=await api(`/api/agents/${encodeURIComponent(path)}`,{method:'DELETE'});
@@ -959,7 +970,7 @@ async function renderOrganization(){
   // 知识库
   html+=`<div class="card"><div class="flex justify-between items-center mb-16">
     <h3 style="margin:0">组织知识库</h3>
-    <button class="btn btn-sm btn-primary" onclick="uploadOrgKnowledge()">上传文件</button></div>
+    <button class="btn btn-sm btn-primary" onclick="uploadOrgKnowledge(false)">上传文件</button> <button class="btn btn-sm btn-secondary" onclick="uploadOrgKnowledge(true)">📁 上传文件夹</button></div>
     <div id="orgKBList"><div class="empty">加载中...</div></div></div>`;
   $('content').innerHTML=html;
   loadOrgKnowledge();
@@ -984,15 +995,24 @@ async function loadOrgKnowledge(){
   }
   html+='</table>';el.innerHTML=html;
 }
-function uploadOrgKnowledge(){
+function uploadOrgKnowledge(folderMode){
   const input=document.createElement('input');input.type='file';input.multiple=true;
+  if(folderMode){input.webkitdirectory=true;}
   input.onchange=async()=>{
     const fd=new FormData();
-    for(const f of input.files)fd.append('files',f);
+    for(const f of input.files){
+      // 文件夹上传时保留相对路径
+      if(f.webkitRelativePath){fd.append('files',f,{headers:{'X-File-Path':f.webkitRelativePath}});}
+      else{fd.append('files',f);}
+    }
+    showToast('正在上传...','info');
     const r=await fetch(API+'/api/organization/knowledge/upload',{method:'POST',body:fd});
     const data=await r.json();
     if(data.error){showToast(data.error,'danger');return}
-    showToast('上传成功','success');loadOrgKnowledge();
+    const total=data.results?data.results.length:0;
+    const okCount=data.results?data.results.filter(x=>x.ok).length:0;
+    showToast(`上传完成: ${okCount}/${total} 文件成功`,okCount===total?'success':'warning');
+    loadOrgKnowledge();
   };input.click();
 }
 async function viewOrgKBFile(path){
@@ -1100,8 +1120,10 @@ async function saveDeptInfo(path){
 async function loadDeptKB(path){
   const files=await api(`/api/departments/${encodeURIComponent(path)}/knowledge`);
   const el=document.getElementById('deptKBArea');if(!el)return;
-  if(!files||!files.length){el.innerHTML='<div class="empty" style="margin-top:12px">暂无知识库文件</div>';return}
-  let html='<h4 style="margin-bottom:8px">部门知识库</h4><table><tr><th>文件</th><th>操作</th></tr>';
+  let html='<h4 style="margin-bottom:8px">部门知识库</h4>';
+  html+='<div style="margin-bottom:8px"><button class="btn btn-sm btn-primary" onclick="uploadDeptKB(\''+escHtml(path)+'\',false)">上传文件</button> <button class="btn btn-sm btn-secondary" onclick="uploadDeptKB(\''+escHtml(path)+'\',true)">📁 上传文件夹</button></div>';
+  if(!files||!files.length){html+='<div class="empty" style="margin-top:12px">暂无知识库文件</div>';el.innerHTML=html;return}
+  html+='<table><tr><th>文件</th><th>操作</th></tr>';
   for(const f of files){
     html+=`<tr><td>${escHtml(f.name||f.path)}</td>
       <td><button class="btn btn-sm btn-ghost" onclick="viewDeptKBFile('${escHtml(path)}','${escHtml(f.path||f.name)}')">查看</button>
@@ -1109,6 +1131,25 @@ async function loadDeptKB(path){
   }
   html+='</table>';el.innerHTML=html;
 }
+async function uploadDeptKB(path,folderMode){
+  const input=document.createElement('input');input.type='file';input.multiple=true;
+  if(folderMode){input.webkitdirectory=true;}
+  input.onchange=async()=>{
+    const fd=new FormData();
+    for(const f of input.files){
+      if(f.webkitRelativePath){fd.append('files',f,{headers:{'X-File-Path':f.webkitRelativePath}});}
+      else{fd.append('files',f);}
+    }
+    showToast('正在上传...','info');
+    const r=await fetch(API+`/api/departments/${encodeURIComponent(path)}/knowledge/upload`,{method:'POST',body:fd});
+    const data=await r.json();
+    if(data.error){showToast(data.error,'danger');return}
+    const total=data.results?data.results.length:0;
+    const okCount=data.results?data.results.filter(x=>x.ok).length:0;
+    showToast(`上传完成: ${okCount}/${total} 文件成功`,okCount===total?'success':'warning');
+    loadDeptKB(path);
+  };input.click();
+}
 
 // Init
 showPage('dashboard');