@simonyea/holysheep-cli 1.7.39 → 1.7.41

package/package.json

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

@@ -63,45 +63,47 @@ function killPortListeners(port) {
   return killed
 }
 
-// 在 bridge 启动前调用：清空 gatewayStartedAt，让 watchdog 以 bridgeStartedAt（进程刚启动）
-// 为基准，并把宽限期延长到 60s，确保 gateway 有足够时间启动。
-function prepareForRestart(gatewayPort) {
+function waitPortFree(port, maxTries, intervalMs) {
+  for (let i = 0; i < maxTries; i++) {
+    if (openclawTool.getPortListeners(port).length === 0) return true
+    const t0 = Date.now()
+    while (Date.now() - t0 < intervalMs) {}
+  }
+  return openclawTool.getPortListeners(port).length === 0
+}
+
+// 在 kill gateway 之前调用：禁用 watchdog，bridge 不会因 gateway 短暂下线而自杀
+function disableWatchdog() {
   const { BRIDGE_CONFIG_FILE } = require('../tools/openclaw-bridge')
   const fs = require('fs')
   try {
     const raw = JSON.parse(fs.readFileSync(BRIDGE_CONFIG_FILE, 'utf8'))
-    raw.gatewayStartedAt = null   // watchdog fallback 到 bridgeStartedAt（始终是刚启动的时间）
-    raw.gatewayPort = gatewayPort
     if (!raw.watchdog) raw.watchdog = {}
-    raw.watchdog.startupGraceMs = 60000  // 给 bridge+gateway 全套重启留出 60s
+    raw.watchdog.enabled = false
+    raw.gatewayPid = null  // 清旧 PID，防止 PID 检查误判
     fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
-  } catch {}
+  } catch (e) {
+    console.log(chalk.yellow(`  ⚠ 无法更新 Bridge 配置: ${e.message}`))
+  }
 }
 
-// 在 gateway 确认就绪后调用：写入真实 gatewayStartedAt，恢复正常 30s 宽限期。
+// 在 gateway 确认就绪后调用：重新启用 watchdog，写入真实 gatewayStartedAt
 function refreshGatewayStartedAt(gatewayPort) {
   const { BRIDGE_CONFIG_FILE } = require('../tools/openclaw-bridge')
   const fs = require('fs')
   try {
     const raw = JSON.parse(fs.readFileSync(BRIDGE_CONFIG_FILE, 'utf8'))
     raw.gatewayStartedAt = new Date().toISOString()
-    raw.gatewayPort = gatewayPort
     raw.gatewayPid = null
+    raw.gatewayPort = gatewayPort
     raw.gatewayLaunchMode = 'direct-process'
-    if (raw.watchdog) raw.watchdog.startupGraceMs = 30000
+    if (!raw.watchdog) raw.watchdog = {}
+    raw.watchdog.startupGraceMs = 30000
+    raw.watchdog.enabled = true  // gateway 已就绪，安全地重新启用 watchdog
     fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
   } catch {}
 }
 
-function waitPortFree(port, maxTries, intervalMs) {
-  for (let i = 0; i < maxTries; i++) {
-    if (openclawTool.getPortListeners(port).length === 0) return true
-    const t0 = Date.now()
-    while (Date.now() - t0 < intervalMs) {}
-  }
-  return openclawTool.getPortListeners(port).length === 0
-}
-
 function findChrome() {
   const { existsSync } = require('fs')
   if (process.platform === 'darwin') {
@@ -165,39 +167,34 @@ async function openclaw() {
   const bridgePort = openclawTool.getBridgePort()
   const gatewayPort = openclawTool.getGatewayPort()
 
-  // 在所有 spawn 之前写好 config：清空 gatewayStartedAt + 延长宽限期到 60s
-  // 这样新 bridge 的 watchdog 第一次 tick 读到的就是新鲜的基准时间，不会立即过期
-  prepareForRestart(gatewayPort)
+  // 先禁用 watchdog，防止后续 kill gateway 期间 bridge 误判自杀
+  disableWatchdog()
 
-  // 先杀掉旧 Bridge，再启动新的
-  const existingBridgeListeners = openclawTool.getPortListeners(bridgePort)
-  if (existingBridgeListeners.length > 0) {
-    process.stdout.write(chalk.gray(`  正在重启 Bridge (端口 ${bridgePort})... `))
-    killPortListeners(bridgePort)
-    waitPortFree(bridgePort, 10, 200)
+  // Bridge：只确保运行，不重启
+  if (checkBridgeHealth(bridgePort)) {
+    console.log(chalk.green(`✓ Bridge 已运行 (端口 ${bridgePort})`))
   } else {
     process.stdout.write(chalk.gray(`  正在启动 Bridge (端口 ${bridgePort})... `))
-  }
-
-  const scriptPath = path.join(__dirname, '..', 'index.js')
-  const spawnCmd = isWin ? 'node' : process.execPath
-  const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(bridgePort)], {
-    detached: true,
-    stdio: 'ignore',
-    windowsHide: true,
-  })
-  child.unref()
+    const scriptPath = path.join(__dirname, '..', 'index.js')
+    const spawnCmd = isWin ? 'node' : process.execPath
+    const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(bridgePort)], {
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true,
+    })
+    child.unref()
 
