diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e99620..2eb876a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,31 @@ ## [未发布] +## [0.15.1] - 2026-05-10 + +### 新功能 (Features) + +- **首次引擎选择页** — 新增启动选择流程，支持选择 OpenClaw、Hermes Agent、双引擎或稍后配置，避免首次启动直接进入不匹配的安装向导 +- **Hermes Agent Provider 预设增强** — 扩展 Provider 注册表与配置合并能力，前端、Web 后端和 Tauri 后端保持一致 + +### 改进 (Improvements) + +- **Hermes Agent 流式对话兼容层** — 优先使用新的流式响应通道，失败时自动回退，并保持现有前端事件格式不变 +- **Hermes Dashboard 生命周期管理** — 状态检测和停止操作优先使用 Hermes Agent 原生能力，失败后再回退到 ClawPanel 记录的进程信息，降低误报和误杀风险 +- **Hermes Agent 安装体验** — 安装、升级和依赖补齐流程增加日志清理，避免用户界面暴露底层安装细节 +- **多引擎初始化体验** — 引擎选择状态会持久化，切换引擎时清理旧请求缓存，减少跨引擎页面状态串扰 +- **推荐内核版本策略** — 推荐版本更新到 `2026.5.7` 与 `2026.5.7-zh.1` + +### 修复 (Fixes) + +- **Hermes Dashboard 依赖提示** — 缺少 Web 依赖时改为引导使用内置安装按钮，减少手动命令操作 +- **Hermes Agent 页面信息边界** — 清理 Dashboard、Setup、Chat、Skills、Memory、Logs、Cron、Extensions 等页面中的非必要实现细节展示 +- **助手内置技能提示** — Hermes Agent 安装与升级建议改为使用 ClawPanel 内置向导，避免暴露底层安装命令 + +### 测试与验证 (Testing) + +- **发布前检查** — 已通过 JS 语法检查、Rust 格式检查、Rust 编译检查和前端生产构建 + ## [0.15.0] - 2026-05-08 ### 新功能 (Features) diff --git a/docs/index.html b/docs/index.html index 5ec15ae..b296333 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.15.0", + "softwareVersion": "0.15.1", "author": { "@type": "Organization", "name": "晴辰云 QingchenCloud", @@ -1225,7 +1225,7 @@
-
v0.15.0 最新版
+
v0.15.1 最新版

下载安装

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

