@simonyea/holysheep-cli 2.1.31 → 2.1.33

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.31",
+  "version": "2.1.33",
   "description": "Claude Code/Cursor/Cline API relay for China \u2014 \u00a51=$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 && node tests/runtime-stale-upgrade.test.js && node tests/hermes.test.js && node tests/preflight.test.js",

package/src/commands/webui.js

@@ -144,7 +144,7 @@ function probeAionUiRuntimeLabel() {
     // is about to return user-cache).
     if (process.env.HOLYSHEEP_DEV === '1') {
       const forkDir = path.resolve(__dirname, '..', '..', 'aionui-fork')
-      if (isValidRuntimeDir(forkDir)) return 'aionui-fork'
+      if (isValidRuntimeDir(forkDir)) return 'dev-checkout'
     }
     if (isValidRuntimeDir(VENDOR_DIR)) return 'vendor'
     if (isValidRuntimeDir(USER_CACHE_DIR)) {
@@ -200,7 +200,7 @@ async function fetchCsrfToken(port) {
 
 async function loginWithApiKey(port, apiKey) {
   const csrf = await fetchCsrfToken(port)
-  if (!csrf) throw new Error('Failed to acquire CSRF token from AionUi server')
+  if (!csrf) throw new Error('Failed to acquire CSRF token from HolySheep runtime')
   const body = JSON.stringify({ apiKey, csrfToken: decodeURIComponent(csrf.csrfToken) })
   const r = await httpRequest(
     {
@@ -237,7 +237,7 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
   return new Promise((resolve, reject) => {
     const entry = path.join(runtimeDir, 'dist-server', 'server.mjs')
     if (!fs.existsSync(entry)) {
-      return reject(new Error(`AionUi entry not found: ${entry}`))
+      return reject(new Error(`HolySheep runtime entry not found: ${entry}`))
     }
 
     // AionUi reads PORT / HOST / JWT_SECRET from env. We set a stable JWT secret
@@ -269,7 +269,7 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
       }
       if (debug) {
         const target = stream === 'err' ? process.stderr : process.stdout
-        target.write(chalk.gray(`[aionui] ${s}`))
+        target.write(chalk.gray(`[holysheep] ${s}`))
       }
     }
     child.stdout.on('data', (d) => appendLog('out', d))
@@ -292,12 +292,12 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
       const tail = logTail.trim()
       let msg = reason
       if (tail) {
-        msg += `\n\n  --- last AionUi output (stderr+stdout tail) ---\n${tail
+        msg += `\n\n  --- last HolySheep runtime output (stderr+stdout tail) ---\n${tail
           .split(/\r?\n/)
           .map((line) => `  ${line}`)
           .join('\n')}\n  ------------------------------------------------`
       } else {
-        msg += '\n  (no output captured from AionUi — check ' +
+        msg += '\n  (no output captured from HolySheep runtime — check ' +
           (process.platform === 'win32' ? 'Windows Defender / antivirus quarantining bun.exe' : 'bun or runtime corruption') +
           ')'
       }
@@ -312,11 +312,11 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
       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}`))
+      console.log(chalk.gray(`  still starting HolySheep runtime — waited ${waited}s…${hint}`))
     }, 10_000)
 
     const timer = setTimeout(() => {
-      fail(`AionUi server failed to start within ${Math.round(AIONUI_STARTUP_TIMEOUT_MS / 1000)}s`)
+      fail(`HolySheep runtime failed to start within ${Math.round(AIONUI_STARTUP_TIMEOUT_MS / 1000)}s`)
     }, AIONUI_STARTUP_TIMEOUT_MS)
 
     // ── Readiness poll ─────────────────────────────────────────────────────
@@ -346,14 +346,14 @@ function spawnAionUiServer({ bunPath, runtimeDir, port }) {
     // ── 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`
+        ? `HolySheep runtime exited with signal ${signal} before becoming ready`
+        : `HolySheep runtime 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}`)
+      fail(`HolySheep runtime spawn error: ${err.message || err}`)
     })
   })
 }
