@simonyea/holysheep-cli 2.1.1 → 2.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.1",
+  "version": "2.1.3",
   "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')
@@ -48,9 +60,14 @@ function resolveBunPath() {
       if (fs.existsSync(p)) return p
     }
   } catch {}
-  // 4. No bun found. AionUi's dist-server/server.mjs uses `bun:` URL scheme
+  // 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 shows install guidance.
+  // immediately), so bun is a hard runtime dep. Caller can auto-install.
   return null
 }
 
@@ -61,6 +78,40 @@ function describeBunInstall() {
   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)
@@ -246,6 +297,7 @@ async function startAionUiMode(opts) {
     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) {
@@ -272,13 +324,35 @@ 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, TTY-gated)
+  let bunPath = resolveBunPath()
+  const autoBunDisabled = process.env.HOLYSHEEP_WEBUI_NO_AUTOFETCH_BUN === '1'
+  if (!bunPath && !autoBunDisabled) {
+    // 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'))
     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:'))
+    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()
@@ -286,7 +360,7 @@ async function startAionUiMode(opts) {
       console.log(chalk.red('  --aionui flag requires bun. Aborting.'))
       process.exit(1)
     }
-    console.log(chalk.yellow('  Falling back to legacy HolySheep workspace.'))
+    console.log(chalk.yellow('  AionUi runtime ready but bun auto-install failed — falling back to legacy HolySheep workspace.'))
     console.log()
     return startLegacyMode(opts)
   }

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() {