@simonyea/holysheep-cli 2.1.2 → 2.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.2",
+  "version": "2.1.4",
   "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}`)
     })
   })
 }
@@ -324,13 +383,28 @@ async function startAionUiMode(opts) {
     return startLegacyMode(opts)
   }
 
-  // 2. Resolve bun — and auto-install if missing (opt-out via env)
+  // 2. Resolve bun — and auto-install if missing (opt-out via env, TTY-gated)
   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}`)))
+    // TTY guard: auto-install pipes a remote script into a shell. In CI,
+    // Docker builds, or other non-interactive environments the user can't
+    // cancel and didn't knowingly opt in. Skip auto-install there and fall
+    // through to the existing manual-install guidance + legacy fallback.
+    if (!process.stdout.isTTY) {
+      console.log(chalk.yellow('  bun missing and not running in a TTY — skipping auto-install (safety).'))
+      console.log(chalk.gray('  In CI / Docker / non-interactive shells, install bun explicitly first:'))
+      console.log(chalk.cyan(`    ${describeBunInstall()}`))
+      console.log(chalk.gray('  Or opt out of this safety with HOLYSHEEP_WEBUI_FORCE_AUTOFETCH_BUN=1.'))
+      if (process.env.HOLYSHEEP_WEBUI_FORCE_AUTOFETCH_BUN === '1') {
+        console.log(chalk.cyan('▶ HOLYSHEEP_WEBUI_FORCE_AUTOFETCH_BUN=1 set — attempting auto-install anyway'))
+        bunPath = autoInstallBun((m) => console.log(chalk.gray(`  ${m}`)))
+      }
+    } else {
+      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'))
@@ -357,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)