From 6494cf6551e91859741db51582e6f833c9280e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=B4=E5=A4=A9?= Date: Sat, 21 Mar 2026 04:08:41 +0800 Subject: [PATCH] chore: release v0.9.7 --- CHANGELOG.md | 26 ++++++++ docs/index.html | 16 ++--- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/src/commands/agent.rs | 108 ++++++++++++++++++++++++++----- src-tauri/src/commands/config.rs | 100 ++++++++++++++++++++++++++-- src-tauri/src/commands/memory.rs | 4 ++ src-tauri/src/commands/mod.rs | 101 +++++++++++++++++++---------- src-tauri/src/commands/skills.rs | 37 +++++++---- src-tauri/src/lib.rs | 11 ++++ src-tauri/tauri.conf.json | 2 +- src/lib/tauri-api.js | 4 ++ src/pages/agents.js | 8 ++- src/pages/channels.js | 6 +- src/pages/chat-debug.js | 98 ++++++++++++++++++++++++++-- src/pages/chat.js | 63 +++++++++++++++++- src/pages/models.js | 45 ++++++++++++- src/pages/settings.js | 82 ++++++++++++++++++++++- src/pages/setup.js | 75 ++++++++++++++++++++- src/pages/skills.js | 9 ++- src/style/chat.css | 11 ++++ 22 files changed, 716 insertions(+), 96 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a87405d..84bc13d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,32 @@ 格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)， 版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。 +## [0.9.7] - 2026-03-21 + +### 新功能 (Features) + +- **Markdown 表格渲染** — 聊天消息中的 Markdown 表格以 HTML 表格形式展示，支持表头高亮、斑马纹、悬停效果 (#112) +- **Doctor 一键诊断修复** — 新增 `openclaw doctor --fix` 和 `openclaw doctor` 后端命令，支持从面板内自动检测和修复配置问题 (#103) +- **自定义 OpenClaw 安装路径** — 初始设置和服务管理页支持自定义 OpenClaw 配置目录（如 `E:\数据\AI\.openclaw`），解决非默认安装位置的检测问题 +- **关闭窗口最小化到托盘** — 关闭主窗口时最小化到系统托盘，不退出应用 +- **应用重启命令** — 设置变更后支持从面板内一键重启应用 + +### 修复 (Fixes) + +- **Agent 创建失败兜底** — CLI 创建 Agent 超时或失败时，自动降级为直接写 openclaw.json，不再因 CLI 卡死导致创建失败 +- **模型 API 类型自动修复** — 保存时自动将错误的 API 类型（如 `google-gemini` → `google-generative-ai`）修正为上游支持的格式 (#97) +- **SkillHub 安装状态竞态** — 搜索时先实时检测 SkillHub 安装状态，避免缓存误判导致误报"请先安装" +- **聊天响应看门狗** — 发送消息后 15 秒无 delta 事件自动刷新历史，防止响应丢失时 UI 卡在等待状态 +- **Clippy 编译警告** — 修复 dead_code 和 manual_flatten 编译警告，代码更规范 + +### 改进 (Improvements) + +- **模型配置可折叠** — 每个服务商区块支持折叠/展开，模型多时页面更清爽 (#98) +- **PATH 检测优先级优化** — macOS/Linux/Windows 均调整为版本管理器路径（nvm/volta/fnm）优先于系统路径，减少环境检测误判 +- **聊天 typing 提示增强** — 等待回复时支持显示工具调用等状态提示文字 +- **官网内容更新** — 新增 apple-touch-icon、布局优化、图标资源重命名解决浏览器缓存问题 +- **贡献者致谢** — README 和 CONTRIBUTING.md 新增历史贡献者致谢名单及维护指南 + ## [0.9.6] - 2026-03-18 ### 修复 (Fixes) diff --git a/docs/index.html b/docs/index.html index 600e8cb..e41b13b 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,7 +34,7 @@ "description": "OpenClaw AI Agent 可视化管理面板，基于 Tauri v2 的跨平台桌面应用。支持仪表盘监控、多模型配置、消息渠道管理、内置 QQ 机器人、实时 AI 聊天、记忆管理、Agent 管理、网关配置、内网穿透等功能。", "url": "https://claw.qt.cool/", "downloadUrl": "https://github.com/qingchencloud/clawpanel/releases/latest", - "softwareVersion": "0.9.6", + "softwareVersion": "0.9.7", "author": { "@type": "Organization", "name": "晴辰云 QingchenCloud", @@ -1133,7 +1133,7 @@
-
v0.9.6 最新版
+
v0.9.7 最新版