-  const bridgeReady = waitForPort(() => checkBridgeHealth(bridgePort), 10, 1000)
-  if (bridgeReady) {
-    console.log(chalk.green('✓'))
-  } else {
-    console.log(chalk.red('✗'))
-    console.log(chalk.red(`  Bridge 启动失败，请手动运行: hs openclaw-bridge --port ${bridgePort}`))
-    process.exit(1)
+    const bridgeReady = waitForPort(() => checkBridgeHealth(bridgePort), 10, 1000)
+    if (bridgeReady) {
+      console.log(chalk.green('✓'))
+    } else {
+      console.log(chalk.red('✗'))
+      console.log(chalk.red(`  Bridge 启动失败，请手动运行: hs openclaw-bridge --port ${bridgePort}`))
+      process.exit(1)
+    }
   }
 
-  // 先杀掉旧 Gateway，再启动新的（避免端口残留导致新进程无法绑定）
+  // Gateway：kill 旧的，直接 spawn 新的（明确 --port，避免 service 配置不一致）
   const existingGatewayListeners = openclawTool.getPortListeners(gatewayPort)
   if (existingGatewayListeners.length > 0) {
     process.stdout.write(chalk.gray(`  正在重启 Gateway (端口 ${gatewayPort})... `))
@@ -208,27 +205,17 @@ async function openclaw() {
   }
 
   const preferNpx = runtime.via === 'npx'
-  const gatewayStartArgs = preferNpx ? ['openclaw', 'gateway', 'start'] : ['gateway', 'start']
-  const gatewayStartCmd = preferNpx ? 'npx' : 'openclaw'
-  const serviceResult = spawnSync(gatewayStartCmd, gatewayStartArgs, {
+  const gatewayArgs = preferNpx
+    ? ['openclaw', 'gateway', '--port', String(gatewayPort)]
+    : ['gateway', '--port', String(gatewayPort)]
+  const gatewayCmd = preferNpx ? 'npx' : 'openclaw'
+  const gatewayChild = spawn(gatewayCmd, gatewayArgs, {
+    detached: true,
     stdio: 'ignore',
-    timeout: 10000,
     shell: isWin,
+    windowsHide: true,
   })
-
-  if (serviceResult.status !== 0) {
-    const directArgs = preferNpx
-      ? ['openclaw', 'gateway', '--port', String(gatewayPort)]
-      : ['gateway', '--port', String(gatewayPort)]
-    const directCmd = preferNpx ? 'npx' : 'openclaw'
-    const gatewayChild = spawn(directCmd, directArgs, {
-      detached: true,
-      stdio: 'ignore',
-      shell: isWin,
-      windowsHide: true,
-    })
-    gatewayChild.unref()
-  }
+  gatewayChild.unref()
 
   const gatewayReady = waitForPort(() => checkGatewayHealth(gatewayPort), 12, 1500)
   if (gatewayReady) {
@@ -238,14 +225,13 @@ async function openclaw() {
     console.log(chalk.yellow('  Gateway 未就绪，仍将尝试打开 Dashboard'))
   }
 
-  // 刷新 bridge config 中的 gatewayStartedAt，让 watchdog 宽限期从现在起算
+  // Gateway 就绪后重新启用 watchdog，写入真实 gatewayStartedAt
   refreshGatewayStartedAt(gatewayPort)
 
   // 获取 Dashboard URL
   const fallbackUrl = `http://127.0.0.1:${gatewayPort}/`
   let dashUrl = fallbackUrl
   try {
-    const preferNpx = runtime.via === 'npx'
     const dashArgs = preferNpx ? ['openclaw', 'dashboard', '--no-open'] : ['dashboard', '--no-open']
     const dashCmd = preferNpx ? 'npx' : 'openclaw'
     const result = spawnSync(dashCmd, dashArgs, {

package/src/tools/claude-code.js

@@ -75,7 +75,7 @@ module.exports = {
       bridge.processProxyPort
     )
   },
-  configure(apiKey, baseUrl) {
+  configure(apiKey, baseUrl, baseUrlOpenAI, primaryModel) {
     const bridgeConfig = buildBridgeConfig(apiKey, baseUrl, readConfig())
     writeConfig(bridgeConfig)
 
@@ -85,6 +85,7 @@ module.exports = {
     settings.env.ANTHROPIC_BASE_URL = BASE_URL_ANTHROPIC
     settings.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1'
     settings.env.HOLYSHEEP_CLAUDE_LAUNCHER = 'hs'
+    if (primaryModel) settings.model = primaryModel
     // 清理旧的同义字段
     delete settings.env.ANTHROPIC_API_KEY
     delete settings.env.HOLYSHEEP_CLAUDE_BRIDGE