@simonyea/holysheep-cli 2.1.0 → 2.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "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

@@ -23,6 +23,18 @@ function isLegacy(opts) {
 }
 
 // ── Bun resolution ───────────────────────────────────────────────────────────
+function homeBunCandidate() {
+  // bun's official installer always drops the binary at:
+  //   Windows: %USERPROFILE%\.bun\bin\bun.exe
+  //   Unix:    $HOME/.bun/bin/bun
+  // This fallback covers the very common "user just installed bun but hasn't
+  // reopened the terminal, so PATH doesn't see it yet" case.
+  const home = process.env.HOME || process.env.USERPROFILE || require('os').homedir()
+  if (!home) return null
+  const name = process.platform === 'win32' ? 'bun.exe' : 'bun'
+  return path.join(home, '.bun', 'bin', name)
+}
+
 function resolveBunPath() {
   // 1. Dev: use bundled bun if present (darwin-arm64 only in 2.0.x)
   const bundledBun = path.join(__dirname, '..', 'webui', 'vendor', 'bun-darwin-arm64')
@@ -31,21 +43,75 @@ function resolveBunPath() {
   }
   // 2. Env override
   if (process.env.BUN && fs.existsSync(process.env.BUN)) return process.env.BUN
-  // 3. System bun
+  // 3. System bun — platform-correct lookup command
+  const isWindows = process.platform === 'win32'
   try {
-    const resolved = execSync('which bun', {
+    // `where.exe bun` on Windows prints one line per match; pick the first.
+    // `which bun` on Unix prints exactly one line (or fails with exit !=0).
+    const cmd = isWindows ? 'where.exe bun' : 'which bun'
+    const raw = execSync(cmd, {
       stdio: ['ignore', 'pipe', 'ignore'],
       encoding: 'utf8',
-      timeout: 2000,
-    }).trim()
-    if (resolved && fs.existsSync(resolved)) return resolved
+      timeout: 3000,
+    })
+    // Windows emits CRLF and may list multiple paths — take the first existing one.
+    const candidates = raw.split(/\r?\n/).map((s) => s.trim()).filter(Boolean)
+    for (const p of candidates) {
+      if (fs.existsSync(p)) return p
+    }
   } catch {}
-  // 4. Fallback: node with experimental support (dist-server/server.mjs is ESM)
-  // AionUi server.mjs targets bun, but node 20+ with --experimental-vm-modules can work.
-  // We'll prefer node as a last-resort if bun is absent.
+  // 4. ~/.bun/bin fallback — bun installer's canonical location. Catches the
+  // "installed bun, didn't reopen terminal" scenario that previously forced
+  // users to fallback to legacy workspace on first `hs web`.
+  const homeBun = homeBunCandidate()
+  if (homeBun && fs.existsSync(homeBun)) return homeBun
+  // 5. No bun found. AionUi's dist-server/server.mjs uses `bun:` URL scheme
+  // imports (verified 2026-04-21: node 25 throws ERR_UNSUPPORTED_ESM_URL_SCHEME
+  // immediately), so bun is a hard runtime dep. Caller can auto-install.
   return null
 }
 
+function describeBunInstall() {
+  if (process.platform === 'win32') {
+    return 'powershell -c "irm bun.sh/install.ps1 | iex"'
+  }
+  return 'curl -fsSL https://bun.sh/install | bash'
+}
+
+// Auto-install bun using the official bun.sh installer. Returns the newly
+// resolved bun path on success, or null on any failure (caller falls back).
+// Controlled by HOLYSHEEP_WEBUI_NO_AUTOFETCH_BUN=1 (opt-out).
+function autoInstallBun(logger) {
+  const isWindows = process.platform === 'win32'
+  // Both installers are official bun.sh first-party scripts. We log the URL
+  // explicitly so the user knows what's running.
+  const cmd = isWindows
+    ? 'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://bun.sh/install.ps1 | iex"'
+    : 'bash -c "curl -fsSL https://bun.sh/install | bash"'
+  logger(`[auto-install-bun] platform=${process.platform} command=${cmd}`)
+  logger('  Fetching official bun installer from https://bun.sh — this takes ~30s')
+  try {
+    execSync(cmd, {
+      stdio: 'inherit',
+      timeout: 180_000,
+      // Keep env minimal — don't leak weird node_options into the installer
+      env: { ...process.env, NODE_OPTIONS: '' },
+    })
+  } catch (e) {
+    logger(`[auto-install-bun] failed: ${e.message || e}`)
+    return null
+  }
+  // Re-resolve — the installer drops bun at ~/.bun/bin/bun[.exe], which our
+  // resolveBunPath() fallback (step 4) picks up without needing a shell reload.
+  const p = resolveBunPath()
+  if (!p) {
+    logger('[auto-install-bun] installer finished but bun still not found at ~/.bun/bin — aborting')
+    return null
+  }
+  logger(`[auto-install-bun] success → ${p}`)
+  return p
+}
+
 // ── Runtime resolution ───────────────────────────────────────────────────────
 // Priority:
 //   1. Local dev checkout at ../aionui-fork/dist-server (developer building locally)
