@simonyea/holysheep-cli 1.7.114 → 1.7.116

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.114",
+  "version": "1.7.116",
   "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/commands/claude-proxy.js

@@ -59,11 +59,12 @@ function isProcessAlive(pid) {
 
 function isProxyHealthy(port) {
   try {
+    // Windows: Invoke-WebRequest 遇到 500 会抛异常，改用 TCP 端口检查
     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, windowsHide: true }
+        ? `powershell -NonInteractive -Command "if(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue){exit 0}else{exit 1}"`
+        : `curl -so /dev/null --max-time 1 http://127.0.0.1:${port}/`,
+      { stdio: 'ignore', timeout: 5000, windowsHide: true }
     )
     return true
   } catch {

package/src/commands/setup.js

@@ -82,7 +82,7 @@ const AUTO_INSTALL = {
   'codex':       { cmd: 'npm install -g @openai/codex',             mgr: 'npm' },
   'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli',        mgr: 'npm' },
   'opencode':    { cmd: 'npm install -g opencode-ai',               mgr: 'npm' },
-  'openclaw':    { cmd: 'npm install -g openclaw@latest --ignore-scripts', mgr: 'npm' },
+  'openclaw':    { cmd: 'npm install -g openclaw@latest', mgr: 'npm' },
   'aider':       { cmd: 'pip install aider-chat',                   mgr: 'pip' },
 }
 

package/src/tools/openclaw.js

@@ -781,14 +781,12 @@ module.exports = {
   },
   ensureGatewayRunning(port) {
     port = port || getConfiguredGatewayPort()
-    // 先检查是否已在运行
+    // 检查端口是否有进程在监听（不依赖 HTTP 状态码，500 也算运行中）
     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 }
-      )
+      const checkCmd = isWin
+        ? `powershell -NonInteractive -Command "if(Get-NetTCPConnection -LocalPort ${port} -State Listen -ErrorAction SilentlyContinue){exit 0}else{exit 1}"`
+        : `curl -so /dev/null --max-time 1 http://127.0.0.1:${port}/ || lsof -iTCP:${port} -sTCP:LISTEN -t >/dev/null 2>&1`
+      execSync(checkCmd, { stdio: 'ignore', timeout: 5000 })
       return true
     } catch {}
     // 未运行，启动它

package/src/webui/server.js

@@ -120,7 +120,7 @@ const AUTO_INSTALL = {
   'codex':       { cmd: 'npm install -g @openai/codex' },
   'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli' },
   'opencode':    { cmd: 'npm install -g opencode-ai' },
-  'openclaw':    { cmd: 'npm install -g openclaw@latest --ignore-scripts' },
+  'openclaw':    { cmd: 'npm install -g openclaw@latest' },
   'aider':       { cmd: 'pip install aider-chat' },
 }
 
@@ -138,7 +138,7 @@ const UPGRADABLE_TOOLS = [
   { name: 'Codex CLI', id: 'codex', command: 'codex', versionCmd: 'codex --version', npmPkg: '@openai/codex', installCmd: 'npm install -g @openai/codex@latest' },
   { name: 'Droid CLI', id: 'droid', command: 'droid', versionCmd: 'droid --version', npmPkg: null, installCmd: process.platform === 'win32' ? 'winget upgrade --id Droid.Droid' : 'brew install --cask droid' },
   { name: 'OpenCode', id: 'opencode', command: 'opencode', versionCmd: 'opencode --version', npmPkg: 'opencode-ai', installCmd: 'npm install -g opencode-ai@latest' },
-  { name: 'OpenClaw', id: 'openclaw', command: 'openclaw', versionCmd: 'openclaw --version', npmPkg: 'openclaw', installCmd: 'npm install -g openclaw@latest --ignore-scripts' },
+  { name: 'OpenClaw', id: 'openclaw', command: 'openclaw', versionCmd: 'openclaw --version', npmPkg: 'openclaw', installCmd: 'npm install -g openclaw@latest' },
   { name: 'Gemini CLI', id: 'gemini-cli', command: 'gemini', versionCmd: 'gemini --version', npmPkg: '@google/gemini-cli', installCmd: 'npm install -g @google/gemini-cli@latest' },
 ]
 
@@ -502,6 +502,14 @@ async function handleUpgrade(_req, res) {
       newVer = m ? m[1] : null
     } catch {}
 
+    // OpenClaw 升级后自动重启 Bridge + Gateway
+    if (ok && tool.id === 'openclaw') {
+      try { execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 }) } catch {}
+      const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+      try { openclawTool?.ensureBridgeRunning?.() } catch {}
+      try { execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 }) } catch {}
+    }
+
     sseEmit(res, { type: 'tool', name: tool.name, status: ok ? 'ok' : 'error', localVer, newVer })
   }
 
@@ -653,6 +661,26 @@ async function handleToolUpgrade(req, res) {
 
   if (ok) {
     sseEmit(res, { type: 'progress', message: `✓ ${entry.name} 升级成功: ${localVer || '?'} → ${newVer || 'latest'}` })
+    // OpenClaw 升级后自动重启 Bridge + Gateway
+    if (entry.id === 'openclaw') {
+      const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+      sseEmit(res, { type: 'progress', message: '正在重启 OpenClaw...' })
+      try { execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 }) } catch {}
+      if (openclawTool?.ensureBridgeRunning) {
+        try {
+          openclawTool.ensureBridgeRunning()
+          sseEmit(res, { type: 'progress', message: '✓ HolySheep Bridge 已启动' })
+        } catch {
+          sseEmit(res, { type: 'progress', message: '⚠️ Bridge 启动失败' })
+        }
+      }
+      try {
+        execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 })
+        sseEmit(res, { type: 'progress', message: '✓ OpenClaw Gateway 已重启' })
+      } catch {
+        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 重启失败，请手动运行: openclaw daemon start' })
+      }
+    }
   } else {
     sseEmit(res, { type: 'progress', message: `✗ ${entry.name} 升级失败` })
   }