@simonyea/holysheep-cli 1.7.136 → 2.0.1

package/README.md

@@ -225,6 +225,8 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v2.0.1** — `hs web` 默认切到 HolySheep 登录版 AionUi runtime；本机检测到 AionUi + bun 时直接接管 WebUI，起不来才回退旧版 shell
+- **v2.0.0** — 修复 `hs web` 的关键可用性问题：工具探测改为异步缓存，避免 WebUI 首屏请求卡死；workspace 对话上游请求增加超时保护，防止发送消息时接口悬挂
 - **v1.7.135** — Droid CLI 的 GPT-5.4 配置切回官方要求的 `provider=openai + https://api.holysheep.ai/v1`；同时服务端兼容桥接 `gpt-5.4` 的 `/responses` 请求到 `/v1/chat/completions`
 - **v1.7.134** — 修复并发配置/Worker 路径下 Droid CLI 的 GPT-5.4 BYOK 配置：GPT 走 `generic-chat-completion-api + https://api.holysheep.ai/v1`，避免误走 Anthropic `/v1/messages`
 - **v1.7.53** — 修复 `hs claude` 在绝对 URL 代理路径下未透传 `x-hs-node-proxied` 的问题，避免同一会话里部分 Claude 请求被后端误判为非可信代理请求并随机触发 403

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.136",
+  "version": "2.0.1",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "scripts": {
     "test": "node tests/droid.test.js && node tests/workspace-store.test.js"

package/src/commands/webui.js

@@ -8,7 +8,6 @@ const { execSync } = require('child_process')
 
 async function webui(opts) {
   const port = Number(opts.port) || 9876
-  const { startServer } = require('../webui/server')
 
   console.log()
   console.log(chalk.bold('🌐  HolySheep WebUI'))
@@ -16,9 +15,31 @@ async function webui(opts) {
   console.log()
 
   try {
-    const server = await startServer(port)
+    let child = null
+    let mode = 'legacy'
+
+    if (process.env.HOLYSHEEP_WEBUI_LEGACY !== '1') {
+      try {
+        const { startAionUiRuntime } = require('../webui/aionui-runtime')
+        const result = await startAionUiRuntime(port)
+        child = result.child
+        mode = 'aionui'
+        console.log(chalk.green(`✓ AionUi runtime 已接管 hs web`))
+      } catch (error) {
+        console.log(chalk.yellow(`! 未切到 AionUi runtime，回退旧版 WebUI: ${error.message}`))
+      }
+    }
+
+    if (!child) {
+      const { startServer } = require('../webui/server')
+      await startServer(port)
+    }
+
     const url = `http://127.0.0.1:${port}`
     console.log(chalk.green(`✓ WebUI 已启动: ${chalk.cyan.bold(url)}`))
+    if (mode === 'aionui') {
+      console.log(chalk.gray('  当前模式: AionUi runtime'))
+    }
     console.log(chalk.gray('  按 Ctrl+C 停止'))
     console.log()
 
@@ -31,6 +52,16 @@ async function webui(opts) {
       } catch {}
     }
 
+    if (child) {
+      const stopChild = () => {
+        if (!child.killed) child.kill('SIGTERM')
+      }
+      process.on('SIGINT', stopChild)
+      process.on('SIGTERM', stopChild)
+      child.on('exit', (code) => {
+        process.exit(code || 0)
+      })
+    }
 
     // Keep alive
     await new Promise(() => {})

package/src/utils/which.js

@@ -2,7 +2,7 @@
  * 跨平台检测命令是否存在
  * Windows 用 where，Unix 用 which，兜底用 --version
  */
-const { execSync } = require('child_process')
+const { exec, execSync } = require('child_process')
 
 function canRun(command, options = {}) {
   try {
@@ -34,4 +34,30 @@ function commandExists(cmd) {
   return canRun(`${cmd} --version`, { timeout: 3000 })
 }
 
-module.exports = { commandExists }
+function canRunAsync(command, options = {}) {
+  return new Promise((resolve) => {
+    exec(command, { timeout: 3000, windowsHide: true, ...options }, (error) => {
+      resolve(!error)
+    })
+  })
+}
+
+async function commandExistsAsync(cmd) {
+  if (process.platform === 'win32') {
+    const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`]
+    for (const variant of variants) {
+      if (await canRunAsync(`where ${variant}`)) return true
+    }
+
+    for (const variant of variants) {
+      if (await canRunAsync(`cmd /d /s /c "${variant} --version"`)) return true
+    }
+
+    return false
+  }
+
+  if (await canRunAsync(`which ${cmd}`)) return true
+  return canRunAsync(`${cmd} --version`)
+}
+
+module.exports = { commandExists, commandExistsAsync }

package/src/webui/aionui-runtime.js

@@ -0,0 +1,120 @@
+'use strict'
+
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
+const http = require('http')
+const { execSync, spawn } = require('child_process')
+
+function resolveBunPath() {
+  if (process.env.BUN && fs.existsSync(process.env.BUN)) return process.env.BUN
+  try {
+    const resolved = execSync('which bun', {
+      stdio: ['ignore', 'pipe', 'ignore'],
+      encoding: 'utf8',
+      timeout: 2000,
+    }).trim()
+    return resolved || null
+  } catch {
+    return null
+  }
+}
+
+function getRuntimeCandidates() {
+  const home = os.homedir()
+  return [
+    process.env.HOLYSHEEP_AIONUI_DIR,
+    path.join(home, 'AionUi'),
+    path.join(home, 'Projects', 'AionUi'),
+    path.join(__dirname, '..', '..', 'vendor', 'aionui'),
+  ].filter(Boolean)
+}
+
+function isValidRuntimeDir(dir) {
+  if (!dir) return false
+  return fs.existsSync(path.join(dir, 'dist-server', 'server.mjs')) &&
+    fs.existsSync(path.join(dir, 'out', 'renderer', 'index.html'))
+}
+
+function resolveAionUiRuntimeDir() {
+  return getRuntimeCandidates().find(isValidRuntimeDir) || null
+}
+
+function waitForReady(port, timeoutMs = 15000) {
+  const startedAt = Date.now()
+  return new Promise((resolve, reject) => {
+    const tick = () => {
+      const req = http.get({
+        hostname: '127.0.0.1',
+        port,
+        path: '/',
+        family: 4,
+        timeout: 1500,
+      }, (res) => {
+        res.resume()
+        if (res.statusCode && res.statusCode < 500) {
+          resolve(true)
+          return
+        }
+        retry()
+      })
+
+      req.on('timeout', () => {
+        req.destroy()
+        retry()
+      })
+      req.on('error', retry)
+    }
+
+    const retry = () => {
+      if (Date.now() - startedAt >= timeoutMs) {
+        reject(new Error('AionUi runtime did not become ready in time'))
+        return
+      }
+      setTimeout(tick, 500)
+    }
+
+    tick()
+  })
+}
+
+async function startAionUiRuntime(port) {
+  const runtimeDir = resolveAionUiRuntimeDir()
+  if (!runtimeDir) {
+    throw new Error('AionUi runtime not found')
+  }
+
+  const bunPath = resolveBunPath()
+  if (!bunPath) {
+    throw new Error('bun is required to start the AionUi runtime')
+  }
+
+  const child = spawn(bunPath, ['dist-server/server.mjs'], {
+    cwd: runtimeDir,
+    env: {
+      ...process.env,
+      PORT: String(port),
+      NODE_ENV: 'production',
+    },
+    stdio: 'inherit',
+  })
+
+  try {
+    await waitForReady(port)
+  } catch (error) {
+    child.kill('SIGTERM')
+    throw error
+  }
+
+  return {
+    child,
+    runtimeDir,
+    bunPath,
+    mode: 'aionui',
+  }
+}
+
+module.exports = {
+  resolveAionUiRuntimeDir,
+  startAionUiRuntime,
+}

package/src/webui/server.js

@@ -15,12 +15,15 @@ const path = require('path')
 const { execSync, spawn } = require('child_process')
 const { loadConfig, saveConfig, getApiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, BASE_URL_CLAUDE_RELAY, SHOP_URL, CONFIG_FILE } = require('../utils/config')
 const { removeEnvFromShell, writeEnvToShell, getShellRcFiles } = require('../utils/shell')
-const { commandExists } = require('../utils/which')
+const { commandExistsAsync } = require('../utils/which')
 const TOOLS = require('../tools')
 const pkg = require('../../package.json')
 const workspaceStore = require('./workspace-store')
 const workspaceRuntime = require('./workspace-runtime')
 
+const TOOL_CHECK_CACHE_TTL_MS = 10_000
+const toolStateCache = new Map()
+
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
 function maskKey(key) {
@@ -94,6 +97,52 @@ function parseBody(req) {
   })
 }
 
+function getToolCommand(toolId) {
+  const cmds = {
+    'claude-code': 'claude',
+    'codex': 'codex',
+    'droid': 'droid',
+    'gemini-cli': 'gemini',
+    'opencode': 'opencode',
+    'openclaw': 'openclaw',
+    'aider': 'aider',
+    'env-config': null,
+  }
+  return cmds[toolId] ?? null
+}
+
+async function detectToolInstalled(tool) {
+  if (tool.id === 'env-config') return true
+
+  const now = Date.now()
+  const cached = toolStateCache.get(tool.id)
+  if (cached && now - cached.checkedAt < TOOL_CHECK_CACHE_TTL_MS) {
+    return cached.installed
+  }
+
+  const command = getToolCommand(tool.id)
+  const installed = command ? await commandExistsAsync(command) : false
+  toolStateCache.set(tool.id, { installed, checkedAt: now })
+  return installed
+}
+
+async function buildToolSummary(tool) {
+  const installed = await detectToolInstalled(tool)
+  return {
+    id: tool.id,
+    name: tool.name,
+    installed,
+    configured: installed ? (tool.isConfigured?.() || false) : false,
+    version: installed ? await getVersionAsync(tool) : null,
+    installCmd: tool.installCmd,
+    hint: tool.hint || null,
+    launchCmd: tool.launchCmd || null,
+    canAutoInstall: !!AUTO_INSTALL[tool.id],
+    canUpgrade: !!UPGRADABLE_TOOLS.find((item) => item.id === tool.id),
+    npmPkg: UPGRADABLE_TOOLS.find((item) => item.id === tool.id)?.npmPkg || null,
+  }
+}
+
 function json(res, data, status = 200) {
   res.writeHead(status, { 'Content-Type': 'application/json' })
   res.end(JSON.stringify(data))
@@ -252,19 +301,7 @@ async function handleDoctor(_req, res) {
   const nodeMajor = parseInt(process.version.slice(1), 10)
 
   // Tools
-  const tools = TOOLS.map(t => {
-    const installed = t.checkInstalled()
-    return {
-      id: t.id,
-      name: t.name,
-      installed,
-      configured: installed ? (t.isConfigured?.() || false) : false,
-      version: installed ? getVersion(t) : null,
-      installCmd: t.installCmd,
-      hint: t.hint || null,
-      launchCmd: t.launchCmd || null,
-    }
-  })
+  const tools = await Promise.all(TOOLS.map((tool) => buildToolSummary(tool)))
 
   // Connectivity
   let connectivity = { ok: false, modelCount: 0 }
@@ -309,22 +346,7 @@ function isClaudeProxyRunning() {
 }
 
 async function handleTools(_req, res) {
-  const tools = await Promise.all(TOOLS.map(async t => {
-    const installed = t.checkInstalled()
-    return {
-      id: t.id,
-      name: t.name,
-      installed,
-      configured: installed ? (t.isConfigured?.() || false) : false,
-      version: installed ? await getVersionAsync(t) : null,
-      installCmd: t.installCmd,
-      hint: t.hint || null,
-      launchCmd: t.launchCmd || null,
-      canAutoInstall: !!AUTO_INSTALL[t.id],
-      canUpgrade: !!UPGRADABLE_TOOLS.find(u => u.id === t.id),
-      npmPkg: UPGRADABLE_TOOLS.find(u => u.id === t.id)?.npmPkg || null,
-    }
-  }))
+  const tools = await Promise.all(TOOLS.map((tool) => buildToolSummary(tool)))
 
   // 追加 claude-proxy 虚拟工具
   const proxyState = isClaudeProxyRunning()

package/src/webui/workspace-runtime.js

@@ -46,18 +46,31 @@ function buildSystemPrompt(toolId) {
 }
 
 async function requestCompletion(messages, config) {
-  const response = await fetch(`${config.baseUrl}/chat/completions`, {
-    method: 'POST',
-    headers: {
-      Authorization: `Bearer ${config.apiKey}`,
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify({
-      model: config.model,
-      temperature: 0.2,
-      messages,
-    }),
-  })
+  const controller = new AbortController()
+  const timeout = setTimeout(() => controller.abort(), 20_000)
+  let response
+  try {
+    response = await fetch(`${config.baseUrl}/chat/completions`, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${config.apiKey}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({
+        model: config.model,
+        temperature: 0.2,
+        messages,
+      }),
+      signal: controller.signal,
+    })
+  } catch (error) {
+    if (error.name === 'AbortError') {
+      throw new Error('HolySheep API request timed out')
+    }
+    throw error
+  } finally {
+    clearTimeout(timeout)
+  }
 
   const payload = await response.json().catch(() => null)
   if (!response.ok) {