@@ -71,14 +137,10 @@ function resolveAionUiRuntimeDir() {
 }
 
 async function downloadAionUiRuntime(logger) {
-  const url = process.env.HOLYSHEEP_AIONUI_RUNTIME_URL
-  if (!url) {
-    logger('HOLYSHEEP_AIONUI_RUNTIME_URL not set — cannot auto-download')
-    return null
-  }
+  // Fetcher has a baked-in default URL + SHA256 — no env var required.
+  // HOLYSHEEP_AIONUI_RUNTIME_URL still works as an override.
   const { resolveRuntime } = require('../webui/aionui-runtime-fetcher')
-  const runtime = await resolveRuntime({ allowDownload: true, logger })
-  return runtime
+  return resolveRuntime({ allowDownload: true, logger })
 }
 
 // ── HolySheep config → API key ───────────────────────────────────────────────
@@ -224,25 +286,33 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
 async function startAionUiMode(opts) {
   const port = Number(opts.port) || 9876
 
-  // 1. Resolve runtime
+  // 1. Resolve runtime. First launch after `npm i -g` won't have one locally
+  // — we auto-download from the baked-in URL (verified by SHA256) unless the
+  // user opts out via HOLYSHEEP_WEBUI_NO_AUTOFETCH=1.
   let runtime = resolveAionUiRuntimeDir()
-  if (!runtime && opts.setupRuntime) {
-    console.log(chalk.gray('  Downloading AionUi runtime...'))
+  const autoFetchDisabled = process.env.HOLYSHEEP_WEBUI_NO_AUTOFETCH === '1'
+  if (!runtime && !autoFetchDisabled) {
+    console.log(chalk.cyan('▶ AionUi runtime not installed — downloading automatically (~21 MB, one-time)'))
+    console.log(chalk.gray('  (disable with HOLYSHEEP_WEBUI_NO_AUTOFETCH=1; override URL with HOLYSHEEP_AIONUI_RUNTIME_URL)'))
     const downloaded = await downloadAionUiRuntime((m) => console.log(chalk.gray(`  ${m}`)))
     if (downloaded) {
       runtime = { dir: downloaded.dir, source: downloaded.source }
+      console.log(chalk.gray('  AionUi runtime installed. Next: ensure bun is available to launch it.'))
     }
   }
   if (!runtime) {
     const home = process.env.HOME || process.env.USERPROFILE || '~'
-    console.log(chalk.red('✗ AionUi runtime not found'))
+    console.log(chalk.red('✗ AionUi runtime not found and auto-download did not succeed'))
     console.log()
     console.log(chalk.gray('  Expected at one of:'))
     console.log(chalk.gray(`    • ${path.resolve(__dirname, '..', '..', 'aionui-fork', 'dist-server')}  (dev checkout)`))
     console.log(chalk.gray(`    • ${path.join(home, '.holysheep', 'aionui-runtime', 'dist-server')}  (installed)`))
     console.log()
-    console.log(chalk.yellow('  Install via:'))
+    console.log(chalk.yellow('  Retry manually:'))
+    console.log(chalk.cyan('    hs web --setup-runtime'))
+    console.log(chalk.gray('  Or pin a specific runtime URL + SHA256:'))
     console.log(chalk.cyan('    export HOLYSHEEP_AIONUI_RUNTIME_URL=https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep.tar.gz'))
+    console.log(chalk.cyan('    export HOLYSHEEP_AIONUI_RUNTIME_SHA256=<see README>'))
     console.log(chalk.cyan('    hs web --setup-runtime'))
     console.log()
     if (opts.aionui) {
@@ -254,16 +324,29 @@ async function startAionUiMode(opts) {
     return startLegacyMode(opts)
   }
 
-  // 2. Resolve bun
-  const bunPath = resolveBunPath()
+  // 2. Resolve bun — and auto-install if missing (opt-out via env)
+  let bunPath = resolveBunPath()
+  const autoBunDisabled = process.env.HOLYSHEEP_WEBUI_NO_AUTOFETCH_BUN === '1'
+  if (!bunPath && !autoBunDisabled) {
+    console.log(chalk.cyan('▶ bun runtime not installed — installing automatically (one-time)'))
+    console.log(chalk.gray('  (disable with HOLYSHEEP_WEBUI_NO_AUTOFETCH_BUN=1; takes ~30s; source: bun.sh official installer)'))
+    bunPath = autoInstallBun((m) => console.log(chalk.gray(`  ${m}`)))
+  }
   if (!bunPath) {
     console.log(chalk.red('✗ bun is required to run the AionUi server'))
-    console.log(chalk.gray('  Install: curl -fsSL https://bun.sh/install | bash'))
+    console.log(chalk.gray('  (AionUi uses bun: URL-scheme imports that Node cannot load directly)'))
+    console.log(chalk.gray('  AionUi runtime itself is ready — bun is the last missing piece.'))
+    console.log()
+    console.log(chalk.yellow('  Install bun manually:'))
+    console.log(chalk.cyan(`    ${describeBunInstall()}`))
+    console.log(chalk.gray('  After install, close and reopen your terminal, then retry `hs web`.'))
     console.log()
     if (opts.aionui) {
+      console.log(chalk.red('  --aionui flag requires bun. Aborting.'))
       process.exit(1)
     }
-    console.log(chalk.yellow('  Falling back to legacy workspace.'))
+    console.log(chalk.yellow('  AionUi runtime ready but bun auto-install failed — falling back to legacy HolySheep workspace.'))
+    console.log()
     return startLegacyMode(opts)
   }
 
@@ -366,8 +449,16 @@ async function webui(opts) {
   try {
     // 默认走 AionUi；HOLYSHEEP_WEBUI_LEGACY=1 才退回 legacy
     if (isLegacy(opts) && !opts.aionui) {
+      console.log(chalk.gray(`[mode=legacy platform=${process.platform}]`))
+      console.log()
       return await startLegacyMode(opts)
     }
+    // Tri-state mode line: helps user-reports when things go sideways
+    const bunFound = resolveBunPath() ? 'found' : 'missing'
+    const rt = resolveAionUiRuntimeDir()
+    const rtLabel = rt ? rt.source : 'none'
+    console.log(chalk.gray(`[mode=aionui platform=${process.platform} bun=${bunFound} runtime=${rtLabel}]`))
+    console.log()
     return await startAionUiMode(opts)
   } catch (err) {
     console.log(chalk.red(`✗ 启动失败: ${err.message}`))

package/src/webui/aionui-runtime.js

@@ -12,16 +12,28 @@ function resolveBunPath() {
     return bundledBun
   }
   if (process.env.BUN && fs.existsSync(process.env.BUN)) return process.env.BUN
+  const isWindows = process.platform === 'win32'
   try {
-    const resolved = execSync('which bun', {
+    const cmd = isWindows ? 'where.exe bun' : 'which bun'
+    const raw = execSync(cmd, {
       stdio: ['ignore', 'pipe', 'ignore'],
       encoding: 'utf8',
       timeout: 2000,
-    }).trim()
-    return resolved || null
-  } catch {
-    return null
+    })
+    const candidates = String(raw).split(/\r?\n/).map((s) => s.trim()).filter(Boolean)
+    for (const p of candidates) {
+      if (fs.existsSync(p)) return p
+    }
+  } catch {}
+  // ~/.bun/bin fallback — canonical location of bun's official installer.
+  // Catches "installed bun but didn't reopen terminal" without needing PATH refresh.
+  const home = process.env.HOME || process.env.USERPROFILE || os.homedir()
+  if (home) {
+    const name = isWindows ? 'bun.exe' : 'bun'
+    const homeBun = path.join(home, '.bun', 'bin', name)
+    if (fs.existsSync(homeBun)) return homeBun
   }
+  return null
 }
 
 function getRuntimeCandidates() {

package/src/webui/server.js

@@ -239,7 +239,7 @@ async function handleLogin(req, res) {
   }
   try {
     const valid = await validateApiKey(apiKey)
-    if (!valid) return json(res, { success: false, message: 'API Key 无效' }, 401)
+    if (!valid) return json(res, { success: false, message: 'API Key 无效 (server returned non-2xx)' }, 401)
     saveConfig({ apiKey, savedAt: new Date().toISOString() })
     workspaceStore.saveHolySheepApiConfig({
       apiKey,
@@ -248,7 +248,25 @@ async function handleLogin(req, res) {
     })
     json(res, { success: true, apiKey: maskKey(apiKey) })
   } catch (e) {
-    json(res, { success: false, message: `验证失败: ${e.message}` }, 500)
+    // Translate cryptic node-fetch / DNS / proxy errors into something actionable.
+    // Previously users just saw "链接失败" in the browser alert — now we surface
+    // the underlying cause (DNS, timeout, proxy interference, TLS, etc).
+    const code = e && (e.code || e.errno || e.type)
+    const name = e && e.name
+    let hint
+    if (code === 'EAI_AGAIN' || code === 'ENOTFOUND') {
+      hint = 'DNS 解析失败 — 检查网络 / 代理 / 防火墙是否拦截了 api.holysheep.ai'
+    } else if (code === 'ETIMEDOUT' || name === 'AbortError') {
+      hint = '连接超时 — 可能是网络慢或代理阻塞；试试开关代理再重试'
+    } else if (code === 'ECONNREFUSED' || code === 'ECONNRESET') {
+      hint = '连接被拒绝 — 检查本机防火墙或公司代理'
+    } else if (code === 'CERT_HAS_EXPIRED' || code === 'UNABLE_TO_VERIFY_LEAF_SIGNATURE') {
+      hint = 'TLS 证书校验失败 — 可能是系统时间错误或中间人代理'
+    } else {
+      hint = e && e.message ? e.message : String(e)
+    }
+    const detail = `${hint}${code ? ` [${code}]` : ''}`
+    json(res, { success: false, message: `验证失败: ${detail}` }, 500)
   }
 }