@@ -382,10 +382,10 @@ async function startAionUiMode(opts) {
     // on HOLYSHEEP_AIONUI_SKIP_UPGRADE.
     const probe = probeAionUiRuntimeLabel()
     if (probe === 'none') {
-      console.log(chalk.cyan('▶ AionUi runtime not installed — downloading automatically (~21 MB, one-time)'))
+      console.log(chalk.cyan('▶ HolySheep 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)'))
     } else if (probe === 'installed-stale' && process.env.HOLYSHEEP_AIONUI_SKIP_UPGRADE !== '1') {
-      console.log(chalk.cyan('▶ AionUi runtime is out of date — upgrading in place (atomic)'))
+      console.log(chalk.cyan('▶ HolySheep runtime is out of date — upgrading in place (atomic)'))
       console.log(chalk.gray('  (set HOLYSHEEP_AIONUI_SKIP_UPGRADE=1 to pin current cache; HOLYSHEEP_AIONUI_PIN_VERSION=<v> to lock a version)'))
     }
   }
@@ -394,18 +394,18 @@ async function startAionUiMode(opts) {
     logger: (m) => console.log(chalk.gray(`  ${m}`)),
   })
   if (runtime && runtime.source === 'download-upgrade') {
-    console.log(chalk.green(`  ✓ AionUi runtime upgraded to ${runtime.version}`))
+    console.log(chalk.green(`  ✓ HolySheep runtime upgraded to ${runtime.version}`))
   } else if (runtime && runtime.source === 'user-cache-stale') {
     console.log(chalk.yellow(
-      `  ⚠ Running stale AionUi runtime (${runtime.version}, expected newer). ` +
+      `  ⚠ Running stale HolySheep runtime (${runtime.version}, expected newer). ` +
       `Run: rm -rf ~/.holysheep/aionui-runtime && hs web  to force rebuild.`
     ))
   } else if (runtime && runtime.source === 'download') {
-    console.log(chalk.gray('  AionUi runtime installed. Next: ensure bun is available to launch it.'))
+    console.log(chalk.gray('  HolySheep 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 and auto-download did not succeed'))
+    console.log(chalk.red('✗ HolySheep 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)`))
@@ -451,9 +451,9 @@ async function startAionUiMode(opts) {
     }
   }
   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(chalk.red('✗ bun is required to run the HolySheep runtime'))
+    console.log(chalk.gray('  (HolySheep runtime uses bun: URL-scheme imports that Node cannot load directly)'))
+    console.log(chalk.gray('  HolySheep runtime itself is ready — bun is the last missing piece.'))
     console.log()
     console.log(chalk.yellow('  Install bun manually:'))
     console.log(chalk.cyan(`    ${describeBunInstall()}`))
@@ -463,12 +463,12 @@ async function startAionUiMode(opts) {
       console.log(chalk.red('  --aionui flag requires bun. Aborting.'))
       process.exit(1)
     }
-    console.log(chalk.yellow('  AionUi runtime ready but bun auto-install failed — falling back to legacy HolySheep workspace.'))
+    console.log(chalk.yellow('  HolySheep runtime ready but bun auto-install failed — falling back to legacy HolySheep workspace.'))
     console.log()
     return startLegacyMode(opts)
   }
 
-  console.log(chalk.cyan(`▶ Starting AionUi v1.9.18 (HolySheep fork, source: ${runtime.source})`))
+  console.log(chalk.cyan(`▶ Starting HolySheep runtime (source: ${runtime.source})`))
 
   // 3. Spawn AionUi on an internal loopback port and wrap it with
   // `aionui-wrapper.js` which listens on the user-visible port. This is the
@@ -498,12 +498,12 @@ async function startAionUiMode(opts) {
     aionuiProc = wrapper.aionui
   } catch (e) {
     const [firstLine, ...rest] = String(e.message).split(/\r?\n/)
-    console.log(chalk.red(`✗ AionUi server failed to start: ${firstLine}`))
+    console.log(chalk.red(`✗ HolySheep runtime 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('  Tip: run again with HS_WEB_DEBUG=1 to stream HolySheep runtime 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)
@@ -544,7 +544,7 @@ async function startAionUiMode(opts) {
   }
 
   console.log(chalk.green(`✓ WebUI 已启动: ${chalk.cyan.bold(launchUrl)}`))
-  console.log(chalk.gray('  Mode: AionUi v1.9.18 (源码 fork, HolySheep 登录)'))
+  console.log(chalk.gray('  Mode: HolySheep WebUI (HolySheep 登录)'))
   console.log(chalk.gray('  Press Ctrl+C to stop'))
   console.log()
 
@@ -610,7 +610,7 @@ async function webui(opts) {
     // next call to resolveAionUiRuntime). `none` means first-ever launch.
     const bunFound = resolveBunPath() ? 'found' : 'missing'
     const rtLabel = probeAionUiRuntimeLabel()
-    console.log(chalk.gray(`[mode=aionui platform=${process.platform} bun=${bunFound} runtime=${rtLabel}]`))
+    console.log(chalk.gray(`[mode=holysheep platform=${process.platform} bun=${bunFound} runtime=${rtLabel}]`))
     console.log()
     return await startAionUiMode(opts)
   } catch (err) {

package/src/index.js

@@ -174,11 +174,11 @@ program
 program
   .command('web')
   .alias('webui')
-  .description('启动 WebUI 本地管理面板 (--aionui 启用 AionUi 界面 + HolySheep API Key 登录)')
+  .description('启动 HolySheep WebUI 本地管理面板 (默认 HolySheep API Key 登录)')
   .option('-p, --port <port>', '指定端口', '9876')
   .option('--no-open', '不自动打开浏览器')
-  .option('--aionui', '使用 AionUi 运行时 (需本地已安装 runtime；npm 包不打包，保持轻量)')
-  .option('--setup-runtime', '允许首次运行时从 HOLYSHEEP_AIONUI_RUNTIME_URL 下载 AionUi runtime')
+  .option('--aionui', '强制使用 HolySheep runtime (兼容 flag 名保留；需本地已安装 runtime)')
+  .option('--setup-runtime', '允许首次运行时自动下载 HolySheep runtime')
   .action(async (opts) => {
     printBanner()
     await require('./commands/webui')(opts)

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

@@ -60,10 +60,10 @@ const VENDOR_DIR = path.join(__dirname, 'vendor', 'aionui')
 // new CLI release, the next `hs web` invocation on user machines will detect
 // the version drift and upgrade the cache in place.
 const DEFAULT_RUNTIME_URL =
-  'https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs22.tar.gz'
+  'https://mail.holysheep.ai/app/cli/aionui-runtime-v1.9.18-holysheep-hs23.tar.gz'
 const DEFAULT_RUNTIME_SHA256 =
-  '03e386ea83660b4074e29026dfc53be6ed01fcd51fa35a9379ed64a396e99f33'
-const DEFAULT_RUNTIME_VERSION = '1.9.18-holysheep-hs22'
+  '96bcf47a06c4cdda206ed6d258edd9d347a587ef300c053e7679df469ccf8856'
+const DEFAULT_RUNTIME_VERSION = '1.9.18-holysheep-hs23'
 
 function isValidRuntimeDir(dir) {
   if (!dir) return false
@@ -206,7 +206,7 @@ async function resolveRuntime({ allowDownload = false, logger = () => {} } = {})
   if (process.env.HOLYSHEEP_DEV === '1') {
     const forkDir = path.resolve(__dirname, '..', '..', 'aionui-fork')
     if (isValidRuntimeDir(forkDir)) {
-      return { dir: forkDir, version: readVersion(forkDir), source: 'aionui-fork' }
+      return { dir: forkDir, version: readVersion(forkDir), source: 'dev-checkout' }
     }
   }
 
@@ -227,9 +227,9 @@ async function resolveRuntime({ allowDownload = false, logger = () => {} } = {})
           source: 'download',
         }
       }
-      logger('AionUi runtime downloaded but directory structure invalid')
+      logger('HolySheep runtime downloaded but directory structure invalid')
     } catch (e) {
-      logger(`AionUi runtime download failed: ${e.message}`)
+      logger(`HolySheep runtime download failed: ${e.message}`)
     }
   }
 
@@ -319,7 +319,7 @@ function rmrf(p) {
 function downloadAndExtract(url, destDir, expectedSha, logger) {
   return new Promise((resolve, reject) => {
     const tmpFile = path.join(os.tmpdir(), `aionui-runtime-${Date.now()}.tar.gz`)
-    logger(`Downloading AionUi runtime from ${url}`)
+    logger(`Downloading HolySheep runtime from ${url}`)
 
     const client = url.startsWith('https:') ? https : http
     const file = fs.createWriteStream(tmpFile)
@@ -394,7 +394,7 @@ function downloadAndExtract(url, destDir, expectedSha, logger) {
 
 function describeInstallGuidance() {
   return [
-    'AionUi runtime not installed. Fastest way to get started:',
+    'HolySheep runtime not installed. Fastest way to get started:',
     '',
     '  One command (downloads the prebuilt 21 MB runtime):',
     '    hs web --setup-runtime',

package/src/webui/aionui-runtime.js

@@ -85,7 +85,7 @@ function waitForReady(port, timeoutMs = 15000) {
 
     const retry = () => {
       if (Date.now() - startedAt >= timeoutMs) {
-        reject(new Error('AionUi runtime did not become ready in time'))
+        reject(new Error('HolySheep runtime did not become ready in time'))
         return
       }
       setTimeout(tick, 500)
@@ -99,13 +99,13 @@ async function startAionUiRuntime(port) {
   const runtimeDir = resolveAionUiRuntimeDir()
   if (!runtimeDir) {
     throw new Error(
-      'AionUi runtime not bundled in this build — set HOLYSHEEP_WEBUI_AIONUI=1 with a local vendor/ directory to enable'
+      'HolySheep runtime not bundled in this build — set HOLYSHEEP_WEBUI_AIONUI=1 with a local vendor/ directory to enable'
     )
   }
 
   const bunPath = resolveBunPath()
   if (!bunPath) {
-    throw new Error('bun is required to start the AionUi runtime (install: https://bun.sh)')
+    throw new Error('bun is required to start the HolySheep runtime (install: https://bun.sh)')
   }
 
   const child = spawn(bunPath, ['dist-server/server.mjs'], {

package/src/webui/aionui-wrapper.js

@@ -73,7 +73,7 @@ const AIONUI_COOKIE_TTL_MS = 10 * 60 * 1000
 
 function log(msg) {
   // eslint-disable-next-line no-console
-  console.log(`[aionui-wrapper] ${msg}`)
+  console.log(`[holysheep-web] ${msg}`)
 }
 
 function randomToken(bytes = 24) {
@@ -235,17 +235,17 @@ function aionuiInternalLoginWithApiKey({ internalPort, apiKey }) {
       res.on('data', (c) => { buf += c.toString() })
       res.on('end', () => {
         if (res.statusCode !== 200) {
-          return reject(new Error(`AionUi /login returned ${res.statusCode}: ${buf.slice(0, 200)}`))
+          return reject(new Error(`HolySheep runtime /login returned ${res.statusCode}: ${buf.slice(0, 200)}`))
         }
         const setCookie = res.headers['set-cookie']
         if (!setCookie || setCookie.length === 0) {
-          return reject(new Error('AionUi /login succeeded but no Set-Cookie header returned'))
+          return reject(new Error('HolySheep runtime /login succeeded but no Set-Cookie header returned'))
         }
         resolve(setCookie)
       })
     })
     req.on('error', reject)
-    req.setTimeout(15_000, () => { req.destroy(new Error('AionUi /login timed out')) })
+    req.setTimeout(15_000, () => { req.destroy(new Error('HolySheep runtime /login timed out')) })
     req.write(body)
     req.end()
   })
@@ -308,7 +308,7 @@ async function handleBootstrap(req, res, ctx) {
     })
     res.end()
   } catch (e) {
-    sendJson(res, 502, { success: false, message: `AionUi bridge login failed: ${e.message}` })
+    sendJson(res, 502, { success: false, message: `bridge login failed: ${e.message}` })
   }
 }
 
@@ -317,7 +317,7 @@ async function handleHolySheepStatus(req, res) {
   sendJson(res, 200, {
     loggedIn: !!apiKey,
     apiKeyMasked: apiKey ? `${apiKey.slice(0, 6)}...${apiKey.slice(-4)}` : null,
-    mode: 'aionui-wrapper',
+    mode: 'holysheep-webui',
     version: require('../../package.json').version,
   })
 }
@@ -380,8 +380,29 @@ function proxyHttp(req, res, internalPort) {
     req.pipe(upstream)
   }
 
-  // Client disconnect → kill upstream
-  req.on('close', () => { if (!upstream.destroyed) upstream.destroy() })
+  // Client disconnect → kill upstream.
+  //
+  // [HolySheep fork v2.1.32 / hs23] Root-cause fix for "Network error" on
+  // /login: Node's IncomingMessage (`req`) emits 'close' as soon as its
+  // Readable side is fully consumed — NOT when the TCP socket disconnects.
+  // For POST requests, req.pipe(upstream) drains the body and the very next
+  // tick `req` fires 'close', which here destroyed the upstream *before*
+  // Express on 9877 had a chance to respond → ECONNRESET → wrapper 502.
+  //
+  // The correct signal for "client disconnected" is `res.on('close')` +
+  // `res.writableFinished === false`. That only fires if the downstream
+  // client aborts before we've finished writing the response.
+  res.on('close', () => {
+    if (res.writableFinished) return
+    if (!upstream.destroyed) upstream.destroy()
+  })
+  upstream.on('close', () => {
+    // If upstream closes before we finished writing to `res` (e.g. upstream
+    // crash), make sure we don't leave the client hanging.
+    if (!res.writableFinished && !res.headersSent) {
+      try { res.writeHead(502, { 'Content-Type': 'text/plain' }); res.end('upstream closed') } catch {}
+    }
+  })
 }
 
 // ── WebSocket proxy (upgrade event) ──────────────────────────────────────────
@@ -586,7 +607,7 @@ async function startWrapper({ port, runtimeDir, runtimeVersion, runtimeSource, b
   // Detect if the vendored AionUi build natively speaks HolySheep auth.
   // Vendored v1.9.17 does; upstream AionUi releases do not (use username/password).
   const hsNative = detectHolySheepAionUi(runtimeDir)
-  log(`AionUi /login mode: ${hsNative ? 'holysheep-native (apiKey)' : 'legacy (username/password bridge)'}`)
+  log(`/login mode: ${hsNative ? 'holysheep-native (apiKey)' : 'legacy (username/password bridge)'}`)
 
   // If the build is legacy username/password, eager pre-flight the bridge cred
   // perms so a misconfigured file fails at boot rather than during a request.
@@ -595,7 +616,7 @@ async function startWrapper({ port, runtimeDir, runtimeVersion, runtimeSource, b
   }
 
   const internalPort = await pickInternalPort()
-  log(`internal AionUi port: ${internalPort}`)
+  log(`internal runtime port: ${internalPort}`)
 
   // Spawn AionUi, bound 127.0.0.1 only (ALLOW_REMOTE never set).
   // stdio is piped (not inherited) so that:
@@ -655,7 +676,7 @@ async function startWrapper({ port, runtimeDir, runtimeVersion, runtimeSource, b
   aionui.stdout.on('data', (d) => appendLog('out', d))
   aionui.stderr.on('data', (d) => appendLog('err', d))
   aionui.on('exit', (code) => {
-    log(`AionUi upstream exited (code=${code})`)
+    log(`runtime upstream exited (code=${code})`)
     process.exit(code || 1)
   })
 
@@ -671,7 +692,7 @@ async function startWrapper({ port, runtimeDir, runtimeVersion, runtimeSource, b
       : e.message
     throw new Error(msg)
   }
-  log(`AionUi upstream ready (version=${runtimeVersion}, source=${runtimeSource})`)
+  log(`runtime ready (version=${runtimeVersion}, source=${runtimeSource})`)
 
   const ctx = { internalPort, runtimeDir, runtimeVersion, runtimeSource, bunPath }
   const server = http.createServer(buildRouter(ctx))