@simonyea/holysheep-cli 1.7.13 → 1.7.15

package/README.md

@@ -76,6 +76,7 @@ You'll be prompted for your API Key (`cr_xxx`), then select the tools to configu
 
 > **Keep the gateway window open** while using OpenClaw. The gateway must be running for the browser UI to work.
 > If only `npx openclaw` is available, HolySheep will start Gateway as a direct process and will not install a persistent daemon from a temporary `npx` cache path.
+> HolySheep Bridge now watches the local OpenClaw Gateway and exits automatically if the Gateway stays unavailable, so it won't keep a blank browser shell alive after OpenClaw has stopped.
 
 > **OpenClaw itself requires Node.js 20+**. If setup fails, first check `node --version`.
 
@@ -164,6 +165,7 @@ hs setup
 
 > ⚠️ **保持 Gateway 窗口开启**，关闭后 Gateway 停止，浏览器界面无法使用。
 > 如果机器上只有 `npx openclaw`，HolySheep 会直接启动 Gateway 进程，不会把 daemon 安装到临时 `npx` 缓存路径上。
+> HolySheep Bridge 会持续检查本地 OpenClaw Gateway；如果 Gateway 持续不可用，Bridge 会自动退出，避免空白浏览器壳窗口一直残留。
 
 > ⚠️ **OpenClaw 自身要求 Node.js 20+**。如果配置失败，请先运行 `node --version` 检查版本。
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.13",
+  "version": "1.7.15",
   "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.",
   "keywords": [
     "openai-china",

package/src/tools/index.js

@@ -5,5 +5,6 @@ module.exports = [
   require('./claude-code'),
   require('./codex'),
   require('./droid'),
+  require('./opencode'),
   require('./openclaw'),
 ]

package/src/tools/openclaw-bridge.js

@@ -9,6 +9,10 @@ const fetch = global.fetch || require('node-fetch')
 
 const OPENCLAW_DIR = path.join(os.homedir(), '.openclaw')
 const BRIDGE_CONFIG_FILE = path.join(OPENCLAW_DIR, 'holysheep-bridge.json')
+const DEFAULT_WATCHDOG_INTERVAL_MS = 3000
+const DEFAULT_WATCHDOG_FAILURE_THRESHOLD = 3
+const DEFAULT_WATCHDOG_STARTUP_GRACE_MS = 30000
+const DEFAULT_WATCHDOG_REQUEST_TIMEOUT_MS = 1500
 
 function readBridgeConfig(configPath = BRIDGE_CONFIG_FILE) {
   return JSON.parse(fs.readFileSync(configPath, 'utf8'))
@@ -581,6 +585,93 @@ function buildModelsResponse(config) {
   }
 }
 
+function isProcessAlive(pid) {
+  if (!Number.isInteger(pid) || pid <= 0) return null
+  try {
+    process.kill(pid, 0)
+    return true
+  } catch (error) {
+    if (error && error.code === 'EPERM') return true
+    return false
+  }
+}
+
+async function checkGatewayHealth(config) {
+  const gatewayPort = Number(config.gatewayPort)
+  if (!Number.isInteger(gatewayPort) || gatewayPort <= 0) {
+    return { ok: true, reason: 'no_gateway_port' }
+  }
+
+  const gatewayPid = Number(config.gatewayPid)
+  const pidAlive = isProcessAlive(gatewayPid)
+  if (pidAlive === false) {
+    return { ok: false, reason: 'gateway_pid_exited' }
+  }
+
+  const host = config.gatewayHost || '127.0.0.1'
+  const timeout = Number(config.watchdog?.requestTimeoutMs) || DEFAULT_WATCHDOG_REQUEST_TIMEOUT_MS
+
+  try {
+    const response = await fetch(`http://${host}:${gatewayPort}/`, { method: 'GET', timeout })
+    return response.ok
+      ? { ok: true, reason: 'gateway_http_ok' }
+      : { ok: false, reason: `gateway_http_${response.status}` }
+  } catch {
+    return { ok: false, reason: 'gateway_http_unreachable' }
+  }
+}
+
+function stopBridge(server, reason) {
+  process.stdout.write(`HolySheep OpenClaw bridge stopping: ${reason}\n`)
+  server.close(() => process.exit(0))
+  setTimeout(() => process.exit(0), 250).unref()
+}
+
+function startGatewayWatchdog(server, configPath = BRIDGE_CONFIG_FILE) {
+  const bridgeStartedAt = Date.now()
+  let consecutiveFailures = 0
+  let stopping = false
+
+  const timer = setInterval(async () => {
+    if (stopping) return
+
+    let config
+    try {
+      config = readBridgeConfig(configPath)
+    } catch {
+      stopping = true
+      stopBridge(server, 'bridge config missing')
+      return
+    }
+
+    const watchdog = config.watchdog || {}
+    if (watchdog.enabled === false) return
+
+    const startupGraceMs = Number(watchdog.startupGraceMs) || DEFAULT_WATCHDOG_STARTUP_GRACE_MS
+    const failureThreshold = Number(watchdog.failureThreshold) || DEFAULT_WATCHDOG_FAILURE_THRESHOLD
+    const health = await checkGatewayHealth(config)
+
+    if (health.ok) {
+      consecutiveFailures = 0
+      return
+    }
+
+    const gatewayStartedAt = Date.parse(config.gatewayStartedAt || '') || bridgeStartedAt
+    if (Date.now() - gatewayStartedAt < startupGraceMs) {
+      return
+    }
+
+    consecutiveFailures += 1
+    if (consecutiveFailures < failureThreshold) return
+
+    stopping = true
+    stopBridge(server, `OpenClaw Gateway unavailable (${health.reason})`)
+  }, DEFAULT_WATCHDOG_INTERVAL_MS)
+
+  timer.unref()
+  server.on('close', () => clearInterval(timer))
+}
+
 function createBridgeServer(configPath = BRIDGE_CONFIG_FILE) {
   return http.createServer(async (req, res) => {
     if (req.method === 'OPTIONS') {
@@ -627,6 +718,7 @@ function startBridge(args = parseArgs(process.argv.slice(2))) {
   server.listen(port, host, () => {
     process.stdout.write(`HolySheep OpenClaw bridge listening on http://${host}:${port}\n`)
   })
+  startGatewayWatchdog(server, args.config)
 
   return server
 }

package/src/tools/openclaw.js

@@ -163,6 +163,14 @@ function writeBridgeConfig(data) {
   fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8')
 }
 
+function updateBridgeConfig(patch) {
+  const current = readBridgeConfig()
+  writeBridgeConfig({
+    ...current,
+    ...patch,
+  })
+}
+
 function getConfiguredBridgePort(config = readBridgeConfig()) {
   const port = Number(config?.port)
   return Number.isInteger(port) && port > 0 ? port : DEFAULT_BRIDGE_PORT
@@ -495,13 +503,15 @@ function _startGateway(port, preferNpx = false, preferService = true) {
     ? runOpenClaw(['gateway', 'start'], { preferNpx, timeout: 20000 })
     : { status: 1 }
 
+  let directChild = null
+
   if (serviceResult.status !== 0) {
-    const child = spawnOpenClaw(['gateway', '--port', String(port)], {
+    directChild = spawnOpenClaw(['gateway', '--port', String(port)], {
       preferNpx,
       detached: true,
       stdio: 'ignore',
     })
-    child.unref()
+    directChild.unref()
   }
 
   for (let i = 0; i < 8; i++) {
@@ -515,11 +525,19 @@ function _startGateway(port, preferNpx = false, preferService = true) {
           : `curl -sf http://127.0.0.1:${port}/ -o /dev/null --max-time 1`,
         { stdio: 'ignore', timeout: 3000 }
       )
-      return true
+      return {
+        ok: true,
+        pid: directChild?.pid || null,
+        mode: directChild ? 'direct-process' : 'daemon',
+      }
     } catch {}
   }
 
-  return false
+  return {
+    ok: false,
+    pid: directChild?.pid || null,
+    mode: directChild ? 'direct-process' : 'daemon',
+  }
 }
 
 function getDashboardUrl(port, preferNpx = false) {
@@ -572,6 +590,12 @@ module.exports = {
     }
 
     const resolvedPrimaryModel = pickPrimaryModel(primaryModel, selectedModels)
+    const gatewayPort = findAvailableGatewayPort(DEFAULT_GATEWAY_PORT)
+    if (!gatewayPort) {
+      throw new Error(`找不到可用端口（已检查 ${DEFAULT_GATEWAY_PORT}-${DEFAULT_GATEWAY_PORT + MAX_PORT_SCAN - 1}）`)
+    }
+    this._lastGatewayPort = gatewayPort
+
     const bridgePort = findAvailableGatewayPort(DEFAULT_BRIDGE_PORT)
     if (!bridgePort) {
       throw new Error(`找不到可用桥接端口（已检查 ${DEFAULT_BRIDGE_PORT}-${DEFAULT_BRIDGE_PORT + MAX_PORT_SCAN - 1}）`)
@@ -580,10 +604,22 @@ module.exports = {
 
     writeBridgeConfig({
       port: bridgePort,
+      host: '127.0.0.1',
       apiKey,
       baseUrlAnthropic,
       baseUrlOpenAI,
       models: normalizeRequestedModels(selectedModels),
+      gatewayPort,
+      gatewayHost: '127.0.0.1',
+      gatewayPid: null,
+      gatewayLaunchMode: null,
+      watchdog: {
+        enabled: true,
+        intervalMs: 3000,
+        failureThreshold: 3,
+        startupGraceMs: 30000,
+        requestTimeoutMs: 1500,
+      },
     })
 
     console.log(chalk.gray('  → 正在启动 HolySheep Bridge...'))
@@ -594,12 +630,6 @@ module.exports = {
 
     runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
 
-    const gatewayPort = findAvailableGatewayPort(DEFAULT_GATEWAY_PORT)
-    if (!gatewayPort) {
-      throw new Error(`找不到可用端口（已检查 ${DEFAULT_GATEWAY_PORT}-${DEFAULT_GATEWAY_PORT + MAX_PORT_SCAN - 1}）`)
-    }
-    this._lastGatewayPort = gatewayPort
-
     if (gatewayPort !== DEFAULT_GATEWAY_PORT) {
       console.log(chalk.yellow(`  ⚠️  端口 ${DEFAULT_GATEWAY_PORT} 已占用，自动切换到 ${gatewayPort}`))
       const listeners = listPortListeners(DEFAULT_GATEWAY_PORT)
@@ -649,21 +679,28 @@ module.exports = {
     }
 
     console.log(chalk.gray('  → 正在启动 Gateway...'))
-    const ok = _startGateway(gatewayPort, runtime.via === 'npx', serviceReady)
+    const gatewayState = _startGateway(gatewayPort, runtime.via === 'npx', serviceReady)
+    updateBridgeConfig({
+      gatewayPort,
+      gatewayPid: gatewayState.pid,
+      gatewayLaunchMode: gatewayState.mode,
+      gatewayStartedAt: new Date().toISOString(),
+    })
 
-    if (ok) {
+    if (gatewayState.ok) {
       console.log(chalk.green('  ✓ OpenClaw Gateway 已启动'))
     } else {
       console.log(chalk.yellow('  ⚠️  Gateway 未就绪；当前不要打开 about:blank 或裸浏览器壳窗口'))
     }
 
-    const dashUrl = ok ? getDashboardUrl(gatewayPort, runtime.via === 'npx') : getDashboardUrlForPort(gatewayPort)
+    const dashUrl = gatewayState.ok ? getDashboardUrl(gatewayPort, runtime.via === 'npx') : getDashboardUrlForPort(gatewayPort)
     console.log(chalk.cyan('\n  → 浏览器打开（推荐使用此地址）:'))
     console.log(chalk.bold.cyan(`     ${dashUrl}`))
     console.log(chalk.gray(`     Bridge 地址: ${bridgeBaseUrl}`))
     console.log(chalk.gray(`     默认模型: ${plan.primaryRef || OPENCLAW_DEFAULT_MODEL}`))
-    console.log(chalk.gray(`     Gateway 启动方式: ${serviceReady ? 'daemon' : 'direct process'}`))
+    console.log(chalk.gray(`     Gateway 启动方式: ${gatewayState.mode}`))
     console.log(chalk.gray('     浏览器应直接打开 dashboard URL，不应停在 about:blank'))
+    console.log(chalk.gray('     Bridge 会在检测到 OpenClaw Gateway 持续不可用后自动退出'))
     console.log(chalk.gray('     如在 Windows 上打开裸 http://127.0.0.1:PORT/ 仍报 Unauthorized，请使用上面的 dashboard 地址'))
 
     return {
@@ -671,8 +708,8 @@ module.exports = {
       hot: false,
       dashboardUrl: dashUrl,
       gatewayPort,
-      gatewayReady: ok,
-      gatewayLaunchMode: serviceReady ? 'daemon' : 'direct-process',
+      gatewayReady: gatewayState.ok,
+      gatewayLaunchMode: gatewayState.mode,
       launchCmd: getLaunchCommand(gatewayPort),
     }
   },