下载安装

选择你的操作系统，一键下载安装

@@ -1143,11 +1143,11 @@

macOS

支持 Apple Silicon 和 Intel 芯片

- + Apple Silicon (M1/M2/M3/M4) .dmg - + Intel 芯片 .dmg @@ -1165,11 +1165,11 @@

Windows

支持 Windows 10 及以上版本

- + 安装程序 .exe - + MSI 安装包 .msi @@ -1180,11 +1180,11 @@

Linux

支持主流 Linux 发行版

- + 通用版 .AppImage - + Debian / Ubuntu .deb diff --git a/package.json b/package.json index 10ec059..351c4a8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clawpanel", - "version": "0.9.6", + "version": "0.9.7", "private": true, "description": "ClawPanel - OpenClaw 可视化管理面板，基于 Tauri v2 的跨平台桌面应用", "type": "module", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 9ccec81..8a06054 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -340,7 +340,7 @@ dependencies = [ [[package]] name = "clawpanel" -version = "0.9.6" +version = "0.9.7" dependencies = [ "base64 0.22.1", "chrono", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 198740c..1b5f487 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clawpanel" -version = "0.9.6" +version = "0.9.7" edition = "2021" description = "ClawPanel - OpenClaw 可视化管理面板" authors = ["qingchencloud"] diff --git a/src-tauri/src/commands/agent.rs b/src-tauri/src/commands/agent.rs index 180a9f8..dc9c59e 100644 --- a/src-tauri/src/commands/agent.rs +++ b/src-tauri/src/commands/agent.rs @@ -102,7 +102,7 @@ pub async fn list_agents() -> Result { Ok(Value::Array(enriched)) } -/// 创建新 agent（走 CLI，自动创建 workspace/sessions 等文件） +/// 创建新 agent（优先走 CLI，失败则直接写 openclaw.json 兜底） #[tauri::command] pub async fn add_agent( name: String, @@ -128,29 +128,105 @@ pub async fn add_agent( if !model.is_empty() { args.push("--model".to_string()); - args.push(model); + args.push(model.clone()); } - let output = openclaw_command_async() - .args(&args) - .output() - .await - .map_err(|e| { - if e.kind() == std::io::ErrorKind::NotFound { - "OpenClaw CLI 未找到，请确认已安装并重启 ClawPanel。".to_string() - } else { - format!("执行失败: {e}") - } - })?; + // 尝试 CLI（15s 超时），失败则直接写配置兜底 + let cli_ok = match tokio::time::timeout( + std::time::Duration::from_secs(15), + openclaw_command_async().args(&args).output(), + ) + .await + { + Ok(Ok(o)) if o.status.success() => true, + Ok(Ok(o)) => { + let stderr = String::from_utf8_lossy(&o.stderr); + eprintln!( + "[agent] CLI 创建失败: {}", + stderr.chars().take(200).collect::() + ); + false + } + Ok(Err(e)) => { + eprintln!("[agent] CLI 执行错误: {e}"); + false + } + Err(_) => { + eprintln!("[agent] CLI 超时 (15s)"); + false + } + }; - if !output.status.success() { - let stderr = String::from_utf8_lossy(&output.stderr); - return Err(format!("创建 Agent 失败: {stderr}")); + if !cli_ok { + // 兜底：直接写 openclaw.json + add_agent_to_config(&name, &model, &ws)?; + } + + // 确保 workspace 目录存在 + if !ws.exists() { + let _ = fs::create_dir_all(&ws); } list_agents().await } +/// 直接写 openclaw.json 创建 agent（CLI 不可用时的兜底方案） +fn add_agent_to_config(id: &str, model: &str, workspace: &std::path::Path) -> Result<(), String> { + let config_path = super::openclaw_dir().join("openclaw.json"); + if !config_path.exists() { + return Err("openclaw.json 不存在，请先安装 OpenClaw".to_string()); + } + let content = fs::read_to_string(&config_path).map_err(|e| format!("读取配置失败: {e}"))?; + let mut config: Value = + serde_json::from_str(&content).map_err(|e| format!("解析 JSON 失败: {e}"))?; + + // 确保 agents.list 存在 + if config.get("agents").is_none() { + config + .as_object_mut() + .ok_or("配置格式错误")? + .insert("agents".to_string(), serde_json::json!({})); + } + if config["agents"].get("list").is_none() { + config["agents"] + .as_object_mut() + .ok_or("agents 格式错误")? + .insert("list".to_string(), serde_json::json!([])); + } + + let list = config["agents"]["list"] + .as_array_mut() + .ok_or("agents.list 格式错误")?; + + // 检查是否已存在同名 agent + let exists = list + .iter() + .any(|a| a.get("id").and_then(|v| v.as_str()) == Some(id)); + if exists { + return Err(format!("Agent「{id}」已存在")); + } + + let mut agent = serde_json::json!({ + "id": id, + "workspace": workspace.to_string_lossy(), + }); + if !model.is_empty() { + agent + .as_object_mut() + .unwrap() + .insert("model".to_string(), serde_json::json!({ "primary": model })); + } + list.push(agent); + + // 备份 + 写回 + let bak = super::openclaw_dir().join("openclaw.json.bak"); + let _ = fs::copy(&config_path, &bak); + let json = serde_json::to_string_pretty(&config).map_err(|e| format!("序列化失败: {e}"))?; + fs::write(&config_path, json).map_err(|e| format!("写入配置失败: {e}"))?; + + Ok(()) +} + /// 删除 agent（直接操作 openclaw.json + 删除 agent 目录，不走 CLI） #[tauri::command] pub async fn delete_agent(id: String) -> Result { diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs index c669e2f..4cbbff7 100644 --- a/src-tauri/src/commands/config.rs +++ b/src-tauri/src/commands/config.rs @@ -2587,6 +2587,66 @@ pub async fn restart_gateway() -> Result { reload_gateway().await } +/// 运行 openclaw doctor --fix 自动修复配置问题 +#[tauri::command] +pub async fn doctor_fix() -> Result { + use crate::utils::openclaw_command_async; + + let result = tokio::time::timeout( + std::time::Duration::from_secs(30), + openclaw_command_async().args(["doctor", "--fix"]).output(), + ) + .await; + + match result { + Ok(Ok(o)) => { + let stdout = String::from_utf8_lossy(&o.stdout).to_string(); + let stderr = String::from_utf8_lossy(&o.stderr).to_string(); + let success = o.status.success(); + Ok(json!({ + "success": success, + "output": stdout.trim(), + "errors": stderr.trim(), + "exitCode": o.status.code(), + })) + } + Ok(Err(e)) => { + if e.kind() == std::io::ErrorKind::NotFound { + Err("OpenClaw CLI 未找到，请先安装".to_string()) + } else { + Err(format!("执行 doctor 失败: {e}")) + } + } + Err(_) => Err("doctor --fix 执行超时 (30s)".to_string()), + } +} + +/// 运行 openclaw doctor（仅诊断，不修复） +#[tauri::command] +pub async fn doctor_check() -> Result { + use crate::utils::openclaw_command_async; + + let result = tokio::time::timeout( + std::time::Duration::from_secs(20), + openclaw_command_async().args(["doctor"]).output(), + ) + .await; + + match result { + Ok(Ok(o)) => { + let stdout = String::from_utf8_lossy(&o.stdout).to_string(); + let stderr = String::from_utf8_lossy(&o.stderr).to_string(); + Ok(json!({ + "success": o.status.success(), + "output": stdout.trim(), + "errors": stderr.trim(), + })) + } + Ok(Err(e)) => Err(format!("执行 doctor 失败: {e}")), + Err(_) => Err("doctor 执行超时 (20s)".to_string()), + } +} + /// 清理 base URL：去掉尾部斜杠和已知端点路径，防止用户粘贴完整端点 URL 导致路径重复 fn normalize_base_url(raw: &str) -> String { let mut base = raw.trim_end_matches('/').to_string(); @@ -3080,9 +3140,25 @@ pub async fn check_panel_update() -> Result { // === 面板配置 (clawpanel.json) === +/// 获取当前生效的 OpenClaw 配置目录路径 +#[tauri::command] +pub fn get_openclaw_dir() -> Result { + let resolved = super::openclaw_dir(); + let is_custom = super::read_panel_config_value() + .and_then(|v| v.get("openclawDir")?.as_str().map(String::from)) + .map(|s| !s.is_empty()) + .unwrap_or(false); + let config_exists = resolved.join("openclaw.json").exists(); + Ok(json!({ + "path": resolved.to_string_lossy(), + "isCustom": is_custom, + "configExists": config_exists, + })) +} + #[tauri::command] pub fn read_panel_config() -> Result { - let path = super::openclaw_dir().join("clawpanel.json"); + let path = super::panel_config_path(); if !path.exists() { return Ok(serde_json::json!({})); } @@ -3092,15 +3168,29 @@ pub fn read_panel_config() -> Result { #[tauri::command] pub fn write_panel_config(config: Value) -> Result<(), String> { - let dir = super::openclaw_dir(); - if !dir.exists() { - fs::create_dir_all(&dir).map_err(|e| format!("创建目录失败: {e}"))?; + let path = super::panel_config_path(); + if let Some(dir) = path.parent() { + if !dir.exists() { + fs::create_dir_all(dir).map_err(|e| format!("创建目录失败: {e}"))?; + } } - let path = dir.join("clawpanel.json"); let json = serde_json::to_string_pretty(&config).map_err(|e| format!("序列化失败: {e}"))?; fs::write(&path, json).map_err(|e| format!("写入失败: {e}")) } +/// 重启应用（用于设置变更后自动重启） +#[tauri::command] +pub async fn relaunch_app(app: tauri::AppHandle) -> Result<(), String> { + let exe = std::env::current_exe().map_err(|e| format!("获取可执行文件路径失败: {e}"))?; + std::process::Command::new(&exe) + .spawn() + .map_err(|e| format!("重启失败: {e}"))?; + // 短暂延迟后退出当前进程 + tokio::time::sleep(std::time::Duration::from_millis(300)).await; + app.exit(0); + Ok(()) +} + /// 测试代理连通性：通过配置的代理访问指定 URL，返回状态码和耗时 #[tauri::command] pub async fn test_proxy(url: Option) -> Result { diff --git a/src-tauri/src/commands/memory.rs b/src-tauri/src/commands/memory.rs index d1f35a2..6c474f1 100644 --- a/src-tauri/src/commands/memory.rs +++ b/src-tauri/src/commands/memory.rs @@ -64,6 +64,8 @@ async fn agent_workspace(agent_id: &str) -> Result { .and_then(|w| w.as_str()) .map(PathBuf::from) .unwrap_or_else(|| super::openclaw_dir().join("workspace")); + // 解析符号链接 + let default_workspace = fs::canonicalize(&default_workspace).unwrap_or(default_workspace); let mut new_map = HashMap::new(); // main agent 使用默认 workspace @@ -93,6 +95,8 @@ async fn agent_workspace(agent_id: &str) -> Result { .join("workspace") } }); + // 解析符号链接，确保软连接的 workspace 也能正确访问 + let ws = fs::canonicalize(&ws).unwrap_or(ws); new_map.insert(id.to_string(), ws); } } diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index d40204e..678b4f3 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -16,13 +16,32 @@ pub mod service; pub mod skills; pub mod update; -/// 获取 OpenClaw 配置目录 (~/.openclaw/) -pub fn openclaw_dir() -> PathBuf { +/// 默认 OpenClaw 配置目录（ClawPanel 自身配置始终在此） +fn default_openclaw_dir() -> PathBuf { dirs::home_dir().unwrap_or_default().join(".openclaw") } +/// 获取 OpenClaw 配置目录 +/// 优先使用 clawpanel.json 中的 openclawDir 自定义路径，不存在则回退默认 ~/.openclaw +pub fn openclaw_dir() -> PathBuf { + // 直接读 clawpanel.json（始终在默认目录下），避免循环依赖 + let config_path = default_openclaw_dir().join("clawpanel.json"); + if let Ok(content) = std::fs::read_to_string(&config_path) { + if let Ok(v) = serde_json::from_str::(&content) { + if let Some(custom) = v.get("openclawDir").and_then(|d| d.as_str()) { + let p = PathBuf::from(custom); + if !custom.is_empty() && p.exists() { + return p; + } + } + } + } + default_openclaw_dir() +} + fn panel_config_path() -> PathBuf { - openclaw_dir().join("clawpanel.json") + // ClawPanel 自身配置始终在默认目录，不随 openclawDir 变化 + default_openclaw_dir().join("clawpanel.json") } fn read_panel_config_value() -> Option { @@ -184,14 +203,15 @@ fn build_enhanced_path() -> String { #[cfg(target_os = "macos")] { + // 版本管理器路径优先于系统路径，确保 nvm/volta/fnm 管理的 Node.js 版本被优先检测到 let mut extra: Vec = vec![ - "/usr/local/bin".into(), - "/opt/homebrew/bin".into(), format!("{}/.nvm/current/bin", home.display()), format!("{}/.volta/bin", home.display()), format!("{}/.nodenv/shims", home.display()), format!("{}/n/bin", home.display()), format!("{}/.npm-global/bin", home.display()), + "/usr/local/bin".into(), + "/opt/homebrew/bin".into(), ]; // NPM_CONFIG_PREFIX: 用户通过 npm config set prefix 自定义的全局安装路径 if let Ok(prefix) = std::env::var("NPM_CONFIG_PREFIX") { @@ -238,16 +258,17 @@ fn build_enhanced_path() -> String { #[cfg(target_os = "linux")] { + // 版本管理器路径优先于系统路径，确保 nvm/volta/fnm 管理的 Node.js 版本被优先检测到 let mut extra: Vec = vec![ - "/usr/local/bin".into(), - "/usr/bin".into(), - "/snap/bin".into(), - format!("{}/.local/bin", home.display()), format!("{}/.nvm/current/bin", home.display()), format!("{}/.volta/bin", home.display()), format!("{}/.nodenv/shims", home.display()), format!("{}/n/bin", home.display()), format!("{}/.npm-global/bin", home.display()), + format!("{}/.local/bin", home.display()), + "/usr/local/bin".into(), + "/usr/bin".into(), + "/snap/bin".into(), ]; // NPM_CONFIG_PREFIX: 用户通过 npm config set prefix 自定义的全局安装路径 if let Ok(prefix) = std::env::var("NPM_CONFIG_PREFIX") { @@ -316,35 +337,17 @@ fn build_enhanced_path() -> String { let localappdata = std::env::var("LOCALAPPDATA").unwrap_or_default(); let appdata = std::env::var("APPDATA").unwrap_or_default(); - let mut extra: Vec = vec![format!(r"{}\nodejs", pf), format!(r"{}\nodejs", pf86)]; - if !localappdata.is_empty() { - extra.push(format!(r"{}\Programs\nodejs", localappdata)); - extra.push(format!(r"{}\fnm_multishells", localappdata)); - } - if !appdata.is_empty() { - extra.push(format!(r"{}\npm", appdata)); - extra.push(format!(r"{}\nvm", appdata)); - // 扫描 nvm-windows 实际安装的版本目录 - let nvm_dir = std::path::Path::new(&appdata).join("nvm"); - if nvm_dir.is_dir() { - if let Ok(entries) = std::fs::read_dir(&nvm_dir) { - for entry in entries.flatten() { - let p = entry.path(); - if p.is_dir() && p.join("node.exe").exists() { - extra.push(p.to_string_lossy().to_string()); - } - } - } - } - } - // NVM_SYMLINK 环境变量（nvm-windows 的活跃版本符号链接，如 D:\nodejs） + // 版本管理器路径优先，确保 nvm/volta/fnm 管理的 Node.js 被优先检测到 + let mut extra: Vec = vec![]; + + // 1. NVM_SYMLINK（nvm-windows 活跃版本符号链接，如 D:\nodejs）—— 最高优先级 if let Ok(nvm_symlink) = std::env::var("NVM_SYMLINK") { let symlink_path = std::path::Path::new(&nvm_symlink); if symlink_path.is_dir() { extra.push(nvm_symlink.clone()); } } - // NVM_HOME 环境变量（用户可能自定义了 nvm 安装目录） + // 2. NVM_HOME（用户自定义 nvm 安装目录） if let Ok(nvm_home) = std::env::var("NVM_HOME") { let nvm_path = std::path::Path::new(&nvm_home); if nvm_path.is_dir() { @@ -358,8 +361,27 @@ fn build_enhanced_path() -> String { } } } + // 3. %APPDATA%\nvm（nvm-windows 默认安装目录） + if !appdata.is_empty() { + extra.push(format!(r"{}\nvm", appdata)); + let nvm_dir = std::path::Path::new(&appdata).join("nvm"); + if nvm_dir.is_dir() { + if let Ok(entries) = std::fs::read_dir(&nvm_dir) { + for entry in entries.flatten() { + let p = entry.path(); + if p.is_dir() && p.join("node.exe").exists() { + extra.push(p.to_string_lossy().to_string()); + } + } + } + } + } + // 4. volta extra.push(format!(r"{}\.volta\bin", home.display())); - // fnm: 扫描 %FNM_DIR% 或默认 %APPDATA%\fnm 下的版本目录 + // 5. fnm + if !localappdata.is_empty() { + extra.push(format!(r"{}\fnm_multishells", localappdata)); + } let fnm_base = std::env::var("FNM_DIR") .ok() .map(std::path::PathBuf::from) @@ -375,8 +397,17 @@ fn build_enhanced_path() -> String { } } } - - // 扫描常见盘符下的 Node 安装（用户可能装在 D:\、F:\ 等） + // 6. npm 全局（openclaw.cmd 通常在这里） + if !appdata.is_empty() { + extra.push(format!(r"{}\npm", appdata)); + } + // 7. 系统默认 Node.js 安装路径（优先级最低） + extra.push(format!(r"{}\nodejs", pf)); + extra.push(format!(r"{}\nodejs", pf86)); + if !localappdata.is_empty() { + extra.push(format!(r"{}\Programs\nodejs", localappdata)); + } + // 8. 扫描常见盘符下的 Node 安装（用户可能装在 D:\、F:\ 等） for drive in &["C", "D", "E", "F"] { extra.push(format!(r"{}:\nodejs", drive)); extra.push(format!(r"{}:\Node", drive)); diff --git a/src-tauri/src/commands/skills.rs b/src-tauri/src/commands/skills.rs index 691c7a0..567414d 100644 --- a/src-tauri/src/commands/skills.rs +++ b/src-tauri/src/commands/skills.rs @@ -8,20 +8,35 @@ use std::os::windows::process::CommandExt; /// 列出所有 Skills 及其状态（openclaw skills list --json） #[tauri::command] pub async fn skills_list() -> Result { - let output = openclaw_command_async() - .args(["skills", "list", "--json"]) - .output() - .await; + let output = tokio::time::timeout( + std::time::Duration::from_secs(15), + openclaw_command_async() + .args(["skills", "list", "--json"]) + .output(), + ) + .await; match output { - Ok(o) if o.status.success() => { + Ok(Ok(o)) => { let stdout = String::from_utf8_lossy(&o.stdout); - // CLI output may contain non-JSON lines (Node warnings, update prompts). - // Extract the first valid JSON object or array from stdout. - extract_json(&stdout).ok_or_else(|| "解析失败: 输出中未找到有效 JSON".to_string()) + // CLI 可能在有 skill 缺依赖时返回非零退出码，但 JSON 输出仍然有效 + // 优先尝试解析 JSON，无论退出码 + match extract_json(&stdout) { + Some(v) => Ok(v), + None => { + let stderr = String::from_utf8_lossy(&o.stderr); + eprintln!( + "[skills] CLI JSON 解析失败 (exit={})，兜底扫描。stdout={} stderr={}", + o.status.code().unwrap_or(-1), + stdout.chars().take(200).collect::(), + stderr.chars().take(200).collect::() + ); + scan_local_skills() + } + } } _ => { - // CLI 不可用时，兜底扫描本地 skills 目录 + // CLI 不可用或超时，兜底扫描本地 skills 目录 scan_local_skills() } } @@ -144,14 +159,14 @@ pub async fn skills_skillhub_check() -> Result { #[cfg(target_os = "windows")] let mut cmd = { let mut c = tokio::process::Command::new("cmd"); - c.args(["/c", "skillhub", "--cli-version"]); + c.args(["/c", "skillhub", "--version"]); c.creation_flags(0x08000000); c }; #[cfg(not(target_os = "windows"))] let mut cmd = { let mut c = tokio::process::Command::new("skillhub"); - c.arg("--cli-version"); + c.arg("--version"); c }; cmd.env("PATH", &path_env); diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 3be3722..9c2e8d8 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -89,6 +89,7 @@ pub fn run() { config::uninstall_gateway, config::patch_model_vision, config::check_panel_update, + config::get_openclaw_dir, config::read_panel_config, config::write_panel_config, config::test_proxy, @@ -99,6 +100,9 @@ pub fn run() { config::configure_git_https, config::invalidate_path_cache, config::get_status_summary, + config::doctor_fix, + config::doctor_check, + config::relaunch_app, // 设备密钥 + Gateway 握手 device::create_connect_frame, // 设备配对 @@ -178,6 +182,13 @@ pub fn run() { update::rollback_frontend_update, update::get_update_status, ]) + .on_window_event(|window, event| { + // 关闭窗口时最小化到托盘，不退出应用 + if let tauri::WindowEvent::CloseRequested { api, .. } = event { + api.prevent_close(); + let _ = window.hide(); + } + }) .build(tauri::generate_context!()) .expect("启动 ClawPanel 失败") .run(|_app, event| { diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 236592b..b23750a 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/tauri-apps/tauri/dev/crates/tauri-config-schema/schema.json", "productName": "ClawPanel", - "version": "0.9.6", + "version": "0.9.7", "identifier": "ai.openclaw.clawpanel", "build": { "frontendDist": "../dist", diff --git a/src/lib/tauri-api.js b/src/lib/tauri-api.js index 67a6ee5..32ecdc1 100644 --- a/src/lib/tauri-api.js +++ b/src/lib/tauri-api.js @@ -181,6 +181,8 @@ export const api = { writeMcpConfig: (config) => { invalidate('read_mcp_config'); return invoke('write_mcp_config', { config }) }, reloadGateway: () => invoke('reload_gateway'), restartGateway: () => invoke('restart_gateway'), + doctorCheck: () => invoke('doctor_check'), + doctorFix: () => invoke('doctor_fix'), listOpenclawVersions: (source = 'chinese') => invoke('list_openclaw_versions', { source }), upgradeOpenclaw: (source = 'chinese', version = null, method = 'auto') => invoke('upgrade_openclaw', { source, version, method }), uninstallOpenclaw: (cleanConfig = false) => invoke('uninstall_openclaw', { cleanConfig }), @@ -222,6 +224,8 @@ export const api = { installChannelPlugin: (packageName, pluginId) => invoke('install_channel_plugin', { packageName, pluginId }), // 面板配置 (clawpanel.json) + getOpenclawDir: () => invoke('get_openclaw_dir'), + relaunchApp: () => invoke('relaunch_app'), readPanelConfig: () => invoke('read_panel_config'), writePanelConfig: (config) => invoke('write_panel_config', { config }), testProxy: (url) => invoke('test_proxy', { url: url || null }), diff --git a/src/pages/agents.js b/src/pages/agents.js index eeee4fd..484a40d 100644 --- a/src/pages/agents.js +++ b/src/pages/agents.js @@ -162,8 +162,14 @@ async function showAddAgentDialog(page, state) { try { await api.addAgent(id, model, workspace || null) + // 身份信息更新（非关键，失败不阻塞） if (name || emoji) { - await api.updateAgentIdentity(id, name || null, emoji || null) + try { + await api.updateAgentIdentity(id, name || null, emoji || null) + } catch (identityErr) { + console.warn('[Agent] 身份信息更新失败（Agent 已创建）:', identityErr) + toast('Agent 已创建，但名称设置失败，可稍后编辑', 'warning') + } } toast('Agent 已创建', 'success') diff --git a/src/pages/channels.js b/src/pages/channels.js index 3af5284..65878fc 100644 --- a/src/pages/channels.js +++ b/src/pages/channels.js @@ -371,7 +371,7 @@ async function openConfigDialog(pid, page, state) { // 飞书插件版本检测：根据已安装的插件自动选择 if (pid === 'feishu' && !existing.pluginVersion) { try { - const officialStatus = await api.getChannelPluginStatus('feishu-openclaw-plugin') + const officialStatus = await api.getChannelPluginStatus('openclaw-lark') || await api.getChannelPluginStatus('feishu-openclaw-plugin') if (officialStatus?.installed) existing.pluginVersion = 'official' else existing.pluginVersion = localStorage.getItem('clawpanel-feishu-plugin-version') || 'builtin' } catch { existing.pluginVersion = 'builtin' } @@ -597,8 +597,8 @@ async function openConfigDialog(pid, page, state) { const pluginVersion = pluginVersionField?.value || 'builtin' localStorage.setItem('clawpanel-feishu-plugin-version', pluginVersion) if (pluginVersion === 'official') { - pluginPackage = '@larksuiteoapi/feishu-openclaw-plugin' - pluginId = 'feishu-openclaw-plugin' + pluginPackage = 'openclaw-lark' + pluginId = 'openclaw-lark' } } const pluginStatus = await api.getChannelPluginStatus(pluginId) diff --git a/src/pages/chat-debug.js b/src/pages/chat-debug.js index 52da48e..c788bd7 100644 --- a/src/pages/chat-debug.js +++ b/src/pages/chat-debug.js @@ -6,23 +6,46 @@ import { api, getRequestLogs, clearRequestLogs } from '../lib/tauri-api.js' import { wsClient } from '../lib/ws-client.js' import { isOpenclawReady, isGatewayRunning } from '../lib/app-state.js' import { icon, statusIcon } from '../lib/icons.js' +import { toast } from '../components/toast.js' +import { navigate } from '../router.js' export async function render() { const page = document.createElement('div') page.className = 'page' page.innerHTML = ` -
+

