@simonyea/holysheep-cli 2.1.3 → 2.1.5

package/package.json

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

@@ -210,6 +210,12 @@ async function loginWithApiKey(port, apiKey) {
 }
 
 // ── Start patched AionUi server ──────────────────────────────────────────────
+// Timeout is generous for Windows first launch: Defender scans 41MB server.mjs,
+// bun JIT-compiles, AionUi initializes sqlite under ~/.aionui-home, and npm
+// may still pull the renderer. 60s is the realistic upper bound on a cold box.
+const AIONUI_STARTUP_TIMEOUT_MS = Number(process.env.HS_WEB_STARTUP_TIMEOUT_MS) || 60_000
+const AIONUI_LOG_TAIL_BYTES = 4096
+
 function spawnAionUiServer({ bunPath, runtimeDir, port }) {
   return new Promise((resolve, reject) => {
     const entry = path.join(runtimeDir, 'dist-server', 'server.mjs')
@@ -231,21 +237,74 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
       stdio: ['ignore', 'pipe', 'pipe'],
     })
 
+    // ── Log capture ────────────────────────────────────────────────────────
+    // Always subscribe to stdout+stderr. In debug mode we ALSO print live; in
+    // normal mode we keep the last ~4KB in a ring buffer so that if startup
+    // fails (timeout OR exit-before-ready) we can surface the real error to
+    // the user instead of the previous silent "failed to start within 20s".
+    const debug = process.env.HS_WEB_DEBUG === '1'
+    let logTail = ''
+    const appendLog = (stream, chunk) => {
+      const s = Buffer.isBuffer(chunk) ? chunk.toString('utf8') : String(chunk)
+      logTail += s
+      if (logTail.length > AIONUI_LOG_TAIL_BYTES) {
+        logTail = logTail.slice(logTail.length - AIONUI_LOG_TAIL_BYTES)
+      }
+      if (debug) {
+        const target = stream === 'err' ? process.stderr : process.stdout
+        target.write(chalk.gray(`[aionui] ${s}`))
+      }
+    }
+    child.stdout.on('data', (d) => appendLog('out', d))
+    child.stderr.on('data', (d) => appendLog('err', d))
+
+    // ── Progress + timeout ─────────────────────────────────────────────────
     let settled = false
+    const startedAt = Date.now()
     const onReady = () => {
       if (!settled) {
         settled = true
+        clearInterval(progressTick)
         resolve(child)
       }
     }
-    const timer = setTimeout(() => {
-      if (!settled) {
-        settled = true
-        reject(new Error('AionUi server failed to start within 20s'))
+    const fail = (reason) => {
+      if (settled) return
+      settled = true
+      clearInterval(progressTick)
+      const tail = logTail.trim()
+      let msg = reason
+      if (tail) {
+        msg += `\n\n  --- last AionUi output (stderr+stdout tail) ---\n${tail
+          .split(/\r?\n/)
+          .map((line) => `  ${line}`)
+          .join('\n')}\n  ------------------------------------------------`
+      } else {
+        msg += '\n  (no output captured from AionUi — check ' +
+          (process.platform === 'win32' ? 'Windows Defender / antivirus quarantining bun.exe' : 'bun or runtime corruption') +
+          ')'
       }
-    }, 20_000)
-    // Poll /health-ish endpoint to detect readiness.
+      reject(new Error(msg))
+    }
+
+    // Progress log every 10s, so user knows we're not hung. On Windows first
+    // launch (Defender scanning bun + bun JIT + sqlite init), 30-50s is normal.
+    const progressTick = setInterval(() => {
+      if (settled) return
+      const waited = Math.round((Date.now() - startedAt) / 1000)
+      const hint = process.platform === 'win32'
+        ? ' (Windows first-launch can take up to 60s while Defender scans bun.exe + server.mjs)'
+        : ''
+      console.log(chalk.gray(`  still starting AionUi — waited ${waited}s…${hint}`))
+    }, 10_000)
+
+    const timer = setTimeout(() => {
+      fail(`AionUi server failed to start within ${Math.round(AIONUI_STARTUP_TIMEOUT_MS / 1000)}s`)
+    }, AIONUI_STARTUP_TIMEOUT_MS)
+
+    // ── Readiness poll ─────────────────────────────────────────────────────
     const pollReady = () => {
+      if (settled) return
       const req = http.request(
         { host: '127.0.0.1', port, path: '/', method: 'HEAD', timeout: 500 },
         (res) => {
@@ -267,17 +326,17 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
     // Start polling after a short grace period so bun has time to boot.
     setTimeout(pollReady, 600)
 
-    // Surface logs with prefix (muted by default; set HS_WEB_DEBUG=1 to see)
-    const debug = process.env.HS_WEB_DEBUG === '1'
-    if (debug) {
-      child.stdout.on('data', (d) => process.stdout.write(chalk.gray(`[aionui] ${d}`)))
-      child.stderr.on('data', (d) => process.stderr.write(chalk.gray(`[aionui] ${d}`)))
-    }
-    child.on('exit', (code) => {
-      if (!settled) {
-        settled = true
-        reject(new Error(`AionUi server exited with code ${code} before becoming ready`))
-      }
+    // ── Early exit ─────────────────────────────────────────────────────────
+    child.on('exit', (code, signal) => {
+      const reason = signal
+        ? `AionUi server exited with signal ${signal} before becoming ready`
+        : `AionUi server exited with code ${code} before becoming ready`
+      clearTimeout(timer)
+      fail(reason)
+    })
+    child.on('error', (err) => {
+      clearTimeout(timer)
+      fail(`AionUi server spawn error: ${err.message || err}`)
     })
   })
 }
@@ -372,7 +431,18 @@ async function startAionUiMode(opts) {
   try {
     aionuiProc = await spawnAionUiServer({ bunPath, runtimeDir: runtime.dir, port })
   } catch (e) {
-    console.log(chalk.red(`✗ AionUi server failed to start: ${e.message}`))
+    // `e.message` may now be multi-line (includes bun/AionUi stderr tail).
+    // Print the first line in red (the reason), then any extra lines verbatim
+    // so the user can see the real bun/AionUi error and paste it back to us.
+    const [firstLine, ...rest] = String(e.message).split(/\r?\n/)
+    console.log(chalk.red(`✗ AionUi server failed to start: ${firstLine}`))
+    for (const line of rest) {
+      if (line.trim()) console.log(chalk.gray(line))
+    }
+    console.log()
+    console.log(chalk.gray('  Tip: run again with HS_WEB_DEBUG=1 to stream AionUi logs live.'))
+    console.log(chalk.gray('       If this is a first launch on Windows, try once more — Defender'))
+    console.log(chalk.gray('       will cache bun.exe + server.mjs after the first scan.'))
     if (opts.aionui) process.exit(1)
     console.log(chalk.yellow('  Falling back to legacy workspace.'))
     return startLegacyMode(opts)

package/src/tools/openclaw-bridge.js

@@ -759,6 +759,73 @@ function buildModelsResponse(config) {
   }
 }
 
+// ── Live HolySheep model list for OpenClaw ───────────────────────────────────
+// OpenClaw / AcpModelSelector hits `/v1/models` to populate its model dropdown.
+// Historically this returned only the static `config.models` from
+// `~/.openclaw/holysheep-bridge.json`, so users saw a stale hand-curated list.
+// We now fetch the full live catalog from the HolySheep API once per bridge
+// process (60s TTL) and merge it with the user's preferred models. The
+// config.models always wins on ordering — new entries from upstream are
+// appended afterwards so existing users don't see their default model jump.
+//
+// Env opt-out: HOLYSHEEP_BRIDGE_NO_LIVE_MODELS=1 keeps the old static behavior.
+let _liveModelsCache = { at: 0, ids: null }
+const LIVE_MODELS_TTL_MS = 60_000
+
+async function fetchLiveHolySheepModels(config) {
+  if (process.env.HOLYSHEEP_BRIDGE_NO_LIVE_MODELS === '1') return null
+  const now = Date.now()
+  if (_liveModelsCache.ids && now - _liveModelsCache.at < LIVE_MODELS_TTL_MS) {
+    return _liveModelsCache.ids
+  }
+  const base = (config.baseUrlOpenAI || 'https://api.holysheep.ai/v1').replace(/\/+$/, '')
+  const url = `${base}/models`
+  const apiKey = config.apiKey
+  if (!apiKey) return null
+  try {
+    const resp = await upstreamFetch(url, {
+      method: 'GET',
+      headers: { authorization: `Bearer ${apiKey}` },
+    })
+    if (!resp.ok) return null
+    const body = await resp.json()
+    const ids = Array.isArray(body?.data)
+      ? body.data.map((m) => (m && typeof m.id === 'string' ? m.id : null)).filter(Boolean)
+      : null
+    if (ids && ids.length) {
+      _liveModelsCache = { at: now, ids }
+      return ids
+    }
+  } catch {
+    // Network error / upstream 5xx — fall back to static config.models.
+  }
+  return null
+}
+
+async function buildLiveModelsResponse(config) {
+  const live = await fetchLiveHolySheepModels(config)
+  const configured = config.models || []
+  if (!live) return buildModelsResponse(config)
+  // Merge: preserve user's preferred ordering from config.models (typically
+  // the models they actively use for OpenClaw), then append new live entries.
+  const seen = new Set(configured)
+  const merged = [...configured]
+  for (const id of live) {
+    if (!seen.has(id)) {
+      merged.push(id)
+      seen.add(id)
+    }
+  }
+  return {
+    object: 'list',
+    data: merged.map((model) => ({
+      id: model,
+      object: 'model',
+      owned_by: 'holysheep',
+    })),
+  }
+}
+
 function isProcessAlive(pid) {
   if (!Number.isInteger(pid) || pid <= 0) return null
   try {

package/src/webui/aionui-runtime-fetcher.js

@@ -29,11 +29,14 @@ const VENDOR_DIR = path.join(__dirname, 'vendor', 'aionui')
 
 // Baked-in defaults — updated with every 2.x.0 release that bumps the bundle.
 // Override via HOLYSHEEP_AIONUI_RUNTIME_URL / HOLYSHEEP_AIONUI_RUNTIME_SHA256.
+// hs2 = HolySheep rebrand + Guid CLI card (2.1.5, 2026-04-21). Previous
+// revisions still live on the CDN for forensics, but all new installs of
+// @simonyea/holysheep-cli >= 2.1.5 pull this tarball.
 const DEFAULT_RUNTIME_URL =
-  'https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep.tar.gz'
+  'https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs2.tar.gz'
 const DEFAULT_RUNTIME_SHA256 =
-  '379ae2a523542c0be55a84abbec5cd1db31684300c66db8aa35c4a02d38e9cb1'
-const DEFAULT_RUNTIME_VERSION = '1.9.18-holysheep'
+  '869d9c49b1902d6305606212b8bb5af0f7b331b311f998f2d86ec38849c8ed5b'
+const DEFAULT_RUNTIME_VERSION = '1.9.18-holysheep-hs2'
 
 function isValidRuntimeDir(dir) {
   if (!dir) return false