@simonyea/holysheep-cli 1.7.38 → 1.7.39

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.38",
+  "version": "1.7.39",
   "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,6 +63,22 @@ function killPortListeners(port) {
   return killed
 }
 
+// 在 bridge 启动前调用：清空 gatewayStartedAt，让 watchdog 以 bridgeStartedAt（进程刚启动）
+// 为基准，并把宽限期延长到 60s，确保 gateway 有足够时间启动。
+function prepareForRestart(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 = null   // watchdog fallback 到 bridgeStartedAt（始终是刚启动的时间）
+    raw.gatewayPort = gatewayPort
+    if (!raw.watchdog) raw.watchdog = {}
+    raw.watchdog.startupGraceMs = 60000  // 给 bridge+gateway 全套重启留出 60s
+    fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
+  } catch {}
+}
+
+// 在 gateway 确认就绪后调用：写入真实 gatewayStartedAt，恢复正常 30s 宽限期。
 function refreshGatewayStartedAt(gatewayPort) {
   const { BRIDGE_CONFIG_FILE } = require('../tools/openclaw-bridge')
   const fs = require('fs')
@@ -72,6 +88,7 @@ function refreshGatewayStartedAt(gatewayPort) {
     raw.gatewayPort = gatewayPort
     raw.gatewayPid = null
     raw.gatewayLaunchMode = 'direct-process'
+    if (raw.watchdog) raw.watchdog.startupGraceMs = 30000
     fs.writeFileSync(BRIDGE_CONFIG_FILE, JSON.stringify(raw, null, 2), 'utf8')
   } catch {}
 }
@@ -148,6 +165,10 @@ async function openclaw() {
   const bridgePort = openclawTool.getBridgePort()
   const gatewayPort = openclawTool.getGatewayPort()
 
+  // 在所有 spawn 之前写好 config：清空 gatewayStartedAt + 延长宽限期到 60s
+  // 这样新 bridge 的 watchdog 第一次 tick 读到的就是新鲜的基准时间，不会立即过期
+  prepareForRestart(gatewayPort)
+
   // 先杀掉旧 Bridge，再启动新的
   const existingBridgeListeners = openclawTool.getPortListeners(bridgePort)
   if (existingBridgeListeners.length > 0) {