@simonyea/holysheep-cli 1.7.93 → 1.7.94

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.93",
+  "version": "1.7.94",
   "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/openclaw.js

@@ -773,6 +773,27 @@ module.exports = {
   getConfigPath() { return CONFIG_FILE },
   getBridgePort() { return getConfiguredBridgePort() },
   getGatewayPort() { return getConfiguredGatewayPort() },
+  ensureBridgeRunning(port) {
+    port = port || getConfiguredBridgePort()
+    return startBridge(port)
+  },
+  ensureGatewayRunning(port) {
+    port = port || getConfiguredGatewayPort()
+    // 先检查是否已在运行
+    try {
+      execSync(
+        isWin
+          ? `powershell -NonInteractive -Command "try{(Invoke-WebRequest -Uri http://127.0.0.1:${port}/ -TimeoutSec 1 -UseBasicParsing).StatusCode}catch{exit 1}"`
+          : `curl -sf http://127.0.0.1:${port}/ -o /dev/null --max-time 1`,
+        { stdio: 'ignore', timeout: 3000 }
+      )
+      return true
+    } catch {}
+    // 未运行，启动它
+    const preferNpx = !hasOpenClawBinary()
+    const result = _startGateway(port, preferNpx, !preferNpx)
+    return result.ok
+  },
   getPrimaryModel() { return getConfiguredPrimaryModel() },
   getPrimaryModelRoute() { return getPrimaryModelRoute() },
   getPortListeners(port = getConfiguredGatewayPort()) { return listPortListeners(port) },

package/src/webui/server.js

@@ -654,10 +654,21 @@ async function handleToolLaunch(req, res) {
   const tool = TOOLS.find(t => t.id === toolId)
   if (!tool) return json(res, { error: '未知工具' }, 400)
 
-  // OpenClaw: 打开浏览器 dashboard 而非终端
+  // OpenClaw: 先启动 Bridge + Gateway，再打开浏览器
   if (toolId === 'openclaw') {
-    const port = tool.getGatewayPort?.() || 18789
-    const url = `http://127.0.0.1:${port}/`
+    const gatewayPort = tool.getGatewayPort?.() || 18789
+    const bridgePort  = tool.getBridgePort?.()  || 18788
+
+    // 确保 Bridge 在运行
+    const bridgeUp = tool.ensureBridgeRunning?.(bridgePort)
+    // 确保 Gateway 在运行
+    const gatewayUp = tool.ensureGatewayRunning?.(gatewayPort)
+
+    if (!gatewayUp) {
+      return json(res, { ok: false, error: 'Gateway 启动失败，请先运行 hs setup 配置 OpenClaw' }, 500)
+    }
+
+    const url = `http://127.0.0.1:${gatewayPort}/`
     if (process.platform === 'darwin') spawn('open', [url], { detached: true, stdio: 'ignore' }).unref()
     else if (process.platform === 'win32') spawn('cmd.exe', ['/c', 'start', '', url], { detached: true, stdio: 'ignore', shell: true }).unref()
     else spawn('xdg-open', [url], { detached: true, stdio: 'ignore' }).unref()