@@ -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 f832dfe..33cd497 100644 --- a/docs/update/latest.json +++ b/docs/update/latest.json @@ -1,6 +1,6 @@ { "version": "0.15.0", - "minAppVersion": "0.15.0", + "minAppVersion": "0.15.1", "hash": "sha256:eabde5ff45d31204725fca058556871cbde493f3768a61d36b29a8269033d540", "url": "https://github.com/qingchencloud/clawpanel/releases/download/v0.15.0/web-0.15.0.zip", "size": 2486628, diff --git a/openclaw-version-policy.json b/openclaw-version-policy.json index 9571209..e9cf50d 100644 --- a/openclaw-version-policy.json +++ b/openclaw-version-policy.json @@ -9,10 +9,10 @@ }, "default": { "official": { - "recommended": "2026.5.6" + "recommended": "2026.5.7" }, "chinese": { - "recommended": "2026.5.6-zh.1" + "recommended": "2026.5.7-zh.1" } }, "panels": { diff --git a/package-lock.json b/package-lock.json index 3ad726c..5864fd5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "clawpanel", - "version": "0.15.0", + "version": "0.15.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "clawpanel", - "version": "0.15.0", + "version": "0.15.1", "license": "AGPL-3.0", "dependencies": { "@tauri-apps/api": "^2.5.0", diff --git a/package.json b/package.json index 6c43148..3c73b5d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "clawpanel", - "version": "0.15.0", + "version": "0.15.1", "private": true, "description": "ClawPanel - OpenClaw 可视化管理面板，基于 Tauri v2 的跨平台桌面应用", "type": "module", diff --git a/scripts/dev-api.js b/scripts/dev-api.js index 55245e5..9a4cb91 100644 --- a/scripts/dev-api.js +++ b/scripts/dev-api.js @@ -21,6 +21,46 @@ const DOCKER_TASK_TIMEOUT_MS = 10 * 60 * 1000 const HERMES_HOME = path.join(homedir(), '.hermes') const HERMES_DEFAULT_PORT = 8642 +function hermesProvider(id, name, authType, baseUrl, baseUrlEnvVar, apiKeyEnvVars, transport, modelsProbe, models, isAggregator = false, cliAuthHint = '') { + return { id, name, authType, baseUrl, baseUrlEnvVar, apiKeyEnvVars, transport, modelsProbe, models, isAggregator, cliAuthHint } +} + +const HERMES_PROVIDER_REGISTRY = [ + hermesProvider('anthropic', 'Anthropic', 'api_key', 'https://api.anthropic.com', '', ['ANTHROPIC_API_KEY', 'ANTHROPIC_TOKEN', 'CLAUDE_CODE_OAUTH_TOKEN'], 'anthropic_messages', 'anthropic', ['claude-opus-4-7', 'claude-opus-4-6', 'claude-sonnet-4-6', 'claude-opus-4-5-20251101', 'claude-sonnet-4-5-20250929', 'claude-opus-4-20250514', 'claude-sonnet-4-20250514', 'claude-haiku-4-5-20251001']), + hermesProvider('gemini', 'Google AI Studio', 'api_key', 'https://generativelanguage.googleapis.com/v1beta/openai', 'GEMINI_BASE_URL', ['GOOGLE_API_KEY', 'GEMINI_API_KEY'], 'openai_chat', 'openai', ['gemini-3.1-pro-preview', 'gemini-3-flash-preview', 'gemini-3.1-flash-lite-preview', 'gemini-2.5-pro', 'gemini-2.5-flash', 'gemini-2.5-flash-lite', 'gemma-4-31b-it', 'gemma-4-26b-it']), + hermesProvider('deepseek', 'DeepSeek', 'api_key', 'https://api.deepseek.com', 'DEEPSEEK_BASE_URL', ['DEEPSEEK_API_KEY'], 'openai_chat', 'openai', ['deepseek-chat', 'deepseek-reasoner']), + hermesProvider('xai', 'xAI', 'api_key', 'https://api.x.ai/v1', 'XAI_BASE_URL', ['XAI_API_KEY'], 'openai_chat', 'openai', ['grok-4.20-reasoning', 'grok-4-1-fast-reasoning']), + hermesProvider('minimax', 'MiniMax (International)', 'api_key', 'https://api.minimax.io/anthropic/v1', 'MINIMAX_BASE_URL', ['MINIMAX_API_KEY'], 'anthropic_messages', 'anthropic', ['MiniMax-M2.7', 'MiniMax-M2.7-highspeed', 'MiniMax-M2.5', 'MiniMax-M2.5-highspeed', 'MiniMax-M2.1', 'MiniMax-M2.1-highspeed', 'MiniMax-M2', 'MiniMax-M2-highspeed']), + hermesProvider('huggingface', 'Hugging Face', 'api_key', 'https://router.huggingface.co/v1', 'HF_BASE_URL', ['HF_TOKEN'], 'openai_chat', 'openai', ['Qwen/Qwen3.5-397B-A17B', 'Qwen/Qwen3.5-35B-A3B', 'deepseek-ai/DeepSeek-V3.2', 'moonshotai/Kimi-K2.5', 'MiniMaxAI/MiniMax-M2.5', 'zai-org/GLM-5', 'XiaomiMiMo/MiMo-V2-Flash', 'moonshotai/Kimi-K2-Thinking'], true), + hermesProvider('arcee', 'Arcee AI', 'api_key', 'https://api.arcee.ai/api/v1', 'ARCEE_BASE_URL', ['ARCEEAI_API_KEY'], 'openai_chat', 'openai', []), + hermesProvider('azure-foundry', 'Azure Foundry', 'api_key', '', 'AZURE_FOUNDRY_BASE_URL', ['AZURE_FOUNDRY_API_KEY'], 'openai_chat', 'openai', [], true), + hermesProvider('gmi', 'GMI Cloud', 'api_key', 'https://api.gmi-serving.com/v1', 'GMI_BASE_URL', ['GMI_API_KEY'], 'openai_chat', 'openai', []), + hermesProvider('lmstudio', 'LM Studio', 'api_key', 'http://127.0.0.1:1234/v1', 'LM_BASE_URL', ['LM_API_KEY'], 'openai_chat', 'openai', []), + hermesProvider('nvidia', 'NVIDIA NIM', 'api_key', 'https://integrate.api.nvidia.com/v1', 'NVIDIA_BASE_URL', ['NVIDIA_API_KEY'], 'openai_chat', 'openai', []), + hermesProvider('ollama-cloud', 'Ollama Cloud', 'api_key', 'https://ollama.com/v1', 'OLLAMA_BASE_URL', ['OLLAMA_API_KEY'], 'openai_chat', 'openai', []), + hermesProvider('copilot', 'GitHub Copilot (PAT)', 'api_key', 'https://api.githubcopilot.com', '', ['COPILOT_GITHUB_TOKEN', 'GH_TOKEN', 'GITHUB_TOKEN'], 'openai_chat', 'none', ['gpt-4o', 'gpt-4.1', 'claude-3.5-sonnet', 'claude-3.7-sonnet', 'claude-sonnet-4-5', 'o1', 'o1-mini', 'gemini-2.5-pro']), + hermesProvider('zai', 'Z.AI / GLM', 'api_key', 'https://api.z.ai/api/paas/v4', 'GLM_BASE_URL', ['GLM_API_KEY', 'ZAI_API_KEY', 'Z_AI_API_KEY'], 'openai_chat', 'openai', ['glm-5.1', 'glm-5', 'glm-5v-turbo', 'glm-5-turbo', 'glm-4.7', 'glm-4.5', 'glm-4.5-flash']), + hermesProvider('kimi-coding', 'Kimi / Moonshot', 'api_key', 'https://api.moonshot.ai/v1', 'KIMI_BASE_URL', ['KIMI_API_KEY'], 'openai_chat', 'openai', ['kimi-for-coding', 'kimi-k2.6', 'kimi-k2.5', 'kimi-k2-thinking', 'kimi-k2-turbo-preview', 'kimi-k2-0905-preview']), + hermesProvider('kimi-coding-cn', 'Kimi / Moonshot (China)', 'api_key', 'https://api.moonshot.cn/v1', '', ['KIMI_CN_API_KEY'], 'openai_chat', 'openai', ['kimi-for-coding', 'kimi-k2.6', 'kimi-k2.5', 'kimi-k2-thinking', 'kimi-k2-turbo-preview']), + hermesProvider('alibaba', 'Alibaba Cloud (DashScope)', 'api_key', 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1', 'DASHSCOPE_BASE_URL', ['DASHSCOPE_API_KEY'], 'openai_chat', 'openai', ['qwen3.5-plus', 'qwen3-coder-plus', 'qwen3-coder-next', 'glm-5', 'glm-4.7', 'kimi-k2.5', 'MiniMax-M2.5']), + hermesProvider('alibaba-coding-plan', 'Alibaba Cloud (Coding Plan)', 'api_key', 'https://coding-intl.dashscope.aliyuncs.com/v1', 'ALIBABA_CODING_PLAN_BASE_URL', ['ALIBABA_CODING_PLAN_API_KEY', 'DASHSCOPE_API_KEY'], 'openai_chat', 'openai', ['qwen3-coder-plus', 'qwen3-coder-next', 'qwen3.5-plus', 'qwen3.5-coder']), + hermesProvider('minimax-cn', 'MiniMax (China)', 'api_key', 'https://api.minimaxi.com/v1', 'MINIMAX_CN_BASE_URL', ['MINIMAX_CN_API_KEY'], 'anthropic_messages', 'anthropic', ['MiniMax-M2.7', 'MiniMax-M2.7-highspeed', 'MiniMax-M2.5', 'MiniMax-M2.5-highspeed', 'MiniMax-M2.1', 'MiniMax-M2.1-highspeed', 'MiniMax-M2', 'MiniMax-M2-highspeed']), + hermesProvider('xiaomi', 'Xiaomi MiMo', 'api_key', 'https://api.xiaomimimo.com/v1', 'XIAOMI_BASE_URL', ['XIAOMI_API_KEY'], 'openai_chat', 'openai', ['mimo-v2-pro', 'mimo-v2-omni', 'mimo-v2-flash']), + hermesProvider('bedrock', 'AWS Bedrock', 'aws_sdk', 'https://bedrock-runtime.us-east-1.amazonaws.com', 'BEDROCK_BASE_URL', [], 'anthropic_messages', 'none', []), + hermesProvider('openrouter', 'OpenRouter', 'api_key', 'https://openrouter.ai/api/v1', 'OPENAI_BASE_URL', ['OPENROUTER_API_KEY'], 'openai_chat', 'openai', [], true), + hermesProvider('ai-gateway', 'Vercel AI Gateway', 'api_key', 'https://ai-gateway.vercel.sh/v1', 'AI_GATEWAY_BASE_URL', ['AI_GATEWAY_API_KEY'], 'openai_chat', 'openai', ['anthropic/claude-opus-4.6', 'anthropic/claude-sonnet-4.6', 'anthropic/claude-sonnet-4.5', 'anthropic/claude-haiku-4.5', 'openai/gpt-5', 'openai/gpt-4.1', 'openai/gpt-4.1-mini', 'google/gemini-3-pro-preview', 'google/gemini-3-flash', 'google/gemini-2.5-pro', 'google/gemini-2.5-flash', 'deepseek/deepseek-v3.2'], true), + hermesProvider('opencode-zen', 'OpenCode Zen', 'api_key', 'https://opencode.ai/zen/v1', 'OPENCODE_ZEN_BASE_URL', ['OPENCODE_ZEN_API_KEY'], 'openai_chat', 'openai', ['gpt-5.4-pro', 'gpt-5.4', 'gpt-5.3-codex', 'claude-opus-4-6', 'claude-sonnet-4-6', 'claude-haiku-4-5', 'gemini-3.1-pro', 'gemini-3-pro', 'minimax-m2.7', 'glm-5', 'kimi-k2.5', 'qwen3-coder'], true), + hermesProvider('opencode-go', 'OpenCode Go', 'api_key', 'https://opencode.ai/zen/go/v1', 'OPENCODE_GO_BASE_URL', ['OPENCODE_GO_API_KEY'], 'openai_chat', 'openai', ['glm-5.1', 'glm-5', 'kimi-k2.5', 'mimo-v2-pro', 'mimo-v2-omni', 'minimax-m2.7', 'minimax-m2.5'], true), + hermesProvider('kilocode', 'Kilo Code', 'api_key', 'https://api.kilo.ai/api/gateway', 'KILOCODE_BASE_URL', ['KILOCODE_API_KEY'], 'openai_chat', 'openai', ['anthropic/claude-opus-4.6', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.4', 'google/gemini-3-pro-preview', 'google/gemini-3-flash-preview'], true), + hermesProvider('nous', 'Nous Portal', 'oauth_device_code', 'https://inference-api.nousresearch.com/v1', '', [], 'openai_chat', 'none', ['moonshotai/kimi-k2.6', 'anthropic/claude-opus-4.7', 'anthropic/claude-sonnet-4.6', 'openai/gpt-5.4', 'google/gemini-3-pro-preview', 'qwen/qwen3.5-plus-02-15', 'minimax/minimax-m2.7', 'z-ai/glm-5.1', 'x-ai/grok-4.20-beta'], true, 'hermes auth login nous'), + hermesProvider('openai-codex', 'OpenAI Codex', 'oauth_external', 'https://chatgpt.com/backend-api/codex', '', [], 'codex_responses', 'none', ['gpt-5.5', 'gpt-5.4-mini', 'gpt-5.4', 'gpt-5.3-codex', 'gpt-5.2-codex', 'gpt-5.1-codex-max', 'gpt-5.1-codex-mini'], false, 'hermes auth login openai-codex'), + hermesProvider('qwen-oauth', 'Qwen OAuth', 'oauth_external', 'https://dashscope-intl.aliyuncs.com/compatible-mode/v1', '', [], 'openai_chat', 'none', ['qwen3.5-plus', 'qwen3-coder-plus', 'qwen3-coder-next'], false, 'hermes auth login qwen-oauth'), + hermesProvider('google-gemini-cli', 'Google Gemini (OAuth)', 'oauth_external', 'https://generativelanguage.googleapis.com/v1beta/openai', '', [], 'openai_chat', 'none', ['gemini-2.5-pro', 'gemini-2.5-flash'], false, 'hermes auth login google-gemini-cli'), + hermesProvider('minimax-oauth', 'MiniMax (OAuth)', 'oauth_minimax', 'https://api.minimax.io/anthropic', '', [], 'anthropic_messages', 'none', ['MiniMax-M2.7', 'MiniMax-M2.7-highspeed', 'MiniMax-M2.5', 'MiniMax-M2.5-highspeed', 'MiniMax-M2.1', 'MiniMax-M2.1-highspeed', 'MiniMax-M2', 'MiniMax-M2-highspeed'], false, 'hermes auth login minimax-oauth'), + hermesProvider('copilot-acp', 'GitHub Copilot ACP', 'external_process', 'http://127.0.0.1:0', 'COPILOT_ACP_BASE_URL', [], 'openai_chat', 'none', ['gpt-4o', 'gpt-4.1', 'claude-3.5-sonnet', 'claude-3.7-sonnet'], false, 'hermes auth login copilot-acp'), + hermesProvider('custom', 'Custom OpenAI-Compatible', 'api_key', '', 'OPENAI_BASE_URL', ['CUSTOM_API_KEY', 'OPENAI_API_KEY'], 'openai_chat', 'openai', [], true), +] + function hermesHome() { return process.env.HERMES_HOME || HERMES_HOME } @@ -118,6 +158,16 @@ function runHermesSilent(program, args) { } } +function sanitizeHermesInstallOutput(text = '') { + return String(text || '') + .replaceAll('git+https://github.com/NousResearch/hermes-agent.git', 'hermes-agent') + .replaceAll('https://github.com/NousResearch/hermes-agent.git', 'hermes-agent') + .replaceAll('https://github.com/NousResearch/hermes-agent', 'hermes-agent') + .replaceAll('github.com/NousResearch/hermes-agent.git', 'hermes-agent') + .replaceAll('github.com/NousResearch/hermes-agent', 'hermes-agent') + .replaceAll('NousResearch/hermes-agent', 'hermes-agent') +} + let _hermesGwProcess = null const __dev_dirname = path.dirname(fileURLToPath(import.meta.url)) @@ -5098,7 +5148,7 @@ const handlers = { source: 'file-read' } } catch (e) { - return { error: e.message || String(e) } + return { ok: false, error: e.message || String(e) } } }) }, @@ -6825,7 +6875,7 @@ const handlers = { const uvPath = path.join(uvBinDir(), isWindows ? 'uv.exe' : 'uv') let uv = fs.existsSync(uvPath) ? uvPath : null if (!uv && runHermesSilent('uv', ['--version']).ok) uv = 'uv' - if (!uv) throw new Error('uv 未安装。请先安装 uv (https://docs.astral.sh/uv/) 或使用 Tauri 桌面版自动下载') + if (!uv) throw new Error('uv 未安装。请先安装 uv 或使用 Tauri 桌面版自动下载') // 2. 安装 const pkg = extras.length ? `hermes-agent[${extras.join(',')}] @ git+https://github.com/NousResearch/hermes-agent.git` @@ -6840,7 +6890,7 @@ const handlers = { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], }) - if (result.status !== 0) throw new Error(`安装失败: ${(result.stderr || '').trim()}`) + if (result.status !== 0) throw new Error(`安装失败: ${sanitizeHermesInstallOutput((result.stderr || '').trim())}`) // 3. 验证 const ver = runHermesSilent('hermes', ['version']) if (ver.ok) return ver.stdout @@ -6853,26 +6903,28 @@ const handlers = { for (const d of ['cron','sessions','logs','memories','skills','pairing','hooks','image_cache','audio_cache']) { fs.mkdirSync(path.join(home, d), { recursive: true }) } - const envProvider = provider === 'anthropic' || provider === 'minimax' ? 'anthropic' : provider === 'openrouter' ? 'openrouter' : 'openai' - const modelStr = model || (envProvider === 'anthropic' ? 'claude-sonnet-4-20250514' : envProvider === 'openrouter' ? 'anthropic/claude-sonnet-4-20250514' : 'gpt-4o') - const baseUrlLine = baseUrl && baseUrl.trim() ? ` base_url: ${baseUrl.trim()}\n` : '' - // config.yaml + const providerId = (provider || '').trim() + const pcfg = HERMES_PROVIDER_REGISTRY.find(p => p.id === providerId) + const modelStr = (model || pcfg?.models?.[0] || '').trim() + if (!modelStr) throw new Error(`Provider '${providerId || 'custom'}' has no default model; please pass an explicit model name`) + const baseUrlValue = baseUrl && baseUrl.trim() ? baseUrl.trim() : '' + const baseUrlLine = baseUrlValue ? ` base_url: ${baseUrlValue}\n` : '' + const providerLine = providerId && providerId !== 'custom' ? ` provider: ${providerId}\n` : '' const configPath = path.join(home, 'config.yaml') let configContent if (fs.existsSync(configPath)) { const existing = fs.readFileSync(configPath, 'utf8') - configContent = _mergeHermesConfigYaml(existing, modelStr, baseUrlLine) + configContent = _mergeHermesConfigYaml(existing, modelStr, baseUrlLine, providerLine) } else { - configContent = `# Hermes Agent configuration (managed by ClawPanel)\nmodel:\n default: ${modelStr}\n${baseUrlLine}platform_toolsets:\n api_server:\n - hermes-api-server\nterminal:\n backend: local\nplatforms:\n api_server:\n enabled: true\n` + configContent = `# Hermes Agent configuration (managed by ClawPanel)\nmodel:\n default: ${modelStr}\n${providerLine}${baseUrlLine}platform_toolsets:\n api_server:\n - hermes-api-server\nterminal:\n backend: local\nplatforms:\n api_server:\n enabled: true\n` } fs.writeFileSync(configPath, configContent) - // .env - const envKey = envProvider === 'anthropic' ? 'ANTHROPIC_API_KEY' : envProvider === 'openrouter' ? 'OPENROUTER_API_KEY' : 'OPENAI_API_KEY' - const managedKeys = ['OPENAI_API_KEY','ANTHROPIC_API_KEY','OPENROUTER_API_KEY','OPENAI_BASE_URL','ANTHROPIC_BASE_URL','GATEWAY_ALLOW_ALL_USERS','API_SERVER_KEY'] - const newPairs = [[envKey, apiKey], ['GATEWAY_ALLOW_ALL_USERS', 'true'], ['API_SERVER_KEY', 'clawpanel-local']] - if (baseUrl && baseUrl.trim()) { - newPairs.push([envProvider === 'anthropic' ? 'ANTHROPIC_BASE_URL' : 'OPENAI_BASE_URL', baseUrl.trim()]) - } + const envKey = pcfg?.apiKeyEnvVars?.[0] || '' + const urlEnv = pcfg?.baseUrlEnvVar || '' + const managedKeys = handlers._hermesManagedEnvKeys() + const newPairs = [['GATEWAY_ALLOW_ALL_USERS', 'true'], ['API_SERVER_KEY', 'clawpanel-local']] + if (envKey && apiKey && apiKey.trim()) newPairs.push([envKey, apiKey.trim()]) + if (urlEnv && baseUrlValue) newPairs.push([urlEnv, baseUrlValue]) const envPath = path.join(home, '.env') let envContent if (fs.existsSync(envPath)) { @@ -7047,13 +7099,12 @@ const handlers = { return { model: displayModel, model_raw: modelName, base_url: baseUrl, provider, api_key: apiKey, config_exists: fs.existsSync(configPath) } }, - // Web-mode stub: the authoritative 22-provider registry lives in Rust. - // Web mode is primarily used for remote admin on headless Linux where - // Hermes configuration is a minor flow; returning an empty array makes - // the frontend fall back to a "Please use the desktop app to configure - // Hermes providers" message in setup.js. hermes_list_providers() { - return [] + return HERMES_PROVIDER_REGISTRY.map(p => ({ + ...p, + apiKeyEnvVars: [...p.apiKeyEnvVars], + models: [...p.models], + })) }, // ----------------------------------------------------------------------- @@ -7148,54 +7199,18 @@ const handlers = { console.warn(`[hermes guardian] patched config.yaml (api_server.enabled). Backup: ${backupPath}`) }, - // ========================================================================= - // .env editor (Step 4) — Web-mode implementations mirroring Rust behavior. - // The managed-key list is duplicated here since Rust's hermes_providers is - // not accessible from Node. Keep in sync with - // src-tauri/src/commands/hermes_providers.rs::all_managed_env_keys - // whenever new providers are added to the registry. - // ========================================================================= _hermesManagedEnvKeys() { - return [ - // Anthropic - 'ANTHROPIC_API_KEY', 'ANTHROPIC_TOKEN', 'CLAUDE_CODE_OAUTH_TOKEN', - // Gemini - 'GOOGLE_API_KEY', 'GEMINI_API_KEY', 'GEMINI_BASE_URL', - // DeepSeek - 'DEEPSEEK_API_KEY', 'DEEPSEEK_BASE_URL', - // Z.AI / GLM - 'GLM_API_KEY', 'ZAI_API_KEY', 'Z_AI_API_KEY', 'GLM_BASE_URL', - // Kimi - 'KIMI_API_KEY', 'KIMI_BASE_URL', - // xAI - 'XAI_API_KEY', 'XAI_BASE_URL', - // MiniMax intl + CN - 'MINIMAX_API_KEY', 'MINIMAX_BASE_URL', - 'MINIMAX_CN_API_KEY', 'MINIMAX_CN_BASE_URL', - // Alibaba DashScope - 'DASHSCOPE_API_KEY', 'DASHSCOPE_BASE_URL', - // Hugging Face - 'HF_TOKEN', 'HF_BASE_URL', - // Xiaomi - 'XIAOMI_API_KEY', 'XIAOMI_BASE_URL', - // AI Gateway - 'AI_GATEWAY_API_KEY', 'AI_GATEWAY_BASE_URL', - // OpenCode Zen + Go - 'OPENCODE_ZEN_API_KEY', 'OPENCODE_ZEN_BASE_URL', - 'OPENCODE_GO_API_KEY', 'OPENCODE_GO_BASE_URL', - // Kilocode - 'KILOCODE_API_KEY', 'KILOCODE_BASE_URL', - // Copilot (PAT) - 'COPILOT_GITHUB_TOKEN', 'GH_TOKEN', 'GITHUB_TOKEN', - // OpenRouter - 'OPENROUTER_API_KEY', 'OPENAI_BASE_URL', - // Copilot ACP - 'COPILOT_ACP_BASE_URL', - // Custom placeholder - 'CUSTOM_API_KEY', 'OPENAI_API_KEY', - // ClawPanel-specific - 'GATEWAY_ALLOW_ALL_USERS', 'API_SERVER_KEY', - ] + const out = [] + const add = key => { + if (key && !out.includes(key)) out.push(key) + } + for (const provider of HERMES_PROVIDER_REGISTRY) { + for (const key of provider.apiKeyEnvVars || []) add(key) + add(provider.baseUrlEnvVar) + } + add('GATEWAY_ALLOW_ALL_USERS') + add('API_SERVER_KEY') + return out }, hermes_env_read_unmanaged() { @@ -7383,8 +7398,9 @@ const handlers = { async hermes_dashboard_probe() { const port = handlers._hermesDashboardPort() - const running = await _tcpProbe('127.0.0.1', port, 800) - return { running, port } + const cli = handlers._hermesDashboardCliStatus(port) + const running = cli?.running || await _tcpProbe('127.0.0.1', port, 800) + return { running, port, status: cli?.output || null } }, // 共用：解析 dashboard.port（缩进感知，避免误匹配 gateway 块的 port） @@ -7410,10 +7426,35 @@ const handlers = { return port }, + _hermesDashboardCliStatus(port) { + const attempts = [ + runHermesSilent('hermes', ['dashboard', '--status']), + runHermesSilent('hermes', ['dashboard', 'status']), + ] + for (const result of attempts) { + if (!result.ok) continue + const output = result.stdout || '' + const lower = output.toLowerCase() + if (lower.includes('not running') || lower.includes('stopped') || lower.includes('inactive') || lower.includes('no dashboard')) { + return { running: false, output } + } + if (lower.includes('running') || lower.includes('listening') || lower.includes('http://') || lower.includes('https://') || lower.includes(String(port))) { + return { running: true, output } + } + } + return null + }, + + _hermesDashboardCliStop() { + return runHermesSilent('hermes', ['dashboard', '--stop']).ok + || runHermesSilent('hermes', ['dashboard', 'stop']).ok + }, + async hermes_dashboard_start() { const port = handlers._hermesDashboardPort() // 1. 已运行？ - if (await _tcpProbe('127.0.0.1', port, 500)) { + const cli = handlers._hermesDashboardCliStatus(port) + if (cli?.running || await _tcpProbe('127.0.0.1', port, 500)) { return { started: true, already_running: true, port } } // 2. 清残留 PID @@ -7469,15 +7510,6 @@ const handlers = { || lower.includes("no module named 'fastapi'") || (lower.includes('import error') && lower.includes('fastapi'))) { kind = 'deps_missing' - } else if (lower.includes("no module named 'fcntl'") - || lower.includes("no module named 'termios'") - || lower.includes("no module named 'pty'") - || lower.includes("no module named 'tty'") - || lower.includes("no module named 'pwd'") - || lower.includes("no module named 'grp'")) { - // Hermes 上游 bug: pty_bridge.py / memory_tool.py 在 Windows 上 import POSIX-only 模块 - // https://github.com/NousResearch/hermes-agent/issues/5246 - kind = 'posix_only_module' } else if (lower.includes('address already in use') || lower.includes('address in use') || (lower.includes('port') && lower.includes('already in use'))) { @@ -7497,7 +7529,18 @@ const handlers = { }, async hermes_dashboard_stop() { - if (!handlers._dashPid) return false + const port = handlers._hermesDashboardPort() + const cliStopped = handlers._hermesDashboardCliStop() + if (!handlers._dashPid) { + if (cliStopped) { + for (let i = 0; i < 20; i++) { + if (!await _tcpProbe('127.0.0.1', port, 200)) return true + await new Promise(r => setTimeout(r, 250)) + } + return true + } + return false + } try { if (isWindows) { spawnSync('taskkill', ['/F', '/PID', String(handlers._dashPid)], { windowsHide: true }) @@ -7505,10 +7548,14 @@ const handlers = { process.kill(handlers._dashPid, 'SIGKILL') } handlers._dashPid = 0 + for (let i = 0; i < 20; i++) { + if (!await _tcpProbe('127.0.0.1', port, 200)) return true + await new Promise(r => setTimeout(r, 250)) + } return true } catch { handlers._dashPid = 0 - return false + return cliStopped } }, @@ -8199,7 +8246,7 @@ const handlers = { env: { ...process.env, PATH: hermesEnhancedPath(), GIT_TERMINAL_PROMPT: '0' }, timeout: 600000, windowsHide: true, encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], }) - if (result.status !== 0) throw new Error(`升级失败: ${(result.stderr || '').trim()}`) + if (result.status !== 0) throw new Error(`升级失败: ${sanitizeHermesInstallOutput((result.stderr || '').trim())}`) return '升级完成' }, @@ -8286,7 +8333,7 @@ const handlers = { } // Hermes 配置合并辅助函数 -function _mergeHermesConfigYaml(existing, modelStr, baseUrlLine) { +function _mergeHermesConfigYaml(existing, modelStr, baseUrlLine, providerLine = '') { const lines = existing.split('\n') const result = [] let inModel = false, written = false, i = 0 @@ -8296,6 +8343,7 @@ function _mergeHermesConfigYaml(existing, modelStr, baseUrlLine) { inModel = true; written = true result.push('model:') result.push(` default: ${modelStr}`) + if (providerLine) result.push(providerLine.trimEnd()) if (baseUrlLine) result.push(baseUrlLine.trimEnd()) i++ while (i < lines.length) { @@ -8313,6 +8361,7 @@ function _mergeHermesConfigYaml(existing, modelStr, baseUrlLine) { if (!written) { result.push('model:') result.push(` default: ${modelStr}`) + if (providerLine) result.push(providerLine.trimEnd()) if (baseUrlLine) result.push(baseUrlLine.trimEnd()) } let final = result.join('\n') @@ -8398,6 +8447,159 @@ function _endStream(res) { if (!res.writableEnded && !res.destroyed) res.end() } +function _startHermesNdjsonStream(res) { + if (res.headersSent) return + 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() +} + +function _hermesStreamHeaders(apiKey, json = false) { + const headers = { 'User-Agent': 'ClawPanel-Web' } + if (json) headers['Content-Type'] = 'application/json' + if (apiKey) headers.Authorization = `Bearer ${apiKey}` + return headers +} + +function _hermesTextFromResponse(value) { + const response = value?.response || value + if (typeof response?.output_text === 'string') return response.output_text + if (typeof response?.text === 'string') return response.text + let out = '' + const outputs = Array.isArray(response?.output) ? response.output : [] + for (const item of outputs) { + const parts = Array.isArray(item?.content) ? item.content : [] + for (const part of parts) { + if ((part?.type === 'output_text' || part?.type === 'text') && typeof part.text === 'string') { + out += part.text + } + } + } + return out +} + +function _hermesDeltaFromResponseEvent(evt) { + if (typeof evt?.delta === 'string') return evt.delta + if (typeof evt?.text === 'string') return evt.text + if (typeof evt?.content === 'string') return evt.content + if (typeof evt?.delta?.text === 'string') return evt.delta.text + if (typeof evt?.delta?.value === 'string') return evt.delta.value + return '' +} + +function _normalizeHermesStreamEvent(evt, runId, sessionId) { + const eventType = evt?.event || evt?.type || '' + if (!eventType) return null + if (eventType === 'message.delta') return { ...evt, run_id: evt.run_id || runId, session_id: evt.session_id || sessionId || null } + if (eventType === 'run.completed' || eventType === 'run.failed') return { ...evt, run_id: evt.run_id || runId, session_id: evt.session_id || sessionId || null } + if (eventType === 'tool.started' || eventType === 'tool.completed' || eventType === 'tool.progress' || eventType === 'tool.error') { + return { ...evt, run_id: evt.run_id || runId, session_id: evt.session_id || sessionId || null } + } + if (eventType === 'response.output_text.delta' || eventType === 'response.text.delta') { + const delta = _hermesDeltaFromResponseEvent(evt) + return delta ? { event: 'message.delta', run_id: runId, session_id: sessionId || null, delta } : null + } + if (eventType === 'response.output_item.added') { + const item = evt.item || evt.output_item || {} + if (item.type === 'function_call' || item.type === 'tool_call') { + return { event: 'tool.started', run_id: runId, session_id: sessionId || null, tool: item.name || item.function?.name || 'tool', input: item.arguments || item.input || null } + } + } + if (eventType === 'response.function_call_arguments.delta') { + return { event: 'tool.progress', run_id: runId, session_id: sessionId || null, tool: evt.name || evt.item?.name || 'tool', preview: _hermesDeltaFromResponseEvent(evt) } + } + if (eventType === 'response.output_item.done' || eventType === 'response.function_call_arguments.done') { + const item = evt.item || evt.output_item || {} + if (item.type === 'function_call' || item.type === 'tool_call' || eventType === 'response.function_call_arguments.done') { + return { event: 'tool.completed', run_id: runId, session_id: sessionId || null, tool: item.name || evt.name || 'tool', input: item.arguments || evt.arguments || null } + } + } + if (eventType === 'response.completed') { + return { event: 'run.completed', run_id: runId, session_id: sessionId || null, output: _hermesTextFromResponse(evt) } + } + if (eventType === 'response.failed' || eventType === 'response.error') { + const error = evt.error?.message || evt.error || evt.message || 'unknown error' + return { event: 'run.failed', run_id: runId, session_id: sessionId || null, error } + } + return { ...evt, event: eventType, run_id: evt.run_id || runId, session_id: evt.session_id || sessionId || null } +} + +async function _streamHermesEventBody(streamResp, res, args, runId) { + const sessionId = args.sessionId || null + const reader = streamResp.body.getReader() + const decoder = new TextDecoder() + let buffer = '' + let finalOutput = '' + 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) + let data = '' + if (line.startsWith('data:')) data = line.slice(5).trim() + else if (line.startsWith('{')) data = line + else continue + if (!data || data === '[DONE]') { + _writeStreamEvent(res, { event: 'run.completed', run_id: runId, output: finalOutput, session_id: sessionId }) + _endStream(res) + return true + } + let evt + try { evt = JSON.parse(data) } catch { continue } + const normalized = _normalizeHermesStreamEvent(evt, runId, sessionId) + if (!normalized) continue + if (normalized.event === 'message.delta' && typeof normalized.delta === 'string') finalOutput += normalized.delta + if (normalized.event === 'run.completed' && typeof normalized.output === 'string') finalOutput = normalized.output || finalOutput + _writeStreamEvent(res, normalized) + if (normalized.event === 'run.completed' || normalized.event === 'run.failed') { + _endStream(res) + return true + } + } + } + } finally { + try { reader.releaseLock() } catch {} + } + _writeStreamEvent(res, { event: 'run.completed', run_id: runId, output: finalOutput, session_id: sessionId }) + _endStream(res) + return true +} + +async function _tryHermesResponsesStream(gwUrl, apiKey, payload, args, controller, res) { + const responsePayload = { ...payload, stream: true } + const resp = await globalThis.fetch(`${gwUrl}/v1/responses`, { + method: 'POST', + headers: _hermesStreamHeaders(apiKey, true), + body: JSON.stringify(responsePayload), + signal: controller.signal, + }) + if (!resp.ok) { + if (resp.status === 401 || resp.status === 403) { + const text = await resp.text().catch(() => '') + throw new Error(`HTTP ${resp.status}: ${text}`) + } + try { await resp.body?.cancel() } catch {} + return false + } + const runId = resp.headers.get('x-request-id') || resp.headers.get('x-response-id') || `response-${Date.now()}` + _startHermesNdjsonStream(res) + _writeStreamEvent(res, { event: 'run.started', run_id: runId, session_id: args.sessionId || null }) + const contentType = (resp.headers.get('content-type') || '').toLowerCase() + if (resp.body && !contentType.includes('application/json')) return await _streamHermesEventBody(resp, res, args, runId) + const body = await resp.json().catch(() => ({})) + const output = _hermesTextFromResponse(body) + _writeStreamEvent(res, { event: 'run.completed', run_id: body.id || runId, output, session_id: args.sessionId || null }) + _endStream(res) + return true +} + async function _handleHermesAgentRunStream(req, res, args = {}) { const controller = new AbortController() res.on('close', () => controller.abort()) @@ -8408,14 +8610,16 @@ async function _handleHermesAgentRunStream(req, res, args = {}) { 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 headers = _hermesStreamHeaders(apiKey, true) 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 handledByResponses = await _tryHermesResponsesStream(gwUrl, apiKey, payload, args, controller, res) + if (handledByResponses) return + const startedResp = await globalThis.fetch(`${gwUrl}/v1/runs`, { method: 'POST', headers, @@ -8430,16 +8634,11 @@ async function _handleHermesAgentRunStream(req, res, args = {}) { 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() + _startHermesNdjsonStream(res) _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' }, + headers: _hermesStreamHeaders(apiKey), signal: controller.signal, }) if (!eventsResp.ok || !eventsResp.body) { diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index cd62930..e9280b6 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -366,7 +366,7 @@ dependencies = [ [[package]] name = "clawpanel" -version = "0.15.0" +version = "0.15.1" dependencies = [ "base64 0.22.1", "chrono", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 4a2702d..acda3b6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "clawpanel" -version = "0.15.0" +version = "0.15.1" edition = "2021" description = "ClawPanel - OpenClaw 可视化管理面板" authors = ["qingchencloud"] diff --git a/src-tauri/src/commands/hermes.rs b/src-tauri/src/commands/hermes.rs index 15cc576..55974ca 100644 --- a/src-tauri/src/commands/hermes.rs +++ b/src-tauri/src/commands/hermes.rs @@ -1,13 +1,9 @@ //! Hermes Agent 安装与管理命令 //! -//! 通过 uv (Astral) 实现零依赖安装： +//! 通过 uv 实现零依赖安装： //! 1. 下载 uv 单文件二进制 //! 2. uv tool install hermes-agent --python 3.11 //! 3. 写入 ~/.hermes/config.yaml + .env -//! -//! 参考： -//! - uv docs: https://docs.astral.sh/uv/ -//! - Hermes 官方安装: https://hermes-agent.nousresearch.com/docs/getting-started/installation/ use serde_json::Value; use std::path::PathBuf; @@ -652,7 +648,7 @@ pub fn check_python() -> Result { }; result.insert("hasUv".into(), Value::Bool(has_uv)); - // 检测 git（从 GitHub 安装 hermes-agent 需要 git） + // 检测 git let has_git = run_at_path("git", &["--version"], &enhanced).is_ok(); result.insert("hasGit".into(), Value::Bool(has_git)); @@ -914,22 +910,59 @@ fn hermes_dashboard_port() -> u16 { 9119 // Hermes Dashboard 默认端口 } +fn hermes_dashboard_cli_status(port: u16) -> Option<(bool, String)> { + let output = run_silent("hermes", &["dashboard", "--status"]) + .or_else(|_| run_silent("hermes", &["dashboard", "status"])) + .ok()?; + let lower = output.to_ascii_lowercase(); + if lower.contains("not running") + || lower.contains("stopped") + || lower.contains("inactive") + || lower.contains("no dashboard") + { + return Some((false, output)); + } + if lower.contains("running") + || lower.contains("listening") + || lower.contains("http://") + || lower.contains("https://") + || lower.contains(&port.to_string()) + { + return Some((true, output)); + } + None +} + +fn hermes_dashboard_tcp_running(port: u16, timeout_ms: u64) -> bool { + let addr = format!("127.0.0.1:{port}"); + let Ok(socket_addr) = addr.parse::() else { + return false; + }; + std::net::TcpStream::connect_timeout(&socket_addr, std::time::Duration::from_millis(timeout_ms)) + .is_ok() +} + +fn hermes_dashboard_cli_stop() -> bool { + run_silent("hermes", &["dashboard", "--stop"]) + .or_else(|_| run_silent("hermes", &["dashboard", "stop"])) + .is_ok() +} + /// 探测 Hermes Dashboard 是否在运行（TCP 连接 127.0.0.1 上的 dashboard 端口） /// 返回 { running: bool, port: u16 }，前端据此决定是否打开浏览器或提示用户启动 #[tauri::command] pub async fn hermes_dashboard_probe() -> Result { let port = hermes_dashboard_port(); - let addr = format!("127.0.0.1:{port}"); - let socket_addr: std::net::SocketAddr = addr - .parse() - .map_err(|e| format!("address parse error: {e}"))?; + let cli_status = hermes_dashboard_cli_status(port); + let cli_running = cli_status.as_ref().map(|(running, _)| *running); + let cli_output = cli_status.as_ref().map(|(_, output)| output.clone()); let running = tokio::task::spawn_blocking(move || { - std::net::TcpStream::connect_timeout(&socket_addr, std::time::Duration::from_millis(800)) - .is_ok() + let tcp_running = hermes_dashboard_tcp_running(port, 800); + tcp_running || cli_running.unwrap_or(false) }) .await .unwrap_or(false); - Ok(serde_json::json!({ "running": running, "port": port })) + Ok(serde_json::json!({ "running": running, "port": port, "status": cli_output })) } /// 我们 spawn 的 Dashboard 进程 PID（0 = 没有） @@ -975,14 +1008,11 @@ fn kill_dashboard_pid() -> bool { #[tauri::command] pub async fn hermes_dashboard_start() -> Result { let port = hermes_dashboard_port(); - let addr_str = format!("127.0.0.1:{port}"); - let socket_addr: std::net::SocketAddr = addr_str - .parse() - .map_err(|e| format!("address parse error: {e}"))?; - // 1. 已运行？ - if std::net::TcpStream::connect_timeout(&socket_addr, std::time::Duration::from_millis(500)) - .is_ok() + if hermes_dashboard_tcp_running(port, 500) + || hermes_dashboard_cli_status(port) + .map(|(running, _)| running) + .unwrap_or(false) { return Ok(serde_json::json!({ "started": true, @@ -1057,17 +1087,6 @@ pub async fn hermes_dashboard_start() -> Result { || (lower.contains("import error") && lower.contains("fastapi")) { "deps_missing" - } else if lower.contains("no module named 'fcntl'") - || lower.contains("no module named 'termios'") - || lower.contains("no module named 'pty'") - || lower.contains("no module named 'tty'") - || lower.contains("no module named 'pwd'") - || lower.contains("no module named 'grp'") - { - // Hermes 在 pty_bridge.py / memory_tool.py 等处无条件 import POSIX-only - // 标准库（fcntl/termios/pty/tty/pwd/grp），Windows 上根本不存在 - // 上游 issue：https://github.com/NousResearch/hermes-agent/issues/5246 - "posix_only_module" } else if lower.contains("address already in use") || lower.contains("address in use") || (lower.contains("port") && lower.contains("already in use")) @@ -1086,12 +1105,7 @@ pub async fn hermes_dashboard_start() -> Result { } Ok(None) => { // 还活着，探端口 - if std::net::TcpStream::connect_timeout( - &socket_addr, - std::time::Duration::from_millis(300), - ) - .is_ok() - { + if hermes_dashboard_tcp_running(port, 300) { // PID 仍记录在 DASH_PID，供后续 stop 使用 return Ok(serde_json::json!({ "started": true, @@ -1148,7 +1162,21 @@ pub async fn hermes_dashboard_start() -> Result { /// 停止我们 spawn 的 Dashboard 进程 #[tauri::command] pub async fn hermes_dashboard_stop() -> Result { - Ok(kill_dashboard_pid()) + let port = hermes_dashboard_port(); + let cli_stopped = tokio::task::spawn_blocking(hermes_dashboard_cli_stop) + .await + .unwrap_or(false); + let pid_stopped = kill_dashboard_pid(); + if cli_stopped || pid_stopped { + for _ in 0..20 { + if !hermes_dashboard_tcp_running(port, 200) { + return Ok(true); + } + tokio::time::sleep(std::time::Duration::from_millis(250)).await; + } + return Ok(true); + } + Ok(false) } // --------------------------------------------------------------------------- @@ -1348,10 +1376,24 @@ fn extract_uv_tar_gz(data: &[u8], dest: &std::path::Path) -> Result<(), String> Err("tar.gz 中未找到 uv".into()) } -/// Hermes Agent 的 GitHub 仓库地址（不在 PyPI 上发布，只能从 GitHub 安装） const HERMES_GIT_URL: &str = "git+https://github.com/NousResearch/hermes-agent.git"; -/// 通过 uv tool install 安装 Hermes Agent（从 GitHub） +fn sanitize_hermes_install_output(text: &str) -> String { + let mut out = text.replace(HERMES_GIT_URL, "hermes-agent"); + out = out.replace( + "https://github.com/NousResearch/hermes-agent.git", + "hermes-agent", + ); + out = out.replace( + "https://github.com/NousResearch/hermes-agent", + "hermes-agent", + ); + out = out.replace("github.com/NousResearch/hermes-agent.git", "hermes-agent"); + out = out.replace("github.com/NousResearch/hermes-agent", "hermes-agent"); + out.replace("NousResearch/hermes-agent", "hermes-agent") +} + +/// 通过 uv tool install 安装 Hermes Agent async fn install_via_uv_tool( app: &tauri::AppHandle, uv_path: &str, @@ -1359,12 +1401,11 @@ async fn install_via_uv_tool( ) -> Result<(), String> { let _ = app.emit( "hermes-install-log", - "📦 通过 uv tool install 从 GitHub 安装 Hermes Agent...", + "📦 通过 uv tool install 安装 Hermes Agent...", ); let _ = app.emit("hermes-install-progress", 25u32); - // 构造包名（PEP 508 格式: "pkg[extras] @ git+url"） - // hermes-agent 未发布到 PyPI，必须从 GitHub 安装 + // 构造安装规格 let pkg = if extras.is_empty() { format!("hermes-agent @ {}", HERMES_GIT_URL) } else { @@ -1396,7 +1437,7 @@ async fn install_via_uv_tool( let _ = app.emit( "hermes-install-log", - format!("> uv tool install \"{}\" --python 3.11", pkg), + "uv tool install hermes-agent --python 3.11", ); let child = cmd.spawn().map_err(|e| format!("启动安装进程失败: {e}"))?; @@ -1411,7 +1452,10 @@ async fn install_via_uv_tool( // 逐行输出日志 for line in stdout.lines().chain(stderr.lines()) { if !line.trim().is_empty() { - let _ = app.emit("hermes-install-log", line.trim()); + let _ = app.emit( + "hermes-install-log", + sanitize_hermes_install_output(line.trim()), + ); } } @@ -1428,7 +1472,7 @@ async fn install_via_uv_tool( Err(format!( "安装失败 (exit {}): {}", output.status.code().unwrap_or(-1), - stderr.trim() + sanitize_hermes_install_output(stderr.trim()) )) } } @@ -1470,13 +1514,13 @@ async fn install_via_uv_pip( let _ = app.emit("hermes-install-log", "✓ Python 虚拟环境创建完成"); let _ = app.emit("hermes-install-progress", 40u32); - // pip install（从 GitHub） + // pip install let pkg = if extras.is_empty() { format!("hermes-agent @ {}", HERMES_GIT_URL) } else { format!("hermes-agent[{}] @ {}", extras.join(","), HERMES_GIT_URL) }; - let _ = app.emit("hermes-install-log", format!("> uv pip install \"{pkg}\"")); + let _ = app.emit("hermes-install-log", "> uv pip install hermes-agent"); let mut pip_cmd = tokio::process::Command::new(uv_path); pip_cmd.args(["pip", "install", &pkg]); @@ -1498,12 +1542,18 @@ async fn install_via_uv_pip( let stderr = String::from_utf8_lossy(&pip_out.stderr); for line in stdout.lines().chain(stderr.lines()) { if !line.trim().is_empty() { - let _ = app.emit("hermes-install-log", line.trim()); + let _ = app.emit( + "hermes-install-log", + sanitize_hermes_install_output(line.trim()), + ); } } if !pip_out.status.success() { - return Err(format!("pip install 失败: {}", stderr.trim())); + return Err(format!( + "pip install 失败: {}", + sanitize_hermes_install_output(stderr.trim()) + )); } let _ = app.emit("hermes-install-log", "✓ pip install 完成"); @@ -1575,8 +1625,8 @@ pub async fn configure_hermes( } // ---- Provider-aware key routing ---- - // ClawPanel 使用 HERMES_PROVIDER_REGISTRY (22 providers) 决定 .env key 名和 - // config.yaml 的 model.provider 字段。详见 hermes_providers.rs 的文档。 + // ClawPanel 根据内置 provider registry 决定 .env key 名和 + // config.yaml 的 model.provider 字段。 use super::hermes_providers; let pcfg = hermes_providers::get_provider(&provider); @@ -1599,8 +1649,8 @@ pub async fn configure_hermes( Some(url) if !url.trim().is_empty() => format!(" base_url: {}\n", url.trim()), _ => String::new(), }; - // Provider 字段：Hermes v0.14+ 的 model_switch 依赖该字段决定 env_var。 - // `custom` 不写 provider 行，让 Hermes 从 base_url 自动推断。 + // Provider 字段用于稳定选择凭证来源。 + // `custom` 不写 provider 行，让 Hermes Agent 从 base_url 自动推断。 let provider_line = if provider == "custom" || provider.is_empty() { String::new() } else { @@ -2734,7 +2784,6 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { "uv".into() }; - // hermes-agent 从 GitHub 安装，upgrade 不可用，改用 reinstall let pkg = format!("hermes-agent[web] @ {}", HERMES_GIT_URL); let mut cmd = tokio::process::Command::new(&uv); cmd.args([ @@ -2750,7 +2799,7 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { let _ = app.emit("hermes-install-progress", 20u32); let _ = app.emit( "hermes-install-log", - format!("> uv tool install --reinstall \"{pkg}\" --python 3.11 --with croniter"), + "uv tool install --reinstall hermes-agent --python 3.11 --with croniter", ); cmd.env("GIT_TERMINAL_PROMPT", "0"); if let Some(mirror) = pypi_mirror_url() { @@ -2767,7 +2816,10 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { 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()); + let _ = app.emit( + "hermes-install-log", + sanitize_hermes_install_output(line.trim()), + ); } } @@ -2776,7 +2828,10 @@ pub async fn update_hermes(app: tauri::AppHandle) -> Result { let _ = app.emit("hermes-install-progress", 100u32); Ok("升级完成".into()) } else { - Err(format!("升级失败: {}", stderr.trim())) + Err(format!( + "升级失败: {}", + sanitize_hermes_install_output(stderr.trim()) + )) } } @@ -2957,9 +3012,347 @@ pub async fn hermes_api_proxy( } // --------------------------------------------------------------------------- -// hermes_agent_run — 通过 /v1/runs + SSE 事件流驱动 Agent（工具调用可见） +// hermes_agent_run — streaming compatibility layer for Hermes Agent // --------------------------------------------------------------------------- +fn hermes_response_text(value: &Value) -> String { + let response = value.get("response").unwrap_or(value); + if let Some(text) = response.get("output_text").and_then(|v| v.as_str()) { + return text.to_string(); + } + if let Some(text) = response.get("text").and_then(|v| v.as_str()) { + return text.to_string(); + } + let mut out = String::new(); + if let Some(items) = response.get("output").and_then(|v| v.as_array()) { + for item in items { + if let Some(parts) = item.get("content").and_then(|v| v.as_array()) { + for part in parts { + let kind = part.get("type").and_then(|v| v.as_str()).unwrap_or(""); + if matches!(kind, "output_text" | "text") { + if let Some(text) = part.get("text").and_then(|v| v.as_str()) { + out.push_str(text); + } + } + } + } + } + } + out +} + +fn hermes_response_delta(evt: &Value) -> String { + evt.get("delta") + .and_then(|v| v.as_str()) + .or_else(|| evt.get("text").and_then(|v| v.as_str())) + .or_else(|| evt.get("content").and_then(|v| v.as_str())) + .or_else(|| { + evt.get("delta") + .and_then(|v| v.get("text")) + .and_then(|v| v.as_str()) + }) + .or_else(|| { + evt.get("delta") + .and_then(|v| v.get("value")) + .and_then(|v| v.as_str()) + }) + .unwrap_or("") + .to_string() +} + +fn normalize_hermes_stream_event( + evt: &Value, + run_id: &str, + session_id: Option<&str>, +) -> Option { + let event_type = evt + .get("event") + .and_then(|v| v.as_str()) + .or_else(|| evt.get("type").and_then(|v| v.as_str())) + .unwrap_or(""); + if event_type.is_empty() { + return None; + } + let sid = session_id + .map(|s| Value::String(s.to_string())) + .unwrap_or(Value::Null); + match event_type { + "message.delta" | "run.completed" | "run.failed" | "tool.started" | "tool.completed" + | "tool.progress" | "tool.error" => { + let mut out = evt.clone(); + if out.get("run_id").is_none() { + out["run_id"] = Value::String(run_id.to_string()); + } + if out.get("session_id").is_none() { + out["session_id"] = sid; + } + Some(out) + } + "response.output_text.delta" | "response.text.delta" => { + let delta = hermes_response_delta(evt); + if delta.is_empty() { + None + } else { + Some(serde_json::json!({ + "event": "message.delta", + "run_id": run_id, + "session_id": sid, + "delta": delta, + })) + } + } + "response.output_item.added" => { + let item = evt + .get("item") + .or_else(|| evt.get("output_item")) + .unwrap_or(&Value::Null); + let kind = item.get("type").and_then(|v| v.as_str()).unwrap_or(""); + if !matches!(kind, "function_call" | "tool_call") { + return None; + } + let tool = item + .get("name") + .and_then(|v| v.as_str()) + .or_else(|| { + item.get("function") + .and_then(|v| v.get("name")) + .and_then(|v| v.as_str()) + }) + .unwrap_or("tool"); + Some(serde_json::json!({ + "event": "tool.started", + "run_id": run_id, + "session_id": sid, + "tool": tool, + "input": item.get("arguments").or_else(|| item.get("input")).cloned().unwrap_or(Value::Null), + })) + } + "response.function_call_arguments.delta" => Some(serde_json::json!({ + "event": "tool.progress", + "run_id": run_id, + "session_id": sid, + "tool": evt.get("name").and_then(|v| v.as_str()).unwrap_or("tool"), + "preview": hermes_response_delta(evt), + })), + "response.output_item.done" | "response.function_call_arguments.done" => { + let item = evt + .get("item") + .or_else(|| evt.get("output_item")) + .unwrap_or(&Value::Null); + let kind = item.get("type").and_then(|v| v.as_str()).unwrap_or(""); + if event_type == "response.output_item.done" + && !matches!(kind, "function_call" | "tool_call") + { + return None; + } + Some(serde_json::json!({ + "event": "tool.completed", + "run_id": run_id, + "session_id": sid, + "tool": item.get("name").and_then(|v| v.as_str()).or_else(|| evt.get("name").and_then(|v| v.as_str())).unwrap_or("tool"), + "input": item.get("arguments").or_else(|| evt.get("arguments")).cloned().unwrap_or(Value::Null), + })) + } + "response.completed" => Some(serde_json::json!({ + "event": "run.completed", + "run_id": run_id, + "session_id": sid, + "output": hermes_response_text(evt), + })), + "response.failed" | "response.error" => Some(serde_json::json!({ + "event": "run.failed", + "run_id": run_id, + "session_id": sid, + "error": evt.get("error").and_then(|v| v.get("message")).and_then(|v| v.as_str()) + .or_else(|| evt.get("error").and_then(|v| v.as_str())) + .or_else(|| evt.get("message").and_then(|v| v.as_str())) + .unwrap_or("unknown error"), + })), + _ => { + let mut out = evt.clone(); + out["event"] = Value::String(event_type.to_string()); + if out.get("run_id").is_none() { + out["run_id"] = Value::String(run_id.to_string()); + } + if out.get("session_id").is_none() { + out["session_id"] = sid; + } + Some(out) + } + } +} + +fn emit_hermes_stream_event( + app: &tauri::AppHandle, + evt: Value, + run_id: &str, + final_output: &mut String, +) -> Result { + let event_type = evt["event"].as_str().unwrap_or(""); + match event_type { + "message.delta" => { + if let Some(delta) = evt["delta"].as_str() { + final_output.push_str(delta); + let _ = app.emit( + "hermes-run-delta", + serde_json::json!({ + "run_id": run_id, + "delta": delta, + }), + ); + } + } + "tool.started" | "tool.completed" | "tool.progress" | "tool.error" => { + let _ = app.emit("hermes-run-tool", evt.clone()); + } + "reasoning.available" => { + let _ = app.emit("hermes-run-reasoning", evt.clone()); + } + "run.completed" => { + if let Some(output) = evt["output"].as_str() { + if !output.is_empty() { + *final_output = output.to_string(); + } + } + let _ = app.emit( + "hermes-run-done", + serde_json::json!({ + "run_id": run_id, + "output": final_output.as_str(), + }), + ); + return Ok(true); + } + "run.failed" => { + let err = evt["error"].as_str().unwrap_or("unknown error"); + let _ = app.emit( + "hermes-run-error", + serde_json::json!({ + "run_id": run_id, + "error": err, + }), + ); + return Err(format!("Agent run failed: {err}")); + } + _ => { + let _ = app.emit("hermes-run-event", evt.clone()); + } + } + Ok(false) +} + +async fn try_hermes_responses_run( + app: &tauri::AppHandle, + gw_url: &str, + api_key: &str, + payload: &Value, + session_id: Option<&str>, +) -> Result, String> { + let client = hermes_gateway_http_client(std::time::Duration::from_secs(300)) + .map_err(|e| format!("HTTP 客户端创建失败: {e}"))?; + let mut response_payload = payload.clone(); + response_payload["stream"] = Value::Bool(true); + let mut req = client + .post(format!("{gw_url}/v1/responses")) + .header("Content-Type", "application/json") + .body(response_payload.to_string()); + if !api_key.is_empty() { + req = req.header("Authorization", format!("Bearer {api_key}")); + } + let resp = match req.send().await { + Ok(resp) => resp, + Err(_) => return Ok(None), + }; + let status = resp.status(); + if !status.is_success() { + if status.as_u16() == 401 || status.as_u16() == 403 { + let text = resp.text().await.unwrap_or_default(); + return Err(format!("HTTP {}: {text}", status.as_u16())); + } + return Ok(None); + } + let run_id = resp + .headers() + .get("x-request-id") + .or_else(|| resp.headers().get("x-response-id")) + .and_then(|v| v.to_str().ok()) + .map(String::from) + .unwrap_or_else(|| { + let now = std::time::SystemTime::now() + .duration_since(std::time::UNIX_EPOCH) + .map(|d| d.as_millis()) + .unwrap_or_default(); + format!("response-{now}") + }); + let _ = app.emit( + "hermes-run-started", + serde_json::json!({ "run_id": &run_id }), + ); + let content_type = resp + .headers() + .get("content-type") + .and_then(|v| v.to_str().ok()) + .unwrap_or("") + .to_ascii_lowercase(); + if content_type.contains("application/json") { + let body: Value = resp.json().await.unwrap_or(Value::Null); + let output = hermes_response_text(&body); + let _ = app.emit( + "hermes-run-done", + serde_json::json!({ + "run_id": &run_id, + "output": output, + }), + ); + return Ok(Some(run_id)); + } + + use futures_util::StreamExt; + let mut stream = resp.bytes_stream(); + let mut buffer = String::new(); + let mut final_output = String::new(); + while let Some(chunk) = stream.next().await { + let chunk = chunk.map_err(|e| format!("SSE 读取失败: {e}"))?; + buffer.push_str(&String::from_utf8_lossy(&chunk)); + while let Some(newline_pos) = buffer.find('\n') { + let line = buffer[..newline_pos].trim().to_string(); + buffer = buffer[newline_pos + 1..].to_string(); + let data = if let Some(rest) = line.strip_prefix("data:") { + rest.trim() + } else if line.starts_with('{') { + line.as_str() + } else { + continue; + }; + if data.is_empty() || data == "[DONE]" { + let _ = app.emit( + "hermes-run-done", + serde_json::json!({ + "run_id": &run_id, + "output": &final_output, + }), + ); + return Ok(Some(run_id)); + } + if let Ok(evt) = serde_json::from_str::(data) { + if let Some(normalized) = normalize_hermes_stream_event(&evt, &run_id, session_id) { + if emit_hermes_stream_event(app, normalized, &run_id, &mut final_output)? { + return Ok(Some(run_id)); + } + } + } + } + } + let _ = app.emit( + "hermes-run-done", + serde_json::json!({ + "run_id": &run_id, + "output": &final_output, + }), + ); + Ok(Some(run_id)) +} + #[tauri::command] pub async fn hermes_agent_run( app: tauri::AppHandle, @@ -3001,6 +3394,12 @@ pub async fn hermes_agent_run( payload["instructions"] = Value::String(inst.clone()); } + if let Some(response_run_id) = + try_hermes_responses_run(&app, &gw_url, &api_key, &payload, session_id.as_deref()).await? + { + return Ok(response_run_id); + } + let client = hermes_gateway_http_client(std::time::Duration::from_secs(10)) .map_err(|e| format!("HTTP 客户端创建失败: {e}"))?; @@ -3071,7 +3470,6 @@ pub async fn hermes_agent_run( return Err(format!("SSE HTTP {status}: {text}")); } - // 流式读取 SSE 事件并转发到前端 use futures_util::StreamExt; let mut stream = sse_resp.bytes_stream(); let mut buffer = String::new(); @@ -3086,11 +3484,14 @@ pub async fn hermes_agent_run( buffer = buffer[newline_pos + 1..].to_string(); let trimmed = line.trim(); - if !trimmed.starts_with("data: ") { + let data = if let Some(rest) = trimmed.strip_prefix("data:") { + rest.trim() + } else if trimmed.starts_with('{') { + trimmed + } else { continue; - } - let data = trimmed[6..].trim(); - if data == "[DONE]" { + }; + if data.is_empty() || data == "[DONE]" { let _ = app.emit( "hermes-run-done", serde_json::json!({ @@ -3102,54 +3503,12 @@ pub async fn hermes_agent_run( } if let Ok(evt) = serde_json::from_str::(data) { - let event_type = evt["event"].as_str().unwrap_or(""); - match event_type { - "message.delta" => { - if let Some(delta) = evt["delta"].as_str() { - final_output.push_str(delta); - let _ = app.emit( - "hermes-run-delta", - serde_json::json!({ - "run_id": &run_id, - "delta": delta, - }), - ); - } - } - "tool.started" | "tool.completed" | "tool.progress" | "tool.error" => { - let _ = app.emit("hermes-run-tool", evt.clone()); - } - "reasoning.available" => { - let _ = app.emit("hermes-run-reasoning", evt.clone()); - } - "run.completed" => { - if let Some(output) = evt["output"].as_str() { - final_output = output.to_string(); - } - let _ = app.emit( - "hermes-run-done", - serde_json::json!({ - "run_id": &run_id, - "output": &final_output, - }), - ); + if let Some(normalized) = + normalize_hermes_stream_event(&evt, &run_id, session_id.as_deref()) + { + if emit_hermes_stream_event(&app, normalized, &run_id, &mut final_output)? { return Ok(run_id); } - "run.failed" => { - let err = evt["error"].as_str().unwrap_or("unknown error"); - let _ = app.emit( - "hermes-run-error", - serde_json::json!({ - "run_id": &run_id, - "error": err, - }), - ); - return Err(format!("Agent run failed: {err}")); - } - _ => { - // 其他事件类型也转发 - let _ = app.emit("hermes-run-event", evt.clone()); - } } } } @@ -3819,9 +4178,7 @@ fn parse_log_line(line: &str) -> ParsedLogLine { } /// Extract the first `# Heading` or the first long prose line from Markdown, -/// used as a skill's canonical name/description. Mirrors hermes-web-ui's -/// `extractDescription()` behaviour — first non-empty/non-heading line, -/// truncated to 200 chars. +/// used as a skill's canonical name/description. fn md_first_heading(content: &str) -> Option { content .lines() @@ -3847,7 +4204,7 @@ fn md_first_description(content: &str) -> String { /// Read `config.yaml` and return the list of `skills.disabled` entries. /// Gracefully handles missing file / missing section → empty list. /// -/// The disable mechanism matches upstream `hermes-web-ui`: +/// The disable mechanism uses the `skills.disabled` list: /// /// ```yaml /// skills: @@ -3900,9 +4257,7 @@ fn read_disabled_skills() -> Vec { disabled } -/// Shape returned to the frontend — kept compatible with the previous -/// version (file/name/description/path) while adding `enabled` and the -/// optional `isDir`/`category` fields that `hermes-web-ui` also uses. +/// Shape returned to the frontend. #[tauri::command] pub async fn hermes_skills_list() -> Result { let skills_dir = hermes_home().join("skills"); @@ -3948,7 +4303,7 @@ pub async fn hermes_skills_list() -> Result { Err(_) => continue, }; - // v0.14.1 structured skill: //SKILL.md + // Structured skill: //SKILL.md if ftype.is_dir() { let skill_md = fpath.join("SKILL.md"); if !skill_md.exists() { @@ -4055,8 +4410,7 @@ pub async fn hermes_skill_detail(file_path: String) -> Result { // ============================================================================ /// Toggle a skill's enabled state by mutating `config.yaml`'s -/// `skills.disabled` list. Matches the behaviour of hermes-web-ui's -/// `PUT /api/hermes/skills/toggle`. +/// `skills.disabled` list. /// /// * `enabled = true` → remove `name` from disabled list /// * `enabled = false` → add `name` to disabled list @@ -4332,8 +4686,7 @@ pub async fn hermes_memory_write( /// + last-modified UNIX timestamp (seconds) for each. A missing file yields an /// empty string and `None` mtime — the caller shows "not yet written" state. /// -/// Shape matches `hermes-web-ui`'s `GET /api/hermes/memory` response so the -/// frontend can mirror the official UI's three-column layout. +/// Shape is optimized for the frontend memory layout. #[tauri::command] pub async fn hermes_memory_read_all() -> Result { let mem_dir = hermes_home().join("memories"); @@ -4416,15 +4769,12 @@ pub async fn hermes_logs_download(name: String) -> Result { } // ============================================================================ -// api_server guardian (Step 5 / G7) +// api_server guardian // // ClawPanel's Hermes integration requires `platforms.api_server.enabled: true` // in ~/.hermes/config.yaml so that `hermes gateway run` exposes the // /v1/runs endpoint we depend on. The setting is written once by -// `configure_hermes`, but several real-world scenarios can remove it: -// * User upgrades Hermes and the new default config.yaml is merged -// without the api_server platform entry. -// * User manually edits config.yaml (via Hermes CLI or text editor). +// `configure_hermes`, but config changes can remove it. // * Migration scripts accidentally drop the section. // // Rather than silently failing at Gateway start time with an opaque @@ -4595,7 +4945,7 @@ fn ensure_api_server_enabled(app: &tauri::AppHandle) -> Result<(), String> { } // ============================================================================ -// .env editor commands (Step 4 / G6) +// .env editor commands // // Users may need to set custom environment variables for Hermes (e.g. // `TAVILY_API_KEY` for the tavily skill, `HTTP_PROXY`, etc.). These keys diff --git a/src-tauri/src/commands/hermes_providers.rs b/src-tauri/src/commands/hermes_providers.rs index 008d98a..ad0f5ea 100644 --- a/src-tauri/src/commands/hermes_providers.rs +++ b/src-tauri/src/commands/hermes_providers.rs @@ -1,21 +1,7 @@ -//! Hermes Provider Registry — authoritative catalog of 22 providers supported +//! Hermes Provider Registry — ClawPanel's built-in provider catalog //! by Hermes Agent, with their auth schemes, env vars, base URLs, and known //! model catalogs. //! -//! Source of truth: upstream `hermes-agent` repository -//! - Auth / env vars: `hermes_cli/auth.py::PROVIDER_REGISTRY` -//! - Model catalogs: `hermes_cli/models.py::_PROVIDER_MODELS` -//! -//! Synced from upstream at: -//! - hermes_cli/auth.py (v0.14.x series) -//! - hermes_cli/models.py (v0.14.x series) -//! -//! When syncing a new Hermes release, verify: -//! 1. Each provider's `api_key_env_vars` matches upstream tuple ordering -//! 2. `models` list reflects the latest _PROVIDER_MODELS entries -//! 3. `base_url` mirrors the default inference URL (users can override via -//! `base_url_env_var`) -//! //! This module is intentionally self-contained: it must NOT depend on any //! runtime state. The static data is queried by commands in `hermes.rs` //! and surfaced to the frontend via `hermes_list_providers`. @@ -26,8 +12,6 @@ use serde::Serialize; // Data model // ============================================================================= -/// Auth scheme matching upstream `auth.py::ProviderConfig.auth_type`. -/// /// - `api_key`: traditional env-var based key (`_API_KEY`, etc.) /// - `oauth_device_code`: interactive device-code OAuth flow (Nous) /// - `oauth_external`: OAuth handled by external process (Codex, Qwen) @@ -36,6 +20,8 @@ pub const AUTH_API_KEY: &str = "api_key"; pub const AUTH_OAUTH_DEVICE: &str = "oauth_device_code"; pub const AUTH_OAUTH_EXTERNAL: &str = "oauth_external"; pub const AUTH_EXTERNAL_PROCESS: &str = "external_process"; +pub const AUTH_AWS_SDK: &str = "aws_sdk"; +pub const AUTH_OAUTH_MINIMAX: &str = "oauth_minimax"; /// Transport negotiated with the provider. pub const TRANSPORT_OPENAI_CHAT: &str = "openai_chat"; @@ -56,7 +42,7 @@ pub const PROBE_NONE: &str = "none"; #[derive(Debug, Clone, Serialize)] #[serde(rename_all = "camelCase")] pub struct HermesProvider { - /// Stable identifier (matches upstream PROVIDER_REGISTRY keys). + /// Stable provider identifier. pub id: &'static str, /// Human-readable display name. pub name: &'static str, @@ -72,7 +58,7 @@ pub struct HermesProvider { pub transport: &'static str, /// See PROBE_* constants above. pub models_probe: &'static str, - /// Known static model list (subset of upstream _PROVIDER_MODELS). + /// Known static model list. pub models: &'static [&'static str], /// True for aggregators/routers (OpenRouter, AI Gateway, etc.) — users /// must explicitly specify a model since there is no sensible default. @@ -82,7 +68,7 @@ pub struct HermesProvider { } // ============================================================================= -// Static registry — 22 providers +// Static registry // ============================================================================= const P_ANTHROPIC: HermesProvider = HermesProvider { @@ -192,6 +178,26 @@ const P_KIMI_CODING: HermesProvider = HermesProvider { cli_auth_hint: "", }; +const P_KIMI_CODING_CN: HermesProvider = HermesProvider { + id: "kimi-coding-cn", + name: "Kimi / Moonshot (China)", + auth_type: AUTH_API_KEY, + base_url: "https://api.moonshot.cn/v1", + base_url_env_var: "", + api_key_env_vars: &["KIMI_CN_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[ + "kimi-for-coding", + "kimi-k2.6", + "kimi-k2.5", + "kimi-k2-thinking", + "kimi-k2-turbo-preview", + ], + is_aggregator: false, + cli_auth_hint: "", +}; + const P_XAI: HermesProvider = HermesProvider { id: "xai", name: "xAI", @@ -252,6 +258,29 @@ const P_MINIMAX_CN: HermesProvider = HermesProvider { cli_auth_hint: "", }; +const P_MINIMAX_OAUTH: HermesProvider = HermesProvider { + id: "minimax-oauth", + name: "MiniMax (OAuth)", + auth_type: AUTH_OAUTH_MINIMAX, + base_url: "https://api.minimax.io/anthropic", + base_url_env_var: "", + api_key_env_vars: &[], + transport: TRANSPORT_ANTHROPIC, + models_probe: PROBE_NONE, + models: &[ + "MiniMax-M2.7", + "MiniMax-M2.7-highspeed", + "MiniMax-M2.5", + "MiniMax-M2.5-highspeed", + "MiniMax-M2.1", + "MiniMax-M2.1-highspeed", + "MiniMax-M2", + "MiniMax-M2-highspeed", + ], + is_aggregator: false, + cli_auth_hint: "hermes auth login minimax-oauth", +}; + const P_ALIBABA: HermesProvider = HermesProvider { id: "alibaba", name: "Alibaba Cloud (DashScope)", @@ -274,6 +303,25 @@ const P_ALIBABA: HermesProvider = HermesProvider { cli_auth_hint: "", }; +const P_ALIBABA_CODING_PLAN: HermesProvider = HermesProvider { + id: "alibaba-coding-plan", + name: "Alibaba Cloud (Coding Plan)", + auth_type: AUTH_API_KEY, + base_url: "https://coding-intl.dashscope.aliyuncs.com/v1", + base_url_env_var: "ALIBABA_CODING_PLAN_BASE_URL", + api_key_env_vars: &["ALIBABA_CODING_PLAN_API_KEY", "DASHSCOPE_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[ + "qwen3-coder-plus", + "qwen3-coder-next", + "qwen3.5-plus", + "qwen3.5-coder", + ], + is_aggregator: false, + cli_auth_hint: "", +}; + const P_HUGGINGFACE: HermesProvider = HermesProvider { id: "huggingface", name: "Hugging Face", @@ -311,6 +359,104 @@ const P_XIAOMI: HermesProvider = HermesProvider { cli_auth_hint: "", }; +const P_ARCEE: HermesProvider = HermesProvider { + id: "arcee", + name: "Arcee AI", + auth_type: AUTH_API_KEY, + base_url: "https://api.arcee.ai/api/v1", + base_url_env_var: "ARCEE_BASE_URL", + api_key_env_vars: &["ARCEEAI_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[], + is_aggregator: false, + cli_auth_hint: "", +}; + +const P_AZURE_FOUNDRY: HermesProvider = HermesProvider { + id: "azure-foundry", + name: "Azure Foundry", + auth_type: AUTH_API_KEY, + base_url: "", + base_url_env_var: "AZURE_FOUNDRY_BASE_URL", + api_key_env_vars: &["AZURE_FOUNDRY_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[], + is_aggregator: true, + cli_auth_hint: "", +}; + +const P_BEDROCK: HermesProvider = HermesProvider { + id: "bedrock", + name: "AWS Bedrock", + auth_type: AUTH_AWS_SDK, + base_url: "https://bedrock-runtime.us-east-1.amazonaws.com", + base_url_env_var: "BEDROCK_BASE_URL", + api_key_env_vars: &[], + transport: TRANSPORT_ANTHROPIC, + models_probe: PROBE_NONE, + models: &[], + is_aggregator: false, + cli_auth_hint: "", +}; + +const P_GMI: HermesProvider = HermesProvider { + id: "gmi", + name: "GMI Cloud", + auth_type: AUTH_API_KEY, + base_url: "https://api.gmi-serving.com/v1", + base_url_env_var: "GMI_BASE_URL", + api_key_env_vars: &["GMI_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[], + is_aggregator: false, + cli_auth_hint: "", +}; + +const P_LMSTUDIO: HermesProvider = HermesProvider { + id: "lmstudio", + name: "LM Studio", + auth_type: AUTH_API_KEY, + base_url: "http://127.0.0.1:1234/v1", + base_url_env_var: "LM_BASE_URL", + api_key_env_vars: &["LM_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[], + is_aggregator: false, + cli_auth_hint: "", +}; + +const P_NVIDIA: HermesProvider = HermesProvider { + id: "nvidia", + name: "NVIDIA NIM", + auth_type: AUTH_API_KEY, + base_url: "https://integrate.api.nvidia.com/v1", + base_url_env_var: "NVIDIA_BASE_URL", + api_key_env_vars: &["NVIDIA_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[], + is_aggregator: false, + cli_auth_hint: "", +}; + +const P_OLLAMA_CLOUD: HermesProvider = HermesProvider { + id: "ollama-cloud", + name: "Ollama Cloud", + auth_type: AUTH_API_KEY, + base_url: "https://ollama.com/v1", + base_url_env_var: "OLLAMA_BASE_URL", + api_key_env_vars: &["OLLAMA_API_KEY"], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_OPENAI, + models: &[], + is_aggregator: false, + cli_auth_hint: "", +}; + const P_AI_GATEWAY: HermesProvider = HermesProvider { id: "ai-gateway", name: "Vercel AI Gateway", @@ -506,6 +652,20 @@ const P_QWEN_OAUTH: HermesProvider = HermesProvider { cli_auth_hint: "hermes auth login qwen-oauth", }; +const P_GOOGLE_GEMINI_CLI: HermesProvider = HermesProvider { + id: "google-gemini-cli", + name: "Google Gemini (OAuth)", + auth_type: AUTH_OAUTH_EXTERNAL, + base_url: "https://generativelanguage.googleapis.com/v1beta/openai", + base_url_env_var: "", + api_key_env_vars: &[], + transport: TRANSPORT_OPENAI_CHAT, + models_probe: PROBE_NONE, + models: &["gemini-2.5-pro", "gemini-2.5-flash"], + is_aggregator: false, + cli_auth_hint: "hermes auth login google-gemini-cli", +}; + const P_COPILOT_ACP: HermesProvider = HermesProvider { id: "copilot-acp", name: "GitHub Copilot ACP", @@ -550,13 +710,23 @@ pub const ALL_PROVIDERS: &[HermesProvider] = &[ P_XAI, P_MINIMAX, P_HUGGINGFACE, + P_ARCEE, + P_AZURE_FOUNDRY, + P_GMI, + P_LMSTUDIO, + P_NVIDIA, + P_OLLAMA_CLOUD, P_COPILOT, // API-key providers — China P_ZAI, P_KIMI_CODING, + P_KIMI_CODING_CN, P_ALIBABA, + P_ALIBABA_CODING_PLAN, P_MINIMAX_CN, P_XIAOMI, + // SDK-backed providers + P_BEDROCK, // Aggregators / routers P_OPENROUTER, P_AI_GATEWAY, @@ -567,6 +737,8 @@ pub const ALL_PROVIDERS: &[HermesProvider] = &[ P_NOUS, P_OPENAI_CODEX, P_QWEN_OAUTH, + P_GOOGLE_GEMINI_CLI, + P_MINIMAX_OAUTH, P_COPILOT_ACP, // Custom (frontend placeholder) P_CUSTOM, @@ -680,9 +852,12 @@ mod tests { #[test] fn registry_has_expected_providers() { - assert_eq!(ALL_PROVIDERS.len(), 22); + assert_eq!(ALL_PROVIDERS.len(), 33); assert!(get_provider("anthropic").is_some()); assert!(get_provider("gemini").is_some()); + assert!(get_provider("alibaba-coding-plan").is_some()); + assert!(get_provider("bedrock").is_some()); + assert!(get_provider("lmstudio").is_some()); assert!(get_provider("nous").is_some()); assert!(get_provider("custom").is_some()); assert!(get_provider("nonexistent").is_none()); @@ -693,6 +868,7 @@ mod tests { assert_eq!(primary_api_key_env("anthropic"), Some("ANTHROPIC_API_KEY")); assert_eq!(primary_api_key_env("gemini"), Some("GOOGLE_API_KEY")); assert_eq!(primary_api_key_env("zai"), Some("GLM_API_KEY")); + assert_eq!(primary_api_key_env("bedrock"), None); assert_eq!(primary_api_key_env("nous"), None); } @@ -704,6 +880,8 @@ mod tests { assert!(keys.contains(&"GOOGLE_API_KEY")); assert!(keys.contains(&"GEMINI_API_KEY")); assert!(keys.contains(&"GEMINI_BASE_URL")); + assert!(keys.contains(&"ALIBABA_CODING_PLAN_API_KEY")); + assert!(keys.contains(&"LM_API_KEY")); assert!(keys.contains(&"GATEWAY_ALLOW_ALL_USERS")); assert!(keys.contains(&"API_SERVER_KEY")); // No duplicates @@ -737,11 +915,7 @@ mod tests { #[test] fn find_provider_by_model_is_unambiguous() { assert_eq!(find_provider_by_model("deepseek-chat"), Some("deepseek")); - assert_eq!( - find_provider_by_model("kimi-for-coding"), - Some("kimi-coding") - ); - // Unknown model + assert_eq!(find_provider_by_model("kimi-for-coding"), None); assert_eq!(find_provider_by_model("nonexistent"), None); } } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 31ca253..28f9195 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.15.0", + "version": "0.15.1", "identifier": "ai.openclaw.clawpanel", "build": { "frontendDist": "../dist", diff --git a/src/components/sidebar.js b/src/components/sidebar.js index fa14045..5cab7ee 100644 --- a/src/components/sidebar.js +++ b/src/components/sidebar.js @@ -11,7 +11,7 @@ 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' +import { getActiveEngine, getActiveEngineId, listEngines, needsInitialEngineChoice, isEngineSetupDeferred, switchEngine, onEngineChange } from '../lib/engine-manager.js' // 当用户点 "暂时不升级" 时，本地会话内不再显示升级提示 const SS_DISMISSED_KERNEL_UPGRADE = 'clawpanel_kernel_upgrade_dismissed' @@ -83,6 +83,23 @@ function NAV_ITEMS_SETUP() { return [ } ] } +function NAV_ITEMS_ENGINE_SELECT() { return [ + { + section: '', + items: [ + { route: '/engine-select', label: t('engine.choiceNav'), icon: 'setup' }, + { route: '/assistant', label: t('sidebar.assistant'), icon: 'assistant' }, + ] + }, + { + section: '', + items: [ + { route: '/settings', label: t('sidebar.settings'), icon: 'settings' }, + { route: '/about', label: t('sidebar.about'), icon: 'about' }, + ] + } +] } + const ICONS = { setup: '', dashboard: '', @@ -190,7 +207,9 @@ export function renderSidebar(el) { // 从当前引擎获取菜单（回退到原有逻辑） const engine = getActiveEngine() - const navItems = engine ? engine.getNavItems() : (isOpenclawReady() ? NAV_ITEMS_FULL() : NAV_ITEMS_SETUP()) + const navItems = needsInitialEngineChoice() || isEngineSetupDeferred() + ? NAV_ITEMS_ENGINE_SELECT() + : (engine ? engine.getNavItems() : (isOpenclawReady() ? NAV_ITEMS_FULL() : NAV_ITEMS_SETUP())) for (const section of navItems) { html += `
diff --git a/src/engines/hermes/lib/chat-store.js b/src/engines/hermes/lib/chat-store.js index 1c37559..1ed9194 100644 --- a/src/engines/hermes/lib/chat-store.js +++ b/src/engines/hermes/lib/chat-store.js @@ -1,8 +1,7 @@ /** * Hermes Chat Store — reactive state for sessions, messages and streaming. * - * Mirrors the shape of `hermes-web-ui`'s Pinia `chat` store in a dependency- - * free, vanilla JS pub/sub style. A single instance is exported (`chatStore`); + * Dependency-free vanilla JS pub/sub store. A single instance is exported (`chatStore`); * the page subscribes via `chatStore.subscribe(listener)` and receives a * notification on every mutation. * @@ -104,7 +103,7 @@ function parseEpochMs(value) { /** * Convert Hermes CLI-exported messages (mixed roles + tool_calls) into the - * flat display list we render. Matches `hermes-web-ui`'s `mapHermesMessages`. + * flat display list we render. */ function mapHermesMessages(msgs) { if (!Array.isArray(msgs)) return [] @@ -215,7 +214,7 @@ function mapSessionSummary(s) { // which crashes with "Cannot read properties of undefined (reading 'transformCallback')". // // To stay safe we short-circuit to a no-op unsubscriber when not running inside -// Tauri. Streaming via SSE is a future Web-mode improvement (issue #260). +// Tauri. let _listenFn = null async function tauriListen(event, cb) { diff --git a/src/engines/hermes/lib/providers.js b/src/engines/hermes/lib/providers.js index 4c497a3..3d2378d 100644 --- a/src/engines/hermes/lib/providers.js +++ b/src/engines/hermes/lib/providers.js @@ -1,12 +1,8 @@ /** * Hermes provider registry (frontend mirror). * - * The authoritative data lives in Rust at - * `src-tauri/src/commands/hermes_providers.rs::ALL_PROVIDERS` - * and is exposed via the Tauri command `hermes_list_providers`. - * * This module: - * 1. Loads the 22 providers once per session (cached) + * 1. Loads providers once per session (cached) * 2. Groups them by auth type and region for UI rendering * 3. Provides small lookup helpers (by id, by model, etc.) * @@ -21,6 +17,8 @@ export const AUTH_API_KEY = 'api_key' export const AUTH_OAUTH_DEVICE = 'oauth_device_code' export const AUTH_OAUTH_EXTERNAL = 'oauth_external' export const AUTH_EXTERNAL_PROCESS = 'external_process' +export const AUTH_AWS_SDK = 'aws_sdk' +export const AUTH_OAUTH_MINIMAX = 'oauth_minimax' // Transport constants export const TRANSPORT_OPENAI_CHAT = 'openai_chat' @@ -30,7 +28,15 @@ export const TRANSPORT_CODEX = 'codex_responses' // China-region provider ids (for UI sub-grouping). Everything else is // considered "International" by default. -const CN_PROVIDER_IDS = new Set(['zai', 'kimi-coding', 'alibaba', 'minimax-cn', 'xiaomi']) +const CN_PROVIDER_IDS = new Set([ + 'zai', + 'kimi-coding', + 'kimi-coding-cn', + 'alibaba', + 'alibaba-coding-plan', + 'minimax-cn', + 'xiaomi', +]) // Aggregator ids (also tagged via `isAggregator` on the data). const AGGREGATOR_IDS = new Set([ @@ -41,6 +47,7 @@ const AGGREGATOR_IDS = new Set([ 'kilocode', 'huggingface', 'nous', + 'azure-foundry', ]) let _cached = null @@ -112,11 +119,11 @@ export function groupProviders(list) { groups.custom.push(p) continue } - if (p.authType === AUTH_EXTERNAL_PROCESS) { + if (p.authType === AUTH_EXTERNAL_PROCESS || p.authType === AUTH_AWS_SDK) { groups.externalProc.push(p) continue } - if (p.authType === AUTH_OAUTH_DEVICE || p.authType === AUTH_OAUTH_EXTERNAL) { + if (p.authType === AUTH_OAUTH_DEVICE || p.authType === AUTH_OAUTH_EXTERNAL || p.authType === AUTH_OAUTH_MINIMAX) { groups.oauth.push(p) continue } diff --git a/src/engines/hermes/pages/chat.js b/src/engines/hermes/pages/chat.js index de654ae..a3fcc84 100644 --- a/src/engines/hermes/pages/chat.js +++ b/src/engines/hermes/pages/chat.js @@ -1,7 +1,7 @@ /** * Hermes Chat — editorial luxury re-write (Phase 4). * - * Layout matches the official `hermes-web-ui`'s ChatPanel: + * Layout: * ┌────────────────┬──────────────────────────────────────────────┐ * │ SessionList │ Header: title · source · new-chat button │ * │ (groups + ├──────────────────────────────────────────────┤ @@ -637,8 +637,7 @@ export function render() { // up above when the user types `/`. // // Token usage strip — only when there's an active session with real - // usage. Mirrors hermes-web-ui's input-top-bar (sans context-length - // bar, which requires a server-side endpoint we don't have). + // usage. const totalIn = active?.inputTokens || 0 const totalOut = active?.outputTokens || 0 const totalCache = (active?.cacheReadTokens || 0) + (active?.cacheWriteTokens || 0) diff --git a/src/engines/hermes/pages/cron.js b/src/engines/hermes/pages/cron.js index 4a92357..ab8a7e2 100644 --- a/src/engines/hermes/pages/cron.js +++ b/src/engines/hermes/pages/cron.js @@ -121,7 +121,6 @@ export function render() { /** * Derive a semantic job state label. * Priority: running > paused > disabled > scheduled - * Mirrors the logic used by hermes-web-ui's JobCard.vue. */ function jobStateOf(j) { if (j.state === 'running') return 'running' @@ -553,7 +552,7 @@ export function render() { if (repeat !== undefined) payload.repeat = repeat if (isEdit) { - // PATCH does not accept `name`; keep it out to match hermes-web-ui contract. + // PATCH does not accept `name`. const patch = { schedule: payload.schedule, prompt, deliver } if (repeat !== undefined) patch.repeat = repeat await gw(`/api/jobs/${encodeURIComponent(id)}`, { method: 'PATCH', body: JSON.stringify(patch) }) diff --git a/src/engines/hermes/pages/dashboard.js b/src/engines/hermes/pages/dashboard.js index 20ee3af..0660cab 100644 --- a/src/engines/hermes/pages/dashboard.js +++ b/src/engines/hermes/pages/dashboard.js @@ -22,7 +22,7 @@ let hermesProviders = [] // Lazy Tauri event listen (avoid top-level await for vite build). // Web 模式下 `@tauri-apps/api/event` 的模块顶层会触碰 `window.__TAURI_INTERNALS__.transformCallback` -// 导致 "Cannot read properties of undefined (reading 'transformCallback')"（issue #260）， +// 导致 "Cannot read properties of undefined (reading 'transformCallback')"， // 因此非 Tauri 环境直接 noop。 let _listenFn = null async function tauriListen(event, cb) { @@ -106,7 +106,7 @@ export function render() { { label: t('engine.cliVersion'), desc: t('engine.cliVersionDesc'), cmd: 'hermes version' }, { label: t('engine.cliGwStart'), desc: t('engine.cliGwStartDesc'), cmd: 'hermes gateway run' }, { label: t('engine.cliGwStop'), desc: t('engine.cliGwStopDesc'), cmd: 'hermes gateway stop' }, - { label: t('engine.cliUpgrade'), desc: t('engine.cliUpgradeDesc'), cmd: 'uv tool install --reinstall "hermes-agent @ git+https://github.com/NousResearch/hermes-agent.git" --python 3.11' }, + { label: t('engine.cliUpgrade'), desc: t('engine.cliUpgradeDesc'), cmd: 'uv tool install --reinstall hermes-agent --python 3.11' }, { label: t('engine.cliUninstall'), desc: t('engine.cliUninstallDesc'), cmd: 'uv tool uninstall hermes-agent' }, { label: t('engine.cliConfig'), desc: t('engine.cliConfigDesc'), cmd: isWin ? `explorer ${configPath}` : `open ${configPath}` }, ] @@ -241,7 +241,6 @@ export function render() {
-
@@ -538,34 +537,6 @@ export function render() { toast(t('engine.dashNativePanelStartPortBusy', { port }), 'warning', { duration: 6000 }) return } - if (startResult.kind === 'posix_only_module') { - // Hermes Agent 上游 bug：pty_bridge.py / memory_tool.py 在 Windows 上 import fcntl 等 POSIX-only 模块 - // 见 https://github.com/NousResearch/hermes-agent/issues/5246 - // 没办法在前端绕过——只能告诉用户原因和替代方案 - const { showContentModal } = await import('../../../components/modal.js') - const m = showContentModal({ - title: t('engine.dashNativePanelWindowsTitle'), - width: 580, - content: ` -

- ${t('engine.dashNativePanelWindowsDesc')} -

-
    -
  • ${t('engine.dashNativePanelWindowsAlt1')}
    • -
  • ${t('engine.dashNativePanelWindowsAlt2')}
    • -
- 
${(startResult.log_tail || '').split('\n').slice(-6).join('\n').replace(/[<>&]/g, c => ({'<':'<','>':'>','&':'&'})[c])}
- `, - buttons: [ - { label: t('engine.dashNativePanelWindowsReportLink'), className: 'btn btn-secondary btn-sm', id: 'hm-dash-issue-link' }, - ], - }) - m.querySelector('#hm-dash-issue-link')?.addEventListener('click', async () => { - try { await openExternalUrl('https://github.com/NousResearch/hermes-agent/issues/5246') } - catch {} - }) - return - } if (startResult.kind !== 'deps_missing') { // spawn_failed / 其他未知 → 显示日志尾部摘要 const detail = (startResult.log_tail || '').split('\n').slice(-3).join('\n').trim() @@ -582,23 +553,15 @@ export function render() {

${t('engine.dashNativePanelDepHint')}

- 
uv tool install --force 'hermes-agent[web] @ git+https://github.com/NousResearch/hermes-agent.git'

${t('engine.dashNativePanelDown', { port })}

`, buttons: [ - { label: t('common.copy') || 'Copy', className: 'btn btn-secondary btn-sm', id: 'hm-dash-copy-cmd' }, { label: t('common.retry') || 'Retry', className: 'btn btn-secondary btn-sm', id: 'hm-dash-retry' }, { label: t('engine.dashNativePanelInstallWeb'), className: 'btn btn-primary btn-sm', id: 'hm-dash-install-web' }, ], }) - overlay.querySelector('#hm-dash-copy-cmd')?.addEventListener('click', async () => { - try { - await navigator.clipboard.writeText(`uv tool install --force 'hermes-agent[web] @ git+https://github.com/NousResearch/hermes-agent.git'`) - toast(t('common.copied') || 'Copied', 'success') - } catch {} - }) overlay.querySelector('#hm-dash-retry')?.addEventListener('click', async () => { // 重试：先 probe，再 auto-start overlay.close() diff --git a/src/engines/hermes/pages/extensions.js b/src/engines/hermes/pages/extensions.js index 0c21ea0..935713f 100644 --- a/src/engines/hermes/pages/extensions.js +++ b/src/engines/hermes/pages/extensions.js @@ -38,9 +38,6 @@ export function render() { let error = '' const docs = [ - ['engine.extensionsDocGettingStarted', 'https://hermes-agent.nousresearch.com/docs/getting-started/installation/'], - ['engine.extensionsDocCron', 'https://hermes-agent.nousresearch.com/docs/guides/automate-with-cron/'], - ['engine.extensionsDocSkills', 'https://hermes-agent.nousresearch.com/docs/guides/skills/'], ['engine.extensionsDocDashboard', 'http://127.0.0.1:9119/'], ] diff --git a/src/engines/hermes/pages/logs.js b/src/engines/hermes/pages/logs.js index 2b358fe..ff1bce3 100644 --- a/src/engines/hermes/pages/logs.js +++ b/src/engines/hermes/pages/logs.js @@ -1,11 +1,11 @@ /** * Hermes Agent — Log viewer * - * Data contract mirrors `hermes-web-ui`'s `/api/hermes/logs` endpoints: + * Data contract: * { files: [{ name, size, modified }] } * { entries: [{ timestamp, level, logger, message, raw }, ...] } * - * Extras beyond the official UI: + * Extras: * - Download entire log file to user's disk * - Clear the currently rendered entries (local only) * - Auto-refresh (polling tail) toggle — 2s tick diff --git a/src/engines/hermes/pages/memory.js b/src/engines/hermes/pages/memory.js index 153d126..3731c79 100644 --- a/src/engines/hermes/pages/memory.js +++ b/src/engines/hermes/pages/memory.js @@ -1,12 +1,11 @@ /** * Hermes Agent — Memory editor (three-section: MEMORY / USER / SOUL) * - * Mirrors the data contract used by the official `hermes-web-ui`: + * Data contract: * GET /api/hermes/memory → { memory, user, soul, mtimes } * POST /api/hermes/memory → { section, content } * - * ClawPanel calls the equivalent Rust/Web-stub commands (`hermes_memory_read_all` - * + `hermes_memory_write`) so the page works on Tauri and Web modes. + * ClawPanel calls Rust/Web commands so the page works on Tauri and Web modes. * * All three files live in `~/.hermes/memories/` and are plain Markdown. */ diff --git a/src/engines/hermes/pages/setup.js b/src/engines/hermes/pages/setup.js index ce76b20..5ae91cd 100644 --- a/src/engines/hermes/pages/setup.js +++ b/src/engines/hermes/pages/setup.js @@ -25,8 +25,7 @@ const ICONS = { // 核心安装不带 extras，后续可在管理页面按需安装 -// Provider 数据 — 异步从 Rust hermes_providers.rs 加载（首次 render 前） -// Web 模式下 dev-api.js 返回空数组，UI 会降级到手填模式 +// Provider 数据 — 首次 render 前异步加载 let hermesProviders = [] let hermesGroups = { apiKeyIntl: [], apiKeyCn: [], aggregators: [], oauth: [], externalProc: [], custom: [] } @@ -60,12 +59,6 @@ export function render() { ${phase === 'configure' ? renderConfigure() : ''} ${phase === 'gateway' ? renderGateway() : ''} ${phase === 'complete' ? renderComplete() : ''} -
` bind() } @@ -473,9 +466,7 @@ export function render() { logs = [] draw() - // 监听事件（Tauri 模式下有 hermes-install-log/progress 事件）。 - // Web 模式下 `@tauri-apps/api/event` 模块顶层会读取 `window.__TAURI_INTERNALS__.transformCallback` - // 直接抛错（issue #260），所以非 Tauri 环境跳过监听安装。 + // 监听安装事件；Web 模式跳过桌面事件监听。 try { if (!isTauriRuntime()) throw new Error('skip-listen-in-web-mode') const { listen } = await import('@tauri-apps/api/event') diff --git a/src/engines/hermes/pages/skills.js b/src/engines/hermes/pages/skills.js index a56c35d..ce899dc 100644 --- a/src/engines/hermes/pages/skills.js +++ b/src/engines/hermes/pages/skills.js @@ -1,7 +1,7 @@ /** * Hermes Agent — Skills browser (editorial luxury re-write) * - * Mirrors the official `hermes-web-ui` Skills view: + * Skill management endpoints: * GET /api/hermes/skills → { categories: [...] } * PUT /api/hermes/skills/toggle → enable/disable * GET /api/hermes/skills/:cat/:skill/files → attached files @@ -15,9 +15,9 @@ * │ │ an attached file * └────────────────────────────────┴──────────────────────────┘ * - * Extras beyond the official UI: + * Extras: * - Collapsible categories (persist in memory only) - * - File browser with breadcrumb + back button (Vue parity) + * - File browser with breadcrumb + back button * - Inline toggle switches use stable loading state per skill */ import { t } from '../../../lib/i18n.js' diff --git a/src/engines/hermes/style/hermes.css b/src/engines/hermes/style/hermes.css index 3108c41..dd16b40 100644 --- a/src/engines/hermes/style/hermes.css +++ b/src/engines/hermes/style/hermes.css @@ -461,9 +461,7 @@ 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). */ +/* Allow absolute-positioned children to escape the panel boundary. */ [data-engine="hermes"] .hm-panel.hm-panel--allow-overflow { overflow: visible; } @@ -3417,10 +3415,6 @@ body[data-active-engine="hermes"][data-theme="dark"] { /* ========================================================================== * 19 · Chat page (editorial luxury re-write) * ========================================================================== - * - * Mirrors the official Hermes web UI's ChatPanel but styled with the warm - * off-white / serif-display / gold-accent system shared across dashboard, - * memory, skills, logs and cron. */ /* ---- Page shell ---- */ diff --git a/src/lib/engine-manager.js b/src/lib/engine-manager.js index d740a43..ab59e2e 100644 --- a/src/lib/engine-manager.js +++ b/src/lib/engine-manager.js @@ -8,6 +8,8 @@ import { registerRoute, setDefaultRoute } from '../router.js' const _engines = {} let _activeEngine = null let _listeners = [] +let _needsInitialEngineChoice = false +let _engineSetupDeferred = false /** 注册引擎 */ export function registerEngine(engine) { @@ -34,6 +36,14 @@ export function getActiveEngineId() { return _activeEngine?.id || 'openclaw' } +export function needsInitialEngineChoice() { + return _needsInitialEngineChoice +} + +export function isEngineSetupDeferred() { + return _engineSetupDeferred +} + /** 按 ID 获取引擎 */ export function getEngine(id) { return _engines[id] || null @@ -51,15 +61,71 @@ export function onEngineChange(fn) { */ export async function initEngineManager() { let mode = 'openclaw' + _engineSetupDeferred = false + let hasChoice = false try { const cfg = await api.readPanelConfig() - if (cfg?.engineMode && _engines[cfg.engineMode]) { + hasChoice = !!cfg?.engineSetupChoice + if (cfg?.engineMode === 'deferred') { + _engineSetupDeferred = true + } else if (cfg?.engineMode === 'both') { + mode = 'openclaw' + } else if (cfg?.engineMode && _engines[cfg.engineMode]) { mode = cfg.engineMode } } catch {} + // “是否需要走首次选择”仅取决于用户有没有真正点过 /engine-select 或引擎切换器； + // 单纯有 engineMode 但没有 engineSetupChoice（旧版本/历史数据）依然视为未选择， + // 这样 OpenClaw 没装好的情况下能走到选择页，而不是被默认拉到 /setup。 + _needsInitialEngineChoice = !hasChoice await activateEngine(mode, false) } +export async function applyEngineSelection({ activeEngineId = 'openclaw', enabledEngineIds = [], deferred = false, choice = '', engineMode = '' } = {}) { + const mode = deferred ? 'openclaw' : activeEngineId + if (!_engines[mode]) { + throw new Error(`unknown engine: ${mode}`) + } + const enabled = Array.isArray(enabledEngineIds) + ? enabledEngineIds.filter((id, idx, arr) => _engines[id] && arr.indexOf(id) === idx) + : [] + const cfg = await api.readPanelConfig().catch(() => ({})) + cfg.engineMode = deferred ? 'deferred' : (engineMode || mode) + cfg.enabledEngines = deferred ? [] : (enabled.length ? enabled : [mode]) + if (choice) cfg.engineSetupChoice = choice + await api.writePanelConfig(cfg) + _needsInitialEngineChoice = false + _engineSetupDeferred = !!deferred + await activateEngine(mode, false) + if (_activeEngine?.boot) { + try { + await Promise.race([ + _activeEngine.boot(), + new Promise((_, reject) => setTimeout(() => reject(new Error('engine boot timeout')), 10000)) + ]) + } catch (e) { + console.warn('[engine-manager] boot 失败或超时:', e) + } + } +} + +export async function adoptActiveEngineSelection({ enabledEngineIds = [], choice = '' } = {}) { + const engine = _activeEngine + if (!engine) return + const enabled = Array.isArray(enabledEngineIds) + ? enabledEngineIds.filter((id, idx, arr) => _engines[id] && arr.indexOf(id) === idx) + : [] + const cfg = await api.readPanelConfig().catch(() => ({})) + if (!cfg.engineMode) { + cfg.engineMode = engine.id + cfg.enabledEngines = enabled.length ? enabled : [engine.id] + if (choice) cfg.engineSetupChoice = choice + await api.writePanelConfig(cfg) + } + _needsInitialEngineChoice = false + _engineSetupDeferred = false +} + /** * 激活指定引擎（注册路由 + 启动） * @param {string} id 引擎 ID @@ -111,10 +177,20 @@ export async function activateEngine(id, persist = true) { if (persist) { try { const cfg = await api.readPanelConfig() + let dirty = false if (cfg.engineMode !== id) { cfg.engineMode = id - await api.writePanelConfig(cfg) + dirty = true } + // 通过侧栏切换器走到这里时，也补一个 engineSetupChoice，避免下次启动 + // 又被判定为“未选择”。已有值（例如 'both'/'later'）则保留不覆盖。 + if (!cfg.engineSetupChoice) { + cfg.engineSetupChoice = id + dirty = true + } + if (dirty) await api.writePanelConfig(cfg) + _needsInitialEngineChoice = false + _engineSetupDeferred = false } catch (e) { console.warn('[engine-manager] 保存 engineMode 失败:', e) } diff --git a/src/locales/modules/engine.js b/src/locales/modules/engine.js index 39ff902..c85ae82 100644 --- a/src/locales/modules/engine.js +++ b/src/locales/modules/engine.js @@ -5,6 +5,30 @@ export default { switchFailed: _('引擎切换失败，请稍后重试', 'Engine switch failed, please try again later', '引擎切換失敗，請稍後重試', 'エンジンの切り替えに失敗しました。後でもう一度お試しください', '엔진 전환에 실패했습니다. 잠시 후 다시 시도해 주세요'), switcherSectionLabel: _('引擎', 'Engine', '引擎', 'エンジン', '엔진', 'Động cơ', 'Motor', 'Motor', 'Движок', 'Moteur', 'Engine'), switcherTooltip: _('点击切换引擎', 'Click to switch engine', '點擊切換引擎', 'クリックしてエンジンを切り替え', '엔진 전환하려면 클릭', 'Nhấp để chuyển đổi engine', 'Haga clic para cambiar de motor', 'Clique para alternar o motor', 'Нажмите, чтобы переключить движок', 'Cliquez pour changer de moteur', 'Klicken, um die Engine zu wechseln'), + choiceNav: _('选择引擎', 'Choose Engine', '選擇引擎', 'エンジンを選択', '엔진 선택', 'Choose Engine', 'Choose Engine', 'Choose Engine', 'Choose Engine', 'Choose Engine', 'Choose Engine'), + choiceKicker: _('首次启动', 'First run', '首次啟動'), + choiceTitle: _('选择你要使用的 Agent 引擎', 'Choose your Agent engine', '選擇你要使用的 Agent 引擎'), + choiceSubtitle: _('ClawPanel 支持 OpenClaw 与 Hermes Agent。你可以先安装其中一个，也可以稍后再配置。', 'ClawPanel supports OpenClaw and Hermes Agent. Install one now, enable both, or configure later.', 'ClawPanel 支援 OpenClaw 與 Hermes Agent。你可以先安裝其中一個，也可以稍後再配置。'), + choiceNoteTitle: _('之后仍可切换', 'You can switch later', '之後仍可切換'), + choiceNoteDesc: _('该选择会保存到 clawpanel.json。安装完成后，可通过侧边栏的引擎切换器切换到其他引擎。', 'This choice is saved to clawpanel.json. After setup, use the engine switcher in the sidebar to switch engines.', '該選擇會儲存到 clawpanel.json。安裝完成後，可透過側邊欄的引擎切換器切換到其他引擎。'), + choiceSaved: _('已保存引擎选择', 'Engine choice saved', '已儲存引擎選擇'), + choiceSaveFailed: _('保存引擎选择失败', 'Failed to save engine choice', '儲存引擎選擇失敗'), + choiceOpenclawTitle: _('OpenClaw', 'OpenClaw', 'OpenClaw'), + choiceOpenclawDesc: _('完整的 OpenClaw 管理面板，适合需要模型、Agent、Gateway、记忆与插件的完整框架用户。', 'The full OpenClaw management panel for models, agents, Gateway, memory, and plugins.', '完整的 OpenClaw 管理面板，適合需要模型、Agent、Gateway、記憶與外掛的完整框架使用者。'), + choiceOpenclawMeta: _('推荐给现有 OpenClaw 用户', 'Recommended for existing OpenClaw users', '推薦給現有 OpenClaw 使用者'), + choiceOpenclawBadge: _('推荐', 'Recommended', '推薦'), + choiceHermesTitle: _('Hermes Agent', 'Hermes Agent', 'Hermes Agent'), + choiceHermesDesc: _('轻量 Python Agent 引擎，专注工具调用、任务编排与快速实验。', 'A lightweight Python Agent engine focused on tool calling, orchestration, and fast experiments.', '輕量 Python Agent 引擎，專注工具呼叫、任務編排與快速實驗。'), + choiceHermesMeta: _('直接进入 Hermes 安装向导', 'Go directly to Hermes setup', '直接進入 Hermes 安裝精靈'), + choiceHermesBadge: _('轻量', 'Lightweight', '輕量'), + choiceBothTitle: _('两个都要', 'Use both', '兩個都要'), + choiceBothDesc: _('先完成 OpenClaw 初始化，并保留 Hermes Agent 入口，后续可随时切换配置。', 'Start with OpenClaw setup while keeping Hermes Agent enabled for later configuration.', '先完成 OpenClaw 初始化，並保留 Hermes Agent 入口，後續可隨時切換配置。'), + choiceBothMeta: _('适合同时评估两个引擎', 'Best for evaluating both engines', '適合同時評估兩個引擎'), + choiceBothBadge: _('进阶', 'Advanced', '進階'), + choiceLaterTitle: _('稍后再配置', 'Configure later', '稍後再配置'), + choiceLaterDesc: _('先停留在引擎选择页，不立即安装任何引擎。准备好后再选择即可。', 'Stay on the engine chooser without installing an engine now. Pick one when you are ready.', '先停留在引擎選擇頁，不立即安裝任何引擎。準備好後再選擇即可。'), + choiceLaterMeta: _('不会启动安装流程', 'No setup flow will start', '不會啟動安裝流程'), + choiceLaterBadge: _('跳过', 'Skip', '跳過'), hermesSetupDesc: _('安装并配置 Hermes Agent', 'Install and configure Hermes Agent', '安裝並配置 Hermes Agent'), hermesPhaseClickHint: _('点击可返回此步骤', 'Click to go back to this step', '點擊可返回此步驟', 'このステップに戻るにはクリック', '이 단계로 돌아가려면 클릭'), hermesSetupIntro: _( @@ -145,11 +169,11 @@ export default { '原生 Windows 暫不支援 Hermes Dashboard', 'ネイティブ Windows では Hermes Dashboard はサポートされていません', '네이티브 Windows에서 Hermes Dashboard는 지원되지 않습니다'), - dashNativePanelWindowsDesc: _('Hermes Agent 在原生 Windows 上无条件导入 POSIX-only 标准库（fcntl / termios），导致 dashboard 启动崩溃。这是已知的上游 bug，官方暂未修复。', - 'Hermes Agent unconditionally imports POSIX-only stdlib modules (fcntl / termios) on native Windows, which crashes the dashboard at startup. This is a known upstream bug not yet fixed.', - 'Hermes Agent 在原生 Windows 上無條件匯入 POSIX-only 標準函式庫（fcntl / termios），導致 dashboard 啟動崩潰。這是已知的上游 bug，官方暫未修復。', - 'Hermes Agent はネイティブ Windows で POSIX 専用の標準ライブラリ（fcntl / termios）を無条件にインポートするため、dashboard が起動時にクラッシュします。これは既知のアップストリームバグで未修正です。', - 'Hermes Agent는 네이티브 Windows에서 POSIX 전용 표준 라이브러리(fcntl / termios)를 무조건 가져와 dashboard 시작 시 충돌합니다. 알려진 업스트림 버그이며 아직 수정되지 않았습니다.'), + dashNativePanelWindowsDesc: _('当前环境暂不支持直接启动 Hermes Dashboard。请继续使用 ClawPanel 内置面板，或在兼容环境中运行。', + 'This environment cannot start Hermes Dashboard directly. Continue using the built-in ClawPanel panel, or run it in a compatible environment.', + '目前環境暫不支援直接啟動 Hermes Dashboard。請繼續使用 ClawPanel 內建面板，或在相容環境中執行。', + '現在の環境では Hermes Dashboard を直接起動できません。ClawPanel 内蔵パネルを使うか、互換環境で実行してください。', + '현재 환경에서는 Hermes Dashboard를 직접 시작할 수 없습니다. ClawPanel 내장 패널을 계속 사용하거나 호환 환경에서 실행하세요.'), dashNativePanelWindowsAlt1: _('继续使用 ClawPanel 内置的 Hermes 面板（推荐，体验更好）', 'Keep using ClawPanel\'s built-in Hermes panel (recommended, better experience)', '繼續使用 ClawPanel 內建的 Hermes 面板（推薦，體驗更好）', @@ -160,7 +184,7 @@ export default { '在 WSL2 中安裝並執行 Hermes（hermes dashboard 在 Linux 上工作正常）', 'WSL2 内で Hermes をインストール・実行（Linux 上では hermes dashboard は正常に動作）', 'WSL2 내에서 Hermes 설치 및 실행 (Linux에서는 hermes dashboard 정상 작동)'), - dashNativePanelWindowsReportLink: _('查看上游 Issue #5246', 'View upstream issue #5246', '檢視上游 Issue #5246', 'アップストリーム Issue #5246 を見る', '업스트림 Issue #5246 보기'), + dashNativePanelWindowsReportLink: _('查看详情', 'View details', '檢視詳情', '詳細を見る', '자세히 보기'), dashNativePanelDown: _('Dashboard 服务未运行（端口 {port} 无响应）。请在终端运行：hermes dashboard', 'Dashboard service is not running (port {port} unreachable). Run in terminal: hermes dashboard', 'Dashboard 服務未執行（連接埠 {port} 無回應）。請在終端執行：hermes dashboard', @@ -168,11 +192,11 @@ export default { 'Dashboard 서비스가 실행 중이 아닙니다 (포트 {port} 연결 불가). 터미널에서 실행: hermes dashboard'), dashNativePanelDownTitle: _('Hermes Dashboard 未启动', 'Hermes Dashboard not running', 'Hermes Dashboard 未啟動', 'Hermes Dashboard が実行されていません', 'Hermes Dashboard가 실행 중이 아닙니다'), dashNativePanelStartHint: _('在终端运行下面命令启动 Dashboard 后再试：', 'Run the command below in your terminal to start the Dashboard, then retry:', '在終端執行以下命令啟動 Dashboard 後再試：', 'ターミナルで以下を実行して Dashboard を起動してから再試行してください：', '아래 명령을 터미널에서 실행하여 Dashboard를 시작한 후 다시 시도하세요:'), - dashNativePanelDepHint: _('首次使用需要先安装 Web 依赖（fastapi + uvicorn）。点击下方按钮自动安装，或在终端运行：', - 'First-time use requires installing the Web dependencies (fastapi + uvicorn). Click the button below to auto-install, or run in your terminal:', - '首次使用需要先安裝 Web 依賴（fastapi + uvicorn）。點擊下方按鈕自動安裝，或在終端執行：', - '初回使用には Web 依存関係（fastapi + uvicorn）のインストールが必要です。下のボタンで自動インストールするか、ターミナルで実行：', - '처음 사용 시 Web 종속성(fastapi + uvicorn) 설치가 필요합니다. 아래 버튼으로 자동 설치하거나 터미널에서 실행:'), + dashNativePanelDepHint: _('首次使用需要先安装 Web 依赖（fastapi + uvicorn）。点击下方按钮自动安装后重试。', + 'First-time use requires installing the Web dependencies (fastapi + uvicorn). Click the button below to install them, then retry.', + '首次使用需要先安裝 Web 依賴（fastapi + uvicorn）。點擊下方按鈕自動安裝後重試。', + '初回使用には Web 依存関係（fastapi + uvicorn）のインストールが必要です。下のボタンでインストールしてから再試行してください。', + '처음 사용 시 Web 종속성(fastapi + uvicorn) 설치가 필요합니다. 아래 버튼으로 설치한 후 다시 시도하세요.'), dashNativePanelInstallWeb: _('安装 Web 依赖', 'Install Web Deps', '安裝 Web 依賴', 'Web 依存関係をインストール', 'Web 종속성 설치'), dashNativePanelInstallWebTitle: _('安装 Hermes Web 依赖', 'Installing Hermes Web Dependencies', '安裝 Hermes Web 依賴', 'Hermes Web 依存関係をインストール中', 'Hermes Web 종속성 설치 중'), dashNativePanelInstallWebDone: _('Web 依赖安装完成！请在终端运行：hermes dashboard', @@ -396,7 +420,7 @@ export default { // 停止流式 chatStop: _('停止', 'Stop', '停止'), chatStopped: _('已停止当前回复', 'Run stopped', '已停止目前回覆'), - // Web 模式（远程浏览器）下流式聊天暂不可用 (issue #260) + // Web 模式（远程浏览器）下流式聊天暂不可用 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.', diff --git a/src/main.js b/src/main.js index b89a80f..702770d 100644 --- a/src/main.js +++ b/src/main.js @@ -20,7 +20,7 @@ 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 { registerEngine, initEngineManager, getActiveEngine, getActiveEngineId, needsInitialEngineChoice, isEngineSetupDeferred, adoptActiveEngineSelection, onEngineChange } from './lib/engine-manager.js' import openclawEngine from './engines/openclaw/index.js' import hermesEngine from './engines/hermes/index.js' import xintianEngine from './engines/xintian/index.js' @@ -323,10 +323,18 @@ async function boot() { registerEngine(openclawEngine) registerEngine(hermesEngine) registerEngine(xintianEngine) + registerRoute('/engine-select', () => import('./pages/engine-select.js')) // 初始化引擎管理器：读取 clawpanel.json 的 engineMode，注册对应路由 await initEngineManager() + // 用户尚未做过明确的引擎选择（无 engineSetupChoice）→ 立即把默认路由 + // 指向 /engine-select，避免初始化期间先闪到 /dashboard 或 /setup 再被 + // 后续逻辑弹回选择页。引擎就绪后会在下方自动 adopt 并跳到 dashboard。 + if (needsInitialEngineChoice() || isEngineSetupDeferred()) { + setDefaultRoute('/engine-select') + } + // 订阅内核版本变化：低于硬地板时弹出全屏拦截，恢复后自动隐藏； // 同时刷新 sidebar 以反映 "内核可升级" 提示卡片状态。 // 触发时机：Gateway 握手成功 / 重连后版本变化 / 引擎切换 @@ -461,7 +469,21 @@ async function boot() { // 监听引擎状态变化（如 setup 完成后 ready 变为 true），自动刷新侧边栏 bindEngineListeners(engine) - if (!engine.isReady()) { + if (needsInitialEngineChoice() && engine.isReady()) { + await adoptActiveEngineSelection({ choice: 'auto-detected' }) + renderSidebar(sidebar) + } + + if (needsInitialEngineChoice() && !engine.isReady()) { + setDefaultRoute('/engine-select') + navigate('/engine-select') + } else if (isEngineSetupDeferred() && !engine.isReady()) { + setDefaultRoute('/engine-select') + const currentHash = window.location.hash.slice(1) || '' + if (!currentHash || currentHash === engine.getSetupRoute()) { + navigate('/engine-select') + } + } else if (!engine.isReady()) { setDefaultRoute(engine.getSetupRoute()) navigate(engine.getSetupRoute()) } else { diff --git a/src/pages/assistant.js b/src/pages/assistant.js index b080d72..108684b 100644 --- a/src/pages/assistant.js +++ b/src/pages/assistant.js @@ -730,7 +730,7 @@ const HERMES_SKILLS = [ 1. 调用 get_system_info 获取系统信息 2. 用 run_command 执行 \`hermes version\` 检查 Hermes 是否已安装 3. 如果已安装，告诉用户可以在终端中运行 \`hermes chat\` 开始对话 -4. 如果未安装，给出安装命令：\`uv tool install "hermes-agent @ git+https://github.com/NousResearch/hermes-agent.git" --python 3.11\``, +4. 如果未安装，引导用户使用 ClawPanel 的 Hermes Agent 安装向导完成安装`, }, { id: 'hermes-diagnose', @@ -799,8 +799,7 @@ const HERMES_SKILLS = [ 具体操作： 1. 调用 get_system_info 获取系统信息 2. 用 run_command 执行 \`hermes version\` 获取当前版本 -3. 告诉用户升级命令： - \`uv tool install --reinstall "hermes-agent @ git+https://github.com/NousResearch/hermes-agent.git" --python 3.11\` +3. 引导用户使用 ClawPanel 的 Hermes Agent 升级功能 4. 提醒用户升级前先停止 Gateway：\`hermes gateway stop\` 5. 升级完成后建议重新启动 Gateway`, }, diff --git a/src/pages/engine-select.js b/src/pages/engine-select.js new file mode 100644 index 0000000..85221b1 --- /dev/null +++ b/src/pages/engine-select.js @@ -0,0 +1,129 @@ +import { navigate } from '../router.js' +import { t } from '../lib/i18n.js' +import { applyEngineSelection } from '../lib/engine-manager.js' +import { toast } from '../components/toast.js' + +const OPTIONS = [ + { + id: 'openclaw', + key: 'Openclaw', + icon: 'layers', + activeEngineId: 'openclaw', + enabledEngineIds: ['openclaw'], + targetRoute: '/setup', + }, + { + id: 'hermes', + key: 'Hermes', + icon: 'bolt', + activeEngineId: 'hermes', + enabledEngineIds: ['hermes'], + targetRoute: '/h/setup', + }, + { + id: 'both', + key: 'Both', + icon: 'spark', + activeEngineId: 'openclaw', + enabledEngineIds: ['openclaw', 'hermes'], + engineMode: 'both', + targetRoute: '/setup', + }, + { + id: 'later', + key: 'Later', + icon: 'clock', + activeEngineId: 'openclaw', + enabledEngineIds: [], + deferred: true, + targetRoute: '/engine-select', + }, +] + +const ICONS = { + layers: '', + bolt: '', + spark: '', + clock: '', +} + +export async function render() { + const page = document.createElement('div') + page.className = 'page engine-select-page' + page.innerHTML = ` +
+
${esc(t('engine.choiceKicker'))}
+

${esc(t('engine.choiceTitle'))}

+

${esc(t('engine.choiceSubtitle'))}

+
+
+ ${OPTIONS.map(renderOption).join('')} +
+
+
${esc(t('engine.choiceNoteTitle'))}
+
${esc(t('engine.choiceNoteDesc'))}
+
+ ` + + page.addEventListener('click', async (event) => { + const card = event.target.closest('.engine-choice-card') + if (!card) return + const option = OPTIONS.find(item => item.id === card.dataset.choice) + if (!option || card.classList.contains('loading')) return + await chooseOption(page, card, option) + }) + + return page +} + +function renderOption(option) { + const badge = t(`engine.choice${option.key}Badge`) + return ` + + ` +} + +async function chooseOption(page, card, option) { + setBusy(page, card, true) + try { + await applyEngineSelection({ + activeEngineId: option.activeEngineId, + enabledEngineIds: option.enabledEngineIds, + deferred: !!option.deferred, + choice: option.id, + engineMode: option.engineMode || '', + }) + toast(t('engine.choiceSaved'), 'success') + navigate(option.targetRoute) + } catch (error) { + console.error('[engine-select] choose failed:', error) + toast(t('engine.choiceSaveFailed'), 'error') + setBusy(page, card, false) + } +} + +function setBusy(page, activeCard, busy) { + page.querySelectorAll('.engine-choice-card').forEach(card => { + card.disabled = busy + card.classList.toggle('loading', busy && card === activeCard) + }) +} + +function esc(value) { + return String(value || '') + .replace(/&/g, '&') + .replace(//g, '>') + .replace(/"/g, '"') +} diff --git a/src/style/pages.css b/src/style/pages.css index a217c3e..d4b79c8 100644 --- a/src/style/pages.css +++ b/src/style/pages.css @@ -2655,4 +2655,191 @@ /* === Hermes Memory Page === 编辑改版后 memory.js 用 .hm-mem-overview + .hm-mem-panel 自然堆叠（见 engines/hermes/style/hermes.css）。原来 .hm-memory-* 那一坨规则已无任何 - JS / CSS 引用，已在此处删除。 */ \ No newline at end of file + JS / CSS 引用，已在此处删除。 */ + +.engine-select-page { + max-width: 1120px; + margin: 0 auto; + padding: 48px 32px; +} + +.engine-select-hero { + max-width: 720px; + margin-bottom: 28px; +} + +.engine-select-kicker { + display: inline-flex; + align-items: center; + padding: 4px 10px; + margin-bottom: 14px; + border: 1px solid var(--border-primary); + border-radius: 999px; + color: var(--accent); + background: var(--bg-glass); + font-size: 12px; + font-weight: 700; + letter-spacing: .08em; + text-transform: uppercase; +} + +.engine-select-hero h1 { + margin: 0 0 12px; + color: var(--text-primary); + font-size: clamp(28px, 4vw, 44px); + line-height: 1.1; + letter-spacing: -0.03em; +} + +.engine-select-hero p { + margin: 0; + color: var(--text-secondary); + font-size: 16px; + line-height: 1.7; +} + +.engine-choice-grid { + display: grid; + grid-template-columns: repeat(2, minmax(0, 1fr)); + gap: 16px; +} + +.engine-choice-card { + position: relative; + display: flex; + align-items: flex-start; + gap: 16px; + width: 100%; + min-height: 172px; + padding: 22px; + border: 1px solid var(--border-primary); + border-radius: 22px; + background: + radial-gradient(circle at top right, rgba(99, 102, 241, 0.12), transparent 34%), + var(--bg-card); + color: var(--text-primary); + text-align: left; + cursor: pointer; + transition: transform .18s ease, border-color .18s ease, background .18s ease, box-shadow .18s ease; +} + +.engine-choice-card:hover { + transform: translateY(-2px); + border-color: var(--accent); + background: + radial-gradient(circle at top right, rgba(99, 102, 241, 0.18), transparent 38%), + var(--bg-card-hover); + box-shadow: 0 18px 50px rgba(0, 0, 0, 0.12); +} + +.engine-choice-card:disabled { + cursor: wait; + opacity: .72; +} + +.engine-choice-card.loading .engine-choice-arrow { + animation: engine-choice-pulse .8s ease-in-out infinite alternate; +} + +.engine-choice-icon { + display: grid; + place-items: center; + width: 48px; + height: 48px; + flex: 0 0 auto; + border-radius: 16px; + color: var(--accent); + background: var(--bg-glass); + border: 1px solid var(--border-primary); +} + +.engine-choice-icon svg { + width: 24px; + height: 24px; +} + +.engine-choice-content { + display: flex; + min-width: 0; + flex: 1; + flex-direction: column; + gap: 10px; +} + +.engine-choice-title-row { + display: flex; + align-items: center; + gap: 10px; + flex-wrap: wrap; +} + +.engine-choice-title { + font-size: 18px; + font-weight: 800; + letter-spacing: -0.02em; +} + +.engine-choice-badge { + padding: 2px 8px; + border-radius: 999px; + color: var(--accent); + background: var(--accent-muted, rgba(99, 102, 241, 0.12)); + font-size: 11px; + font-weight: 700; +} + +.engine-choice-desc { + color: var(--text-secondary); + font-size: 14px; + line-height: 1.6; +} + +.engine-choice-meta { + margin-top: auto; + color: var(--text-tertiary); + font-size: 12px; +} + +.engine-choice-arrow { + margin-left: auto; + color: var(--text-tertiary); + font-size: 22px; + line-height: 1; +} + +.engine-choice-note { + margin-top: 18px; + padding: 16px 18px; + border: 1px solid var(--border-primary); + border-radius: 16px; + background: var(--bg-glass); + color: var(--text-secondary); + font-size: 13px; + line-height: 1.6; +} + +.engine-choice-note-title { + margin-bottom: 4px; + color: var(--text-primary); + font-weight: 700; +} + +@keyframes engine-choice-pulse { + from { transform: translateX(0); opacity: .5; } + to { transform: translateX(4px); opacity: 1; } +} + +@media (max-width: 760px) { + .engine-select-page { + padding: 28px 18px; + } + + .engine-choice-grid { + grid-template-columns: 1fr; + } + + .engine-choice-card { + min-height: auto; + padding: 18px; + } +} \ No newline at end of file