系统诊断

-

全面检测系统状态，快速定位问题

-
+

全面检测系统状态，快速定位问题

+
+ + - + +
+
+
+
+
+
+
+
+
+
+
应用状态
+
WebSocket 连接
+
Node.js 环境
+
版本信息
+
+
+ -
` - // 第四步：配置文件 + // 第四步：配置文件 + 自定义路径 html += `
@@ -188,6 +188,23 @@ function renderSteps(page, { node, git, cliOk, config, version }) {

` } +
+ + 自定义 OpenClaw 安装路径 + +
+

+ 如果 OpenClaw 安装在非默认目录（如 E:\\数据\\AI\\.openclaw），可在此指定。留空则使用默认路径。 +

+
+ + + +
+ +
+
` @@ -432,6 +449,62 @@ function bindEvents(page, nodeOk, detectState) { } }) + // 自定义 OpenClaw 安装路径 + const dirInput = page.querySelector('#input-openclaw-dir') + const dirResultEl = page.querySelector('#openclaw-dir-result') + // 预填当前自定义路径 + if (dirInput) { + api.getOpenclawDir().then(info => { + if (info.isCustom) { + dirInput.value = info.path + // 已有自定义路径时自动展开 + const details = page.querySelector('#custom-dir-details') + if (details) details.open = true + } + }).catch(() => {}) + } + + page.querySelector('#btn-save-openclaw-dir')?.addEventListener('click', async () => { + const value = dirInput?.value?.trim() + if (!value) { toast('请输入路径', 'warning'); return } + const btn = page.querySelector('#btn-save-openclaw-dir') + btn.disabled = true + if (dirResultEl) { dirResultEl.style.display = 'block'; dirResultEl.innerHTML = '保存中...' } + try { + const cfg = await api.readPanelConfig() + cfg.openclawDir = value + await api.writePanelConfig(cfg) + invalidate() + if (dirResultEl) dirResultEl.innerHTML = `✓ 路径已保存，正在重新检测...` + toast('自定义路径已保存', 'success') + setTimeout(() => runDetect(page), 500) + } catch (e) { + if (dirResultEl) dirResultEl.innerHTML = `保存失败: ${e}` + toast('保存失败: ' + e, 'error') + } finally { + btn.disabled = false + } + }) + + page.querySelector('#btn-reset-openclaw-dir')?.addEventListener('click', async () => { + const btn = page.querySelector('#btn-reset-openclaw-dir') + btn.disabled = true + try { + const cfg = await api.readPanelConfig() + delete cfg.openclawDir + await api.writePanelConfig(cfg) + invalidate() + if (dirInput) dirInput.value = '' + if (dirResultEl) { dirResultEl.style.display = 'block'; dirResultEl.innerHTML = `✓ 已恢复默认路径，正在重新检测...` } + toast('已恢复默认路径', 'success') + setTimeout(() => runDetect(page), 500) + } catch (e) { + toast('恢复失败: ' + e, 'error') + } finally { + btn.disabled = false + } + }) + // 一键初始化配置 page.querySelector('#btn-init-config')?.addEventListener('click', async () => { const btn = page.querySelector('#btn-init-config') diff --git a/src/pages/skills.js b/src/pages/skills.js index af7b321..26fea3a 100644 --- a/src/pages/skills.js +++ b/src/pages/skills.js @@ -280,7 +280,13 @@ async function handleSourceSearch(page) { const q = input.value.trim() if (!q) { results.innerHTML = '
输入关键词搜索社区 Skills
'; return } const source = getInstallSource() - // SkillHub 未安装时友好提示 + // SkillHub 未安装时友好提示（先实时检测一次，避免竞态误判） + if (source === 'skillhub' && !_skillhubInstalled) { + try { + const info = await api.skillsSkillHubCheck() + _skillhubInstalled = !!info.installed + } catch { /* ignore */ } + } if (source === 'skillhub' && !_skillhubInstalled) { results.innerHTML = `
⚠️ 请先安装 SkillHub CLI
@@ -361,6 +367,7 @@ async function handleSkillHubSetup(page) { if (statusEl) statusEl.textContent = '正在安装 SkillHub CLI...' try { await api.skillsSkillHubSetup(true) + _skillhubInstalled = true toast('SkillHub CLI 安装成功', 'success') if (statusEl) statusEl.textContent = '✅ 已安装' // 隐藏安装按钮 diff --git a/src/style/chat.css b/src/style/chat.css index 1ae6f4f..1de4028 100644 --- a/src/style/chat.css +++ b/src/style/chat.css @@ -373,6 +373,17 @@ .typing-indicator span:nth-child(2) { animation-delay: 0.2s; } .typing-indicator span:nth-child(3) { animation-delay: 0.4s; } +.typing-hint { + width: auto !important; + height: auto !important; + background: none !important; + animation: none !important; + font-size: 12px; + color: var(--text-tertiary); + margin-left: 4px; + white-space: nowrap; +} + @keyframes typing-bounce { 0%, 60%, 100% { transform: translateY(0); opacity: 0.4; } 30% { transform: translateY(-6px); opacity: 1; }