From 328624cf0379498a0727b6ff076b88650a70a872 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=99=B4=E5=A4=A9?= Date: Fri, 8 May 2026 04:39:36 +0800 Subject: [PATCH] chore: release v0.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 发布 0.15.0： - 新增内核版本兼容层、特性门控、低版本阻断和升级提示 - 新增 PATH 中 OpenClaw CLI 冲突检测、隔离与恢复 - 修复 Hermes Gateway loopback 自动拉起与 /v1/runs 诊断 - 修复 standalone 一键安装包在 About/仪表盘显示未知版本 - 同步 OpenClaw 2026.5.6 推荐版本和热更新 minAppVersion - 补齐本地 JS/Rust 测试与发布前检查说明 验证： - npm run build - node --test tests/*.test.js - node --check src/scripts JS 文件 - cargo fmt --all -- --check - cargo check - cargo clippy --all-targets -- -D warnings - cargo test --- .windsurf/workflows/release.md | 29 ++ CHANGELOG.md | 32 ++ docs/index.html | 18 +- docs/update/latest.json | 2 +- openclaw-version-policy.json | 4 +- package-lock.json | 4 +- package.json | 2 +- scripts/dev-api.js | 259 +++++++++++++- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/src/commands/cli_conflict.rs | 448 +++++++++++++++++++++++++ src-tauri/src/commands/config.rs | 116 +++++-- src-tauri/src/commands/hermes.rs | 212 ++++++++++-- src-tauri/src/commands/mod.rs | 1 + src-tauri/src/commands/update.rs | 2 +- src-tauri/src/lib.rs | 52 ++- src-tauri/tauri.conf.json | 2 +- src/components/cli-conflict-banner.js | 220 ++++++++++++ src/components/floor-blocker.js | 164 +++++++++ src/components/kernel-badge.js | 144 ++++++++ src/components/modal.js | 17 +- src/components/sidebar.js | 72 ++++ src/engines/hermes/lib/chat-store.js | 157 ++++++++- src/engines/hermes/pages/dashboard.js | 12 +- src/engines/hermes/pages/services.js | 109 +++++- src/engines/hermes/pages/setup.js | 7 +- src/engines/hermes/style/hermes.css | 7 + src/lib/api-compat.js | 194 +++++++++++ src/lib/docker-tasking.js | 30 ++ src/lib/feature-catalog.js | 198 +++++++++++ src/lib/feature-gates.js | 157 ++------- src/lib/gateway-guardian-policy.js | 18 + src/lib/gateway-restart-queue.js | 39 ++- src/lib/kernel-upgrade.js | 94 ++++++ src/lib/kernel.js | 270 +++++++++++++++ src/lib/model-presets.js | 5 +- src/lib/tauri-api.js | 49 +++ src/lib/ws-client.js | 108 +++++- src/locales/de.json | 60 +++- src/locales/en.json | 60 +++- src/locales/es.json | 60 +++- src/locales/fr.json | 60 +++- src/locales/index.js | 3 +- src/locales/ja.json | 60 +++- src/locales/ko.json | 60 +++- src/locales/modules/cliConflict.js | 50 +++ src/locales/modules/engine.js | 18 + src/locales/pt.json | 60 +++- src/locales/ru.json | 60 +++- src/locales/vi.json | 60 +++- src/locales/zh-CN.json | 90 +++-- src/locales/zh-TW.json | 60 +++- src/main.js | 29 ++ src/pages/about.js | 7 +- src/pages/agents.js | 29 +- src/pages/dashboard.js | 23 +- src/pages/models.js | 17 +- src/pages/services.js | 67 ++++ src/style/agents.css | 15 + src/style/components.css | 129 +++++++ src/style/layout.css | 97 ++++++ tests/kernel.test.js | 198 +++++++++++ 62 files changed, 4328 insertions(+), 302 deletions(-) create mode 100644 src-tauri/src/commands/cli_conflict.rs create mode 100644 src/components/cli-conflict-banner.js create mode 100644 src/components/floor-blocker.js create mode 100644 src/components/kernel-badge.js create mode 100644 src/lib/api-compat.js create mode 100644 src/lib/docker-tasking.js create mode 100644 src/lib/feature-catalog.js create mode 100644 src/lib/gateway-guardian-policy.js create mode 100644 src/lib/kernel-upgrade.js create mode 100644 src/lib/kernel.js create mode 100644 src/locales/modules/cliConflict.js create mode 100644 tests/kernel.test.js diff --git a/.windsurf/workflows/release.md b/.windsurf/workflows/release.md index 1aee7a1..bcf2fd2 100644 --- a/.windsurf/workflows/release.md +++ b/.windsurf/workflows/release.md @@ -17,6 +17,35 @@ description: 发布新版本（打 tag + 推送，触发跨平台构建） git status ``` +## 人工确认门禁 + +在继续执行版本号更新、提交、tag 或推送前，必须先把本次发布候选版交给维护者手动确认。 + +必须确认以下项目： + +- [ ] Web 模式：`npm run dev` 后核心页面可打开 +- [ ] 桌面模式：`npm run tauri dev` 后核心页面可打开 +- [ ] Hermes：安装/修复、升级、卸载弹窗流程可正常显示日志和进度 +- [ ] Hermes：Gateway 启动/停止/重启正常 +- [ ] Hermes：实时聊天 `/v1/runs` 至少完成一次真实消息回复 +- [ ] OpenClaw：仪表盘、模型、服务页无明显回归 +- [ ] 更新检查：`docs/update/latest.json` 的 `minAppVersion` 设置符合本次是否包含 Rust/Tauri 命令变更 + +确认方式： + +维护者必须明确回复类似： + +```text +确认发布 0.15.0 +``` + +在收到明确确认前，不要执行： + +- `npm run version:set ` +- `git commit` +- `git tag` +- `git push` + ## 更新版本号 `version:set` 会自动同步以下文件，不需要手动改： diff --git a/CHANGELOG.md b/CHANGELOG.md index 3305876..0e99620 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,38 @@ ## [未发布] +## [0.15.0] - 2026-05-08 + +### 新功能 (Features) + +- **内核版本兼容层** — 新增 `kernel.js` / `feature-catalog.js` / `api-compat.js`，统一管理 OpenClaw/Hermes 内核版本、特性门控、最低版本地板和新旧 RPC 返回结构兼容 +- **内核升级提示** — 侧边栏新增可升级提示卡，低版本内核可直接触发一键升级流程；低于硬地板版本时显示阻断式引导，避免旧内核继续进入不兼容页面 +- **CLI 冲突检测与隔离** — 新增 PATH 中外部 OpenClaw CLI 扫描、隔离、恢复能力，支持识别 Cherry Studio / Cursor / npm 全局安装等残留来源，降低错绑旧 CLI 的风险 +- **Hermes 实时聊天桥接增强** — Web 模式补齐 Hermes Gateway `/v1/runs` 流式转发、API Key 注入、取消与错误事件处理，使浏览器模式与桌面模式聊天链路保持一致 + +### 改进 (Improvements) + +- **OpenClaw 2026.5.6 适配** — 推荐版本更新到官方 `2026.5.6` 与汉化版 `2026.5.6-zh.1`，特性目录覆盖 sessions 分页、模型探测、memory deep status、doctor 修复、渠道进度等 5.x 能力 +- **多版本内核兼容 UX** — Dashboard、服务页、Agents、Models、侧边栏和 WebSocket 连接流程统一接入内核快照，老内核自动降级，新内核显示更丰富状态 +- **Gateway 重启体验** — 模型保存后先探测 Gateway 是否运行，运行中才防抖排队重启；未运行时只提示配置已保存，避免无意义 doctor/restart 卡顿 +- **Hermes 安装依赖补齐** — `uv tool install` 统一追加 `croniter`，并默认安装 `hermes-agent[web]`，减少定时任务和 Web 面板运行时缺依赖 +- **MiniMax 预设补全** — MiniMax 服务商预设恢复 OpenAI-compatible 入口，并补齐 M2.7/M2.5 及 highspeed 模型快捷项 +- **热更新兼容底座** — 本次版本包含新增 Tauri 命令，热更新清单最低兼容版本提升到 `0.15.0`，避免旧桌面端加载不兼容前端 + +### 修复 (Fixes) + +- **Hermes Gateway 本机自动拉起** — 自定义 Gateway URL 为 `127.0.0.1`、`localhost`、`::1` 等 loopback 地址时不再误判为远程 Gateway，桌面端和 Web 模式都会自动启动本机 Gateway +- **Hermes `/v1/runs` 连接失败诊断** — 启动 run 前自动确保本机 Gateway ready，请求失败时附带健康检查和日志尾部，便于定位 10061/连接拒绝等问题 +- **Standalone 版本显示未知** — About 页和仪表盘优先读取 standalone 安装目录的 `VERSION` / `package.json`，正确识别官方版或汉化版，不再把一键安装包显示为未知版本或误判来源 +- **仪表盘版本缓存自愈** — 检测到空版本、unknown 来源或不完整版本信息时自动清理 `get_version_info` 缓存并重新拉取，避免旧缓存长期显示未知 +- **版本检测不再被运行态拖垮** — `openclaw status --json` 后移为 fallback 并增加短超时，避免 Gateway 未运行时拖慢 About 页和仪表盘 +- **服务配置错误引导** — 启停服务遇到配置 schema 错误时弹出 `doctor --fix` 一键修复入口，而不是只显示技术错误 toast + +### 测试与验证 (Testing) + +- **本地 CI 链路补齐** — 新增/修复 kernel、Docker tasking、Gateway guardian policy、模型预设测试；本地通过 45 个 JS 测试和 16 个 Rust 单元测试 +- **发布前检查增强** — Release 工作流文档增加人工确认门禁，要求版本号、提交、tag、push 前完成 Web/桌面/Hermes/OpenClaw 回归确认 + ## [0.14.0] - 2026-04-25 ### 新功能 (Features) diff --git a/docs/index.html b/docs/index.html index 66e4c4e..5ec15ae 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,7 +34,7 @@ "description": "支持 OpenClaw 和 Hermes Agent 双引擎的多 AI Agent 可视化管理面板，基于 Tauri v2 的跨平台桌面应用。内置晴辰助手支持工具调用，晴辰云 AI 接口一键接入。支持仪表盘监控、多模型配置、Hermes Agent 对话、消息渠道管理、内置 QQ 机器人、实时 AI 聊天、记忆管理、Agent 管理、网关配置、内网穿透等功能。支持 11 种语言。", "url": "https://claw.qt.cool/", "downloadUrl": "https://github.com/qingchencloud/clawpanel/releases/latest", - "softwareVersion": "0.14.0", + "softwareVersion": "0.15.0", "author": { "@type": "Organization", "name": "晴辰云 QingchenCloud", @@ -1225,7 +1225,7 @@
-
v0.14.0 最新版
+
v0.15.0 最新版

下载安装

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

@@ -1235,11 +1235,11 @@

macOS

支持 Apple Silicon 和 Intel 芯片

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

Windows

支持 Windows 10 及以上版本

- + 安装程序 .exe - + 完整包（含 WebView2） .exe - + MSI 安装包 .msi @@ -1276,11 +1276,11 @@

Linux

支持主流 Linux 发行版

- + 通用版 .AppImage - + Debian / Ubuntu .deb diff --git a/docs/update/latest.json b/docs/update/latest.json index a3ccd3a..e6ea0ac 100644 --- a/docs/update/latest.json +++ b/docs/update/latest.json @@ -1,6 +1,6 @@ { "version": "0.14.0", - "minAppVersion": "0.9.0", + "minAppVersion": "0.15.0", "hash": "sha256:feb569a71a51c350a4daeb0eb3988b4e600b51c62c14c10995b8e07663777e08", "url": "https://github.com/qingchencloud/clawpanel/releases/download/v0.14.0/web-0.14.0.zip", "size": 2475873, diff --git a/openclaw-version-policy.json b/openclaw-version-policy.json index 859ec8d..9571209 100644 --- a/openclaw-version-policy.json +++ b/openclaw-version-policy.json @@ -9,10 +9,10 @@ }, "default": { "official": { - "recommended": "2026.4.9" + "recommended": "2026.5.6" }, "chinese": { - "recommended": "2026.4.9-zh.2" + "recommended": "2026.5.6-zh.1" } }, "panels": { diff --git a/package-lock.json b/package-lock.json index 84d8004..3ad726c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "clawpanel", - "version": "0.14.0", + "version": "0.15.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "clawpanel", - "version": "0.14.0", + "version": "0.15.0", "license": "AGPL-3.0", "dependencies": { "@tauri-apps/api": "^2.5.0", diff --git a/package.json b/package.json index d5c3da3..6c43148 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clawpanel", - "version": "0.14.0", + "version": "0.15.0", "private": true, "description": "ClawPanel - OpenClaw 可视化管理面板，基于 Tauri v2 的跨平台桌面应用", "type": "module", diff --git a/scripts/dev-api.js b/scripts/dev-api.js index ad2f64d..55245e5 100644 --- a/scripts/dev-api.js +++ b/scripts/dev-api.js @@ -84,6 +84,24 @@ function hermesGatewayUrl() { return `http://127.0.0.1:${hermesGatewayPort()}` } +function hermesGatewayCustomUrl() { + try { + const cfg = readPanelConfig() + const url = cfg?.hermes?.gatewayUrl + if (url && typeof url === 'string' && url.trim()) return url.trim().replace(/\/+$/, '') + } catch {} + return '' +} + +function isLoopbackGatewayUrl(url) { + try { + const host = new URL(url).hostname.toLowerCase() + return host === 'localhost' || host.endsWith('.localhost') || host === '::1' || host === '127.0.0.1' || host.startsWith('127.') + } catch { + return false + } +} + function runHermesSilent(program, args) { try { const result = spawnSync(program, args, { @@ -317,6 +335,33 @@ function normalizeCliInstallSource(cliSource) { return 'unknown' } +function detectStandaloneSourceFromDir(dir) { + try { + const versionFile = path.join(dir, 'VERSION') + if (fs.existsSync(versionFile)) { + const pairs = Object.create(null) + for (const line of fs.readFileSync(versionFile, 'utf8').split(/\r?\n/)) { + const eq = line.indexOf('=') + if (eq > 0) pairs[line.slice(0, eq).trim().toLowerCase()] = line.slice(eq + 1).trim().toLowerCase() + } + const pkg = pairs.package || '' + const edition = pairs.edition || '' + if (pkg.includes('openclaw-zh') || pkg.includes('@qingchencloud')) return 'chinese' + if (pkg === 'openclaw') return 'official' + if (['zh', 'zh-cn', 'chinese', 'cn'].includes(edition)) return 'chinese' + if (['en', 'official'].includes(edition)) return 'official' + } + } catch {} + if (fs.existsSync(path.join(dir, 'node_modules', '@qingchencloud', 'openclaw-zh', 'package.json'))) return 'chinese' + if (fs.existsSync(path.join(dir, 'node_modules', 'openclaw', 'package.json'))) return 'official' + return null +} + +function detectStandaloneSourceFromCliPath(cliPath) { + const normalized = normalizeCliPath(cliPath) + return normalized ? detectStandaloneSourceFromDir(path.dirname(normalized)) : null +} + function readVersionFromInstallation(cliPath) { const resolved = canonicalCliPath(cliPath) if (!resolved || !fs.existsSync(resolved)) return null @@ -1141,6 +1186,7 @@ function scanLocalSkillsFallback(agentSkillsDir = null) { function detectInstalledSource() { const activeCliPath = resolveOpenclawCliPath() const activeCliSource = classifyCliSource(activeCliPath) + if (activeCliSource === 'standalone') return detectStandaloneSourceFromCliPath(activeCliPath) || 'chinese' const activeSource = normalizeCliInstallSource(activeCliSource) if (activeSource !== 'unknown') return activeSource if (isMac) { @@ -1158,18 +1204,21 @@ function detectInstalledSource() { } catch {} // standalone const saDir = standaloneInstallDir() - if (fs.existsSync(path.join(saDir, 'openclaw')) || fs.existsSync(path.join(saDir, 'VERSION'))) return 'chinese' - if (fs.existsSync('/opt/openclaw/openclaw')) return 'chinese' + if (fs.existsSync(path.join(saDir, 'openclaw')) || fs.existsSync(path.join(saDir, 'VERSION'))) return detectStandaloneSourceFromDir(saDir) || 'chinese' + if (fs.existsSync('/opt/openclaw/openclaw')) return detectStandaloneSourceFromDir('/opt/openclaw') || 'chinese' // findOpenclawBin fallback const bin = findOpenclawBin() if (bin) { const lower = bin.replace(/\\/g, '/').toLowerCase() - if (lower.includes('openclaw-zh') || lower.includes('@qingchencloud') || lower.includes('/openclaw-bin/') || lower.includes('/opt/openclaw/')) return 'chinese' + if (lower.includes('/openclaw-bin/') || lower.includes('/opt/openclaw/')) return detectStandaloneSourceFromCliPath(bin) || 'chinese' + if (lower.includes('openclaw-zh') || lower.includes('@qingchencloud')) return 'chinese' return 'official' } return 'official' } if (isWindows) { + const saDir = standaloneInstallDir() + if (fs.existsSync(path.join(saDir, 'openclaw.cmd')) || fs.existsSync(path.join(saDir, 'VERSION'))) return detectStandaloneSourceFromDir(saDir) || 'chinese' try { const npmPrefix = readWindowsNpmGlobalPrefix() if (npmPrefix) { @@ -1191,6 +1240,15 @@ function detectInstalledSource() { function getLocalOpenclawVersion() { let current = readVersionFromInstallation(resolveOpenclawCliPath()) + if (!current) { + try { + const saDir = standaloneInstallDir() + const bin = isWindows ? path.join(saDir, 'openclaw.cmd') : path.join(saDir, 'openclaw') + if (fs.existsSync(bin) || fs.existsSync(path.join(saDir, 'VERSION'))) { + current = readVersionFromInstallation(bin) + } + } catch {} + } if (isMac) { // ARM Homebrew try { @@ -1238,7 +1296,15 @@ function getLocalOpenclawVersion() { } if (!current) { try { - const result = spawnOpenclawSync(['--version'], { timeout: 5000, windowsHide: true, encoding: 'utf8', cwd: homedir() }) + const result = spawnOpenclawSync(['status', '--json'], { timeout: 2000, windowsHide: true, encoding: 'utf8', cwd: homedir() }) + const output = openclawResultOutput(result) + const parsed = JSON.parse(output.slice(output.indexOf('{'))) + current = parsed?.runtimeVersion || null + } catch {} + } + if (!current) { + try { + const result = spawnOpenclawSync(['--version'], { timeout: 3000, windowsHide: true, encoding: 'utf8', cwd: homedir() }) const output = openclawResultOutput(result) current = output.trim().split(/\s+/).find(w => /^\d/.test(w)) || null } catch {} @@ -2987,6 +3053,36 @@ async function proxyToInstance(instance, cmd, body) { catch { return text } } +async function proxyStreamToInstance(instance, cmd, body, req, res) { + const controller = new AbortController() + res.on('close', () => controller.abort()) + const upstream = await fetch(`${instance.endpoint}/__api/${cmd}`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(body), + signal: controller.signal, + }) + res.statusCode = upstream.status + const contentType = upstream.headers.get('content-type') || 'application/x-ndjson; charset=utf-8' + res.setHeader('Content-Type', contentType) + res.setHeader('Cache-Control', 'no-cache, no-transform') + if (!upstream.body) { + res.end(await upstream.text()) + return + } + const reader = upstream.body.getReader() + try { + while (true) { + const { done, value } = await reader.read() + if (done) break + if (value) res.write(Buffer.from(value)) + } + } finally { + try { reader.releaseLock() } catch {} + if (!res.writableEnded && !res.destroyed) res.end() + } +} + async function instanceHealthCheck(instance) { const result = { id: instance.id, online: false, version: null, gatewayRunning: false, lastCheck: Date.now() } if (instance.type === 'local') { @@ -5016,7 +5112,9 @@ const handlers = { const cli_path = resolveOpenclawCliPath() const cli_source = classifyCliSource(cli_path) || null if (source === 'unknown') { - const cliInstallSource = normalizeCliInstallSource(cli_source) + const cliInstallSource = cli_source === 'standalone' + ? (detectStandaloneSourceFromCliPath(cli_path) || 'chinese') + : normalizeCliInstallSource(cli_source) if (cliInstallSource !== 'unknown') source = cliInstallSource } const latest = source === 'unknown' ? null : await getLatestVersionFor(source) @@ -6734,7 +6832,7 @@ const handlers = { : 'hermes-agent @ git+https://github.com/NousResearch/hermes-agent.git' const installArgs = method === 'uv-pip' ? ['pip', 'install', pkg] - : ['tool', 'install', '--force', pkg, '--python', '3.11'] + : ['tool', 'install', '--force', pkg, '--python', '3.11', '--with', 'croniter'] const result = spawnSync(uv, installArgs, { env: { ...process.env, PATH: hermesEnhancedPath(), GIT_TERMINAL_PROMPT: '0' }, timeout: 600000, @@ -6845,6 +6943,14 @@ const handlers = { throw new Error(`不支持的操作: ${action}`) }, + async _hermesEnsureGatewayReady() { + const customUrl = hermesGatewayCustomUrl() + if (customUrl && !isLoopbackGatewayUrl(customUrl)) return + const port = hermesGatewayPort() + if (await _tcpProbe('127.0.0.1', port, 300)) return + await this.hermes_gateway_action({ action: 'start' }) + }, + async hermes_health_check() { const url = `${hermesGatewayUrl()}/health` const resp = await globalThis.fetch(url, { signal: AbortSignal.timeout(5000), headers: { 'User-Agent': 'ClawPanel-Web' } }) @@ -6879,6 +6985,7 @@ const handlers = { async hermes_agent_run({ input, sessionId, conversationHistory, instructions } = {}) { // Web 模式下简化实现：POST /v1/runs 然后轮询或直接返回 + await this._hermesEnsureGatewayReady() const gwUrl = hermesGatewayUrl() const home = hermesHome() let apiKey = '' @@ -8087,8 +8194,8 @@ const handlers = { async update_hermes() { const uvPath = path.join(uvBinDir(), isWindows ? 'uv.exe' : 'uv') const uv = fs.existsSync(uvPath) ? uvPath : 'uv' - const pkg = 'hermes-agent @ git+https://github.com/NousResearch/hermes-agent.git' - const result = spawnSync(uv, ['tool', 'install', '--reinstall', pkg, '--python', '3.11'], { + const pkg = 'hermes-agent[web] @ git+https://github.com/NousResearch/hermes-agent.git' + const result = spawnSync(uv, ['tool', 'install', '--reinstall', pkg, '--python', '3.11', '--with', 'croniter'], { env: { ...process.env, PATH: hermesEnhancedPath(), GIT_TERMINAL_PROMPT: '0' }, timeout: 600000, windowsHide: true, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], }) @@ -8272,6 +8379,129 @@ function _initApi() { }, 10 * 60 * 1000) } +function _readHermesApiServerKey() { + try { + const envContent = fs.readFileSync(path.join(hermesHome(), '.env'), 'utf8') + const m = envContent.match(/^API_SERVER_KEY=(.+)$/m) + return m ? m[1].trim() : '' + } catch { + return '' + } +} + +function _writeStreamEvent(res, event) { + if (res.writableEnded || res.destroyed) return + res.write(JSON.stringify(event) + '\n') +} + +function _endStream(res) { + if (!res.writableEnded && !res.destroyed) res.end() +} + +async function _handleHermesAgentRunStream(req, res, args = {}) { + const controller = new AbortController() + res.on('close', () => controller.abort()) + + let runId = '' + let finalOutput = '' + try { + const gwUrl = hermesGatewayUrl() + await handlers._hermesEnsureGatewayReady() + const apiKey = _readHermesApiServerKey() + const headers = { 'Content-Type': 'application/json', 'User-Agent': 'ClawPanel-Web' } + if (apiKey) headers.Authorization = `Bearer ${apiKey}` + + const payload = { input: args.input || '' } + if (args.sessionId) payload.session_id = args.sessionId + if (args.conversationHistory) payload.conversation_history = args.conversationHistory + if (args.instructions) payload.instructions = args.instructions + + const startedResp = await globalThis.fetch(`${gwUrl}/v1/runs`, { + method: 'POST', + headers, + body: JSON.stringify(payload), + signal: controller.signal, + }) + if (!startedResp.ok) { + const text = await startedResp.text() + throw new Error(`HTTP ${startedResp.status}: ${text}`) + } + const started = await startedResp.json() + runId = started.run_id || started.id || '' + if (!runId) throw new Error('响应中没有 run_id') + + res.statusCode = 200 + res.setHeader('Content-Type', 'application/x-ndjson; charset=utf-8') + res.setHeader('Cache-Control', 'no-cache, no-transform') + res.setHeader('Connection', 'keep-alive') + res.setHeader('X-Accel-Buffering', 'no') + if (typeof res.flushHeaders === 'function') res.flushHeaders() + _writeStreamEvent(res, { event: 'run.started', run_id: runId, session_id: args.sessionId || null }) + + const eventsResp = await globalThis.fetch(`${gwUrl}/v1/runs/${encodeURIComponent(runId)}/events`, { + headers: apiKey ? { Authorization: `Bearer ${apiKey}`, 'User-Agent': 'ClawPanel-Web' } : { 'User-Agent': 'ClawPanel-Web' }, + signal: controller.signal, + }) + if (!eventsResp.ok || !eventsResp.body) { + const text = await eventsResp.text().catch(() => '') + throw new Error(`SSE HTTP ${eventsResp.status}: ${text}`) + } + + const reader = eventsResp.body.getReader() + const decoder = new TextDecoder() + let buffer = '' + try { + while (true) { + const { done, value } = await reader.read() + if (done) break + buffer += decoder.decode(value, { stream: true }) + let newline + while ((newline = buffer.indexOf('\n')) >= 0) { + const line = buffer.slice(0, newline).trim() + buffer = buffer.slice(newline + 1) + if (!line.startsWith('data:')) continue + const data = line.slice(5).trim() + if (!data || data === '[DONE]') { + _writeStreamEvent(res, { event: 'run.completed', run_id: runId, output: finalOutput, session_id: args.sessionId || null }) + _endStream(res) + return + } + let evt + try { evt = JSON.parse(data) } catch { continue } + if (!evt.run_id) evt.run_id = runId + if (!evt.session_id && args.sessionId) evt.session_id = args.sessionId + if (evt.event === 'message.delta' && typeof evt.delta === 'string') finalOutput += evt.delta + if (evt.event === 'run.completed' && typeof evt.output === 'string') finalOutput = evt.output + _writeStreamEvent(res, evt) + if (evt.event === 'run.completed' || evt.event === 'run.failed') { + _endStream(res) + return + } + } + } + } finally { + try { reader.releaseLock() } catch {} + } + + _writeStreamEvent(res, { event: 'run.completed', run_id: runId, output: finalOutput, session_id: args.sessionId || null }) + _endStream(res) + } catch (e) { + if (!res.headersSent) { + res.statusCode = 500 + res.setHeader('Content-Type', 'application/json') + res.end(JSON.stringify({ error: e.message || String(e) })) + return + } + _writeStreamEvent(res, { + event: 'run.failed', + run_id: runId || null, + session_id: args.sessionId || null, + error: e.name === 'AbortError' ? 'aborted' : (e.message || String(e)), + }) + _endStream(res) + } +} + // API 中间件（dev server 和 preview server 共用） async function _apiMiddleware(req, res, next) { if (!req.url?.startsWith('/__api/')) return next() @@ -8440,8 +8670,19 @@ async function _apiMiddleware(req, res, next) { return } - // --- 实例代理：非 ALWAYS_LOCAL 命令，活跃实例非本机时代理转发 --- const activeInst = getActiveInstance() + + if (cmd === 'hermes_agent_run_stream') { + const args = await readBody(req) + if (activeInst.type !== 'local' && activeInst.endpoint && !ALWAYS_LOCAL.has(cmd)) { + await proxyStreamToInstance(activeInst, cmd, args, req, res) + } else { + await _handleHermesAgentRunStream(req, res, args) + } + return + } + + // --- 实例代理：非 ALWAYS_LOCAL 命令，活跃实例非本机时代理转发 --- if (activeInst.type !== 'local' && activeInst.endpoint && !ALWAYS_LOCAL.has(cmd)) { try { const args = await readBody(req) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 21df9f4..cd62930 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -366,7 +366,7 @@ dependencies = [ [[package]] name = "clawpanel" -version = "0.14.0" +version = "0.15.0" dependencies = [ "base64 0.22.1", "chrono", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 83325c6..4a2702d 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clawpanel" -version = "0.14.0" +version = "0.15.0" edition = "2021" description = "ClawPanel - OpenClaw 可视化管理面板" authors = ["qingchencloud"] diff --git a/src-tauri/src/commands/cli_conflict.rs b/src-tauri/src/commands/cli_conflict.rs new file mode 100644 index 0000000..f88a07e --- /dev/null +++ b/src-tauri/src/commands/cli_conflict.rs @@ -0,0 +1,448 @@ +//! 检测和清理 PATH 中残留的非 standalone OpenClaw 安装 +//! +//! ## 用户场景 +//! +//! 用户系统可能装了多个 OpenClaw（CherryStudio 自带、旧 npm 全局、手动下载等）， +//! 它们与 ClawPanel 管理的 standalone 共存时会引起： +//! - 用户在终端用 `openclaw` 时拿到老版本，schema 与 standalone 不兼容 → doctor --fix 卡死 +//! - 第三方工具调用 openclaw 时拿到老版本 +//! - PATH 优先级影响 Tauri 后端选择 CLI（虽然 `is_rejected_cli_path` 排除了 cherrystudio， +//! 但其他来源仍可能漏过） +//! +//! ## 本模块功能 +//! +//! - **扫描**：列出 PATH 中所有非 standalone 的 openclaw 可执行文件 +//! - **隔离**：把指定路径重命名为 `<原名>.disabled-by-clawpanel-.bak`，**不真删** +//! - **列出已隔离**：扫描 PATH 中现有的 `.bak` 文件 +//! - **恢复**：把 `.bak` 改回原名 +//! +//! 隔离而非删除，是为了让用户/被影响的第三方软件可以恢复，避免 ClawPanel 越界破坏用户系统。 + +use serde::Serialize; +use std::path::{Path, PathBuf}; + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct CliConflict { + /// 冲突的 openclaw 可执行文件绝对路径 + pub path: String, + /// 来源识别：`cherrystudio` / `npm-global` / `unknown` + pub source: String, + /// 人类可读的来源描述 + pub source_label: String, + /// 从同目录 / 父目录 package.json 读到的版本（不调用 CLI 防止卡死） + pub version: Option, + /// 文件大小（bytes） + pub size_bytes: Option, +} + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct QuarantineRecord { + /// 隔离前的原始路径（可读，未必当前还存在） + pub original_path: String, + /// 隔离后的 `.bak` 文件路径 + pub quarantined_path: String, + /// ISO-8601 时间戳 + pub quarantined_at: String, +} + +/// 一键隔离结果统计 +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct BulkQuarantineResult { + pub records: Vec, + pub failed: Vec, +} + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub struct BulkQuarantineFailure { + pub path: String, + pub error: String, +} + +/// 标准化路径用于比较：转换为 lowercase 字符串（Windows 不区分大小写）， +/// `/` 和 `\` 统一为 `/`，去掉尾部分隔符。 +fn canonical_lower(path: &Path) -> String { + let canon = path + .canonicalize() + .ok() + .map(|p| p.to_string_lossy().to_string()) + .unwrap_or_else(|| path.to_string_lossy().to_string()); + let mut s = canon.replace('\\', "/").to_lowercase(); + // 去掉 Windows 上 canonicalize() 加的 \\?\ 前缀 + if let Some(stripped) = s.strip_prefix("//?/") { + s = stripped.to_string(); + } + while s.ends_with('/') { + s.pop(); + } + s +} + +/// 候选可执行文件名（带扩展名） +fn executable_candidates(dir: &Path) -> Vec { + #[cfg(target_os = "windows")] + { + vec![ + dir.join("openclaw.exe"), + dir.join("openclaw.cmd"), + dir.join("openclaw.bat"), + ] + } + #[cfg(not(target_os = "windows"))] + { + vec![dir.join("openclaw")] + } +} + +/// 来源识别：路径关键字匹配 +fn detect_source(path: &Path) -> (&'static str, &'static str) { + let s = path.to_string_lossy().replace('\\', "/").to_lowercase(); + if s.contains("/.cherrystudio/") || s.contains("cherry-studio") { + ("cherrystudio", "Cherry Studio 内嵌") + } else if s.contains("/.cursor/") || s.contains("/cursor/") { + ("cursor", "Cursor 内嵌") + } else if s.contains("/node_modules/.bin/") + || s.contains("/npm/") + || s.contains("\\npm\\") + || s.contains("/.npm-global/") + { + ("npm-global", "npm 全局安装") + } else { + ("unknown", "未识别来源") + } +} + +/// 尝试从同目录 / 父目录的 `package.json` 读取版本号。 +/// **不主动调用** openclaw 二进制 —— 避免被损坏或老旧的 CLI 卡死扫描流程。 +fn try_get_version(path: &Path) -> Option { + let dir = path.parent()?; + let mut candidates = vec![dir.join("package.json")]; + if let Some(parent) = dir.parent() { + candidates.push(parent.join("package.json")); + // 常见 npm 全局：xxx/openclaw 包目录在 node_modules/openclaw 下 + candidates.push( + parent + .join("node_modules") + .join("openclaw") + .join("package.json"), + ); + candidates.push( + parent + .join("node_modules") + .join("@qingchencloud") + .join("openclaw-zh") + .join("package.json"), + ); + } + + for pkg in candidates.iter().filter(|p| p.exists()) { + let Ok(content) = std::fs::read_to_string(pkg) else { + continue; + }; + let Ok(json) = serde_json::from_str::(&content) else { + continue; + }; + // 必须是 openclaw 相关的包 + let name = json.get("name").and_then(|v| v.as_str()).unwrap_or(""); + let is_openclaw_pkg = + name == "openclaw" || name == "@qingchencloud/openclaw-zh" || name.contains("openclaw"); + if !is_openclaw_pkg { + continue; + } + if let Some(v) = json.get("version").and_then(|v| v.as_str()) { + return Some(v.to_string()); + } + } + None +} + +/// 扫描 PATH 中所有非 standalone 的 openclaw 可执行文件 +#[tauri::command] +pub async fn scan_openclaw_path_conflicts() -> Result, String> { + let mut conflicts = Vec::new(); + let mut seen = std::collections::HashSet::new(); + + let standalone_canon: Vec = crate::commands::config::all_standalone_dirs() + .iter() + .map(|p| canonical_lower(p)) + .filter(|s| !s.is_empty()) + .collect(); + + let path_var = crate::commands::enhanced_path(); + #[cfg(target_os = "windows")] + let separator = ';'; + #[cfg(not(target_os = "windows"))] + let separator = ':'; + + for dir_str in path_var.split(separator) { + let dir = Path::new(dir_str.trim()); + if dir.as_os_str().is_empty() || !dir.is_dir() { + continue; + } + + for candidate in executable_candidates(dir) { + if !candidate.exists() { + continue; + } + + let canon = canonical_lower(&candidate); + if !seen.insert(canon.clone()) { + continue; + } + + // 跳过 standalone 目录下的（这是当前在用的合法版本） + let is_standalone = standalone_canon + .iter() + .any(|sa| !sa.is_empty() && canon.starts_with(sa)); + if is_standalone { + continue; + } + + let (source, source_label) = detect_source(&candidate); + let size_bytes = std::fs::metadata(&candidate).ok().map(|m| m.len()); + let version = try_get_version(&candidate); + + conflicts.push(CliConflict { + path: candidate.to_string_lossy().to_string(), + source: source.to_string(), + source_label: source_label.to_string(), + version, + size_bytes, + }); + } + } + + Ok(conflicts) +} + +/// 把指定路径的 openclaw 可执行文件重命名为 `.disabled-by-clawpanel-.bak` +#[tauri::command] +pub async fn quarantine_openclaw_path(path: String) -> Result { + let original = PathBuf::from(&path); + if !original.exists() { + return Err(format!("文件不存在: {}", path)); + } + if !original.is_file() { + return Err(format!("不是文件: {}", path)); + } + + // 安全检查 1：拒绝隔离 standalone 目录下的文件 + let canon = canonical_lower(&original); + let standalone_dirs = crate::commands::config::all_standalone_dirs(); + for sa in &standalone_dirs { + let sa_canon = canonical_lower(sa); + if !sa_canon.is_empty() && canon.starts_with(&sa_canon) { + return Err("拒绝隔离 standalone 安装目录下的 OpenClaw（这是当前运行版本）".into()); + } + } + + // 安全检查 2：文件名必须以 openclaw 开头（防止误用接口隔离别的文件） + let file_name = original + .file_name() + .and_then(|n| n.to_str()) + .ok_or_else(|| "无效的文件名".to_string())?; + if !file_name.to_lowercase().starts_with("openclaw") { + return Err(format!("拒绝隔离非 openclaw 文件: {}", file_name)); + } + + let ts = chrono::Local::now().format("%Y%m%d-%H%M%S").to_string(); + let new_name = format!("{}.disabled-by-clawpanel-{}.bak", file_name, ts); + let parent = original + .parent() + .ok_or_else(|| "无法解析父目录".to_string())?; + let new_path = parent.join(&new_name); + + if new_path.exists() { + return Err(format!( + "目标文件已存在，请稍后再试: {}", + new_path.display() + )); + } + + std::fs::rename(&original, &new_path).map_err(|e| format!("重命名失败: {}", e))?; + + // 刷新 PATH 缓存，让 Tauri 后端立刻看到变化 + crate::commands::refresh_enhanced_path(); + + Ok(QuarantineRecord { + original_path: original.to_string_lossy().to_string(), + quarantined_path: new_path.to_string_lossy().to_string(), + quarantined_at: chrono::Local::now().to_rfc3339(), + }) +} + +/// 一键隔离多个冲突路径。即使部分失败，已成功的不会回滚。 +#[tauri::command] +pub async fn quarantine_openclaw_paths_bulk( + paths: Vec, +) -> Result { + let mut records = Vec::new(); + let mut failed = Vec::new(); + + for p in paths { + match quarantine_openclaw_path(p.clone()).await { + Ok(rec) => records.push(rec), + Err(e) => failed.push(BulkQuarantineFailure { path: p, error: e }), + } + } + + Ok(BulkQuarantineResult { records, failed }) +} + +/// 解析 `.disabled-by-clawpanel-.bak` 中的 `` +fn parse_quarantined_name(name: &str) -> Option<&str> { + if !name.ends_with(".bak") { + return None; + } + let marker = ".disabled-by-clawpanel-"; + let pos = name.rfind(marker)?; + // marker 之后必须是 数字-数字 / 数字 这种 timestamp，简单做法只校验 marker 之后到 .bak 之间不为空 + let between = &name[pos + marker.len()..name.len() - 4]; + if between.is_empty() { + return None; + } + Some(&name[..pos]) +} + +/// 列出 PATH 中所有已隔离的 `.bak` 文件 +#[tauri::command] +pub async fn list_quarantined_openclaw() -> Result, String> { + let mut records = Vec::new(); + let mut seen = std::collections::HashSet::new(); + + let path_var = crate::commands::enhanced_path(); + #[cfg(target_os = "windows")] + let separator = ';'; + #[cfg(not(target_os = "windows"))] + let separator = ':'; + + for dir_str in path_var.split(separator) { + let dir = Path::new(dir_str.trim()); + if dir.as_os_str().is_empty() || !dir.is_dir() { + continue; + } + + let entries = match std::fs::read_dir(dir) { + Ok(e) => e, + Err(_) => continue, + }; + + for entry in entries.flatten() { + let path = entry.path(); + let name = match path.file_name().and_then(|n| n.to_str()) { + Some(n) => n.to_string(), + None => continue, + }; + // 仅看 openclaw 相关 + if !name.to_lowercase().starts_with("openclaw") { + continue; + } + let Some(orig_name) = parse_quarantined_name(&name) else { + continue; + }; + + let canon = canonical_lower(&path); + if !seen.insert(canon) { + continue; + } + + let original_path = dir.join(orig_name); + let mtime_iso = entry + .metadata() + .ok() + .and_then(|m| m.modified().ok()) + .map(|t| { + let dt: chrono::DateTime = t.into(); + dt.to_rfc3339() + }) + .unwrap_or_default(); + + records.push(QuarantineRecord { + original_path: original_path.to_string_lossy().to_string(), + quarantined_path: path.to_string_lossy().to_string(), + quarantined_at: mtime_iso, + }); + } + } + + Ok(records) +} + +/// 撤销隔离：把 `.bak` 改回原始文件名 +#[tauri::command] +pub async fn restore_quarantined_openclaw(quarantined_path: String) -> Result { + let qpath = PathBuf::from(&quarantined_path); + if !qpath.exists() { + return Err(format!("隔离文件不存在: {}", quarantined_path)); + } + if !qpath.is_file() { + return Err(format!("不是文件: {}", quarantined_path)); + } + + let file_name = qpath + .file_name() + .and_then(|n| n.to_str()) + .ok_or_else(|| "无效的文件名".to_string())?; + let original_name = parse_quarantined_name(file_name) + .ok_or_else(|| format!("不是 ClawPanel 隔离文件，无法恢复: {}", file_name))?; + + let parent = qpath.parent().ok_or_else(|| "无法解析父目录".to_string())?; + let original_path = parent.join(original_name); + + if original_path.exists() { + return Err(format!( + "目标位置已存在文件，无法恢复: {}", + original_path.display() + )); + } + + std::fs::rename(&qpath, &original_path).map_err(|e| format!("恢复失败: {}", e))?; + crate::commands::refresh_enhanced_path(); + + Ok(original_path.to_string_lossy().to_string()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn parse_quarantined_name_basic() { + assert_eq!( + parse_quarantined_name("openclaw.exe.disabled-by-clawpanel-20260507-153012.bak"), + Some("openclaw.exe") + ); + assert_eq!( + parse_quarantined_name("openclaw.cmd.disabled-by-clawpanel-12345.bak"), + Some("openclaw.cmd") + ); + } + + #[test] + fn parse_quarantined_name_invalid() { + assert_eq!(parse_quarantined_name("openclaw.exe"), None); + assert_eq!(parse_quarantined_name("openclaw.exe.bak"), None); + assert_eq!( + parse_quarantined_name("openclaw.exe.disabled-by-clawpanel-.bak"), + None + ); + assert_eq!(parse_quarantined_name("not-related.bak"), None); + } + + #[test] + fn detect_source_cherrystudio() { + let p = PathBuf::from(r"C:\Users\u\.cherrystudio\bin\openclaw.exe"); + let (key, _) = detect_source(&p); + assert_eq!(key, "cherrystudio"); + } + + #[test] + fn detect_source_npm_global() { + let p = PathBuf::from(r"C:\Users\u\AppData\Roaming\npm\openclaw.cmd"); + let (key, _) = detect_source(&p); + assert_eq!(key, "npm-global"); + } +} diff --git a/src-tauri/src/commands/config.rs b/src-tauri/src/commands/config.rs index f3e01c9..adec15a 100644 --- a/src-tauri/src/commands/config.rs +++ b/src-tauri/src/commands/config.rs @@ -1891,22 +1891,6 @@ pub fn write_mcp_config(config: Value) -> Result<(), String> { /// macOS: 优先从 npm 包的 package.json 读取（含完整后缀），fallback 到 CLI /// Windows/Linux: 优先读文件系统，fallback 到 CLI async fn get_local_version() -> Option { - // Fix #219: 优先从运行中的 openclaw 实例获取版本，避免多实例共存时读取到非活跃安装的版本 - if let Ok(output) = crate::utils::openclaw_command_async() - .args(["status", "--json"]) - .output() - .await - { - if output.status.success() { - let stdout = String::from_utf8_lossy(&output.stdout); - if let Some(ver) = crate::commands::skills::extract_json_pub(&stdout) - .and_then(|v| v.get("runtimeVersion")?.as_str().map(String::from)) - { - return Some(ver); - } - } - } - #[cfg(target_os = "macos")] { if let Some(cli_path) = crate::utils::resolve_openclaw_cli_path() { @@ -2031,7 +2015,9 @@ async fn get_local_version() -> Option { // 2. standalone 目录 for sa_dir in all_standalone_dirs() { if sa_dir.join("openclaw").exists() || sa_dir.join("VERSION").exists() { - return Some("unknown".to_string()); + if let Some(ver) = read_version_from_installation(&sa_dir.join("openclaw")) { + return Some(ver); + } } } // 3. symlink -> package.json @@ -2053,6 +2039,21 @@ async fn get_local_version() -> Option { } } + let mut status_cmd = crate::utils::openclaw_command_async(); + status_cmd.args(["status", "--json"]); + if let Ok(Ok(output)) = + tokio::time::timeout(std::time::Duration::from_secs(2), status_cmd.output()).await + { + if output.status.success() { + let stdout = String::from_utf8_lossy(&output.stdout); + if let Some(ver) = crate::commands::skills::extract_json_pub(&stdout) + .and_then(|v| v.get("runtimeVersion")?.as_str().map(String::from)) + { + return Some(ver); + } + } + } + // 所有平台通用 fallback: CLI 输出 // Windows: 先确认 openclaw 不是第三方程序（如 CherryStudio） #[cfg(target_os = "windows")] @@ -2121,6 +2122,57 @@ fn detect_source_from_cmd_shim(cmd_path: &std::path::Path) -> Option { None } +fn detect_standalone_source_from_dir(dir: &std::path::Path) -> Option { + let version_file = dir.join("VERSION"); + if let Ok(content) = std::fs::read_to_string(&version_file) { + let mut edition = String::new(); + let mut package = String::new(); + for line in content.lines() { + if let Some(value) = line.strip_prefix("edition=") { + edition = value.trim().to_ascii_lowercase(); + } else if let Some(value) = line.strip_prefix("package=") { + package = value.trim().to_ascii_lowercase(); + } + } + if package.contains("openclaw-zh") || package.contains("@qingchencloud") { + return Some("chinese".into()); + } + if package == "openclaw" { + return Some("official".into()); + } + if matches!(edition.as_str(), "zh" | "zh-cn" | "chinese" | "cn") { + return Some("chinese".into()); + } + if matches!(edition.as_str(), "en" | "official") { + return Some("official".into()); + } + } + if dir + .join("node_modules") + .join("@qingchencloud") + .join("openclaw-zh") + .join("package.json") + .exists() + { + return Some("chinese".into()); + } + if dir + .join("node_modules") + .join("openclaw") + .join("package.json") + .exists() + { + return Some("official".into()); + } + None +} + +fn detect_standalone_source_from_cli_path(cli_path: &std::path::Path) -> Option { + cli_path + .parent() + .and_then(detect_standalone_source_from_dir) +} + /// 检测当前安装的是官方版还是汉化版 /// macOS: 优先检查 symlink 指向的实际路径 /// Windows: 读取 .cmd shim 内容判断实际关联的包 @@ -2134,7 +2186,11 @@ fn detect_installed_source() -> String { .ok() .unwrap_or_else(|| PathBuf::from(&cli_path)); let source = crate::utils::classify_cli_source(&resolved.to_string_lossy()); - if source == "npm-zh" || source == "standalone" { + if source == "standalone" { + return detect_standalone_source_from_cli_path(&resolved) + .unwrap_or_else(|| "chinese".into()); + } + if source == "npm-zh" { return "chinese".into(); } if source == "npm-official" || source == "npm-global" { @@ -2152,7 +2208,8 @@ fn detect_installed_source() -> String { } for sa_dir in all_standalone_dirs() { if sa_dir.join("openclaw").exists() || sa_dir.join("VERSION").exists() { - return "chinese".into(); + return detect_standalone_source_from_dir(&sa_dir) + .unwrap_or_else(|| "chinese".into()); } } "unknown".into() @@ -2167,7 +2224,11 @@ fn detect_installed_source() -> String { if let Some(cli_path) = crate::utils::resolve_openclaw_cli_path() { let source = crate::utils::classify_cli_source(&cli_path); // 路径本身能确定的情况（standalone 目录、npm-zh 路径含 openclaw-zh） - if source == "npm-zh" || source == "standalone" { + if source == "standalone" { + return detect_standalone_source_from_cli_path(std::path::Path::new(&cli_path)) + .unwrap_or_else(|| "chinese".into()); + } + if source == "npm-zh" { return "chinese".into(); } // npm-official / npm-global / unknown: 路径不含包名，读 .cmd 内容判断 @@ -2183,6 +2244,12 @@ fn detect_installed_source() -> String { return s; } } + for sa_dir in all_standalone_dirs() { + if sa_dir.join("openclaw.cmd").exists() || sa_dir.join("VERSION").exists() { + return detect_standalone_source_from_dir(&sa_dir) + .unwrap_or_else(|| "chinese".into()); + } + } // 确实无法判断 "unknown".into() } @@ -2195,7 +2262,11 @@ fn detect_installed_source() -> String { .ok() .unwrap_or_else(|| PathBuf::from(&cli_path)); let source = crate::utils::classify_cli_source(&resolved.to_string_lossy()); - if source == "npm-zh" || source == "standalone" { + if source == "standalone" { + return detect_standalone_source_from_cli_path(&resolved) + .unwrap_or_else(|| "chinese".into()); + } + if source == "npm-zh" { return "chinese".into(); } if source == "npm-official" || source == "npm-global" { @@ -2218,7 +2289,8 @@ fn detect_installed_source() -> String { // 3. standalone 目录检测 for sa_dir in all_standalone_dirs() { if sa_dir.join("openclaw").exists() || sa_dir.join("VERSION").exists() { - return "chinese".into(); + return detect_standalone_source_from_dir(&sa_dir) + .unwrap_or_else(|| "chinese".into()); } } // 4. npm list 兜底 diff --git a/src-tauri/src/commands/hermes.rs b/src-tauri/src/commands/hermes.rs index 36b4f9d..15cc576 100644 --- a/src-tauri/src/commands/hermes.rs +++ b/src-tauri/src/commands/hermes.rs @@ -36,9 +36,8 @@ static GW_GUARDIAN_STOP: AtomicBool = AtomicBool::new(false); static GW_APP_HANDLE: OnceLock = OnceLock::new(); /// 获取 Gateway 的完整 URL（当前本地，未来可扩展为远程） -fn hermes_gateway_url() -> String { - // 先检查 panel config 中是否配置了自定义 URL - if let Some(url) = super::read_panel_config_value() +fn hermes_gateway_custom_url() -> Option { + super::read_panel_config_value() .and_then(|v| { v.get("hermes")? .get("gatewayUrl")? @@ -46,13 +45,126 @@ fn hermes_gateway_url() -> String { .map(String::from) }) .filter(|s| !s.trim().is_empty()) - { - return url.trim_end_matches('/').to_string(); + .map(|url| url.trim_end_matches('/').to_string()) +} + +fn is_loopback_gateway_url(url: &str) -> bool { + let rest = url + .trim() + .strip_prefix("http://") + .or_else(|| url.trim().strip_prefix("https://")) + .unwrap_or(url.trim()); + let host = if let Some(stripped) = rest.strip_prefix('[') { + stripped.split(']').next().unwrap_or("") + } else { + rest.split('/') + .next() + .unwrap_or("") + .split(':') + .next() + .unwrap_or("") + }; + let lower = host.trim().to_ascii_lowercase(); + if lower == "localhost" || lower.ends_with(".localhost") { + return true; + } + lower + .parse::() + .map(|ip| ip.is_loopback()) + .unwrap_or(false) +} + +fn hermes_gateway_url() -> String { + if let Some(url) = hermes_gateway_custom_url() { + return url; } let port = hermes_gateway_port(); format!("http://127.0.0.1:{port}") } +async fn ensure_managed_gateway_ready(app: &tauri::AppHandle, gw_url: &str) -> Result<(), String> { + if let Some(url) = hermes_gateway_custom_url() { + if !is_loopback_gateway_url(&url) { + return Ok(()); + } + } + if gateway_quick_health_check().await { + start_guardian(app); + emit_gateway_status(true); + return Ok(()); + } + hermes_gateway_action(app.clone(), "start".into()) + .await + .map(|_| ()) + .map_err(|e| { + format!( + "Gateway 未运行且自动启动失败: {e}\nGateway: {gw_url}\n{}", + hermes_gateway_log_tail(20) + ) + }) +} + +fn hermes_gateway_http_client(timeout: std::time::Duration) -> Result { + reqwest::Client::builder() + .timeout(timeout) + .user_agent("ClawPanel") + .gzip(true) + .brotli(true) + .deflate(true) + .no_proxy() + .build() + .map_err(|e| e.to_string()) +} + +fn reqwest_error_detail(error: &reqwest::Error) -> String { + use std::error::Error as _; + let mut detail = error.to_string(); + let mut source = error.source(); + while let Some(item) = source { + let text = item.to_string(); + if !text.is_empty() && !detail.contains(&text) { + detail.push_str(": "); + detail.push_str(&text); + } + source = item.source(); + } + detail +} + +fn hermes_gateway_log_tail(limit: usize) -> String { + let log_path = hermes_home().join("gateway-run.log"); + let content = std::fs::read_to_string(log_path).unwrap_or_default(); + content + .lines() + .rev() + .take(limit) + .collect::>() + .into_iter() + .rev() + .collect::>() + .join("\n") +} + +async fn hermes_run_failure_message(action: &str, gw_url: &str, detail: String) -> String { + let health_url = format!("{gw_url}/health"); + let health = match hermes_gateway_http_client(std::time::Duration::from_secs(3)) { + Ok(client) => match client.get(&health_url).send().await { + Ok(resp) => format!("HTTP {}", resp.status().as_u16()), + Err(error) => format!("不可达 ({})", reqwest_error_detail(&error)), + }, + Err(error) => format!("无法创建客户端 ({error})"), + }; + let log_tail = hermes_gateway_log_tail(12); + let log_block = if log_tail.trim().is_empty() { + "最近 Gateway 日志为空".to_string() + } else { + format!("最近 Gateway 日志:\n{log_tail}") + }; + format!( + "{action}: {detail}\nGateway: {gw_url}\nHealth: {health}\n建议：在 Hermes 服务页点击“重启 Gateway”后重试；如果刚改过模型/API Key，必须重启 Gateway。\n{log_block}" + ) +} + /// 精准杀掉我们 spawn 的 Gateway 进程 fn kill_gateway_pid() -> bool { let pid = GW_PID.load(Ordering::SeqCst); @@ -2398,7 +2510,7 @@ pub async fn hermes_gateway_action( pub async fn hermes_health_check() -> Result { let url = format!("{}/health", hermes_gateway_url()); - let client = super::build_http_client(std::time::Duration::from_secs(5), Some("ClawPanel")) + let client = hermes_gateway_http_client(std::time::Duration::from_secs(5)) .map_err(|e| format!("HTTP 客户端创建失败: {e}"))?; match client.get(&url).send().await { @@ -2613,6 +2725,7 @@ pub async fn hermes_set_gateway_url(url: Option) -> Result Result { let _ = app.emit("hermes-install-log", "📦 升级 Hermes Agent..."); + let _ = app.emit("hermes-install-progress", 0u32); let uv_path = uv_bin_path(); let uv = if uv_path.exists() { @@ -2622,9 +2735,23 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { }; // hermes-agent 从 GitHub 安装，upgrade 不可用，改用 reinstall - let pkg = format!("hermes-agent @ {}", HERMES_GIT_URL); + let pkg = format!("hermes-agent[web] @ {}", HERMES_GIT_URL); let mut cmd = tokio::process::Command::new(&uv); - cmd.args(["tool", "install", "--reinstall", &pkg, "--python", "3.11"]); + cmd.args([ + "tool", + "install", + "--reinstall", + &pkg, + "--python", + "3.11", + "--with", + "croniter", + ]); + let _ = app.emit("hermes-install-progress", 20u32); + let _ = app.emit( + "hermes-install-log", + format!("> uv tool install --reinstall \"{pkg}\" --python 3.11 --with croniter"), + ); cmd.env("GIT_TERMINAL_PROMPT", "0"); if let Some(mirror) = pypi_mirror_url() { cmd.args(["--index-url", &mirror]); @@ -2646,6 +2773,7 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { if output.status.success() { let _ = app.emit("hermes-install-log", "✅ 升级完成"); + let _ = app.emit("hermes-install-progress", 100u32); Ok("升级完成".into()) } else { Err(format!("升级失败: {}", stderr.trim())) @@ -2657,7 +2785,10 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { // --------------------------------------------------------------------------- #[tauri::command] -pub async fn uninstall_hermes(clean_config: bool) -> Result { +pub async fn uninstall_hermes(app: tauri::AppHandle, clean_config: bool) -> Result { + let _ = app.emit("hermes-install-log", "🗑️ 卸载 Hermes Agent..."); + let _ = app.emit("hermes-install-progress", 10u32); + let uv_path = uv_bin_path(); let uv = if uv_path.exists() { uv_path.to_string_lossy().to_string() @@ -2668,20 +2799,32 @@ pub async fn uninstall_hermes(clean_config: bool) -> Result { // uv tool uninstall let mut cmd = tokio::process::Command::new(&uv); cmd.args(["tool", "uninstall", "hermes-agent"]); + let _ = app.emit("hermes-install-log", "> uv tool uninstall hermes-agent"); cmd.env("PATH", hermes_enhanced_path()); #[cfg(target_os = "windows")] cmd.creation_flags(CREATE_NO_WINDOW); let output = cmd.output().await.map_err(|e| format!("卸载失败: {e}"))?; + let stdout = String::from_utf8_lossy(&output.stdout); + let stderr = String::from_utf8_lossy(&output.stderr); + for line in stdout.lines().chain(stderr.lines()) { + if !line.trim().is_empty() { + let _ = app.emit("hermes-install-log", line.trim()); + } + } if !output.status.success() { - let stderr = String::from_utf8_lossy(&output.stderr); return Err(format!("卸载失败: {}", stderr.trim())); } + let _ = app.emit("hermes-install-progress", 65u32); // 清理 venv（如果存在） let venv_dir = dirs::home_dir().unwrap_or_default().join(".hermes-venv"); if venv_dir.exists() { + let _ = app.emit( + "hermes-install-log", + format!("清理虚拟环境: {}", venv_dir.display()), + ); let _ = std::fs::remove_dir_all(&venv_dir); } @@ -2689,10 +2832,16 @@ pub async fn uninstall_hermes(clean_config: bool) -> Result { if clean_config { let home = hermes_home(); if home.exists() { + let _ = app.emit( + "hermes-install-log", + format!("清理配置目录: {}", home.display()), + ); let _ = std::fs::remove_dir_all(&home); } } + let _ = app.emit("hermes-install-log", "✅ Hermes Agent 已卸载"); + let _ = app.emit("hermes-install-progress", 100u32); Ok("Hermes Agent 已卸载".into()) } @@ -2730,8 +2879,8 @@ pub async fn hermes_api_proxy( } else { std::time::Duration::from_secs(30) }; - let client = super::build_http_client(timeout, Some("ClawPanel")) - .map_err(|e| format!("HTTP 客户端创建失败: {e}"))?; + let client = + hermes_gateway_http_client(timeout).map_err(|e| format!("HTTP 客户端创建失败: {e}"))?; let mut req = match method.to_uppercase().as_str() { "GET" => client.get(&url), @@ -2822,6 +2971,8 @@ pub async fn hermes_agent_run( let gw_url = hermes_gateway_url(); let runs_url = format!("{gw_url}/v1/runs"); + ensure_managed_gateway_ready(&app, &gw_url).await?; + // 读取 API_SERVER_KEY let home = hermes_home(); let api_key = { @@ -2850,7 +3001,7 @@ pub async fn hermes_agent_run( payload["instructions"] = Value::String(inst.clone()); } - let client = super::build_http_client(std::time::Duration::from_secs(10), Some("ClawPanel")) + let client = hermes_gateway_http_client(std::time::Duration::from_secs(10)) .map_err(|e| format!("HTTP 客户端创建失败: {e}"))?; // 1. POST /v1/runs → 获取 run_id @@ -2862,10 +3013,17 @@ pub async fn hermes_agent_run( req = req.header("Authorization", format!("Bearer {api_key}")); } - let resp = req - .send() - .await - .map_err(|e| format!("启动 run 失败: {e}"))?; + let resp = match req.send().await { + Ok(resp) => resp, + Err(error) => { + return Err(hermes_run_failure_message( + "启动 run 失败", + &gw_url, + reqwest_error_detail(&error), + ) + .await); + } + }; if !resp.status().is_success() { let status = resp.status().as_u16(); let text = resp.text().await.unwrap_or_default(); @@ -2887,19 +3045,25 @@ pub async fn hermes_agent_run( // 2. GET /v1/runs/{run_id}/events — SSE 事件流 let events_url = format!("{gw_url}/v1/runs/{run_id}/events"); - let sse_client = - super::build_http_client(std::time::Duration::from_secs(300), Some("ClawPanel")) - .map_err(|e| format!("SSE 客户端创建失败: {e}"))?; + let sse_client = hermes_gateway_http_client(std::time::Duration::from_secs(300)) + .map_err(|e| format!("SSE 客户端创建失败: {e}"))?; let mut sse_req = sse_client.get(&events_url); if !api_key.is_empty() { sse_req = sse_req.header("Authorization", format!("Bearer {api_key}")); } - let sse_resp = sse_req - .send() - .await - .map_err(|e| format!("SSE 连接失败: {e}"))?; + let sse_resp = match sse_req.send().await { + Ok(resp) => resp, + Err(error) => { + return Err(hermes_run_failure_message( + "SSE 连接失败", + &gw_url, + reqwest_error_detail(&error), + ) + .await); + } + }; if !sse_resp.status().is_success() { let status = sse_resp.status().as_u16(); diff --git a/src-tauri/src/commands/mod.rs b/src-tauri/src/commands/mod.rs index 3143bcf..54a5f6a 100644 --- a/src-tauri/src/commands/mod.rs +++ b/src-tauri/src/commands/mod.rs @@ -15,6 +15,7 @@ static GATEWAY_PORT_CACHE: std::sync::LazyLock Result { } /// 简单的语义化版本比较：current >= required -fn version_ge(current: &str, required: &str) -> bool { +pub fn version_ge(current: &str, required: &str) -> bool { let parse = |s: &str| -> Vec { s.trim_start_matches('v') .split('.') diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 11094f2..e038bd4 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -4,8 +4,8 @@ mod tray; mod utils; use commands::{ - agent, assistant, config, device, diagnose, extensions, hermes, hermes_providers, logs, memory, - messaging, pairing, service, skills, update, + agent, assistant, cli_conflict, config, device, diagnose, extensions, hermes, hermes_providers, + logs, memory, messaging, pairing, service, skills, update, }; pub fn run() { @@ -13,6 +13,12 @@ pub fn run() { .join("clawpanel") .join("web-update"); + // issue #261: 装新版 app 时，如果旧的热更新目录里装的是更旧版本的前端 + // （或根本没 .version 标记），protocol handler 会优先读它，导致 + // 用户装了 v0.14.0 看到的还是 v0.9.8 的界面。 + // 启动时先比对版本，落后于当前 app 就直接清掉，让 protocol handler 回退到内嵌 bundle。 + cleanup_stale_hot_update(&hot_update_dir); + tauri::Builder::default() .plugin(tauri_plugin_shell::init()) .plugin(tauri_plugin_autostart::init( @@ -131,6 +137,12 @@ pub fn run() { // 诊断 diagnose::diagnose_gateway_connection, diagnose::check_ciao_windowshide_bug, + // CLI 冲突检测与隔离（PATH 中残留的非 standalone openclaw） + cli_conflict::scan_openclaw_path_conflicts, + cli_conflict::quarantine_openclaw_path, + cli_conflict::quarantine_openclaw_paths_bulk, + cli_conflict::list_quarantined_openclaw, + cli_conflict::restore_quarantined_openclaw, // 日志 logs::read_log_tail, logs::search_log, @@ -293,3 +305,39 @@ pub fn run() { } }); } + +/// 启动时清理落后版本的热更新目录（issue #261）。 +/// +/// 规则： +/// - 目录不存在：noop +/// - 目录存在，`.version` 文件不存在：视为"版本未知"，保守清理 +/// （老版 ClawPanel 没写 .version，不清理就会永远卡在旧前端） +/// - 目录存在，`.version >= app 版本`：保留（正常热更新场景） +/// - 目录存在，`.version < app 版本`：清理（用户装了新 app，旧热更新残留） +fn cleanup_stale_hot_update(dir: &std::path::Path) { + if !dir.exists() { + return; + } + let app_version = env!("CARGO_PKG_VERSION"); + let web_version = std::fs::read_to_string(dir.join(".version")) + .ok() + .map(|s| s.trim().to_string()) + .unwrap_or_default(); + + // 有标记且 >= app 版本：保留 + if !web_version.is_empty() && update::version_ge(&web_version, app_version) { + return; + } + + // 落后或无标记：清理，让 protocol handler 回退到 asset_resolver + eprintln!( + "[clawpanel] clearing stale web-update dir (app={}, web={})", + app_version, + if web_version.is_empty() { + "" + } else { + web_version.as_str() + } + ); + let _ = std::fs::remove_dir_all(dir); +} diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 4b7163a..31ca253 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.14.0", + "version": "0.15.0", "identifier": "ai.openclaw.clawpanel", "build": { "frontendDist": "../dist", diff --git a/src/components/cli-conflict-banner.js b/src/components/cli-conflict-banner.js new file mode 100644 index 0000000..a84ddef --- /dev/null +++ b/src/components/cli-conflict-banner.js @@ -0,0 +1,220 @@ +/** + * CLI 冲突检测与一键隔离横幅 + * + * 用户场景： + * 系统 PATH 中存在多份 openclaw（CherryStudio 内嵌 / 旧 npm 全局 / 手动下载等）， + * 它们与 ClawPanel 管理的 standalone 共存时会引起： + * - 终端 `openclaw` 命令拿到老版本 → schema 不兼容 → doctor --fix 卡死 + * - 第三方工具调用 openclaw 时拿到老版本 + * + * 本组件： + * 1. 异步扫描 PATH，发现冲突时在容器内显示警告横幅 + * 2. 提供"一键隔离"按钮：把冲突文件重命名为 .disabled-by-clawpanel-{ts}.bak（**不真删**） + * 3. 提供"详情"展开列表 / 单条隔离按钮 + * 4. 一键隔离后保留"撤销"入口，找回 .bak 文件 + * + * 使用： + * import { attachCliConflictBanner } from '../components/cli-conflict-banner.js' + * const cleanup = attachCliConflictBanner(containerEl) + */ + +import { api } from '../lib/tauri-api.js' +import { t } from '../lib/i18n.js' +import { toast } from './toast.js' + +const STORAGE_KEY = 'clawpanel-cli-conflict-dismissed-paths' + +// 已知良性来源：这些 IDE/客户端会自带一份 openclaw，跟 ClawPanel 共存不会出问题—— +// Tauri 后端的 `is_rejected_cli_path` 已排除它们，不会被 ClawPanel 选用； +// 用户在终端调用 `openclaw` 想拿到的本来也就是这些 IDE 自己的版本。 +// 这些来源默认不再触发警告横幅，避免用户误以为需要清理一键安装包。 +const BENIGN_SOURCES = new Set(['cherrystudio', 'cursor']) + +function escapeHtml(s) { + return String(s ?? '') + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') + .replace(/'/g, ''') +} + +function loadDismissed() { + try { + const raw = localStorage.getItem(STORAGE_KEY) + if (!raw) return new Set() + const arr = JSON.parse(raw) + return new Set(Array.isArray(arr) ? arr : []) + } catch { + return new Set() + } +} + +function saveDismissed(set) { + try { + localStorage.setItem(STORAGE_KEY, JSON.stringify([...set])) + } catch (_) { + // 忽略 localStorage 异常（隐私模式 / 配额） + } +} + +function formatBytes(n) { + if (n == null) return '' + if (n < 1024) return `${n} B` + if (n < 1024 * 1024) return `${(n / 1024).toFixed(1)} KB` + return `${(n / 1024 / 1024).toFixed(1)} MB` +} + +/** + * 在容器内挂载 CLI 冲突警告横幅。 + * @param {HTMLElement} containerEl - 容器元素（横幅会作为其首个子元素插入） + * @returns {() => void} cleanup 函数，从 DOM 移除横幅 + */ +export function attachCliConflictBanner(containerEl) { + if (!containerEl || !(containerEl instanceof HTMLElement)) return () => {} + + // 占位元素（即便 scan 失败也保留，便于后续重试逻辑） + const slot = document.createElement('div') + slot.className = 'cli-conflict-slot' + slot.style.display = 'none' + containerEl.insertBefore(slot, containerEl.firstChild) + + let cancelled = false + + ;(async () => { + let conflicts + try { + conflicts = await api.scanOpenclawPathConflicts() + } catch (e) { + // scan 失败本身不展示给用户（可能是 web 模式没注册命令）；仅在控制台留痕 + console.warn('[cli-conflict-banner] scan failed:', e?.message || e) + return + } + if (cancelled) return + + const dismissed = loadDismissed() + const isActionable = c => !dismissed.has(c.path) && !BENIGN_SOURCES.has(c.source) + const visible = (conflicts || []).filter(isActionable) + if (visible.length === 0) return + + // 重新扫描+重渲染（隔离后调用），用 named function 自引用 + const reload = async () => { + try { + const next = await api.scanOpenclawPathConflicts() + const dismissedNow = loadDismissed() + const stillVisible = (next || []).filter(c => + !dismissedNow.has(c.path) && !BENIGN_SOURCES.has(c.source) + ) + if (stillVisible.length === 0) { + slot.innerHTML = '' + slot.style.display = 'none' + } else { + renderBanner(slot, stillVisible, reload) + } + } catch (_) { /* ignore */ } + } + renderBanner(slot, visible, reload) + })() + + return () => { + cancelled = true + slot.remove() + } +} + +function renderBanner(slot, conflicts, onChanged) { + const count = conflicts.length + slot.style.display = '' + slot.innerHTML = ` + + ` + + const banner = slot.querySelector('.cli-conflict-banner') + const body = banner.querySelector('.cli-conflict-banner-body') + const toggleBtn = banner.querySelector('[data-act="toggle"]') + const quarantineAllBtn = banner.querySelector('[data-act="quarantine-all"]') + const dismissBtn = banner.querySelector('[data-act="dismiss"]') + + toggleBtn.addEventListener('click', () => { + body.hidden = !body.hidden + toggleBtn.textContent = body.hidden ? t('cliConflict.viewDetails') : t('cliConflict.hideDetails') + }) + + dismissBtn.addEventListener('click', () => { + const dismissed = loadDismissed() + conflicts.forEach(c => dismissed.add(c.path)) + saveDismissed(dismissed) + slot.innerHTML = '' + slot.style.display = 'none' + toast(t('cliConflict.dismissedHint'), 'info', { duration: 4000 }) + }) + + quarantineAllBtn.addEventListener('click', async () => { + quarantineAllBtn.disabled = true + quarantineAllBtn.textContent = t('cliConflict.quarantining') + try { + const result = await api.quarantineOpenclawPathsBulk(conflicts.map(c => c.path)) + const ok = result?.records?.length || 0 + const fail = result?.failed?.length || 0 + if (ok > 0) { + toast(t('cliConflict.quarantineOk', { count: ok }), 'success', { duration: 4000 }) + } + if (fail > 0) { + const detail = result.failed.map(f => `${f.path}: ${f.error}`).join('\n') + toast(t('cliConflict.quarantinePartial', { count: fail }) + '\n' + detail, 'warning', { duration: 8000 }) + } + await onChanged() + } catch (e) { + toast(t('cliConflict.quarantineFail', { error: e?.message || e }), 'error', { duration: 8000 }) + quarantineAllBtn.disabled = false + quarantineAllBtn.textContent = t('cliConflict.quarantineAll') + } + }) + + body.querySelectorAll('[data-act="quarantine-one"]').forEach(btn => { + btn.addEventListener('click', async () => { + const path = btn.getAttribute('data-path') + btn.disabled = true + btn.textContent = t('cliConflict.quarantining') + try { + await api.quarantineOpenclawPath(path) + toast(t('cliConflict.quarantineOneOk'), 'success', { duration: 4000 }) + await onChanged() + } catch (e) { + toast(t('cliConflict.quarantineFail', { error: e?.message || e }), 'error', { duration: 8000 }) + btn.disabled = false + btn.textContent = t('cliConflict.quarantineOne') + } + }) + }) +} diff --git a/src/components/floor-blocker.js b/src/components/floor-blocker.js new file mode 100644 index 0000000..d372dab --- /dev/null +++ b/src/components/floor-blocker.js @@ -0,0 +1,164 @@ +/** + * 硬地板拦截组件 + * + * 当检测到内核版本低于 ClawPanel 支持的最低版本（KERNEL_FLOOR）时， + * 显示一个全屏遮罩，引导用户升级内核或继续以只读模式使用。 + * + * 使用方式： + * import { showFloorBlocker, hideFloorBlocker } from './floor-blocker.js' + * showFloorBlocker({ currentVersion, floor, target, onIgnore }) + */ +import { t } from '../lib/i18n.js' + +const OVERLAY_ID = 'kernel-floor-blocker' + +/** + * 显示地板拦截 + * + * @param {Object} opts + * @param {string} opts.currentVersion 当前检测到的内核版本（含后缀） + * @param {string} opts.floor 最低支持版本 + * @param {string|null} opts.target 推荐目标版本 + * @param {() => void} [opts.onIgnore] 用户点击「继续（只读模式）」时的回调 + */ +export function showFloorBlocker({ currentVersion, floor, target, onIgnore }) { + // 已存在则不重复创建 + if (document.getElementById(OVERLAY_ID)) return + + const overlay = document.createElement('div') + overlay.id = OVERLAY_ID + overlay.className = 'floor-blocker-overlay' + overlay.innerHTML = ` +
+ +

${escapeHtml(t('kernel.floorBlocker.title'))}

+

${t('kernel.floorBlocker.message', { + current: `${escapeHtml(currentVersion || '-')}`, + floor: `${escapeHtml(floor || '-')}`, + })}

+ ${target ? `

${t('kernel.floorBlocker.targetHint', { + target: `${escapeHtml(target)}`, + })}

` : ''} +
+ ${escapeHtml(t('kernel.floorBlocker.goUpgrade'))} + +
+

${escapeHtml(t('kernel.floorBlocker.readonlyHint'))}

+
+ ` + + // 升级按钮 → 跳 about 页，然后移除遮罩让用户操作 + overlay.querySelector('[data-action="upgrade"]')?.addEventListener('click', () => { + hideFloorBlocker() + }) + + // 忽略 → 只读模式 + overlay.querySelector('[data-action="ignore"]')?.addEventListener('click', () => { + hideFloorBlocker() + try { onIgnore?.() } catch (e) { console.warn('[floor-blocker] onIgnore error', e) } + }) + + document.body.appendChild(overlay) + injectStyles() +} + +export function hideFloorBlocker() { + const el = document.getElementById(OVERLAY_ID) + if (!el) return + el.classList.add('hide') + setTimeout(() => el.remove(), 300) +} + +function escapeHtml(s) { + return String(s ?? '') + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') +} + +let _stylesInjected = false +function injectStyles() { + if (_stylesInjected) return + _stylesInjected = true + const css = ` + .floor-blocker-overlay { + position: fixed; inset: 0; z-index: 9998; + background: rgba(0, 0, 0, 0.55); + backdrop-filter: blur(6px); + display: flex; align-items: center; justify-content: center; + padding: 24px; + animation: floor-blocker-fade-in 0.24s ease-out; + } + .floor-blocker-overlay.hide { + opacity: 0; + transition: opacity 0.24s ease-in; + } + .floor-blocker-card { + max-width: 520px; width: 100%; + background: var(--bg-primary, #fff); + color: var(--text-primary, #111); + border-radius: 16px; + padding: 32px; + box-shadow: 0 20px 50px rgba(0,0,0,0.35); + text-align: center; + animation: floor-blocker-slide-up 0.28s ease-out; + } + .floor-blocker-icon { + color: var(--warning, #f59e0b); + display: inline-flex; + margin-bottom: 12px; + } + .floor-blocker-title { + margin: 0 0 12px; font-size: 20px; font-weight: 600; + } + .floor-blocker-message, + .floor-blocker-target { + margin: 0 0 12px; + color: var(--text-secondary, #555); + font-size: 14px; + line-height: 1.6; + } + .floor-blocker-message code, + .floor-blocker-target code { + background: var(--bg-tertiary, #f3f4f6); + padding: 2px 8px; + border-radius: 4px; + font-family: var(--font-mono, monospace); + font-size: 13px; + color: var(--text-primary, #111); + } + .floor-blocker-actions { + display: flex; flex-wrap: wrap; gap: 10px; + justify-content: center; + margin: 20px 0 12px; + } + .floor-blocker-actions .btn { + min-width: 140px; + text-decoration: none; + } + .floor-blocker-hint { + margin: 0; + font-size: 12px; + color: var(--text-tertiary, #888); + } + @keyframes floor-blocker-fade-in { + from { opacity: 0; } + to { opacity: 1; } + } + @keyframes floor-blocker-slide-up { + from { opacity: 0; transform: translateY(12px); } + to { opacity: 1; transform: translateY(0); } + } + ` + const style = document.createElement('style') + style.setAttribute('data-origin', 'floor-blocker') + style.textContent = css + document.head.appendChild(style) +} diff --git a/src/components/kernel-badge.js b/src/components/kernel-badge.js new file mode 100644 index 0000000..9be138e --- /dev/null +++ b/src/components/kernel-badge.js @@ -0,0 +1,144 @@ +/** + * 内核版本徽章组件 + * + * 在 sidebar 底部 / 设置页 / About 页显示当前对接的内核版本以及已启用特性数。 + * 用法： + * import { mountKernelBadge } from './components/kernel-badge.js' + * const el = mountKernelBadge(container, { compact: true }) + * + * 自动订阅 onKernelChange，状态变化时刷新；container 销毁时调用 el._unsub() 清理。 + */ +import { onKernelChange, getKernelSnapshot } from '../lib/kernel.js' +import { FEATURE_CATALOG } from '../lib/feature-catalog.js' +import { t } from '../lib/i18n.js' + +/** + * 在指定容器中挂载内核徽章。 + * + * @param {HTMLElement} container 父容器 + * @param {Object} [opts] + * @param {boolean} [opts.compact=false] 紧凑模式：仅显示版本号 + 角标 + * @returns {HTMLElement & { _unsub?: () => void }} + */ +export function mountKernelBadge(container, opts = {}) { + const compact = !!opts.compact + const el = document.createElement('div') + el.className = compact ? 'kernel-badge kernel-badge-compact' : 'kernel-badge' + + function update(snap) { + if (!snap || !snap.version) { + el.innerHTML = compact + ? `${escapeHtml(t('kernel.badge.unknown'))}` + : `
${escapeHtml(t('kernel.badge.currentKernel'))}${escapeHtml(t('kernel.badge.unknown'))}
` + return + } + + const total = Object.values(FEATURE_CATALOG).filter(f => f.engine === snap.engine).length + const enabled = snap.features.size + + let stateBadge = '' + if (!snap.aboveFloor) { + stateBadge = `${escapeHtml(t('kernel.badge.belowTarget'))}` + } else if (snap.isLatest) { + stateBadge = `${escapeHtml(t('kernel.badge.latest'))}` + } else if (!snap.isLatest && snap.target) { + stateBadge = `${escapeHtml(t('kernel.badge.belowTarget'))}` + } + + if (compact) { + el.innerHTML = ` + ${escapeHtml(snap.versionLabel || snap.version)} + ${stateBadge} + ` + el.title = t('kernel.badge.featuresEnabled', { enabled, total }) + } else { + el.innerHTML = ` +
+ ${escapeHtml(t('kernel.badge.currentKernel'))} + ${escapeHtml(snap.versionLabel || snap.version)} + ${stateBadge} +
+
+ ${escapeHtml(t('kernel.badge.featuresEnabled', { enabled, total }))} +
+ ` + } + } + + // 立即渲染当前快照（可能为 null） + update(getKernelSnapshot()) + + // 订阅变化 + const unsub = onKernelChange(update) + el._unsub = unsub + + injectStyles() + container.appendChild(el) + return el +} + +function escapeHtml(s) { + return String(s ?? '') + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') +} + +let _stylesInjected = false +function injectStyles() { + if (_stylesInjected) return + _stylesInjected = true + const css = ` + .kernel-badge { + display: flex; flex-direction: column; gap: 4px; + padding: 8px 12px; + border-radius: 8px; + background: var(--bg-tertiary, #f3f4f6); + border: 1px solid var(--border-color, #e5e7eb); + font-size: 12px; + line-height: 1.4; + } + .kernel-badge-compact { + flex-direction: row; + align-items: center; + gap: 6px; + padding: 4px 10px; + background: transparent; + border: 1px solid var(--border-color, #e5e7eb); + cursor: default; + } + .kernel-badge-row { + display: flex; align-items: center; gap: 8px; + flex-wrap: wrap; + } + .kernel-badge-label { + color: var(--text-tertiary, #888); + font-size: 11px; + } + .kernel-badge-version { + font-family: var(--font-mono, monospace); + font-weight: 600; + color: var(--text-primary, #111); + } + .kernel-badge-features { + color: var(--text-secondary, #555); + font-size: 11px; + } + .kernel-badge-state { + font-size: 10px; + font-weight: 600; + padding: 1px 6px; + border-radius: 10px; + text-transform: uppercase; + letter-spacing: 0.04em; + } + .kernel-badge-state.ok { color: var(--success, #16a34a); background: rgba(34,197,94,.12); } + .kernel-badge-state.info { color: var(--info, #2563eb); background: rgba(59,130,246,.12); } + .kernel-badge-state.warn { color: var(--warning, #d97706); background: rgba(245,158,11,.16); } + ` + const style = document.createElement('style') + style.setAttribute('data-origin', 'kernel-badge') + style.textContent = css + document.head.appendChild(style) +} diff --git a/src/components/modal.js b/src/components/modal.js index 7b7a75b..b7708b6 100644 --- a/src/components/modal.js +++ b/src/components/modal.js @@ -20,17 +20,26 @@ function escapeAttr(str) { * @param {string} message 确认消息 * @returns {Promise} 用户选择确认返回 true，取消返回 false */ -export function showConfirm(message) { +export function showConfirm(message, options = {}) { + // options: + // title: 标题文本（默认 t('common.confirmAction')） + // confirmText: 确认按钮文字（默认 t('common.confirm')） + // cancelText: 取消按钮文字（默认 t('common.cancel')） + // variant: 'danger' | 'primary'（默认 'danger'，决定确认按钮颜色） + const title = options.title || t('common.confirmAction') + const confirmText = options.confirmText || t('common.confirm') + const cancelText = options.cancelText || t('common.cancel') + const variant = options.variant === 'primary' ? 'btn-primary' : 'btn-danger' return new Promise((resolve) => { const overlay = document.createElement('div') overlay.className = 'modal-overlay' overlay.innerHTML = `
-
${t('common.confirmAction')}
+
${escapeAttr(title)}
${escapeAttr(message)}
- - + +
` diff --git a/src/components/sidebar.js b/src/components/sidebar.js index ae2f903..fa14045 100644 --- a/src/components/sidebar.js +++ b/src/components/sidebar.js @@ -9,8 +9,13 @@ import { toast } from './toast.js' const APP_VERSION = typeof __APP_VERSION__ !== 'undefined' ? __APP_VERSION__ : '0.0.0' import { t, getLang, setLang, getAvailableLangs } from '../lib/i18n.js' import { isFeatureAvailable } from '../lib/feature-gates.js' +import { getKernelSnapshot } from '../lib/kernel.js' +import { triggerKernelUpgrade } from '../lib/kernel-upgrade.js' import { getActiveEngine, getActiveEngineId, listEngines, switchEngine, onEngineChange } from '../lib/engine-manager.js' +// 当用户点 "暂时不升级" 时，本地会话内不再显示升级提示 +const SS_DISMISSED_KERNEL_UPGRADE = 'clawpanel_kernel_upgrade_dismissed' + function NAV_ITEMS_FULL() { return [ { section: t('sidebar.sectionMonitor'), @@ -224,6 +229,9 @@ export function renderSidebar(el) {
`).join('') + // 内核可升级卡片（仅 openclaw 引擎、已连接、低于推荐版时显示） + html += _renderKernelUpgradeHint() + html += `
- -
+ +
diff --git a/src/engines/hermes/pages/services.js b/src/engines/hermes/pages/services.js index 0398b5b..5428ac1 100644 --- a/src/engines/hermes/pages/services.js +++ b/src/engines/hermes/pages/services.js @@ -1,8 +1,9 @@ /** * Hermes Agent 服务管理 */ -import { api, invalidate } from '../../../lib/tauri-api.js' +import { api, invalidate, isTauriRuntime } from '../../../lib/tauri-api.js' import { t } from '../../../lib/i18n.js' +import { showConfirm, showUpgradeModal } from '../../../components/modal.js' const ICONS = { refresh: '', @@ -370,6 +371,7 @@ export function render() {
+
@@ -506,20 +508,96 @@ export function render() { async function runMaintenance(kind) { if (maintenanceBusy) return - const confirmText = kind === 'upgrade' - ? t('engine.servicesConfirmUpgrade') - : kind === 'uninstall-clean' - ? t('engine.servicesConfirmUninstallClean') - : t('engine.servicesConfirmUninstall') - if (!confirm(confirmText)) return + const confirmText = kind === 'install' + ? (info?.installed ? t('engine.servicesConfirmRepairInstall') : t('engine.servicesConfirmInstall')) + : kind === 'upgrade' + ? t('engine.servicesConfirmUpgrade') + : kind === 'uninstall-clean' + ? t('engine.servicesConfirmUninstallClean') + : t('engine.servicesConfirmUninstall') + const confirmed = await showConfirm(confirmText, { + title: t('engine.servicesMaintenance'), + confirmText: kind.includes('uninstall') ? t('engine.servicesUninstall') : t('common.confirm'), + variant: kind.includes('uninstall') ? 'danger' : 'primary', + }) + if (!confirmed) return maintenanceBusy = true - setPageMessage(kind === 'upgrade' ? t('engine.servicesUpgrade') : t('engine.servicesUninstall'), 'muted') + setPageMessage( + kind === 'install' + ? t('engine.servicesInstall') + : kind === 'upgrade' + ? t('engine.servicesUpgrade') + : t('engine.servicesUninstall'), + 'muted' + ) draw() + + const modalTitle = kind === 'install' + ? (info?.installed ? t('engine.servicesRepairInstall') : t('engine.servicesInstall')) + : kind === 'upgrade' + ? t('engine.servicesUpgrade') + : kind === 'uninstall-clean' + ? t('engine.servicesUninstallClean') + : t('engine.servicesUninstall') + const modal = showUpgradeModal(`${modalTitle} Hermes Agent`) + modal.setProgressLabels({ + preparing: t('common.preparing'), + downloading: kind === 'install' ? t('engine.installingBtn') : kind === 'upgrade' ? t('about.upgrading') : t('about.uninstalling'), + installing: kind === 'install' ? t('engine.installingBtn') : kind === 'upgrade' ? t('about.upgrading') : t('about.uninstalling'), + done: kind === 'install' ? t('engine.installSuccess') : kind === 'upgrade' ? t('engine.servicesUpgradeDone') : t('engine.servicesUninstallDone'), + }) + modal.setProgress(5) + modal.appendLog(`${modalTitle} Hermes Agent`) + + let unlisten = null try { - const result = kind === 'upgrade' - ? await api.updateHermes() - : await api.uninstallHermes(kind === 'uninstall-clean') + if (isTauriRuntime()) { + const { listen } = await import('@tauri-apps/api/event') + const u1 = await listen('hermes-install-log', (event) => modal.appendLog(String(event.payload))) + const u2 = await listen('hermes-install-progress', (event) => modal.setProgress(Number(event.payload) || 0)) + unlisten = () => { u1(); u2() } + } + } catch (_) {} + + const shouldStopGateway = !!info?.gatewayRunning && (kind === 'install' || kind === 'upgrade' || kind.includes('uninstall')) + let shouldRestartGateway = !!info?.gatewayRunning && (kind === 'install' || kind === 'upgrade') + + try { + if (shouldStopGateway) { + modal.appendLog(t('engine.servicesMaintenanceStopGateway')) + modal.setProgress(12) + try { + await api.hermesGatewayAction('stop') + await new Promise(resolve => setTimeout(resolve, 900)) + modal.appendLog(t('engine.servicesMaintenanceGatewayStopped')) + } catch (error) { + modal.appendLog(t('engine.servicesMaintenanceGatewayStopWarn', { error: stripError(error) })) + } + } + + modal.setProgress(25) + const result = kind === 'install' + ? await api.installHermes('uv-tool', ['web']) + : kind === 'upgrade' + ? await api.updateHermes() + : await api.uninstallHermes(kind === 'uninstall-clean') + modal.appendLog(`✅ ${result || modalTitle}`) + modal.setProgress(85) + + if (shouldRestartGateway) { + modal.appendLog(t('engine.servicesMaintenanceRestartGateway')) + try { + await api.hermesGatewayAction('start') + modal.appendLog(t('engine.servicesMaintenanceGatewayRestarted')) + } catch (error) { + shouldRestartGateway = false + modal.appendLog(t('engine.servicesMaintenanceGatewayRestartWarn', { error: stripError(error) })) + } + } + + modal.setProgress(100) + modal.setDone(kind === 'install' ? t('engine.installSuccess') : kind === 'upgrade' ? t('engine.servicesUpgradeDone') : t('engine.servicesUninstallDone')) setPageMessage(result, 'success') invalidate('check_hermes') await refresh(false) @@ -527,7 +605,13 @@ export function render() { window.location.hash = '#/h/setup' } } catch (error) { - setPageMessage(stripError(error), 'error') + const message = stripError(error) + modal.appendLog(`❌ ${message}`) + modal.setError(message) + setPageMessage(message, 'error') + } finally { + if (unlisten) unlisten() + modal.onClose(() => refresh(false)) } maintenanceBusy = false draw() @@ -552,6 +636,7 @@ export function render() { el.querySelector('#hm-services-custom-url')?.addEventListener('input', (event) => { customUrl = event.target.value }) + el.querySelector('.hm-services-install')?.addEventListener('click', () => runMaintenance('install')) el.querySelector('.hm-services-upgrade')?.addEventListener('click', () => runMaintenance('upgrade')) el.querySelector('.hm-services-uninstall')?.addEventListener('click', () => runMaintenance('uninstall')) el.querySelector('.hm-services-uninstall-clean')?.addEventListener('click', () => runMaintenance('uninstall-clean')) diff --git a/src/engines/hermes/pages/setup.js b/src/engines/hermes/pages/setup.js index 0a451ec..ce76b20 100644 --- a/src/engines/hermes/pages/setup.js +++ b/src/engines/hermes/pages/setup.js @@ -4,7 +4,7 @@ * 状态机: detect → install → configure → gateway → complete */ import { t } from '../../../lib/i18n.js' -import { api, invalidate } from '../../../lib/tauri-api.js' +import { api, invalidate, isTauriRuntime } from '../../../lib/tauri-api.js' import { getActiveEngine } from '../../../lib/engine-manager.js' import { loadHermesProviders, @@ -473,8 +473,11 @@ export function render() { logs = [] draw() - // 监听事件（Tauri 模式下有 hermes-install-log/progress 事件） + // 监听事件（Tauri 模式下有 hermes-install-log/progress 事件）。 + // Web 模式下 `@tauri-apps/api/event` 模块顶层会读取 `window.__TAURI_INTERNALS__.transformCallback` + // 直接抛错（issue #260），所以非 Tauri 环境跳过监听安装。 try { + if (!isTauriRuntime()) throw new Error('skip-listen-in-web-mode') const { listen } = await import('@tauri-apps/api/event') const u1 = await listen('hermes-install-log', (e) => { const line = String(e.payload) diff --git a/src/engines/hermes/style/hermes.css b/src/engines/hermes/style/hermes.css index d167148..3108c41 100644 --- a/src/engines/hermes/style/hermes.css +++ b/src/engines/hermes/style/hermes.css @@ -461,6 +461,13 @@ box-shadow: none; } +/* Allow absolute-positioned children (e.g. model dropdown) to escape the + panel boundary. Used on the model-config panel where the long fetched + model list otherwise gets clipped at the panel's bottom edge (issue #260). */ +[data-engine="hermes"] .hm-panel.hm-panel--allow-overflow { + overflow: visible; +} + [data-engine="hermes"] .hm-panel-header { display: flex; align-items: center; diff --git a/src/lib/api-compat.js b/src/lib/api-compat.js new file mode 100644 index 0000000..d7bce97 --- /dev/null +++ b/src/lib/api-compat.js @@ -0,0 +1,194 @@ +/** + * 跨内核版本的归一化 API 封装 + * + * 上游不同版本的 RPC 返回结构可能不同（数组 vs 分页对象、字段拆分等）。 + * 此模块为页面提供 **统一形态** 的 helper： + * - 老内核返回数组 → wrapper 包成 { items, truncated, cursor } + * - 新内核返回 { items, truncated, cursor } → 透传 + * - 页面按一致接口处理，不需自己 if/else + * + * 仅在需要使用 5.x 新返回字段（truncation、status 拆分等）时引入本模块； + * 不需要新字段的页面可以继续直接用 wsClient.request(...)。 + * + * @see .tmp/multi-kernel-compat-design.md §5 + */ +import { wsClient } from './ws-client.js' +import { hasFeature } from './kernel.js' + +/** + * @typedef {Object} PagedResult + * @property {any[]} items 数据条目 + * @property {boolean} truncated 是否被服务端截断 + * @property {string|null} cursor 下一页游标，null 表示没有更多 + * @property {number|null} total 服务端如果返回总数则填，否则 null + */ + +/** + * 列出会话，归一化分页字段（兼容 4.x 数组返回 / 5.4+ 截断元数据） + * + * @param {Object} [opts] + * @param {number} [opts.limit=100] + * @param {string} [opts.cursor] + * @returns {Promise} + */ +export async function listSessions(opts = {}) { + const params = { limit: opts.limit ?? 100 } + if (opts.cursor) params.cursor = opts.cursor + + // sessions.list 在所有支持的内核版本（>=2026.3.x）都存在；用 requestCompat 仅为兜底 + const raw = await wsClient.requestCompat('sessions.list', params, []) + + // 老内核：直接返回数组 + if (Array.isArray(raw)) { + return { + items: raw, + truncated: false, + cursor: null, + total: raw.length, + } + } + + // 5.4+：返回 { items, truncated, cursor } 或 { sessions, hasMore, nextCursor } + const items = raw?.items ?? raw?.sessions ?? [] + const truncated = !!(raw?.truncated || raw?.hasMore) + const cursor = raw?.cursor ?? raw?.nextCursor ?? null + const total = raw?.total ?? null + + return { items, truncated, cursor, total } +} + +/** + * @typedef {Object} MemoryStatus + * @property {boolean} ready 整体就绪 + * @property {{ ready: boolean, reason?: string|null }} vectorStore 向量存储（sqlite-vec） + * @property {{ ready: boolean, reason?: string|null }} embedding 嵌入提供方 + * @property {string|null} reason 整体失败原因（兼容老内核） + * @property {Object} raw 原始返回，调试用 + */ + +/** + * 获取记忆系统状态，归一化新老内核字段差异。 + * + * 老内核（< 2026.5.3）：返回 { ready, reason }，前端无法区分 vector-store / embedding + * 新内核（>= 2026.5.3）：返回 { ready, vectorStore: {...}, embedding: {...} } + * + * @param {Object} [opts] + * @param {boolean} [opts.deep] 仅在新内核生效，老内核忽略此字段 + * @returns {Promise} + */ +export async function memoryStatus(opts = {}) { + const params = {} + if (opts.deep && hasFeature('memory.statusDeepSplit')) { + params.deep = true + } + // 上游 RPC 名称在不同版本间统一为 doctor.memory.status，老内核可能没有 + const raw = await wsClient.requestCompat('doctor.memory.status', params, null) + if (!raw) { + return { + ready: false, + vectorStore: { ready: false, reason: null }, + embedding: { ready: false, reason: null }, + reason: 'unsupported', + raw: null, + } + } + + const overallReady = raw?.ready ?? raw?.healthy ?? false + const overallReason = raw?.reason ?? raw?.error ?? null + + return { + ready: overallReady, + vectorStore: { + ready: raw?.vectorStore?.ready ?? overallReady, + reason: raw?.vectorStore?.reason ?? null, + }, + embedding: { + ready: raw?.embedding?.ready ?? overallReady, + reason: raw?.embedding?.reason ?? null, + }, + reason: overallReason, + raw, + } +} + +/** + * @typedef {Object} ProbeStatus + * @property {string} model + * @property {string|null} status 可能值: 'ok' | 'no_model' | 'excluded_by_auth_order' | 'cooling_down' + * @property {number|null} cooldownUntilMs + * @property {string|null} reason + */ + +/** + * 模型探测：归一化 5.2+ 的 excluded_by_auth_order / no_model / cooldown 字段。 + * + * @param {Object} [opts] + * @returns {Promise} + */ +export async function modelStatusProbe(opts = {}) { + // 5.2+ 才有专用 probe RPC，老内核回退到 model.list + if (hasFeature('models.probeStatus')) { + const raw = await wsClient.requestCompat('model.status.probe', opts, null) + if (raw) { + const list = raw?.results || raw?.probes || raw || [] + return list.map(m => ({ + model: m.model || m.id || '', + status: m.status || 'ok', + cooldownUntilMs: m.cooldownUntilMs ?? m.cooldown_until_ms ?? null, + reason: m.reason ?? null, + })) + } + } + + // 降级：用 model.list 构造简化 probe 结果 + const raw = await wsClient.requestCompat('model.list', {}, null) + if (!raw) return [] + const models = raw?.models || raw || [] + return models.map(m => ({ + model: m.id || m.fullId || m.name || '', + status: 'ok', + cooldownUntilMs: null, + reason: null, + })) +} + +/** + * 列出 Agents，自动剥离/补全 agentRuntime 字段。 + * + * - 老内核（< 2026.5.2）：补 `agentRuntime: { id: 'pi' }` 默认值 + * - 新内核：透传 + * + * 注意：底层调用的是 Tauri 命令 `list_agents`（封装了 Gateway RPC），不直接走 WS。 + */ +export async function listAgentsCompat() { + // 动态导入避免顶层依赖 + const { api } = await import('./tauri-api.js') + const list = await api.listAgents() + if (!Array.isArray(list)) return [] + + return list.map(ag => { + const out = { ...ag } + if (!out.agentRuntime) { + out.agentRuntime = { id: 'pi' } + } else if (typeof out.agentRuntime === 'string') { + out.agentRuntime = { id: out.agentRuntime } + } + return out + }) +} + +/** + * Cron 任务列表，归一化老/新返回结构。 + * + * - 老内核：可能直接返回数组或 { jobs: [...] } + * - 新内核（5.4+）：每个 job 多了 lastErrorDetail 字段 + * + * @returns {Promise<{ jobs: any[] }>} + */ +export async function cronList(opts = {}) { + const params = { includeDisabled: opts.includeDisabled ?? true } + const raw = await wsClient.requestCompat('cron.list', params, null) + if (!raw) return { jobs: [], raw: null } + const jobs = Array.isArray(raw) ? raw : (raw?.jobs ?? []) + return { jobs, raw } +} diff --git a/src/lib/docker-tasking.js b/src/lib/docker-tasking.js new file mode 100644 index 0000000..ebfb17d --- /dev/null +++ b/src/lib/docker-tasking.js @@ -0,0 +1,30 @@ +export const DOCKER_TASK_TIMEOUT_MS = 10 * 60 * 1000 + +export function buildDockerDispatchTargets(containers = []) { + return containers.map(container => ({ + containerId: container.id, + containerName: container.name, + nodeId: container.nodeId, + })) +} + +export function buildDockerInstanceSwitchContext(container = {}) { + const containerId = String(container.containerId || container.id || '') + const port = Number(container.port) + const gatewayPort = Number(container.gatewayPort) + const instanceId = `docker-${containerId.slice(0, 12)}` + + return { + instanceId, + reloadRoute: true, + registration: { + name: container.name, + type: 'docker', + endpoint: `http://127.0.0.1:${port}`, + gatewayPort, + containerId, + nodeId: container.nodeId, + note: 'Added from Docker page', + }, + } +} diff --git a/src/lib/feature-catalog.js b/src/lib/feature-catalog.js new file mode 100644 index 0000000..19eab1d --- /dev/null +++ b/src/lib/feature-catalog.js @@ -0,0 +1,198 @@ +/** + * 特性目录 — 声明每个可选特性需要的最低内核版本 + * + * 这是 ClawPanel 跨多版本内核的「唯一真相源」： + * - 当上游引入一个新特性而我们想在面板中使用时，在这里加一行 + * - 页面通过 kernel.js 的 hasFeature(id) 同步查询，不要硬编码版本号比较 + * - 命名规范: .，例如 sessions.truncation, models.cooldownScope + * + * @see .tmp/multi-kernel-compat-design.md §4.1 为详细设计文档 + */ + +/** + * @typedef {Object} FeatureDef + * @property {string} engine 引擎 id，当前仅 'openclaw' 或 'hermes' + * @property {string} minVersion 最低内核版本号（不含 -zh 后缀） + * @property {string} [desc] 特性说明，仅调试用 + */ + +/** @type {Record} */ +export const FEATURE_CATALOG = { + // ===== 协议层 ===== + 'gateway.backendSelfPair': { + engine: 'openclaw', + minVersion: '2026.3.2', + desc: 'gateway-client backend 模式可省略 device 字段', + }, + 'ws.startupSidecarsErr': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'connect 期间返回 startup-sidecars 错误码 + retryAfterMs', + }, + + // ===== Sessions / Chat ===== + 'sessions.truncation': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'sessions.list 返回 truncated/cursor 分页元数据', + }, + 'sessions.cleanupTranscript': { + engine: 'openclaw', + minVersion: '2026.5.5', + desc: 'sessions cleanup 修剪孤立 transcript / checkpoint / trajectory', + }, + 'chat.replyRunGuard': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: '连续 chat.send 不再 ReplyRunAlreadyActiveError', + }, + + // ===== Agents ===== + 'agents.runtime': { + engine: 'openclaw', + minVersion: '2026.5.2', + desc: 'agents.list 返回 agentRuntime 元数据', + }, + 'agents.toolProgressDetail': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'agents.defaults.toolProgressDetail: "raw"', + }, + 'agents.contextLimits': { + engine: 'openclaw', + minVersion: '2026.4.10', + desc: 'agents.defaults.contextLimits.* (4 字段)', + }, + 'agents.skillsLimits': { + engine: 'openclaw', + minVersion: '2026.4.15', + desc: 'agents.list[].skillsLimits.maxSkillsPromptChars', + }, + + // ===== Models ===== + 'models.probeStatus': { + engine: 'openclaw', + minVersion: '2026.5.2', + desc: '/model status 返回 excluded_by_auth_order / no_model 状态', + }, + 'models.cooldownScope': { + engine: 'openclaw', + minVersion: '2026.5.3', + desc: 'auth profile cooldown 改为 model-scoped', + }, + 'models.codexRouteMigrated': { + engine: 'openclaw', + minVersion: '2026.5.5', + desc: 'doctor 自动迁移 openai-codex/* → openai/* + agentRuntime: codex', + }, + + // ===== Memory ===== + 'memory.statusDeepSplit': { + engine: 'openclaw', + minVersion: '2026.5.3', + desc: 'memory status --deep 分离 sqlite-vec 与 embedding-provider 就绪', + }, + 'memory.activeMemoryGraceful': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: '无 memory plugin 时优雅跳过，不打 allowlist 错', + }, + 'memory.dreamingTabs': { + engine: 'openclaw', + minVersion: '2026.4.11', + desc: 'Dreaming Wiki / Imported Insights / Memory Palace 子标签', + }, + + // ===== Cron ===== + 'cron.toolPolicyError': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'cron show 返回真实 tool-policy 失败原因', + }, + 'cron.timeoutSecondsDual': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'cron timeoutSeconds 同时驱动 CLI 和 LLM watchdog', + }, + + // ===== Doctor / Update ===== + 'doctor.deepSupervisor': { + engine: 'openclaw', + minVersion: '2026.5.5', + desc: 'doctor --deep 报告 supervisor restart handoff', + }, + 'doctor.heartbeatRecovery': { + engine: 'openclaw', + minVersion: '2026.5.5', + desc: 'doctor --fix 修复 agent:main:main heartbeat 中毒', + }, + 'doctor.failClosedConfig': { + engine: 'openclaw', + minVersion: '2026.5.3', + desc: 'Gateway 启动 fail-closed 无效配置，由 doctor --fix 修复', + }, + + // ===== Channels ===== + 'channels.lineOpenValidate': { + engine: 'openclaw', + minVersion: '2026.5.5', + desc: 'LINE dmPolicy:"open" 校验 allowFrom 通配', + }, + 'channels.mattermostUrlWizard': { + engine: 'openclaw', + minVersion: '2026.5.5', + desc: 'Mattermost setup wizard 收集 httpUrl', + }, + 'channels.toolProgressRaw': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: '渠道进度草稿 honor toolProgressDetail: raw', + }, + + // ===== Plugins ===== + 'plugins.installHints': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'doctor 输出 catalog-backed install hints', + }, + 'plugins.clawhubRateLimit': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'ClawHub 429 错误带 Retry-After', + }, + + // ===== Gateway 配置（我们一般不改，但读取时需容错） ===== + 'gateway.embedSandbox': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'gateway.controlUi.embedSandbox 字段', + }, + 'gateway.allowExternalEmbedUrls': { + engine: 'openclaw', + minVersion: '2026.5.4', + desc: 'gateway.controlUi.allowExternalEmbedUrls 字段', + }, +} + +/** + * 硬地板：低于此版本的内核，ClawPanel 会弹出全屏拦截。 + * 选择 2026.3.2 是因为 gateway-client backend 模式从此引入，是我们长期对接路径根基。 + */ +export const KERNEL_FLOOR = { + openclaw: '2026.3.2', + hermes: '0.8.0', +} + +/** + * 推荐目标版本：默认安装/升级使用。 + * 真正的推荐版由 openclaw-version-policy.json 控制，这里仅作 fallback / 展示用。 + */ +export const KERNEL_TARGET = { + openclaw: { + official: '2026.5.6', + chinese: '2026.5.6-zh.2', + }, + hermes: { + default: '0.13.x', + }, +} diff --git a/src/lib/feature-gates.js b/src/lib/feature-gates.js index 76d1c98..5064f12 100644 --- a/src/lib/feature-gates.js +++ b/src/lib/feature-gates.js @@ -1,135 +1,36 @@ /** - * 功能版本门控 — 根据 OpenClaw 版本动态显示/隐藏功能 + * 功能版本门控 — 向后兼容适配层 * - * 工作原理： - * 1. 从 api.getVersionInfo() 获取当前 OpenClaw 版本 - * 2. 对比功能所需最低版本 - * 3. sidebar 和页面可调用 isFeatureAvailable() 判断是否显示 + * 从 ClawPanel 0.15.0 开始，内核版本门控逻辑迁移到 `./kernel.js`， + * 本文件仅作为 **别名**，保持旧调用代码可用而无需立刻修改所有页面。 * - * 版本格式: x.y.z 或 x.y.z-zh.w（汉化版） + * 新代码请直接 `import { hasFeature, onKernelChange, getKernelSnapshot } from './kernel.js'` + * + * 迁移指南： + * isFeatureAvailable(id) → hasFeature(id) + * initFeatureGates() → initKernelGates() + * getCachedVersion() → getKernelSnapshot()?.version + * invalidateVersionCache() → refreshKernelSnapshot() */ -import { api } from './tauri-api.js' -import { wsClient } from './ws-client.js' +export { + isFeatureAvailable, + initFeatureGates, + getCachedVersion, + invalidateVersionCache, + getAllFeatureStatus, + hasFeature, + hasFeatureStrict, + getKernelSnapshot, + isAboveFloor, + onKernelChange, + refreshKernelSnapshot, + initKernelGates, + parseVersion, + versionGte, +} from './kernel.js' -// 功能 → 最低版本映射（语义化版本号，不含 -zh 后缀） -const FEATURE_MIN_VERSIONS = { - dreaming: '0.11.0', - cron: '0.10.0', - skills: '0.10.0', - 'route-map': '0.9.0', - 'plugin-hub': '0.9.0', - memory: '0.8.0', -} - -let _cachedVersion = null -let _cacheTime = 0 -const CACHE_TTL = 60000 - -/** - * 解析版本号为可比较的数组 [major, minor, patch] - * 支持 '0.11.6', '0.11.6-zh.2', '2026.3.18' 等格式 - */ -function parseVersion(ver) { - if (!ver) return null - // 移除 -zh.xxx / -beta.xxx 等后缀，只保留主版本号 - const base = ver.replace(/-.*$/, '') - const parts = base.split('.').map(Number) - if (parts.some(isNaN)) return null - while (parts.length < 3) parts.push(0) - return parts.slice(0, 3) -} - -/** - * 比较版本: a >= b 返回 true - */ -function versionGte(a, b) { - const pa = parseVersion(a) - const pb = parseVersion(b) - if (!pa || !pb) return true // 无法解析时默认允许 - for (let i = 0; i < 3; i++) { - if (pa[i] > pb[i]) return true - if (pa[i] < pb[i]) return false - } - return true // equal -} - -/** - * 获取当前 OpenClaw 版本（带缓存） - */ -async function getCurrentVersion() { - if (_cachedVersion && Date.now() - _cacheTime < CACHE_TTL) return _cachedVersion - - // 优先从 wsClient.serverVersion 获取（实时） - if (wsClient.serverVersion) { - _cachedVersion = wsClient.serverVersion - _cacheTime = Date.now() - return _cachedVersion - } - - // 回退到 API - try { - const info = await api.getVersionInfo() - if (info?.current) { - _cachedVersion = info.current - _cacheTime = Date.now() - } - } catch {} - - return _cachedVersion -} - -/** - * 同步获取上次缓存的版本（不发请求） - */ -export function getCachedVersion() { - return _cachedVersion || wsClient.serverVersion || null -} - -/** - * 同步检查功能是否可用（基于缓存版本） - * 如果版本信息尚未获取，默认返回 true（避免隐藏功能） - */ -export function isFeatureAvailable(featureId) { - const minVer = FEATURE_MIN_VERSIONS[featureId] - if (!minVer) return true // 无门控 → 始终可用 - - const currentVer = getCachedVersion() - if (!currentVer) return true // 版本未知 → 默认显示 - - return versionGte(currentVer, minVer) -} - -/** - * 异步检查功能是否可用（会先获取版本） - */ +// 为兼容旧代码中 `checkFeatureAvailable`（异步版）导出一个异步包装 +import { hasFeature as _hasFeature } from './kernel.js' export async function checkFeatureAvailable(featureId) { - await getCurrentVersion() - return isFeatureAvailable(featureId) -} - -/** - * 初始化：预加载版本信息 - */ -export async function initFeatureGates() { - await getCurrentVersion() -} - -/** - * 刷新缓存 - */ -export function invalidateVersionCache() { - _cachedVersion = null - _cacheTime = 0 -} - -/** - * 获取所有功能门控状态（调试用） - */ -export function getAllFeatureStatus() { - const ver = getCachedVersion() - const result = {} - for (const [feature, minVer] of Object.entries(FEATURE_MIN_VERSIONS)) { - result[feature] = { minVersion: minVer, available: isFeatureAvailable(feature) } - } - return { currentVersion: ver, features: result } + return _hasFeature(featureId) } diff --git a/src/lib/gateway-guardian-policy.js b/src/lib/gateway-guardian-policy.js new file mode 100644 index 0000000..21e8a35 --- /dev/null +++ b/src/lib/gateway-guardian-policy.js @@ -0,0 +1,18 @@ +export const MAX_AUTO_RESTART = 3 +export const RESTART_COOLDOWN = 60 * 1000 +export const STABLE_RUNNING_MS = 5 * 60 * 1000 + +export function shouldResetAutoRestartCount({ autoRestartCount = 0, runningSince = 0, now = Date.now() } = {}) { + if (autoRestartCount <= 0 || !runningSince) return false + return now - runningSince >= STABLE_RUNNING_MS +} + +export function evaluateAutoRestartAttempt({ now = Date.now(), lastRestartTime = 0, autoRestartCount = 0 } = {}) { + if (autoRestartCount >= MAX_AUTO_RESTART) return { action: 'give_up' } + if (now - lastRestartTime < RESTART_COOLDOWN) return { action: 'cooldown' } + return { + action: 'restart', + autoRestartCount: autoRestartCount + 1, + lastRestartTime: now, + } +} diff --git a/src/lib/gateway-restart-queue.js b/src/lib/gateway-restart-queue.js index aaaee80..a31404d 100644 --- a/src/lib/gateway-restart-queue.js +++ b/src/lib/gateway-restart-queue.js @@ -131,6 +131,32 @@ export function onRestartState(fn) { } } +/** + * 等待 Gateway 端口真正监听上。 + * 修复了之前 restart_service 返回 Ok 后立即 emit('succeeded') 的误报： + * Rust 端 restart_service 只代表"启动命令执行了"，不代表 Gateway 真正监听端口。 + * 比如 Gateway 进程因配置错误启动后立即崩溃，前端却显示"配置已生效"，导致小白误判。 + * + * 这里在 restart 命令返回后，**实际探测端口** 最多 PROBE_TIMEOUT_MS，可连通才认为成功。 + * + * @returns {Promise} 端口是否在限定时间内变得可连通 + */ +const PROBE_TIMEOUT_MS = 12000 // 12s 给 Gateway 充分启动时间（一般 1-3s 就能起来） +const PROBE_INTERVAL_MS = 500 +async function _waitGatewayPortReady() { + const deadline = Date.now() + PROBE_TIMEOUT_MS + while (Date.now() < deadline) { + try { + const ok = await api.probeGatewayPort() + if (ok) return true + } catch (_) { + // probe 自身异常也算未就绪，继续重试 + } + await new Promise(r => setTimeout(r, PROBE_INTERVAL_MS)) + } + return false +} + async function runRestart() { _pendingTimer = null _inflight = true @@ -138,7 +164,18 @@ async function runRestart() { try { const result = await api.restartGateway() - emit('succeeded', { result }) + // ⚠ 关键修复：restart_service 返回 Ok 不代表 Gateway 真正在监听端口。 + // 必须 probe 端口确认它真起来了，才能 emit('succeeded')。 + // 否则用户会在"已重启"的假象下继续操作，但实际 WS 连不上。 + const portReady = await _waitGatewayPortReady() + if (portReady) { + emit('succeeded', { result }) + } else { + emit('failed', { + error: 'Gateway 重启命令已执行，但端口在 12 秒内仍未监听。请前往「服务管理」查看日志。', + portTimeout: true, + }) + } } catch (err) { emit('failed', { error: err?.message ? err.message : String(err) }) } finally { diff --git a/src/lib/kernel-upgrade.js b/src/lib/kernel-upgrade.js new file mode 100644 index 0000000..d84bd19 --- /dev/null +++ b/src/lib/kernel-upgrade.js @@ -0,0 +1,94 @@ +/** + * 一键升级内核 + * + * 把 about 页升级流程的核心代码提取出来，让 sidebar / dashboard 也能复用。 + * 全程对小白透明：弹确认 → 进度展示 → 成功提示 / 失败提示，无需打开终端。 + */ +import { api, isTauriRuntime } from './tauri-api.js' +import { showUpgradeModal, showConfirm } from '../components/modal.js' +import { setUpgrading } from './app-state.js' +import { toast } from '../components/toast.js' +import { t } from './i18n.js' +import { getKernelSnapshot } from './kernel.js' + +/** + * 触发一键升级。会自动检测当前内核 variant（官方/汉化）选择源，调推荐版本。 + * + * @param {Object} [opts] + * @param {boolean} [opts.skipConfirm=false] 跳过确认对话框（不推荐） + * @param {() => void} [opts.onDone] 升级成功完成时回调 + * @returns {Promise} 启动了升级流程返回 true，用户取消返回 false + */ +export async function triggerKernelUpgrade(opts = {}) { + const snap = getKernelSnapshot() + if (!snap || snap.engine !== 'openclaw') { + toast(t('common.unsupportedAction') || 'Unsupported', 'warning') + return false + } + + const variant = snap.variant === 'chinese' ? 'chinese' : 'official' + const targetVersion = snap.target || '' + + // 1. 确认对话框 + if (!opts.skipConfirm) { + const msg = t('kernel.upgrade.confirmMessage', { + from: snap.versionLabel || snap.version || '?', + to: targetVersion || t('kernel.badge.latest'), + }) + const ok = await showConfirm(msg) + if (!ok) return false + } + + // 2. 进度弹窗 + const modal = showUpgradeModal(t('kernel.upgrade.title')) + modal.onClose(() => { try { opts.onDone?.() } catch {} }) + let unlistenLog, unlistenProgress, unlistenDone, unlistenError + setUpgrading(true) + + const cleanup = () => { + unlistenLog?.() + unlistenProgress?.() + unlistenDone?.() + unlistenError?.() + setUpgrading(false) + } + + try { + if (isTauriRuntime() && window.__TAURI_INTERNALS__) { + // 桌面端：订阅原生事件流 + const { listen } = await import('@tauri-apps/api/event') + unlistenLog = await listen('upgrade-log', (e) => modal.appendLog(e.payload)) + unlistenProgress = await listen('upgrade-progress', (e) => modal.setProgress(e.payload)) + unlistenDone = await listen('upgrade-done', (e) => { + cleanup() + const msg = typeof e.payload === 'string' + ? e.payload + : t('kernel.upgrade.successMessage') + modal.setDone(msg) + toast(t('kernel.upgrade.successToast'), 'success') + }) + unlistenError = await listen('upgrade-error', (e) => { + cleanup() + modal.setError(t('kernel.upgrade.failurePrefix') + ' ' + (e.payload || '')) + }) + + modal.appendLog(t('kernel.upgrade.starting', { version: targetVersion || t('common.recommended') })) + // version=null 让后端按 openclaw-version-policy.json 自己挑推荐版 + await api.upgradeOpenclaw(variant, null, 'auto') + } else { + // Web 模式：单次同步调用，无进度事件 + modal.appendLog(t('kernel.upgrade.starting', { version: targetVersion || t('common.recommended') })) + const result = await api.upgradeOpenclaw(variant, null, 'auto') + modal.setProgress(100) + modal.setDone(typeof result === 'string' ? result : t('kernel.upgrade.successMessage')) + toast(t('kernel.upgrade.successToast'), 'success') + cleanup() + } + return true + } catch (e) { + console.error('[kernel-upgrade] 升级失败', e) + modal.setError(t('kernel.upgrade.failurePrefix') + ' ' + (e?.message || String(e))) + cleanup() + return false + } +} diff --git a/src/lib/kernel.js b/src/lib/kernel.js new file mode 100644 index 0000000..8e3992f --- /dev/null +++ b/src/lib/kernel.js @@ -0,0 +1,270 @@ +/** + * 内核版本与特性门控 + * + * 此模块是 ClawPanel 多内核版本兼容的核心： + * - 连接 Gateway 成功后，从 hello.serverVersion 构造 kernel snapshot + * - 页面通过 hasFeature(id) 同步查询特性可用性 + * - 低于硬地板时通过 onKernelChange 触发 floor blocker + * + * @see .tmp/multi-kernel-compat-design.md §4.2 为详细设计 + */ +import { FEATURE_CATALOG, KERNEL_FLOOR, KERNEL_TARGET } from './feature-catalog.js' +import { wsClient } from './ws-client.js' +import { getActiveEngineId, onEngineChange } from './engine-manager.js' + +/** @type {KernelSnapshot|null} */ +let _snapshot = null +let _initialized = false +const _listeners = [] + +/** + * @typedef {Object} KernelSnapshot + * @property {string} engine 当前引擎 id + * @property {string|null} version 原始版本字符串，可能含 -zh.2 后缀 + * @property {string|null} versionBase 剥离后缀的基础版本 x.y.z + * @property {'official'|'chinese'|'unknown'} variant + * @property {string|null} target 当前推荐目标版本 + * @property {string} floor 硬地板版本 + * @property {boolean} aboveFloor 是否 >= floor + * @property {boolean} isLatest 是否 >= target + * @property {Set} features 当前启用的特性 id 集合 + * @property {string} versionLabel 人类可读的版本显示，例如 "2026.5.6 汉化" + */ + +/** + * 解析版本号 → [major, minor, patch]，自动剥离 -zh.* / -beta.* 等后缀 + * @param {string|null|undefined} ver + * @returns {number[]|null} + */ +export function parseVersion(ver) { + if (!ver) return null + const base = String(ver).replace(/-.*$/, '') + const parts = base.split('.').map(Number) + if (parts.some(isNaN)) return null + while (parts.length < 3) parts.push(0) + return parts.slice(0, 3) +} + +/** + * 比较版本: a >= b 返回 true。版本无法解析时返回 false（严格）。 + */ +export function versionGte(a, b) { + const pa = parseVersion(a) + const pb = parseVersion(b) + if (!pa || !pb) return false + for (let i = 0; i < 3; i++) { + if (pa[i] > pb[i]) return true + if (pa[i] < pb[i]) return false + } + return true +} + +/** + * 检测版本是否属于汉化版 + */ +function detectVariant(ver) { + if (!ver) return 'unknown' + if (/-zh/i.test(ver)) return 'chinese' + return 'official' +} + +/** + * 根据当前 engine + serverVersion 构造一份特性快照 + * @param {string} engineId + * @param {string|null} version + * @returns {KernelSnapshot} + */ +export function buildSnapshot(engineId, version) { + const features = new Set() + for (const [id, def] of Object.entries(FEATURE_CATALOG)) { + if (def.engine !== engineId) continue + if (version && versionGte(version, def.minVersion)) { + features.add(id) + } + } + + const variant = detectVariant(version) + const target = KERNEL_TARGET[engineId]?.[variant] + || KERNEL_TARGET[engineId]?.official + || KERNEL_TARGET[engineId]?.default + || null + const floor = KERNEL_FLOOR[engineId] || '0.0.0' + const versionBase = parseVersion(version)?.join('.') || version || null + + return { + engine: engineId, + version: version || null, + versionBase, + variant, + target, + floor, + aboveFloor: !!version && versionGte(version, floor), + isLatest: !!version && !!target && versionGte(version, target), + features, + versionLabel: version + ? `${versionBase}${variant === 'chinese' ? ' 汉化' : ''}` + : '', + } +} + +/** + * 同步：当前是否启用某个特性 + * + * 语义： + * - featureId **不在** catalog 中 → 返回 true（兼容老代码 isFeatureAvailable，例如 'memory' / 'cron'） + * - featureId **在** catalog 中： + * - 还未连接 Gateway / 无版本信息 → 返回 **false**（避免首屏闪烁出 5.x 新功能后又消失） + * - 有版本信息但引擎不匹配 → 返回 false + * - 有版本信息且匹配 → 返回 features.has(id) + * + * 设计要点：在 catalog 中的特性默认严格，对小白用户 UX 更平滑—— + * 老内核连接前他根本不会看到 5.x 按钮闪现一下又消失。 + * + * @param {string} featureId + * @returns {boolean} + */ +export function hasFeature(featureId) { + const def = FEATURE_CATALOG[featureId] + if (!def) return true + if (!_snapshot || !_snapshot.version) return false + if (_snapshot.engine !== def.engine) return false + return _snapshot.features.has(featureId) +} + +/** + * @deprecated 当前 hasFeature 已经是 strict 行为，本函数仅做向后兼容 + */ +export function hasFeatureStrict(featureId) { + return hasFeature(featureId) +} + +/** + * 返回当前内核快照（可能为 null）。 + * 页面应该通过此对象读取 version/versionLabel/aboveFloor/target 等状态。 + * @returns {KernelSnapshot|null} + */ +export function getKernelSnapshot() { + return _snapshot +} + +/** + * 当前版本是否高于硬地板 + */ +export function isAboveFloor() { + return _snapshot?.aboveFloor ?? true +} + +/** + * 监听内核快照变化。 + * - 连接 Gateway 握手成功 → 触发 + * - 重连后 serverVersion 变化 → 触发 + * - 引擎切换 → 触发 + * + * @param {(snap: KernelSnapshot) => void} fn + * @returns {() => void} 取消监听函数 + */ +export function onKernelChange(fn) { + _listeners.push(fn) + if (_snapshot) { + try { fn(_snapshot) } catch (e) { console.warn('[kernel] listener error', e) } + } + return () => { + const idx = _listeners.indexOf(fn) + if (idx >= 0) _listeners.splice(idx, 1) + } +} + +/** + * 刷新快照。内部调用。 + * @returns {KernelSnapshot} + */ +function refresh() { + const engineId = getActiveEngineId() + const version = wsClient.serverVersion + const next = buildSnapshot(engineId, version) + const changed = !_snapshot + || _snapshot.engine !== next.engine + || _snapshot.version !== next.version + || _snapshot.features.size !== next.features.size + _snapshot = next + if (changed) { + _listeners.forEach(fn => { + try { fn(next) } catch (e) { console.warn('[kernel] listener error', e) } + }) + } + return next +} + +/** + * 手动触发刷新（给 ws-client 在握手成功后调用）。 + * 也可在外部场景（例如手动切版本后）调用。 + */ +export function refreshKernelSnapshot() { + return refresh() +} + +/** + * 初始化。应由 engine.boot() 调用一次。 + * - 立即构造一份快照（可能 version=null） + * - 订阅 wsClient.onReady 以在握手成功后刷新 + * - 订阅 engine 切换 + */ +export function initKernelGates() { + if (_initialized) { + refresh() + return + } + _initialized = true + refresh() + + // WS 握手成功 → 刷新快照 + wsClient.onReady(() => { + refresh() + }) + + // 引擎切换 → 刷新快照 + onEngineChange(() => { + refresh() + }) +} + +// === 兼容旧 API（feature-gates.js 曾经使用的名字） === + +/** @deprecated 使用 hasFeature 代替 */ +export function isFeatureAvailable(featureId) { + return hasFeature(featureId) +} + +/** @deprecated 使用 initKernelGates 代替 */ +export function initFeatureGates() { + initKernelGates() + return Promise.resolve() +} + +/** @deprecated 使用 getKernelSnapshot()?.version 代替 */ +export function getCachedVersion() { + return _snapshot?.version || null +} + +/** @deprecated kernel.js 会自动 refresh，手动清缓存无效；仅保留函数签名兼容 */ +export function invalidateVersionCache() { + refresh() +} + +/** 调试用：获取所有特性的启用状态 */ +export function getAllFeatureStatus() { + const snap = _snapshot + const result = {} + for (const [id, def] of Object.entries(FEATURE_CATALOG)) { + result[id] = { + engine: def.engine, + minVersion: def.minVersion, + desc: def.desc, + available: snap ? snap.features.has(id) : null, + } + } + return { + snapshot: snap, + features: result, + } +} diff --git a/src/lib/model-presets.js b/src/lib/model-presets.js index 2868892..5a55037 100644 --- a/src/lib/model-presets.js +++ b/src/lib/model-presets.js @@ -23,7 +23,7 @@ export const PROVIDER_PRESETS = [ { key: 'volcengine', label: '火山引擎', baseUrl: 'https://ark.cn-beijing.volces.com/api/v3', api: 'openai-completions', site: 'https://volcengine.com/L/Ph1OP5I3_GY', desc: '字节跳动旗下云平台，支持豆包等模型' }, { key: 'aliyun', label: '阿里云百炼', baseUrl: 'https://dashscope.aliyuncs.com/compatible-mode/v1', api: 'openai-completions', site: 'https://www.aliyun.com/benefit/ai/aistar?userCode=keahn2zr&clubBiz=subTask..12435175..10263..', desc: '阿里云 AI 大模型平台，支持通义千问全系列' }, { key: 'zhipu', label: '智谱 AI', baseUrl: 'https://open.bigmodel.cn/api/paas/v4', api: 'openai-completions', site: 'https://www.bigmodel.cn/glm-coding?ic=3F6F9XYKTS', desc: '国产大模型领军企业，支持 GLM-4 全系列' }, - { key: 'minimax', label: 'MiniMax', baseUrl: 'https://api.minimaxi.com/anthropic/v1', api: 'anthropic-messages', site: 'https://platform.minimaxi.com/user-center/basic-information/interface-key', desc: '国产多模态大模型，支持 MiniMax-M2.7 / M2.5 系列' }, + { key: 'minimax', label: 'MiniMax', baseUrl: 'https://api.minimax.io/v1', api: 'openai-completions', site: 'https://platform.minimaxi.com/user-center/basic-information/interface-key', desc: '国产多模态大模型，支持 MiniMax-M2.7 / M2.5 系列' }, { key: 'moonshot', label: 'Moonshot / Kimi', baseUrl: 'https://api.moonshot.ai/v1', api: 'openai-completions', site: 'https://platform.moonshot.ai/console/api-keys', desc: 'Kimi 大模型平台，支持超长上下文' }, { key: 'openai', label: 'OpenAI 官方', baseUrl: 'https://api.openai.com/v1', api: 'openai-completions', site: 'https://platform.openai.com/api-keys' }, { key: 'anthropic', label: 'Anthropic 官方', baseUrl: 'https://api.anthropic.com/v1', api: 'anthropic-messages', site: 'https://console.anthropic.com/settings/keys' }, @@ -78,7 +78,10 @@ export const MODEL_PRESETS = { { id: 'gemini-2.5-flash', name: 'Gemini 2.5 Flash', contextWindow: 1000000 }, ], minimax: [ + { id: 'MiniMax-M2.7', name: 'MiniMax M2.7', contextWindow: 1000000 }, + { id: 'MiniMax-M2.7-highspeed', name: 'MiniMax M2.7 Highspeed', contextWindow: 1000000 }, { id: 'MiniMax-M2.5', name: 'MiniMax M2.5', contextWindow: 204000 }, + { id: 'MiniMax-M2.5-highspeed', name: 'MiniMax M2.5 Highspeed', contextWindow: 204000 }, ], moonshot: [ { id: 'kimi-k2.5', name: 'Kimi K2.5', contextWindow: 131072 }, diff --git a/src/lib/tauri-api.js b/src/lib/tauri-api.js index 78a290c..5a172ea 100644 --- a/src/lib/tauri-api.js +++ b/src/lib/tauri-api.js @@ -146,6 +146,47 @@ async function webInvoke(cmd, args) { return resp.json() } +async function webStreamInvoke(cmd, args, onEvent, options = {}) { + const resp = await fetch(`/__api/${cmd}`, { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(args || {}), + signal: options.signal, + }) + if (resp.status === 401) { + if (!isTauriRuntime() && window.__clawpanel_show_login) window.__clawpanel_show_login() + throw new Error(t('common.loginRequired')) + } + if (!resp.ok) { + const data = await resp.json().catch(() => ({ error: `HTTP ${resp.status}` })) + throw new Error(data.error || `HTTP ${resp.status}`) + } + if (!resp.body) throw new Error('Streaming response is not supported by this browser') + + const reader = resp.body.getReader() + const decoder = new TextDecoder() + let buffer = '' + try { + while (true) { + const { done, value } = await reader.read() + if (done) break + buffer += decoder.decode(value, { stream: true }) + const lines = buffer.split(/\r?\n/) + buffer = lines.pop() || '' + for (const line of lines) { + const trimmed = line.trim() + if (!trimmed) continue + const event = JSON.parse(trimmed) + if (typeof onEvent === 'function') onEvent(event) + } + } + const tail = buffer.trim() + if (tail && typeof onEvent === 'function') onEvent(JSON.parse(tail)) + } finally { + try { reader.releaseLock() } catch {} + } +} + // 后端连接状态 let _backendOnline = null // null=未检测, true=在线, false=离线 const _backendListeners = [] @@ -198,6 +239,13 @@ export const api = { guardianStatus: () => invoke('guardian_status'), checkCiaoWindowsHideBug: () => invoke('check_ciao_windowshide_bug'), + // CLI 冲突检测与隔离（PATH 中残留的非 standalone openclaw） + scanOpenclawPathConflicts: () => invoke('scan_openclaw_path_conflicts'), + quarantineOpenclawPath: (path) => invoke('quarantine_openclaw_path', { path }), + quarantineOpenclawPathsBulk: (paths) => invoke('quarantine_openclaw_paths_bulk', { paths }), + listQuarantinedOpenclaw: () => invoke('list_quarantined_openclaw'), + restoreQuarantinedOpenclaw: (quarantinedPath) => invoke('restore_quarantined_openclaw', { quarantinedPath }), + // 配置（读缓存，写清缓存） getVersionInfo: () => cachedInvoke('get_version_info', {}, 30000), getStatusSummary: () => cachedInvoke('get_status_summary', {}, 60000), @@ -404,6 +452,7 @@ export const api = { hermesHealthCheck: () => invoke('hermes_health_check'), hermesApiProxy: (method, path, body, headers) => invoke('hermes_api_proxy', { method, path, body: body || null, headers: headers || null }), hermesAgentRun: (input, sessionId, conversationHistory, instructions) => invoke('hermes_agent_run', { input, sessionId: sessionId || null, conversationHistory: conversationHistory || null, instructions: instructions || null }), + hermesAgentRunStream: (input, sessionId, conversationHistory, instructions, onEvent, options) => webStreamInvoke('hermes_agent_run_stream', { input, sessionId: sessionId || null, conversationHistory: conversationHistory || null, instructions: instructions || null }, onEvent, options), hermesReadConfig: () => invoke('hermes_read_config'), hermesFetchModels: (baseUrl, apiKey, apiType, provider) => invoke('hermes_fetch_models', { baseUrl, apiKey, apiType: apiType || null, provider: provider || null }), hermesUpdateModel: (model, provider) => invoke('hermes_update_model', { model, provider: provider || null }), diff --git a/src/lib/ws-client.js b/src/lib/ws-client.js index 63c8087..6d03c85 100644 --- a/src/lib/ws-client.js +++ b/src/lib/ws-client.js @@ -29,6 +29,30 @@ const MESSAGE_CACHE_SIZE = 100 // Gateway 启动前的初始重连延迟（更长，给 Gateway 充足的重启/初始化时间） const INITIAL_RECONNECT_DELAY = 10000 +/** + * 判断 RPC 错误是否为「method 不被当前 Gateway 支持」类型。 + * 用于跨内核兼容降级：老内核没有的新 RPC 应该被静默吃掉，而不是 toast 给小白用户。 + * + * 上游 Gateway 错误码可能是：METHOD_NOT_FOUND / UNKNOWN_METHOD / UNKNOWN_RPC / NOT_IMPLEMENTED + * 错误消息可能包含 "method ... not found" / "unknown method" / "no handler" + */ +function isMethodUnsupportedError(err) { + if (!err) return false + const code = String(err.code || '').toUpperCase() + if ( + code === 'METHOD_NOT_FOUND' || + code === 'UNKNOWN_METHOD' || + code === 'UNKNOWN_RPC' || + code === 'NOT_IMPLEMENTED' || + code === 'UNSUPPORTED' + ) return true + const msg = String(err.message || '').toLowerCase() + if (/method\s+.*\s+not\s+(found|implemented|supported)/.test(msg)) return true + if (/unknown\s+(method|rpc|handler)/.test(msg)) return true + if (/no\s+handler\s+for/.test(msg)) return true + return false +} + export class WsClient { constructor() { this._ws = null @@ -68,6 +92,10 @@ export class WsClient { this._messageCache = new Map() this._cacheSize = MESSAGE_CACHE_SIZE this._seenMessageIds = new Set() + + // 跨内核兼容：当前 Gateway 已确认不支持的 RPC method 名集合 + // 由 requestCompat 在收到 method-not-found 类错误时填充，连接断开时清空 + this._unsupportedMethods = new Set() } get connected() { return this._connected } @@ -390,6 +418,26 @@ export class WsClient { } } + // 上游 5.4+：Gateway 启动期间收到的 connect 会返回 retryable UNAVAILABLE， + // details.reason='startup-sidecars'，附带 retryAfterMs。 + // 这种错误对小白用户应该完全无感——按建议时间静默重试，不显示红色错误。 + const isStartupSidecars = + /^UNAVAILABLE$/i.test(errCode || '') && + ( + details.reason === 'startup-sidecars' || + details.code === 'startup-sidecars' || + detailCode === 'STARTUP_SIDECARS' || + /startup[-_]?sidecars/i.test(errMsg) + ) + if (!handled && isStartupSidecars) { + const retryMs = Math.max(500, Math.min(details.retryAfterMs || msg.error?.retryAfterMs || 1500, 10000)) + console.log(`[ws] Gateway 启动中 (sidecars 加载)，${retryMs}ms 后重试`) + // 标 reconnecting 而非 error，UI 上显示的是 spinner 不是红色叉 + this._setConnected(false, 'reconnecting', 'Gateway 启动中...') + setTimeout(() => { if (!this._intentionalClose) this._doConnect() }, retryMs) + return + } + // 使用 recommendedNextStep 给用户更好的提示 const hints = { 'retry_with_device_token': '设备令牌需要更新，请重启面板', @@ -418,7 +466,13 @@ export class WsClient { this._pending.delete(msg.id) clearTimeout(cb.timer) if (msg.ok) cb.resolve(msg.payload) - else cb.reject(new Error(msg.error?.message || msg.error?.code || 'request failed')) + else { + const err = new Error(msg.error?.message || msg.error?.code || 'request failed') + err.code = msg.error?.code || null + err.details = msg.error?.details || null + err.method = cb.method || null + cb.reject(err) + } } return } @@ -528,6 +582,8 @@ export class WsClient { this._hello = payload || null this._snapshot = payload?.snapshot || null this._serverVersion = payload?.serverVersion || null + // 新连接 → 清空 method 降级缓存（可能换了 Gateway 版本） + this.resetCompatCache() const defaults = this._snapshot?.sessionDefaults if (defaults?.mainSessionKey) { this._sessionKey = defaults.mainSessionKey @@ -690,11 +746,59 @@ export class WsClient { } const id = uuid() const timer = setTimeout(() => { this._pending.delete(id); reject(new Error('请求超时')) }, REQUEST_TIMEOUT) - this._pending.set(id, { resolve, reject, timer }) + this._pending.set(id, { resolve, reject, timer, method }) this._ws.send(JSON.stringify({ type: 'req', id, method, params })) }) } + /** + * 跨内核兼容版 request： + * - 老内核不支持的 RPC 会返回 fallback（默认 null），不抛错 + * - 第二次起跳过实际请求，直接返回 fallback + * - 真实失败（网络、参数错误等）仍然 throw + * + * 用法： + * const status = await wsClient.requestCompat('memory.status.deep', {}) + * if (status) renderRich(status); else renderBasic() + * + * @param {string} method + * @param {object} [params] + * @param {*} [fallback=null] 老内核不支持时返回此值 + * @returns {Promise<*>} + */ + async requestCompat(method, params = {}, fallback = null) { + if (this._unsupportedMethods.has(method)) { + return fallback + } + try { + return await this.request(method, params) + } catch (e) { + if (isMethodUnsupportedError(e)) { + this._unsupportedMethods.add(method) + console.warn(`[ws] RPC \`${method}\` 不被当前 Gateway 支持 (code=${e.code}), 已记入降级集合`) + return fallback + } + throw e + } + } + + /** + * 是否已确认某 method 在当前 Gateway 上不可用 + */ + isMethodUnsupported(method) { + return this._unsupportedMethods.has(method) + } + + /** + * 清空降级集合（在新连接成功时自动调用） + */ + resetCompatCache() { + if (this._unsupportedMethods.size > 0) { + console.log('[ws] 清空 method 降级集合', Array.from(this._unsupportedMethods)) + } + this._unsupportedMethods.clear() + } + chatSend(sessionKey, message, attachments) { const params = { sessionKey, message, deliver: false, idempotencyKey: uuid() } if (attachments && attachments.length > 0) { diff --git a/src/locales/de.json b/src/locales/de.json index 8e91e9a..130b48a 100644 --- a/src/locales/de.json +++ b/src/locales/de.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "OpenClaw-Konfigurationsproblem erkannt", + "invalidConfigPrompt": "Aktion „{action}\" fehlgeschlagen:\n\n{error}\n\nNormalerweise ist das Konfigurationsschema veraltet. doctor zur automatischen Reparatur ausführen?", + "runDoctorFix": "doctor --fix ausführen", + "runningDoctorFix": "doctor --fix wird ausgeführt...", + "doctorFixSuccess": "Konfiguration repariert. Bitte erneut versuchen", + "doctorFixFailed": "doctor-Reparatur fehlgeschlagen" }, "settings": { "title": "Panel-Einstellungen", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "Konfiguration gespeichert. Gateway läuft nicht — Einstellungen werden beim Start übernommen." }, "agents": { "title": "Agenten-Verwaltung", @@ -504,7 +511,8 @@ "deleteFailed": "Löschen fehlgeschlagen", "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", - "backupFailed": "Backup failed" + "backupFailed": "Backup failed", + "labelRuntime": "Runtime:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "Bestätigen", "confirmOk": "OK", "confirmCancel": "Abbrechen" + }, + "kernel": { + "floorBlocker": { + "title": "Kernel-Version zu alt", + "message": "OpenClaw-Kernel {current} liegt unter der minimal unterstützten Version {floor}. Einige Funktionen funktionieren möglicherweise nicht.", + "targetHint": "Ein Upgrade auf {target} wird für die beste Erfahrung empfohlen.", + "goUpgrade": "Jetzt upgraden", + "continueReadonly": "Fortfahren (schreibgeschützt)", + "readonlyHint": "Im schreibgeschützten Modus werden Schreibvorgänge clientseitig blockiert, um alte Kernel-Konfigurationen nicht zu beschädigen." + }, + "badge": { + "currentKernel": "Kernel", + "featuresEnabled": "{enabled}/{total} Funktionen aktiviert", + "belowTarget": "Unter der empfohlenen", + "latest": "Aktuell", + "unknown": "Unbekannt" + }, + "upgrade": { + "title": "OpenClaw-Kernel aktualisieren", + "confirmMessage": "Aktualisierung von {from} auf {to}.\nDauert ca. 2 Minuten, Gateway wird automatisch neu gestartet. Fortfahren?", + "starting": "Aktualisierung auf {version}...", + "successMessage": "Kernel-Update abgeschlossen", + "successToast": "Kernel erfolgreich aktualisiert", + "failurePrefix": "Kernel-Update fehlgeschlagen:" + }, + "upgradeHint": { + "title": "Neuer Kernel verfügbar", + "subtitle": "{from} → {to}, hier klicken zum Aktualisieren", + "dismissTooltip": "In dieser Sitzung nicht erneut anzeigen" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/en.json b/src/locales/en.json index ced508f..a135422 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -257,7 +257,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "OpenClaw config issue detected", + "invalidConfigPrompt": "Action \"{action}\" failed:\n\n{error}\n\nThis usually means the config schema is outdated. Run doctor to fix automatically?", + "runDoctorFix": "Run doctor --fix", + "runningDoctorFix": "Running doctor --fix...", + "doctorFixSuccess": "Config fixed. Please retry", + "doctorFixFailed": "doctor fix failed" }, "settings": { "title": "Settings", @@ -465,7 +471,8 @@ "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", "visitSite": "Visit {name} website", - "configure": "Configure" + "configure": "Configure", + "configSavedGwNotRunning": "Config saved. Gateway is not running — settings will take effect once it starts." }, "agents": { "title": "Agents", @@ -512,7 +519,8 @@ "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", "backupFailed": "Backup failed", - "detailHint": "Click a card or the Details button to open the new Agent detail page." + "detailHint": "Click a card or the Details button to open the new Agent detail page.", + "labelRuntime": "Runtime:" }, "agentDetail": { "back": "← Back to Agents", @@ -2200,5 +2208,51 @@ "confirmTitle": "Confirm", "confirmOk": "OK", "confirmCancel": "Cancel" + }, + "kernel": { + "floorBlocker": { + "title": "Kernel version too old", + "message": "OpenClaw kernel {current} is below the minimum supported version {floor}. Some features may not work.", + "targetHint": "Upgrading to {target} is recommended for the best experience.", + "goUpgrade": "Upgrade now", + "continueReadonly": "Continue (read-only)", + "readonlyHint": "In read-only mode, write operations are blocked client-side to avoid corrupting older kernel configs." + }, + "badge": { + "currentKernel": "Kernel", + "featuresEnabled": "{enabled}/{total} features enabled", + "belowTarget": "Below recommended", + "latest": "Latest", + "unknown": "Unknown" + }, + "upgrade": { + "title": "Upgrade OpenClaw kernel", + "confirmMessage": "Upgrading from {from} to {to}.\nThis takes about 2 minutes; Gateway will restart automatically. Continue?", + "starting": "Upgrading to {version}...", + "successMessage": "Kernel upgrade complete", + "successToast": "Kernel upgraded successfully", + "failurePrefix": "Kernel upgrade failed:" + }, + "upgradeHint": { + "title": "New kernel available", + "subtitle": "{from} → {to}, click to upgrade", + "dismissTooltip": "Don't remind me this session" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/es.json b/src/locales/es.json index 84c444f..4d71f63 100644 --- a/src/locales/es.json +++ b/src/locales/es.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "Problema de configuración de OpenClaw detectado", + "invalidConfigPrompt": "La acción \"{action}\" falló:\n\n{error}\n\nNormalmente el esquema de configuración está desactualizado. ¿Ejecutar doctor para arreglarlo automáticamente?", + "runDoctorFix": "Ejecutar doctor --fix", + "runningDoctorFix": "Ejecutando doctor --fix...", + "doctorFixSuccess": "Configuración arreglada. Inténtalo de nuevo", + "doctorFixFailed": "doctor falló al arreglar" }, "settings": { "title": "Configuración del panel", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "Configuración guardada. Gateway no está en ejecución — se aplicará al iniciarlo." }, "agents": { "title": "Gestión de Agentes", @@ -504,7 +511,8 @@ "deleteFailed": "Error al eliminar", "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", - "backupFailed": "Backup failed" + "backupFailed": "Backup failed", + "labelRuntime": "Runtime:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "Confirmar", "confirmOk": "Aceptar", "confirmCancel": "Cancelar" + }, + "kernel": { + "floorBlocker": { + "title": "Versión del kernel demasiado antigua", + "message": "El kernel de OpenClaw {current} está por debajo de la versión mínima soportada {floor}. Algunas funciones podrían no funcionar.", + "targetHint": "Se recomienda actualizar a {target} para una mejor experiencia.", + "goUpgrade": "Actualizar ahora", + "continueReadonly": "Continuar (solo lectura)", + "readonlyHint": "En modo solo lectura, las operaciones de escritura se bloquean en el cliente para evitar dañar configuraciones de kernels antiguos." + }, + "badge": { + "currentKernel": "Kernel", + "featuresEnabled": "{enabled}/{total} funciones habilitadas", + "belowTarget": "Bajo la recomendada", + "latest": "Más reciente", + "unknown": "Desconocido" + }, + "upgrade": { + "title": "Actualizar kernel de OpenClaw", + "confirmMessage": "Se actualizará de {from} a {to}.\nTarda unos 2 minutos; Gateway se reiniciará automáticamente. ¿Continuar?", + "starting": "Actualizando a {version}...", + "successMessage": "Actualización del kernel completada", + "successToast": "Kernel actualizado correctamente", + "failurePrefix": "Falló la actualización del kernel:" + }, + "upgradeHint": { + "title": "Nuevo kernel disponible", + "subtitle": "{from} → {to}, haz clic para actualizar", + "dismissTooltip": "No avisar en esta sesión" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/fr.json b/src/locales/fr.json index 8f00eef..41ae7b8 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "Problème de configuration OpenClaw détecté", + "invalidConfigPrompt": "L'action « {action} » a échoué :\n\n{error}\n\nIl s'agit généralement d'un schéma de configuration obsolète. Lancer doctor pour corriger automatiquement ?", + "runDoctorFix": "Lancer doctor --fix", + "runningDoctorFix": "Exécution de doctor --fix...", + "doctorFixSuccess": "Configuration corrigée. Réessayez", + "doctorFixFailed": "Échec de la correction par doctor" }, "settings": { "title": "Paramètres du panneau", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "Configuration enregistrée. Le Gateway n'est pas en cours d'exécution — les paramètres prendront effet au démarrage." }, "agents": { "title": "Gestion des Agents", @@ -504,7 +511,8 @@ "deleteFailed": "Échec de la suppression", "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", - "backupFailed": "Backup failed" + "backupFailed": "Backup failed", + "labelRuntime": "Runtime :" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "Confirmer", "confirmOk": "OK", "confirmCancel": "Annuler" + }, + "kernel": { + "floorBlocker": { + "title": "Version du noyau trop ancienne", + "message": "Le noyau OpenClaw {current} est inférieur à la version minimale prise en charge {floor}. Certaines fonctionnalités peuvent ne pas fonctionner.", + "targetHint": "Il est recommandé de passer à {target} pour la meilleure expérience.", + "goUpgrade": "Mettre à niveau", + "continueReadonly": "Continuer (lecture seule)", + "readonlyHint": "En mode lecture seule, les opérations d'écriture sont bloquées côté client pour éviter de corrompre les configurations d'anciens noyaux." + }, + "badge": { + "currentKernel": "Noyau", + "featuresEnabled": "{enabled}/{total} fonctionnalités activées", + "belowTarget": "Sous la version recommandée", + "latest": "À jour", + "unknown": "Inconnu" + }, + "upgrade": { + "title": "Mettre à jour le noyau OpenClaw", + "confirmMessage": "Mise à jour de {from} vers {to}.\nCela prend environ 2 minutes ; Gateway redémarrera automatiquement. Continuer ?", + "starting": "Mise à jour vers {version}...", + "successMessage": "Mise à jour du noyau terminée", + "successToast": "Noyau mis à jour avec succès", + "failurePrefix": "Échec de la mise à jour du noyau :" + }, + "upgradeHint": { + "title": "Nouveau noyau disponible", + "subtitle": "{from} → {to}, cliquez pour mettre à jour", + "dismissTooltip": "Ne plus avertir pendant cette session" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/index.js b/src/locales/index.js index 38a47e7..6c4bce5 100644 --- a/src/locales/index.js +++ b/src/locales/index.js @@ -36,13 +36,14 @@ import routeMap from './modules/routeMap.js' import extensions from './modules/extensions.js' import engine from './modules/engine.js' import ciaoBug from './modules/ciaoBug.js' +import cliConflict from './modules/cliConflict.js' const MODULES = { common, sidebar, instance, dashboard, services, settings, models, agents, agentDetail, gateway, security, communication, channels, memory, dreaming, cron, usage, skills, chat, chatDebug, setup, about, ext, logs, assistant, toast, modal, engagement, diagnose, routeMap, extensions, - engine, ciaoBug, + engine, ciaoBug, cliConflict, } /** 构建所有语言字典 { 'zh-CN': { common: {...}, sidebar: {...}, ... }, ... } */ diff --git a/src/locales/ja.json b/src/locales/ja.json index 9ce0141..8b6c868 100644 --- a/src/locales/ja.json +++ b/src/locales/ja.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "OpenClaw 設定の問題を検出", + "invalidConfigPrompt": "操作 \"{action}\" が失敗しました：\n\n{error}\n\n通常は設定ファイルのスキーマが古いことが原因です。doctor で自動修復しますか？", + "runDoctorFix": "自動修復を実行", + "runningDoctorFix": "doctor --fix を実行中...", + "doctorFixSuccess": "設定を修復しました。もう一度お試しください", + "doctorFixFailed": "doctor の修復に失敗" }, "settings": { "title": "パネル設定", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "設定を保存しました。Gateway は現在実行されていません。起動後に自動で適用されます。" }, "agents": { "title": "Agent 管理", @@ -504,7 +511,8 @@ "deleteFailed": "削除失敗", "backingUp": "Agent「{id}」をバックアップ中...", "backupDone": "バックアップ完了: {file}", - "backupFailed": "バックアップ失敗" + "backupFailed": "バックアップ失敗", + "labelRuntime": "ランタイム:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "操作の確認", "confirmOk": "OK", "confirmCancel": "キャンセル" + }, + "kernel": { + "floorBlocker": { + "title": "カーネルバージョンが古すぎます", + "message": "OpenClaw カーネル {current} は ClawPanel がサポートする最低バージョン {floor} を下回っています。一部機能が動作しない可能性があります。", + "targetHint": "最高の体験のため {target} へのアップグレードを推奨します。", + "goUpgrade": "アップグレードへ", + "continueReadonly": "続行（読み取り専用）", + "readonlyHint": "読み取り専用モードでは、古いカーネル設定を壊さないよう書き込み操作はクライアント側でブロックされます。" + }, + "badge": { + "currentKernel": "カーネル", + "featuresEnabled": "{enabled}/{total} 機能が有効", + "belowTarget": "推奨より低い", + "latest": "最新", + "unknown": "不明" + }, + "upgrade": { + "title": "OpenClaw カーネルをアップグレード", + "confirmMessage": "{from} から {to} へアップグレードします。\n約 2 分かかり、その間 Gateway が再起動します。続行しますか？", + "starting": "{version} にアップグレード中...", + "successMessage": "カーネルのアップグレードが完了しました", + "successToast": "カーネルのアップグレードに成功しました", + "failurePrefix": "カーネルのアップグレードに失敗:" + }, + "upgradeHint": { + "title": "新しいカーネルが利用可能", + "subtitle": "{from} → {to}、クリックでアップグレード", + "dismissTooltip": "このセッションでは再表示しない" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/ko.json b/src/locales/ko.json index 885bc5e..131de8f 100644 --- a/src/locales/ko.json +++ b/src/locales/ko.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "OpenClaw 설정 문제 감지", + "invalidConfigPrompt": "작업 \"{action}\" 실패:\n\n{error}\n\n설정 파일 스키마가 오래된 것이 원인일 수 있습니다. doctor 로 자동 수정할까요?", + "runDoctorFix": "자동 수정 실행", + "runningDoctorFix": "doctor --fix 실행 중...", + "doctorFixSuccess": "설정이 수정되었습니다. 다시 시도하세요", + "doctorFixFailed": "doctor 수정 실패" }, "settings": { "title": "패널 설정", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "설정이 저장되었습니다. Gateway가 실행 중이 아니므로 시작 시 자동으로 적용됩니다." }, "agents": { "title": "Agent 관리", @@ -504,7 +511,8 @@ "deleteFailed": "삭제 실패", "backingUp": "Agent「{id}」 백업 중...", "backupDone": "백업 완료: {file}", - "backupFailed": "백업 실패" + "backupFailed": "백업 실패", + "labelRuntime": "런타임:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "작업 확인", "confirmOk": "확인", "confirmCancel": "취소" + }, + "kernel": { + "floorBlocker": { + "title": "커널 버전이 너무 낮습니다", + "message": "현재 OpenClaw 커널 {current} 은 ClawPanel 의 최소 지원 버전 {floor} 보다 낮습니다. 일부 기능이 작동하지 않을 수 있습니다.", + "targetHint": "최상의 경험을 위해 {target} 으로 업그레이드를 권장합니다.", + "goUpgrade": "업그레이드", + "continueReadonly": "계속 (읽기 전용)", + "readonlyHint": "읽기 전용 모드에서는 구 커널 설정을 손상시키지 않도록 쓰기 작업이 클라이언트 측에서 차단됩니다." + }, + "badge": { + "currentKernel": "커널", + "featuresEnabled": "{enabled}/{total} 기능 활성화", + "belowTarget": "권장 이하", + "latest": "최신", + "unknown": "알 수 없음" + }, + "upgrade": { + "title": "OpenClaw 커널 업그레이드", + "confirmMessage": "{from} 에서 {to} 로 업그레이드합니다.\n약 2 분 소요되며 그동안 Gateway 가 재시작됩니다. 계속할까요?", + "starting": "{version} 으로 업그레이드 중...", + "successMessage": "커널 업그레이드 완료", + "successToast": "커널 업그레이드 성공", + "failurePrefix": "커널 업그레이드 실패:" + }, + "upgradeHint": { + "title": "새 커널 사용 가능", + "subtitle": "{from} → {to}, 클릭하여 업그레이드", + "dismissTooltip": "이 세션에서는 알리지 않음" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/modules/cliConflict.js b/src/locales/modules/cliConflict.js new file mode 100644 index 0000000..f30cb50 --- /dev/null +++ b/src/locales/modules/cliConflict.js @@ -0,0 +1,50 @@ +/** + * CLI 冲突横幅 (cli-conflict-banner) 文案 + * 用于 OpenClaw 仪表盘提示用户存在非 ClawPanel 管理的 CLI 冲突项 + */ +import { _ } from '../helper.js' + +export default { + title: _( + '检测到 {count} 处可能冲突的 OpenClaw 安装', + 'Detected {count} possibly conflicting OpenClaw installation(s)', + '偵測到 {count} 處可能衝突的 OpenClaw 安裝', + ), + desc: _( + '系统 PATH 中存在非 ClawPanel 管理的 OpenClaw（如 Cherry Studio 内嵌、旧 npm 全局），可能导致终端命令拿到老版本，引发 schema 不兼容、doctor --fix 卡死等问题。', + 'Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.', + '系統 PATH 中存在非 ClawPanel 管理的 OpenClaw（如 Cherry Studio 內嵌、舊 npm 全域），可能導致終端指令取得舊版本，引發 schema 不相容、doctor --fix 卡住等問題。', + ), + viewDetails: _('查看详情', 'View details', '查看詳情'), + hideDetails: _('收起详情', 'Hide details', '收起詳情'), + quarantineAll: _('一键隔离', 'Quarantine all', '一鍵隔離'), + quarantining: _('正在隔离…', 'Quarantining…', '正在隔離…'), + quarantineOne: _('隔离', 'Quarantine', '隔離'), + dismiss: _('暂时忽略', 'Dismiss', '暫時忽略'), + dismissedHint: _( + '已忽略本次检测。下次启动会重新扫描。', + 'Dismissed for this session. Next launch will scan again.', + '已忽略本次偵測。下次啟動會重新掃描。', + ), + quarantineOk: _( + '已隔离 {count} 个冲突项', + 'Quarantined {count} item(s)', + '已隔離 {count} 個衝突項', + ), + quarantinePartial: _( + '另有 {count} 个未隔离', + '{count} item(s) failed', + '另有 {count} 個未隔離', + ), + quarantineFail: _( + '隔离失败：{error}', + 'Quarantine failed: {error}', + '隔離失敗：{error}', + ), + quarantineOneOk: _('已隔离', 'Quarantined', '已隔離'), + footnote: _( + '隔离 = 重命名为 .disabled-by-clawpanel-<时间>.bak（不会删除）。如需恢复，到原目录把 .bak 文件改回原名即可。', + 'Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory.', + '隔離 = 重新命名為 .disabled-by-clawpanel-<時間>.bak（不會刪除）。如需恢復，到原目錄把 .bak 檔案改回原名即可。', + ), +} diff --git a/src/locales/modules/engine.js b/src/locales/modules/engine.js index d1d8fbd..39ff902 100644 --- a/src/locales/modules/engine.js +++ b/src/locales/modules/engine.js @@ -396,6 +396,12 @@ export default { // 停止流式 chatStop: _('停止', 'Stop', '停止'), chatStopped: _('已停止当前回复', 'Run stopped', '已停止目前回覆'), + // Web 模式（远程浏览器）下流式聊天暂不可用 (issue #260) + chatWebModeStreamingUnsupported: _( + 'Web 模式暂不支持 Hermes 实时流式聊天（依赖桌面端事件桥）。请打开桌面客户端使用此功能。', + 'Hermes streaming chat isn\'t available in Web mode yet (it relies on the desktop event bridge). Please use the desktop app for this.', + 'Web 模式暫不支援 Hermes 即時串流聊天（依賴桌面端事件橋）。請開啟桌面客戶端使用此功能。', + ), // 会话搜索 (Ctrl+K) chatSearchShortcut: _('搜索会话 (Ctrl+K)', 'Search sessions (Ctrl+K)', '搜尋會話 (Ctrl+K)'), chatSearchPlaceholder: _('搜索会话标题或内容...', 'Search by title or message content…', '搜尋會話標題或內容...'), @@ -601,6 +607,8 @@ export default { servicesRawJson: _('查看原始 JSON', 'View Raw JSON', '查看原始 JSON'), servicesNoHealth: _('Gateway 未运行或暂时无法返回健康数据。', 'The gateway is offline or health data is temporarily unavailable.', 'Gateway 未運行或暫時無法返回健康資料。'), servicesMaintenance: _('维护操作', 'Maintenance', '維護操作'), + servicesInstall: _('安装 Hermes', 'Install Hermes', '安裝 Hermes'), + servicesRepairInstall: _('修复/重装 Hermes', 'Repair / Reinstall Hermes', '修復/重裝 Hermes'), servicesUpgrade: _('升级 Hermes', 'Upgrade Hermes', '升級 Hermes'), servicesUninstall: _('卸载 Hermes', 'Uninstall Hermes', '解除安裝 Hermes'), servicesUninstallClean: _('卸载并清理配置', 'Uninstall and Clean Config', '解除安裝並清理配置'), @@ -612,9 +620,19 @@ export default { servicesReadyTag: _('就绪', 'READY', '就緒'), servicesDefaultDistro: _('默认发行版', 'default distro', '預設發行版'), servicesContainerCount: _('{n} 个容器', '{n} containers', '{n} 個容器'), + servicesConfirmInstall: _('确认安装 Hermes Agent？将通过 uv 安装最新版本及 Web 扩展。', 'Install Hermes Agent? The latest version and Web extensions will be installed via uv.', '確認安裝 Hermes Agent？將透過 uv 安裝最新版本及 Web 擴展。'), + servicesConfirmRepairInstall: _('确认修复/重装 Hermes Agent？将保留配置并重新安装最新版本及 Web 扩展。', 'Repair / reinstall Hermes Agent? Config will be kept and the latest version with Web extensions will be reinstalled.', '確認修復/重裝 Hermes Agent？將保留配置並重新安裝最新版本及 Web 擴展。'), servicesConfirmUpgrade: _('确认升级 Hermes Agent？升级期间可能短暂中断 Gateway。', 'Upgrade Hermes Agent? The gateway may be briefly interrupted during the upgrade.', '確認升級 Hermes Agent？升級期間 Gateway 可能短暫中斷。'), servicesConfirmUninstall: _('确认卸载 Hermes Agent？保留现有配置文件。', 'Uninstall Hermes Agent? Existing config files will be kept.', '確認解除安裝 Hermes Agent？會保留現有配置檔。'), servicesConfirmUninstallClean: _('确认卸载 Hermes Agent 并删除配置文件？此操作不可撤销。', 'Uninstall Hermes Agent and remove config files? This cannot be undone.', '確認解除安裝 Hermes Agent 並刪除配置檔？此操作無法撤銷。'), + servicesUpgradeDone: _('Hermes Agent 升级完成', 'Hermes Agent upgraded', 'Hermes Agent 升級完成'), + servicesUninstallDone: _('Hermes Agent 已卸载', 'Hermes Agent uninstalled', 'Hermes Agent 已解除安裝'), + servicesMaintenanceStopGateway: _('正在停止 Gateway，释放 Hermes 可执行文件...', 'Stopping gateway to release Hermes executable...', '正在停止 Gateway，釋放 Hermes 可執行檔...'), + servicesMaintenanceGatewayStopped: _('Gateway 已停止', 'Gateway stopped', 'Gateway 已停止'), + servicesMaintenanceGatewayStopWarn: _('Gateway 停止失败，继续执行：{error}', 'Failed to stop gateway, continuing: {error}', 'Gateway 停止失敗，繼續執行：{error}'), + servicesMaintenanceRestartGateway: _('正在重新启动 Gateway...', 'Restarting gateway...', '正在重新啟動 Gateway...'), + servicesMaintenanceGatewayRestarted: _('Gateway 已重新启动', 'Gateway restarted', 'Gateway 已重新啟動'), + servicesMaintenanceGatewayRestartWarn: _('Gateway 重启失败，请稍后手动启动：{error}', 'Gateway restart failed; start it manually later: {error}', 'Gateway 重新啟動失敗，請稍後手動啟動：{error}'), hermesConfigTitle: _('Hermes 配置', 'Hermes Config', 'Hermes 配置'), hermesChannelsTitle: _('Hermes 渠道', 'Hermes Channels', 'Hermes 頻道'), extensionsEyebrow: _('HERMES AGENT · 扩展', 'HERMES AGENT · EXTENSIONS', 'HERMES AGENT · 擴展'), diff --git a/src/locales/pt.json b/src/locales/pt.json index caf4f24..bc37c20 100644 --- a/src/locales/pt.json +++ b/src/locales/pt.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "Problema de configuração do OpenClaw detectado", + "invalidConfigPrompt": "A ação \"{action}\" falhou:\n\n{error}\n\nGeralmente é o esquema de configuração desatualizado. Executar doctor para corrigir automaticamente?", + "runDoctorFix": "Executar doctor --fix", + "runningDoctorFix": "Executando doctor --fix...", + "doctorFixSuccess": "Configuração corrigida. Tente novamente", + "doctorFixFailed": "doctor falhou ao corrigir" }, "settings": { "title": "Configurações do painel", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "Configuração salva. O Gateway não está em execução — será aplicada ao iniciá-lo." }, "agents": { "title": "Gestão de Agentes", @@ -504,7 +511,8 @@ "deleteFailed": "Falha ao excluir", "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", - "backupFailed": "Backup failed" + "backupFailed": "Backup failed", + "labelRuntime": "Runtime:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "Confirmar", "confirmOk": "OK", "confirmCancel": "Cancelar" + }, + "kernel": { + "floorBlocker": { + "title": "Versão do kernel muito antiga", + "message": "O kernel OpenClaw {current} está abaixo da versão mínima suportada {floor}. Alguns recursos podem não funcionar.", + "targetHint": "Recomenda-se atualizar para {target} para a melhor experiência.", + "goUpgrade": "Atualizar agora", + "continueReadonly": "Continuar (somente leitura)", + "readonlyHint": "No modo somente leitura, operações de escrita são bloqueadas no cliente para evitar corromper configurações de kernels antigos." + }, + "badge": { + "currentKernel": "Kernel", + "featuresEnabled": "{enabled}/{total} recursos habilitados", + "belowTarget": "Abaixo do recomendado", + "latest": "Mais recente", + "unknown": "Desconhecido" + }, + "upgrade": { + "title": "Atualizar kernel do OpenClaw", + "confirmMessage": "Atualizando de {from} para {to}.\nLeva cerca de 2 minutos; Gateway será reiniciado automaticamente. Continuar?", + "starting": "Atualizando para {version}...", + "successMessage": "Atualização do kernel concluída", + "successToast": "Kernel atualizado com sucesso", + "failurePrefix": "Falha na atualização do kernel:" + }, + "upgradeHint": { + "title": "Novo kernel disponível", + "subtitle": "{from} → {to}, clique para atualizar", + "dismissTooltip": "Não avisar nesta sessão" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/ru.json b/src/locales/ru.json index e65202a..077669b 100644 --- a/src/locales/ru.json +++ b/src/locales/ru.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "Обнаружена проблема конфигурации OpenClaw", + "invalidConfigPrompt": "Действие \"{action}\" не удалось:\n\n{error}\n\nОбычно это означает, что схема конфигурации устарела. Запустить doctor для автоисправления?", + "runDoctorFix": "Запустить doctor --fix", + "runningDoctorFix": "Выполняется doctor --fix...", + "doctorFixSuccess": "Конфигурация исправлена. Повторите попытку", + "doctorFixFailed": "doctor не смог исправить" }, "settings": { "title": "Настройки панели", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "Конфигурация сохранена. Gateway не запущен — настройки применятся при запуске." }, "agents": { "title": "Управление агентами", @@ -504,7 +511,8 @@ "deleteFailed": "Ошибка удаления", "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", - "backupFailed": "Backup failed" + "backupFailed": "Backup failed", + "labelRuntime": "Среда:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "Подтвердите", "confirmOk": "ОК", "confirmCancel": "Отмена" + }, + "kernel": { + "floorBlocker": { + "title": "Версия ядра слишком старая", + "message": "Версия ядра OpenClaw {current} ниже минимально поддерживаемой {floor}. Некоторые функции могут не работать.", + "targetHint": "Рекомендуется обновиться до {target} для лучшего опыта.", + "goUpgrade": "Обновить", + "continueReadonly": "Продолжить (только чтение)", + "readonlyHint": "В режиме только чтения операции записи блокируются на стороне клиента, чтобы не повредить конфиги старых ядер." + }, + "badge": { + "currentKernel": "Ядро", + "featuresEnabled": "{enabled}/{total} функций включено", + "belowTarget": "Ниже рекомендуемого", + "latest": "Последняя", + "unknown": "Неизвестно" + }, + "upgrade": { + "title": "Обновить ядро OpenClaw", + "confirmMessage": "Обновление с {from} до {to}.\nЗаймёт около 2 минут; Gateway перезапустится автоматически. Продолжить?", + "starting": "Обновление до {version}...", + "successMessage": "Обновление ядра завершено", + "successToast": "Ядро успешно обновлено", + "failurePrefix": "Ошибка обновления ядра:" + }, + "upgradeHint": { + "title": "Доступно новое ядро", + "subtitle": "{from} → {to}, нажмите для обновления", + "dismissTooltip": "Не напоминать в этой сессии" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/vi.json b/src/locales/vi.json index 131bae7..6a81aeb 100644 --- a/src/locales/vi.json +++ b/src/locales/vi.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web mode: Upgrade logs unavailable, please wait...", "taskDone": "Operation complete", "upgradeDone": "Upgrade complete", - "upgradeScene": "Upgrade OpenClaw" + "upgradeScene": "Upgrade OpenClaw", + "invalidConfigTitle": "Phát hiện vấn đề cấu hình OpenClaw", + "invalidConfigPrompt": "Hành động \"{action}\" thất bại:\n\n{error}\n\nThường do schema cấu hình lỗi thời. Chạy doctor để sửa tự động?", + "runDoctorFix": "Chạy doctor --fix", + "runningDoctorFix": "Đang chạy doctor --fix...", + "doctorFixSuccess": "Đã sửa cấu hình. Vui lòng thử lại", + "doctorFixFailed": "doctor sửa thất bại" }, "settings": { "title": "Cài đặt panel", @@ -459,7 +465,8 @@ "restartOk": "Gateway restarted", "restartFailed": "Restart failed", "configSavedGwFailed": "Config saved, but Gateway restart failed", - "visitSite": "Visit {name} website" + "visitSite": "Visit {name} website", + "configSavedGwNotRunning": "Đã lưu cấu hình. Gateway hiện không chạy — sẽ tự động áp dụng khi khởi động." }, "agents": { "title": "Quản lý Agent", @@ -504,7 +511,8 @@ "deleteFailed": "Xóa thất bại", "backingUp": "Backing up Agent \"{id}\"...", "backupDone": "Backup done: {file}", - "backupFailed": "Backup failed" + "backupFailed": "Backup failed", + "labelRuntime": "Runtime:" }, "gateway": { "title": "Gateway", @@ -2098,5 +2106,51 @@ "confirmTitle": "Xác nhận", "confirmOk": "Đồng ý", "confirmCancel": "Hủy" + }, + "kernel": { + "floorBlocker": { + "title": "Phiên bản kernel quá cũ", + "message": "Kernel OpenClaw {current} thấp hơn phiên bản tối thiểu được hỗ trợ {floor}. Một số tính năng có thể không hoạt động.", + "targetHint": "Khuyến nghị nâng cấp lên {target} để có trải nghiệm tốt nhất.", + "goUpgrade": "Nâng cấp ngay", + "continueReadonly": "Tiếp tục (chỉ đọc)", + "readonlyHint": "Ở chế độ chỉ đọc, các thao tác ghi sẽ bị chặn ở phía client để tránh làm hỏng cấu hình kernel cũ." + }, + "badge": { + "currentKernel": "Kernel", + "featuresEnabled": "{enabled}/{total} tính năng đã bật", + "belowTarget": "Dưới khuyến nghị", + "latest": "Mới nhất", + "unknown": "Không xác định" + }, + "upgrade": { + "title": "Nâng cấp kernel OpenClaw", + "confirmMessage": "Sẽ nâng cấp từ {from} lên {to}.\nMất khoảng 2 phút, Gateway sẽ khởi động lại tự động. Tiếp tục?", + "starting": "Đang nâng cấp lên {version}...", + "successMessage": "Nâng cấp kernel hoàn tất", + "successToast": "Nâng cấp kernel thành công", + "failurePrefix": "Nâng cấp kernel thất bại:" + }, + "upgradeHint": { + "title": "Có kernel mới", + "subtitle": "{from} → {to}, nhấn để nâng cấp", + "dismissTooltip": "Không nhắc trong phiên này" + } + }, + "cliConflict": { + "title": "Detected {count} possibly conflicting OpenClaw installation(s)", + "desc": "Your PATH has OpenClaw installations not managed by ClawPanel (e.g. Cherry Studio bundled, legacy npm global). They can cause terminal commands to pick up old versions, triggering schema mismatches and doctor --fix hangs.", + "viewDetails": "View details", + "hideDetails": "Hide details", + "quarantineAll": "Quarantine all", + "quarantining": "Quarantining…", + "quarantineOne": "Quarantine", + "dismiss": "Dismiss", + "dismissedHint": "Dismissed for this session. Next launch will scan again.", + "quarantineOk": "Quarantined {count} item(s)", + "quarantinePartial": "{count} item(s) failed", + "quarantineFail": "Quarantine failed: {error}", + "quarantineOneOk": "Quarantined", + "footnote": "Quarantine = rename to .disabled-by-clawpanel-.bak (not deleted). To restore, rename the .bak back to its original name in the same directory." } } diff --git a/src/locales/zh-CN.json b/src/locales/zh-CN.json index e86c6cb..50179c9 100644 --- a/src/locales/zh-CN.json +++ b/src/locales/zh-CN.json @@ -79,9 +79,9 @@ "addRemote": "添加远程实例", "namePlaceholder": "远程服务器", "endpointPlaceholder": "http://192.168.1.100:1420", - "nameLabel": "\u540d\u79f0", - "endpointLabel": "\u9762\u677f\u5730\u5740", - "gwPortLabel": "Gateway \u7aef\u53e3\uff08\u53ef\u9009\uff09", + "nameLabel": "名称", + "endpointLabel": "面板地址", + "gwPortLabel": "Gateway 端口（可选）", "nameRequired": "请填写名称和面板地址", "endpointExists": "该端点已存在", "adding": "添加中...", @@ -339,7 +339,13 @@ "webModeNoLog": "Web 模式：升级过程日志不可用，请等待完成...", "taskDone": "操作完成", "upgradeDone": "升级完成", - "upgradeScene": "升级 OpenClaw" + "upgradeScene": "升级 OpenClaw", + "invalidConfigTitle": "检测到 OpenClaw 配置问题", + "invalidConfigPrompt": "操作 \"{action}\" 失败：\n\n{error}\n\n这通常是配置文件 schema 已过期。是否运行 doctor 自动修复？", + "runDoctorFix": "一键修复", + "runningDoctorFix": "正在运行 doctor --fix...", + "doctorFixSuccess": "配置已修复，请再次尝试", + "doctorFixFailed": "doctor 修复失败" }, "settings": { "title": "面板设置", @@ -547,7 +553,8 @@ "restartOk": "Gateway 重启成功", "restartFailed": "重启失败", "configSavedGwFailed": "配置已保存，但 Gateway 重启失败", - "visitSite": "访问 {name}官网" + "visitSite": "访问 {name}官网", + "configSavedGwNotRunning": "配置已保存。Gateway 当前未运行，启动后配置自动生效。" }, "agents": { "title": "Agent 管理", @@ -594,7 +601,8 @@ "backingUp": "正在备份 Agent「{id}」...", "backupDone": "备份完成: {file}", "backupFailed": "备份失败", - "detailHint": "点击卡片空白区域或“详情”按钮，进入新的 Agent 详情页。" + "detailHint": "点击卡片空白区域或“详情”按钮，进入新的 Agent 详情页。", + "labelRuntime": "运行时:" }, "agentDetail": { "back": "← 返回 Agent 列表", @@ -894,7 +902,6 @@ "loadFailed": "加载平台列表失败", "agentBindHint": "每个 Agent 可绑定多条路由（例如不同账号或匹配条件）；绑定之间互不影响。请先在「渠道列表」中完成渠道接入。", "createAgentFirst": "请先在「Agent 管理」中创建 Agent", - "qqbotLabel": "QQ 机器人", "qqbotDesc": "通过 QQ 开放平台接入，支持私聊和群聊", "qqbotGuide1": "前往 QQ 开放平台 创建机器人", @@ -906,7 +913,6 @@ "qqbotGuideFooter": "
遇到问题？参考 OpenClaw × QQ 常见问题
", "qqbotAppIdPh": "QQ 开放平台 AppID", "qqbotSecretPh": "QQ 开放平台 ClientSecret", - "dingtalkLabel": "钉钉", "dingtalkDesc": "通过钉钉企业内部应用接入，支持单聊和群聊", "dingtalkGuide1": "前往 钉钉开放平台，创建「企业内部应用」", @@ -919,7 +925,6 @@ "dingtalkGuideFooter": "
注意：Stream 模式需要钉钉服务端主动推送，确保网络可达
", "dingtalkClientIdPh": "AppKey / Client ID", "dingtalkClientSecretPh": "AppSecret / Client Secret", - "feishuLabel": "飞书", "feishuDesc": "通过飞书企业自建应用接入，支持单聊和群聊", "feishuGuide1": "前往 飞书开放平台 创建企业自建应用", @@ -934,21 +939,18 @@ "feishuDomainLabel": "平台域名", "feishuDomainFeishu": "飞书 (feishu.cn)", "feishuDomainLark": "Lark (larksuite.com)", - "telegramDesc": "接入 Telegram Bot，支持私聊和群组", "telegramGuide1": "在 Telegram 中搜索 @BotFather 并发送 /newbot", "telegramGuide2": "按提示设置机器人名称和用户名", "telegramGuide3": "复制 BotFather 返回的 Bot Token", "telegramGuide4": "填入下方凭证并保存", "telegramGuideFooter": "
需要公网可达的服务器或使用 polling 模式
", - "discordDesc": "接入 Discord Bot，支持服务器频道和私信", "discordGuide1": "前往 Discord Developer Portal 创建 Application", "discordGuide2": "在 Bot 页面点击「Reset Token」获取 Bot Token", "discordGuide3": "开启 MESSAGE CONTENT INTENT", "discordGuide4": "使用 OAuth2 URL Generator 邀请 Bot 加入服务器", "discordGuideFooter": "
确保开启 Message Content Intent 以接收消息内容
", - "slackDesc": "接入 Slack App，支持频道和私信", "slackGuide1": "前往 Slack API 创建 App（推荐 From a manifest）", "slackGuide2": "在 OAuth & Permissions 中添加 Bot Token Scopes：chat:write、app_mentions:read 等", @@ -974,7 +976,6 @@ "groupAllowlist": "白名单", "allowFromPh": "可选，逗号分隔用户/频道 ID", "allowFromHint": "限制允许的用户或频道 ID，留空不限制", - "weixinLabel": "微信", "weixinDesc": "通过 openclaw-weixin 插件接入个人微信", "weixinGuide1": "本功能基于 openclaw-weixin 插件", @@ -988,7 +989,6 @@ "weixinLogin": "扫码登录", "weixinLoginHint": "启动微信登录流程，扫码后自动接管消息", "weixinScanQr": "用手机微信扫描此二维码", - "msteamsDesc": "接入 Microsoft Teams Bot", "msteamsGuide1": "在 Azure Portal 注册 Bot Channel Registration", "msteamsGuide2": "获取 App ID 和 App Password", @@ -997,7 +997,6 @@ "msteamsGuideFooter": "
需要 Azure AD 应用注册和 Teams 管理员权限
", "msteamsTenantIdPh": "可选，单租户时填写", "msteamsAllowFromPh": "可选，逗号分隔", - "signalDesc": "接入 Signal Messenger", "signalGuide1": "安装 signal-cli 并注册/链接账号", "signalGuide2": "确保 signal-cli 可正常收发消息", @@ -1008,7 +1007,6 @@ "signalCliPathLabel": "signal-cli 路径", "signalCliPathPh": "可选，默认从 PATH 查找", "signalAllowFromPh": "可选，逗号分隔", - "matrixDesc": "接入 Matrix 协议（Element 等客户端）", "matrixGuide1": "在 Matrix 服务器上注册 Bot 账号", "matrixGuide2": "获取 Access Token（或使用用户名密码）", @@ -1023,7 +1021,6 @@ "groupAllTeams": "所有团队", "groupMentionBot": "仅 @机器人时", "optionalEg": "可选，如", - "editAccountLabel": "编辑 {id}", "bound": "已绑定", "notBoundAgent": "未绑定 Agent", @@ -1035,7 +1032,6 @@ "addNewAccount": "添加新账号", "addNewAccountSub": "创建一个新的机器人账号配置", "actions": "操作", - "bindAgentTitle": "绑定 Agent", "targetAgent": "目标 Agent", "targetAgentHint": "选择接收消息的 Agent", @@ -1056,7 +1052,6 @@ "saving": "保存中...", "bindingSaved": "绑定已保存", "saveFailed": "保存失败", - "accountLabel": "账号", "defaultAccount": "默认账号", "accountShort": "账号", @@ -1078,7 +1073,6 @@ "subAccount": "子账号", "noMultiAccount": "该渠道不支持多账号", "noMultiAccountHint": "请先在渠道列表中添加多个账号", - "confirmRemoveAccount": "确定移除该账号及其所有配置？", "removed": "已移除", "removeFailed": "移除失败", @@ -1088,7 +1082,6 @@ "confirmRemovePlatform": "确定移除该平台及其所有配置？", "supportsActions": "支持操作", "connectedClickEdit": "已接入，点击编辑", - "qqDiagAllPassed": "全部检查通过 ✓", "qqDiagHasFailed": "存在未通过的检查项", "qqRepairHint": "可尝试一键修复：重新安装插件并重启 Gateway", @@ -1099,7 +1092,6 @@ "processing": "处理中...", "repairDone": "修复完成", "repairFailed": "修复失败", - "unknownChannelType": "无法识别渠道类型", "diagnosing": "诊断中...", "testing": "测试中...", @@ -1108,7 +1100,6 @@ "verifyFailed": "校验失败", "testFailed": "渠道测试失败", "diagFailed": "诊断失败", - "connectingGateway": "连接 Gateway...", "gatewayNotConnected": "Gateway 未连接", "generatingQr": "正在生成二维码...", @@ -1124,7 +1115,6 @@ "whatsappNotAvailableHint": "WhatsApp 插件未加载", "scanLoginFailed": "扫码登录失败", "unknownPlatform": "未知平台", - "setupSteps": "接入步骤", "clickToExpand": "点击展开", "docsOnlyTitle": "当前面板暂未完成该渠道的可用配置向导", @@ -1135,7 +1125,6 @@ "operations": "操作", "setup": "接入", "close": "关闭", - "pluginStatusFailed": "无法获取插件状态", "pluginInstalled": "已安装", "version": "版本", @@ -1157,13 +1146,11 @@ "reDetecting": "重新检测…", "actionDone": "渠道动作执行完成", "actionFailed": "渠道动作执行失败", - "accountIdentifier": "账号标识", "accountIdPlaceholder": "留空为默认账号；修改会创建新账号", "accountIdHint": "每个账号对应一个独立机器人。不同账号可绑定不同 Agent。", "bindAgent": "绑定 Agent", "bindAgentHint": "该账号收到的消息路由到哪个 Agent（可在「Agent 对接」页添加更多绑定）。", - "show": "显示", "hide": "隐藏", "pairingApproval": "配对审批", @@ -1182,7 +1169,6 @@ "verifyCredentials": "校验凭证", "save": "保存", "connectAndSave": "接入并保存", - "reading": "读取中...", "pendingRequests": "待审批请求", "noPendingRequests": "暂无待审批请求", @@ -1192,13 +1178,11 @@ "pairingApproved": "配对已批准", "operationComplete": "操作完成", "approveFailed": "批准失败", - "pleaseFill": "请填写「{field}」", "verifying": "校验中...", "credentialsValid": "凭证有效", "qqVerifyNote": "此项只验证 AppID/Secret 能否向腾讯换 token。不能代表 QQ 里机器人已在线；若提示「灵魂不在线」，请使用下方 完整联通诊断 并对照 QQ OpenClaw 常见问题。", "verifyRequestFailed": "校验请求失败", - "installingPlugin": "安装插件中...", "installPlugin": "安装插件", "pluginInstallFailed": "插件安装失败", @@ -2307,5 +2291,51 @@ "confirmTitle": "确认操作", "confirmOk": "确认", "confirmCancel": "取消" + }, + "kernel": { + "floorBlocker": { + "title": "内核版本过低", + "message": "当前 OpenClaw 内核版本 {current} 低于 ClawPanel 支持的最低版本 {floor}，部分功能可能无法工作。", + "targetHint": "推荐升级到 {target} 以获得最佳体验。", + "goUpgrade": "前往升级", + "continueReadonly": "继续使用（只读模式）", + "readonlyHint": "只读模式下，写入操作会被前端校验拦截，避免破坏老内核的配置。" + }, + "badge": { + "currentKernel": "当前内核", + "featuresEnabled": "已启用 {enabled}/{total} 个特性", + "belowTarget": "低于推荐版", + "latest": "已是最新", + "unknown": "未知" + }, + "upgrade": { + "title": "升级 OpenClaw 内核", + "confirmMessage": "即将从 {from} 升级到 {to}。\n升级约需 2 分钟，期间 Gateway 会自动重启。继续？", + "starting": "开始升级到 {version}...", + "successMessage": "内核升级完成", + "successToast": "内核升级成功", + "failurePrefix": "内核升级失败:" + }, + "upgradeHint": { + "title": "有新内核可用", + "subtitle": "{from} → {to}，点此一键升级", + "dismissTooltip": "本次会话不再提醒" + } + }, + "cliConflict": { + "title": "检测到 {count} 处可能冲突的 OpenClaw 安装", + "desc": "系统 PATH 中存在非 ClawPanel 管理的 OpenClaw（如 Cherry Studio 内嵌、旧 npm 全局），可能导致终端命令拿到老版本，引发 schema 不兼容、doctor --fix 卡死等问题。", + "viewDetails": "查看详情", + "hideDetails": "收起详情", + "quarantineAll": "一键隔离", + "quarantining": "正在隔离…", + "quarantineOne": "隔离", + "dismiss": "暂时忽略", + "dismissedHint": "已忽略本次检测。下次启动会重新扫描。", + "quarantineOk": "已隔离 {count} 个冲突项", + "quarantinePartial": "另有 {count} 个未隔离", + "quarantineFail": "隔离失败：{error}", + "quarantineOneOk": "已隔离", + "footnote": "隔离 = 重命名为 .disabled-by-clawpanel-<时间>.bak（不会删除）。如需恢复，到原目录把 .bak 文件改回原名即可。" } } diff --git a/src/locales/zh-TW.json b/src/locales/zh-TW.json index 0f264ff..701f445 100644 --- a/src/locales/zh-TW.json +++ b/src/locales/zh-TW.json @@ -252,7 +252,13 @@ "webModeNoLog": "Web 模式：升級過程日誌不可用，請等待完成...", "taskDone": "操作完成", "upgradeDone": "升級完成", - "upgradeScene": "升級 OpenClaw" + "upgradeScene": "升級 OpenClaw", + "invalidConfigTitle": "偵測到 OpenClaw 配置問題", + "invalidConfigPrompt": "操作 \"{action}\" 失敗：\n\n{error}\n\n這通常是配置檔案 schema 已過期。是否執行 doctor 自動修復？", + "runDoctorFix": "一鍵修復", + "runningDoctorFix": "正在執行 doctor --fix...", + "doctorFixSuccess": "配置已修復，請再試一次", + "doctorFixFailed": "doctor 修復失敗" }, "settings": { "title": "面板設定", @@ -459,7 +465,8 @@ "restartOk": "Gateway 重啟成功", "restartFailed": "重啟失敗", "configSavedGwFailed": "設定已儲存，但 Gateway 重啟失敗", - "visitSite": "訪問 {name}官網" + "visitSite": "訪問 {name}官網", + "configSavedGwNotRunning": "設定已儲存。Gateway 目前未執行，啟動後設定自動生效。" }, "agents": { "title": "Agent 管理", @@ -504,7 +511,8 @@ "deleteFailed": "刪除失敗", "backingUp": "正在備份 Agent「{id}」...", "backupDone": "備份完成: {file}", - "backupFailed": "備份失敗" + "backupFailed": "備份失敗", + "labelRuntime": "執行階段:" }, "gateway": { "title": "Gateway 設定", @@ -2099,5 +2107,51 @@ "confirmTitle": "確認操作", "confirmOk": "確認", "confirmCancel": "取消" + }, + "kernel": { + "floorBlocker": { + "title": "核心版本過低", + "message": "目前 OpenClaw 核心版本 {current} 低於 ClawPanel 支援的最低版本 {floor}，部分功能可能無法運作。", + "targetHint": "建議升級到 {target} 以獲得最佳體驗。", + "goUpgrade": "前往升級", + "continueReadonly": "繼續使用（唯讀模式）", + "readonlyHint": "唯讀模式下，寫入操作會被前端攔截，避免破壞舊核心的設定。" + }, + "badge": { + "currentKernel": "目前核心", + "featuresEnabled": "已啟用 {enabled}/{total} 個特性", + "belowTarget": "低於推薦版", + "latest": "已是最新", + "unknown": "未知" + }, + "upgrade": { + "title": "升級 OpenClaw 核心", + "confirmMessage": "即將從 {from} 升級到 {to}。\n升級約需 2 分鐘，期間 Gateway 會自動重啟。繼續？", + "starting": "開始升級到 {version}...", + "successMessage": "核心升級完成", + "successToast": "核心升級成功", + "failurePrefix": "核心升級失敗:" + }, + "upgradeHint": { + "title": "有新核心可用", + "subtitle": "{from} → {to}，點此一鍵升級", + "dismissTooltip": "本次工作階段不再提醒" + } + }, + "cliConflict": { + "title": "偵測到 {count} 處可能衝突的 OpenClaw 安裝", + "desc": "系統 PATH 中存在非 ClawPanel 管理的 OpenClaw（如 Cherry Studio 內嵌、舊 npm 全域），可能導致終端指令取得舊版本，引發 schema 不相容、doctor --fix 卡住等問題。", + "viewDetails": "查看詳情", + "hideDetails": "收起詳情", + "quarantineAll": "一鍵隔離", + "quarantining": "正在隔離…", + "quarantineOne": "隔離", + "dismiss": "暫時忽略", + "dismissedHint": "已忽略本次偵測。下次啟動會重新掃描。", + "quarantineOk": "已隔離 {count} 個衝突項", + "quarantinePartial": "另有 {count} 個未隔離", + "quarantineFail": "隔離失敗：{error}", + "quarantineOneOk": "已隔離", + "footnote": "隔離 = 重新命名為 .disabled-by-clawpanel-<時間>.bak（不會刪除）。如需恢復，到原目錄把 .bak 檔案改回原名即可。" } } diff --git a/src/main.js b/src/main.js index 8aa0fec..b89a80f 100644 --- a/src/main.js +++ b/src/main.js @@ -18,6 +18,8 @@ import { tryShowEngagement } from './components/engagement.js' import { toast } from './components/toast.js' import { initI18n, t } from './lib/i18n.js' import { initFeatureGates } from './lib/feature-gates.js' +import { onKernelChange } from './lib/kernel.js' +import { showFloorBlocker, hideFloorBlocker } from './components/floor-blocker.js' import { registerEngine, initEngineManager, getActiveEngine, getActiveEngineId, onEngineChange } from './lib/engine-manager.js' import openclawEngine from './engines/openclaw/index.js' import hermesEngine from './engines/hermes/index.js' @@ -325,6 +327,33 @@ async function boot() { // 初始化引擎管理器：读取 clawpanel.json 的 engineMode，注册对应路由 await initEngineManager() + // 订阅内核版本变化：低于硬地板时弹出全屏拦截，恢复后自动隐藏； + // 同时刷新 sidebar 以反映 "内核可升级" 提示卡片状态。 + // 触发时机：Gateway 握手成功 / 重连后版本变化 / 引擎切换 + let _readonlyModeActive = false + onKernelChange((snap) => { + if (!snap?.version) { + // 还未拿到版本，保持当前状态不变 + return + } + if (!snap.aboveFloor && !_readonlyModeActive) { + console.warn(`[kernel] 检测到内核版本 ${snap.version} 低于 ${snap.engine} 硬地板 ${snap.floor}`) + showFloorBlocker({ + currentVersion: snap.version, + floor: snap.floor, + target: snap.target, + onIgnore: () => { _readonlyModeActive = true }, + }) + } else if (snap.aboveFloor) { + hideFloorBlocker() + _readonlyModeActive = false + } + // sidebar 卡片显隐依赖 snapshot，状态变化时刷新一次 + if (sidebar) { + try { renderSidebar(sidebar) } catch (e) { console.warn('[main] kernel-change renderSidebar 失败', e) } + } + }) + renderSidebar(sidebar) initRouter(content) diff --git a/src/pages/about.js b/src/pages/about.js index e0873bc..2352cf2 100644 --- a/src/pages/about.js +++ b/src/pages/about.js @@ -154,8 +154,7 @@ async function loadHermesData(page) { ${!installed ? `${t('about.hermesSetup')}` : ''} ${installed ? ` - - + ` : ''}
@@ -198,6 +197,10 @@ async function loadHermesData(page) { } }) + cards.querySelector('#btn-hermes-services')?.addEventListener('click', () => { + window.location.hash = '#/h/services' + }) + // --- 升级模态框（带实时日志） --- cards.querySelector('#btn-hermes-upgrade')?.addEventListener('click', async () => { const confirmed = await showConfirm(t('about.hermesUpgradeConfirm')) diff --git a/src/pages/agents.js b/src/pages/agents.js index 3cedb53..63f6f45 100644 --- a/src/pages/agents.js +++ b/src/pages/agents.js @@ -7,6 +7,8 @@ import { toast } from '../components/toast.js' import { showModal, showConfirm } from '../components/modal.js' import { CHANNEL_LABELS } from '../lib/channel-labels.js' import { t } from '../lib/i18n.js' +import { listAgentsCompat } from '../lib/api-compat.js' +import { hasFeature } from '../lib/kernel.js' export async function render() { const page = document.createElement('div') @@ -56,7 +58,7 @@ async function loadAgents(page, state) { renderSkeleton(container) try { const [agents, config] = await Promise.all([ - api.listAgents(), + listAgentsCompat(), api.readOpenclawConfig().catch(() => null), ]) state.agents = agents @@ -90,6 +92,26 @@ function renderBindingBadges(agentId, bindings) { }).join(' ') } +/** + * 渲染 Agent Runtime 徽章。 + * + * 上游 2026.5.2+ 会在 agents.list 返回 agentRuntime 元数据： + * - { id: 'pi' } → 默认 Pi runtime（最常用，蓝色徽章） + * - { id: 'codex' } → OpenAI Codex CLI runtime（紫色徽章） + * - { id: '其他' } → 显示原始 id（灰色徽章） + * + * 老内核不会调用本函数（被 hasFeature('agents.runtime') 门控）。 + */ +function _renderRuntimeBadge(runtime) { + const id = (runtime && typeof runtime === 'object' ? runtime.id : runtime) || 'pi' + const map = { + pi: { label: 'Pi', cls: 'badge-info' }, + codex: { label: 'Codex CLI', cls: 'badge-purple' }, + } + const meta = map[id] || { label: id, cls: 'badge-neutral' } + return `${meta.label}` +} + function renderAgents(page, state) { const container = page.querySelector('#agents-list') if (!state.agents.length) { @@ -127,6 +149,11 @@ function renderAgents(page, state) { ${t('agents.labelWorkspace')} ${a.workspace || t('agents.notSet')}
+ ${hasFeature('agents.runtime') ? ` +
+ ${t('agents.labelRuntime')} + ${_renderRuntimeBadge(a.agentRuntime)} +
` : ''}
${t('agents.labelBindings')} ${renderBindingBadges(a.id, state.bindings)} diff --git a/src/pages/dashboard.js b/src/pages/dashboard.js index 176370f..813ac03 100644 --- a/src/pages/dashboard.js +++ b/src/pages/dashboard.js @@ -1,17 +1,19 @@ /** * 仪表盘页面 */ -import { api } from '../lib/tauri-api.js' +import { api, invalidate } from '../lib/tauri-api.js' import { toast } from '../components/toast.js' import { getActiveInstance, onGatewayChange } from '../lib/app-state.js' import { isForeignGatewayError, isForeignGatewayService, maybeShowForeignGatewayBindingPrompt, showGatewayConflictGuidance, showInstallationCleanup } from '../lib/gateway-ownership.js' import { navigate } from '../router.js' import { t } from '../lib/i18n.js' import { wsClient } from '../lib/ws-client.js' +import { attachCliConflictBanner } from '../components/cli-conflict-banner.js' let _unsubGw = null let _loadInFlight = false let _lastGwChangeLoad = 0 +let _detachCliConflict = null export async function render() { const page = document.createElement('div') @@ -22,6 +24,7 @@ export async function render() {

${t('dashboard.title')}

${t('dashboard.desc')}

+
@@ -45,6 +48,13 @@ export async function render() { // 绑定事件（只绑一次） bindActions(page) + // 挂载 CLI 冲突检测横幅（异步扫描 PATH，发现非 standalone 的 openclaw 时显示） + const cliConflictMount = page.querySelector('#cli-conflict-mount') + if (cliConflictMount) { + if (_detachCliConflict) { try { _detachCliConflict() } catch (_) {} } + _detachCliConflict = attachCliConflictBanner(cliConflictMount) + } + // 异步加载数据 loadDashboardData(page).catch(e => { console.error('[dashboard] loadDashboardData 异常:', e) @@ -69,6 +79,7 @@ export async function render() { export function cleanup() { if (_unsubGw) { _unsubGw(); _unsubGw = null } + if (_detachCliConflict) { try { _detachCliConflict() } catch (_) {} _detachCliConflict = null } } function openclawInstallationIdentity(installation) { @@ -111,6 +122,10 @@ function syncDashboardInstanceScope() { _dashboardInstanceId = instanceId } +function versionInfoIncomplete(version) { + return !version || !version.current || !version.source || version.source === 'unknown' +} + async function loadDashboardData(page, fullRefresh = false) { // 并发保护：如果上一次加载仍在进行，跳过本次（fullRefresh 除外） if (_loadInFlight && !fullRefresh) return @@ -126,12 +141,16 @@ async function _loadDashboardDataInner(page, fullRefresh) { promise, new Promise((_, reject) => setTimeout(() => reject(new Error(`超时(${ms/1000}s)`)), ms)) ]) + const shouldFetchVersion = !_dashboardInitialized || fullRefresh || !_dashboardVersionCache || versionInfoIncomplete(_dashboardVersionCache) + if (shouldFetchVersion && (fullRefresh || versionInfoIncomplete(_dashboardVersionCache))) { + invalidate('get_version_info') + } // 每个请求独立超时：避免单个慢请求拖垮整体渲染 const coreP = Promise.allSettled([ withTimeout(api.getServicesStatus(), 12000), withTimeout(api.readOpenclawConfig(), 5000), // 版本信息：首次加载或手动刷新时才查询（避免 ARM 设备上频繁查 npm registry） - (!_dashboardInitialized || fullRefresh || !_dashboardVersionCache) ? withTimeout(api.getVersionInfo(), 8000) : Promise.resolve(_dashboardVersionCache), + shouldFetchVersion ? withTimeout(api.getVersionInfo(), 8000) : Promise.resolve(_dashboardVersionCache), withTimeout(api.readPanelConfig(), 5000), ]) const secondaryP = Promise.allSettled([ diff --git a/src/pages/models.js b/src/pages/models.js index fc98d5d..4ce30ab 100644 --- a/src/pages/models.js +++ b/src/pages/models.js @@ -715,9 +715,20 @@ async function doAutoSave(state) { normalizeProviderUrls(state.config) await api.writeOpenclawConfig(state.config) - // 配置已写入。使用 3s 防抖 + 单飞行锁排队重启，避免快速连续编辑触发多次重启。 - showRestartPendingToast() - scheduleGatewayRestart({ reason: 'models-page' }) + // ⚠ 只有 Gateway 已经在运行时才触发 restart 让配置生效。 + // 如果 Gateway 没启动（首次安装 / 用户手动停了），盲目调 restart_gateway 会： + // 1) HTTP 重载失败（端口没人）→ fallback 到 restart_service 强制启动 + // 2) Gateway 启动失败 → 触发后端 Guardian 自动跑 doctor --fix → 卡 30s + // 3) 用户看到的全是错误 toast，但**配置实际已经写入文件了** + // 改成：先 probe，运行才 schedule restart；没运行就静默告诉用户"已保存"。 + const gwRunning = await api.probeGatewayPort().catch(() => false) + if (gwRunning) { + // 配置已写入。使用 3s 防抖 + 单飞行锁排队重启，避免快速连续编辑触发多次重启。 + showRestartPendingToast() + scheduleGatewayRestart({ reason: 'models-page' }) + } else { + toast(t('models.configSavedGwNotRunning'), 'info', { duration: 4000 }) + } } catch (e) { toast(t('models.autoSaveFailed') + ': ' + e, 'error') } diff --git a/src/pages/services.js b/src/pages/services.js index 6c819e9..5ae18ec 100644 --- a/src/pages/services.js +++ b/src/pages/services.js @@ -684,6 +684,10 @@ async function handleServiceAction(action, label, page) { } catch (e) { if (isForeignGatewayError(e)) { await openGatewayConflict(page, e) + } else if (_looksLikeInvalidConfigError(e)) { + // 上游 5.x doctor 增强：配置 schema 错误 → 直接给一键修复入口， + // 而不是丢一个 toast 让小白对着 stderr 干瞪眼。 + await _promptDoctorFix(page, actionLabel, e) } else { toast(t('services.actionCmdFailed', { action: actionLabel, error: e.message || e }), 'error') } @@ -1027,3 +1031,66 @@ async function handleUninstallGateway(btn, page) { btn.textContent = t('services.uninstall') } } + +// === 配置错误一键修复（上游 5.x doctor --fix 自动迁移多种 schema 问题） === + +/** + * 判断错误是不是来自 OpenClaw 的配置 schema 校验失败。 + * + * 命中关键词（覆盖中英文上游 stderr 模式）： + * - "invalid config" / "schema validation" / "schema error" + * - "unknown field" / "unrecognized key" / "extra fields" + * - "config validation" / "doctor --fix" + * - 中文："配置无效" / "配置校验失败" / "未知字段" + */ +function _looksLikeInvalidConfigError(e) { + const msg = String(e?.message || e || '').toLowerCase() + if (!msg) return false + return ( + /invalid\s+config/.test(msg) || + /schema\s+(validation|error)/.test(msg) || + /config\s+validation/.test(msg) || + /(unknown|unrecognized)\s+(field|key)/.test(msg) || + /extra\s+fields/.test(msg) || + /doctor\s+--?fix/.test(msg) || + msg.includes('配置无效') || + msg.includes('配置校验失败') || + msg.includes('未知字段') + ) +} + +/** + * 弹出"检测到配置问题，要不要跑 doctor --fix"的引导。 + * + * 这个交互替代单纯的红色 toast： + * - 让小白看到一个**可点击的修复路径**而不是无解的报错文本 + * - 修复成功后自动重新加载服务列表 + * - 修复失败再回退到原有的 toast 错误展示 + */ +async function _promptDoctorFix(page, actionLabel, originalErr) { + const errMsg = String(originalErr?.message || originalErr || '') + const yes = await showConfirm( + t('services.invalidConfigPrompt', { action: actionLabel, error: errMsg }), + { + title: t('services.invalidConfigTitle'), + confirmText: t('services.runDoctorFix'), + cancelText: t('common.cancel'), + variant: 'primary', // 修复是建设性操作，按钮用 primary 蓝色而非 danger 红色 + } + ) + if (!yes) { + toast(t('services.actionCmdFailed', { action: actionLabel, error: errMsg }), 'error') + return + } + + toast(t('services.runningDoctorFix'), 'info') + try { + await api.doctorFix() + toast(t('services.doctorFixSuccess'), 'success') + // doctor 改了配置，缓存可能脏 → 强制刷新 + invalidate('read_openclaw_config') + await loadServices(page) + } catch (e2) { + toast(t('services.doctorFixFailed') + ': ' + (e2?.message || e2), 'error') + } +} diff --git a/src/style/agents.css b/src/style/agents.css index 42b7a53..d32e884 100644 --- a/src/style/agents.css +++ b/src/style/agents.css @@ -44,6 +44,21 @@ color: var(--success); } +.badge-info { + background: rgba(59, 130, 246, 0.12); + color: rgb(37, 99, 235); +} + +.badge-purple { + background: rgba(139, 92, 246, 0.14); + color: rgb(124, 58, 237); +} + +.badge-neutral { + background: var(--bg-tertiary, rgba(0, 0, 0, 0.06)); + color: var(--text-secondary); +} + .agent-card-actions { display: flex; gap: 6px; diff --git a/src/style/components.css b/src/style/components.css index c73a260..fecd8a4 100644 --- a/src/style/components.css +++ b/src/style/components.css @@ -700,3 +700,132 @@ mark { height: 80px; } } + +/* ========== CLI 冲突警告横幅 ========== */ +.cli-conflict-slot { + margin-bottom: var(--space-md); +} +.cli-conflict-banner { + background: var(--bg-card); + border: 1px solid rgba(245, 158, 11, 0.45); + border-left: 3px solid #f59e0b; + border-radius: var(--radius-md); + padding: var(--space-sm) var(--space-md); + font-size: var(--font-size-sm); +} +.cli-conflict-banner-head { + display: flex; + align-items: center; + gap: var(--space-sm); + flex-wrap: wrap; +} +.cli-conflict-banner-icon { + font-size: 18px; + color: #f59e0b; + flex-shrink: 0; +} +.cli-conflict-banner-text { + flex: 1; + min-width: 200px; +} +.cli-conflict-banner-title { + font-weight: 600; + color: var(--text-primary); + line-height: 1.4; +} +.cli-conflict-banner-desc { + margin-top: 2px; + font-size: var(--font-size-xs); + color: var(--text-secondary); + line-height: 1.5; +} +.cli-conflict-banner-actions { + display: flex; + gap: var(--space-xs); + flex-wrap: wrap; + flex-shrink: 0; +} +.cli-conflict-banner-actions .btn-ghost { + background: transparent; + border: 1px solid transparent; + color: var(--text-tertiary); +} +.cli-conflict-banner-actions .btn-ghost:hover { + color: var(--text-secondary); + background: var(--bg-glass-hover); +} +.cli-conflict-banner-body { + margin-top: var(--space-md); + padding-top: var(--space-md); + border-top: 1px solid var(--border-primary); +} +.cli-conflict-list { + display: flex; + flex-direction: column; + gap: var(--space-sm); +} +.cli-conflict-item { + display: flex; + align-items: center; + gap: var(--space-md); + padding: var(--space-sm); + background: var(--bg-tertiary); + border-radius: var(--radius-sm); +} +.cli-conflict-item-main { + flex: 1; + min-width: 0; +} +.cli-conflict-item-source { + font-weight: 600; + font-size: var(--font-size-sm); + color: var(--text-primary); +} +.cli-conflict-item-version { + font-weight: 400; + font-size: 11px; + color: var(--text-tertiary); + font-family: var(--font-mono); + margin-left: 4px; +} +.cli-conflict-item-path { + margin-top: 2px; + font-family: var(--font-mono); + font-size: 11px; + color: var(--text-secondary); + word-break: break-all; + line-height: 1.5; +} +.cli-conflict-item-meta { + margin-top: 2px; + font-size: 11px; + color: var(--text-tertiary); +} +.cli-conflict-item-actions { + flex-shrink: 0; +} +.cli-conflict-banner-foot { + margin-top: var(--space-sm); + padding: var(--space-xs) var(--space-sm); + background: var(--bg-tertiary); + border-radius: var(--radius-sm); + font-size: 11px; + color: var(--text-tertiary); + line-height: 1.6; +} +@media (max-width: 768px) { + .cli-conflict-banner-head { + flex-direction: column; + align-items: stretch; + } + .cli-conflict-banner-actions { + justify-content: flex-end; + } + .cli-conflict-item { + flex-direction: column; + align-items: stretch; + } + .cli-conflict-item-actions { + align-self: flex-end; + } +} diff --git a/src/style/layout.css b/src/style/layout.css index 05d9f5f..bccdd43 100644 --- a/src/style/layout.css +++ b/src/style/layout.css @@ -208,6 +208,103 @@ border-top: 1px solid var(--border-secondary); } +/* === 内核可升级提示卡（侧边栏 footer 之上） === */ +.kernel-upgrade-hint { + display: flex; + align-items: center; + gap: 10px; + margin: 8px var(--space-sm); + padding: 10px 12px; + border-radius: 10px; + background: linear-gradient(135deg, rgba(99,102,241,0.10), rgba(139,92,246,0.10)); + border: 1px solid rgba(99,102,241,0.25); + cursor: pointer; + position: relative; + transition: background 0.2s, transform 0.15s, border-color 0.2s, box-shadow 0.2s; +} +.kernel-upgrade-hint:hover { + background: linear-gradient(135deg, rgba(99,102,241,0.18), rgba(139,92,246,0.18)); + border-color: rgba(99,102,241,0.45); + transform: translateY(-1px); + box-shadow: 0 4px 12px rgba(99,102,241,0.18); +} +.kernel-upgrade-hint:focus-visible { + outline: 2px solid var(--primary, #6366f1); + outline-offset: 2px; +} +.kernel-upgrade-hint-icon { + display: inline-flex; + align-items: center; + justify-content: center; + width: 28px; + height: 28px; + flex-shrink: 0; + border-radius: 8px; + background: rgba(99,102,241,0.18); + color: var(--primary, #6366f1); +} +.kernel-upgrade-hint-body { + flex: 1; + min-width: 0; +} +.kernel-upgrade-hint-title { + font-size: 12px; + font-weight: 600; + color: var(--text-primary); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.kernel-upgrade-hint-meta { + margin-top: 2px; + font-size: 11px; + color: var(--text-secondary); + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} +.kernel-upgrade-hint-arrow { + color: var(--text-tertiary); + transform: rotate(-90deg); + flex-shrink: 0; +} +.kernel-upgrade-hint-dismiss { + position: absolute; + top: 4px; + right: 4px; + width: 18px; + height: 18px; + padding: 0; + border: none; + background: transparent; + color: var(--text-tertiary); + font-size: 14px; + line-height: 1; + cursor: pointer; + border-radius: 4px; + opacity: 0; + transition: opacity 0.15s, background 0.15s; +} +.kernel-upgrade-hint:hover .kernel-upgrade-hint-dismiss { + opacity: 0.8; +} +.kernel-upgrade-hint-dismiss:hover { + opacity: 1 !important; + background: rgba(0,0,0,0.06); + color: var(--text-secondary); +} +/* 折叠态：仅显示图标 */ +#sidebar.sidebar-collapsed .kernel-upgrade-hint { + margin: 8px 6px; + padding: 8px; + justify-content: center; +} +#sidebar.sidebar-collapsed .kernel-upgrade-hint-body, +#sidebar.sidebar-collapsed .kernel-upgrade-hint-arrow, +#sidebar.sidebar-collapsed .kernel-upgrade-hint-dismiss { + display: none; +} + .sidebar-meta { display: flex; justify-content: space-between; diff --git a/tests/kernel.test.js b/tests/kernel.test.js new file mode 100644 index 0000000..a35b60d --- /dev/null +++ b/tests/kernel.test.js @@ -0,0 +1,198 @@ +/** + * 内核版本与特性门控的单元测试 + * + * 运行：node --test tests/kernel.test.js + * + * 注意：本测试只覆盖 kernel.js 中的 **纯函数**（parseVersion / versionGte / buildSnapshot）。 + * 涉及 wsClient 订阅 / DOM 的状态函数无法在 node 环境直接测试，留给 e2e。 + */ +import test from 'node:test' +import assert from 'node:assert/strict' + +import { parseVersion, versionGte, buildSnapshot } from '../src/lib/kernel.js' +import { FEATURE_CATALOG, KERNEL_FLOOR } from '../src/lib/feature-catalog.js' + +// ============================================================================ +// parseVersion +// ============================================================================ + +test('parseVersion handles standard semver', () => { + assert.deepEqual(parseVersion('1.2.3'), [1, 2, 3]) + assert.deepEqual(parseVersion('0.0.1'), [0, 0, 1]) + assert.deepEqual(parseVersion('2026.5.6'), [2026, 5, 6]) +}) + +test('parseVersion strips -zh / -beta suffix', () => { + assert.deepEqual(parseVersion('2026.5.6-zh.2'), [2026, 5, 6]) + assert.deepEqual(parseVersion('2026.5.6-beta.1'), [2026, 5, 6]) + assert.deepEqual(parseVersion('1.0.0-rc.1'), [1, 0, 0]) +}) + +test('parseVersion pads short version', () => { + assert.deepEqual(parseVersion('1'), [1, 0, 0]) + assert.deepEqual(parseVersion('1.2'), [1, 2, 0]) +}) + +test('parseVersion returns null on invalid input', () => { + assert.equal(parseVersion(null), null) + assert.equal(parseVersion(''), null) + assert.equal(parseVersion(undefined), null) + assert.equal(parseVersion('not-a-version'), null) + assert.equal(parseVersion('a.b.c'), null) +}) + +test('parseVersion only takes first 3 segments', () => { + assert.deepEqual(parseVersion('1.2.3.4.5'), [1, 2, 3]) +}) + +// ============================================================================ +// versionGte +// ============================================================================ + +test('versionGte returns true for equal versions', () => { + assert.equal(versionGte('1.0.0', '1.0.0'), true) + assert.equal(versionGte('2026.5.6', '2026.5.6'), true) +}) + +test('versionGte returns true for higher major', () => { + assert.equal(versionGte('2.0.0', '1.99.99'), true) + assert.equal(versionGte('2026.0.0', '2025.99.99'), true) +}) + +test('versionGte returns true for higher minor when major equal', () => { + assert.equal(versionGte('1.5.0', '1.4.99'), true) + assert.equal(versionGte('2026.5.0', '2026.4.21'), true) +}) + +test('versionGte returns true for higher patch when major+minor equal', () => { + assert.equal(versionGte('1.0.5', '1.0.4'), true) + assert.equal(versionGte('2026.5.6', '2026.5.5'), true) +}) + +test('versionGte returns false for lower versions', () => { + assert.equal(versionGte('1.0.0', '2.0.0'), false) + assert.equal(versionGte('2026.4.9', '2026.5.6'), false) + assert.equal(versionGte('2026.3.2', '2026.5.6'), false) +}) + +test('versionGte ignores -zh suffix correctly', () => { + assert.equal(versionGte('2026.5.6-zh.2', '2026.5.6'), true) + assert.equal(versionGte('2026.5.6', '2026.5.6-zh.2'), true) + assert.equal(versionGte('2026.4.9-zh.2', '2026.5.6'), false) +}) + +test('versionGte returns false when input is unparseable', () => { + assert.equal(versionGte(null, '1.0.0'), false) + assert.equal(versionGte('1.0.0', null), false) + assert.equal(versionGte('foo', 'bar'), false) +}) + +// ============================================================================ +// buildSnapshot +// ============================================================================ + +test('buildSnapshot constructs correct shape for known engine + version', () => { + const snap = buildSnapshot('openclaw', '2026.5.6') + assert.equal(snap.engine, 'openclaw') + assert.equal(snap.version, '2026.5.6') + assert.equal(snap.versionBase, '2026.5.6') + assert.equal(snap.variant, 'official') + assert.equal(snap.aboveFloor, true) + assert.equal(snap.floor, KERNEL_FLOOR.openclaw) + assert.ok(snap.features instanceof Set) +}) + +test('buildSnapshot detects chinese variant', () => { + const snap = buildSnapshot('openclaw', '2026.5.6-zh.2') + assert.equal(snap.variant, 'chinese') + assert.equal(snap.versionBase, '2026.5.6') + assert.equal(snap.versionLabel, '2026.5.6 汉化') +}) + +test('buildSnapshot.features contains 5.6 features for 5.6 kernel', () => { + const snap = buildSnapshot('openclaw', '2026.5.6') + assert.ok(snap.features.has('sessions.truncation'), 'sessions.truncation should be enabled on 5.6') + assert.ok(snap.features.has('agents.runtime'), 'agents.runtime should be enabled on 5.6') + assert.ok(snap.features.has('memory.statusDeepSplit'), 'memory.statusDeepSplit should be enabled on 5.6') + assert.ok(snap.features.has('doctor.deepSupervisor'), 'doctor.deepSupervisor should be enabled on 5.6') +}) + +test('buildSnapshot.features excludes 5.6 features on 4.9 kernel', () => { + const snap = buildSnapshot('openclaw', '2026.4.9') + assert.equal(snap.features.has('sessions.truncation'), false, 'sessions.truncation should NOT be enabled on 4.9') + assert.equal(snap.features.has('agents.runtime'), false, 'agents.runtime should NOT be enabled on 4.9') + assert.equal(snap.features.has('memory.statusDeepSplit'), false) + assert.equal(snap.features.has('doctor.deepSupervisor'), false) +}) + +test('buildSnapshot.aboveFloor is false for kernel below floor', () => { + const snap = buildSnapshot('openclaw', '2026.2.0') + assert.equal(snap.aboveFloor, false, '2026.2.0 should be below floor 2026.3.2') +}) + +test('buildSnapshot.aboveFloor is true at exactly floor', () => { + const snap = buildSnapshot('openclaw', KERNEL_FLOOR.openclaw) + assert.equal(snap.aboveFloor, true) +}) + +test('buildSnapshot returns null version when input is null', () => { + const snap = buildSnapshot('openclaw', null) + assert.equal(snap.version, null) + assert.equal(snap.aboveFloor, false) + assert.equal(snap.features.size, 0, 'no features enabled when version unknown') +}) + +test('buildSnapshot.features only includes current engine', () => { + const snap = buildSnapshot('hermes', '0.13.0') + // openclaw 特性应该全部被排除 + for (const id of snap.features) { + const def = FEATURE_CATALOG[id] + assert.equal(def.engine, 'hermes', `${id} should belong to hermes engine`) + } +}) + +test('buildSnapshot edge case: version slightly below 5.6 feature requirement', () => { + // sessions.truncation requires 2026.5.4 + const at = buildSnapshot('openclaw', '2026.5.4') + const below = buildSnapshot('openclaw', '2026.5.3') + assert.equal(at.features.has('sessions.truncation'), true) + assert.equal(below.features.has('sessions.truncation'), false) +}) + +test('buildSnapshot.isLatest works against KERNEL_TARGET', () => { + const at_target = buildSnapshot('openclaw', '2026.5.6') + const above_target = buildSnapshot('openclaw', '2026.6.0') + const below_target = buildSnapshot('openclaw', '2026.5.5') + assert.equal(at_target.isLatest, true) + assert.equal(above_target.isLatest, true) + assert.equal(below_target.isLatest, false) +}) + +// ============================================================================ +// FEATURE_CATALOG sanity +// ============================================================================ + +test('FEATURE_CATALOG: every entry has engine and minVersion', () => { + for (const [id, def] of Object.entries(FEATURE_CATALOG)) { + assert.ok(def.engine, `${id} missing engine`) + assert.ok(def.minVersion, `${id} missing minVersion`) + assert.ok(parseVersion(def.minVersion), `${id} has unparseable minVersion: ${def.minVersion}`) + } +}) + +test('FEATURE_CATALOG: id format is . camelCase', () => { + for (const id of Object.keys(FEATURE_CATALOG)) { + assert.match(id, /^[a-z]+\.[a-zA-Z0-9]+$/, `${id} should match .`) + } +}) + +test('FEATURE_CATALOG: all openclaw features minVersion >= floor', () => { + for (const [id, def] of Object.entries(FEATURE_CATALOG)) { + if (def.engine !== 'openclaw') continue + assert.equal( + versionGte(def.minVersion, KERNEL_FLOOR.openclaw), + true, + `${id} minVersion ${def.minVersion} is below floor ${KERNEL_FLOOR.openclaw}`, + ) + } +})