@simonyea/holysheep-cli 1.7.116 → 1.7.118

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.116",
+  "version": "1.7.118",
   "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/webui/index.html

@@ -187,7 +187,7 @@ const I18N = {
     installSuccess: '安装完成', installFailed: '安装失败',
     needLogin: '请先登录', cleanDone: '已清理',
     hotReload: '已生效，无需重启', needRestart: '重启终端后生效',
-    launch: '启动命令', upgradeOne: '升级', open: '打开',
+    launch: '启动命令', upgradeOne: '升级', rollback: '回退版本', open: '打开',
     updateAvailable: '有新版本可用', updateNow: '立即升级',
   },
   en: {
@@ -210,7 +210,7 @@ const I18N = {
     installSuccess: 'Installed', installFailed: 'Install failed',
     needLogin: 'Please login first', cleanDone: 'Cleaned',
     hotReload: 'Active, no restart needed', needRestart: 'Restart terminal to apply',
-    launch: 'Launch', upgradeOne: 'Upgrade', open: 'Open',
+    launch: 'Launch', upgradeOne: 'Upgrade', rollback: 'Rollback', open: 'Open',
     updateAvailable: 'Update available', updateNow: 'Update now',
   },
 }
@@ -384,15 +384,17 @@ function renderToolCard(tool) {
     dotClass = 'dot-warn'
     statusBadges = `<span class="badge badge-ok">${t('installed')}</span> <span class="badge badge-warn">${t('notConfigured')}</span>`
     const upgradeBtn = tool.canUpgrade ? `<button class="btn btn-outline btn-sm" onclick="doUpgradeTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('upgradeOne')}</button>` : ''
-    actions = `<button class="btn btn-primary btn-sm" onclick="doConfigureTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('configure')}</button>${upgradeBtn}`
+    const rollbackBtn = tool.canUpgrade && tool.npmPkg ? `<button class="btn btn-outline btn-sm" onclick="doRollbackTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('rollback')}</button>` : ''
+    actions = `<button class="btn btn-primary btn-sm" onclick="doConfigureTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('configure')}</button>${upgradeBtn}${rollbackBtn}`
     hintLine = tool.version ? `<span class="mono" style="font-size:0.78rem;color:var(--text2)">${esc(tool.version)}</span>` : ''
   } else {
     dotClass = 'dot-ok'
     statusBadges = `<span class="badge badge-ok">${t('installed')}</span> <span class="badge badge-ok">${t('configured')}</span>`
     const upgradeBtn = tool.canUpgrade ? `<button class="btn btn-outline btn-sm" onclick="doUpgradeTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('upgradeOne')}</button>` : ''
+    const rollbackBtn = tool.canUpgrade && tool.npmPkg ? `<button class="btn btn-outline btn-sm" onclick="doRollbackTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('rollback')}</button>` : ''
     actions = `<button class="btn btn-primary btn-sm" onclick="doLaunchTool('${tool.id}')">${t('open')}</button>
       <button class="btn btn-outline btn-sm" onclick="doConfigureTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('reconfigure')}</button>
-      ${upgradeBtn}
+      ${upgradeBtn}${rollbackBtn}
       <button class="btn btn-danger btn-sm" onclick="doResetTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('reset')}</button>`
     hintLine = tool.version ? `<span class="mono" style="font-size:0.78rem;color:var(--text2)">${esc(tool.version)}</span>` : ''
   }
@@ -548,6 +550,28 @@ async function doUpgradeTool(id, name) {
   loadTools()
 }
 
+async function doRollbackTool(id, name) {
+  if (busy) return
+  if (!confirm(lang === 'zh' ? `确认回退 ${name} 到上一个版本？` : `Rollback ${name} to previous version?`)) return
+  busy = true
+  openConsole(`${t('rollback')}: ${name}`)
+  document.getElementById('console-section').classList.add('busy')
+
+  let success = false
+  await streamSSE('/api/tool/rollback', { toolId: id }, (ev) => {
+    if (ev.type === 'progress') appendLog(ev.message, 'info')
+    else if (ev.type === 'output') appendLogRaw(ev.text)
+    else if (ev.type === 'done') {
+      success = ev.success
+      appendLog(ev.success ? `\n✓ ${lang === 'zh' ? '回退成功' : 'Rollback succeeded'}` : `\n✗ ${lang === 'zh' ? '回退失败' : 'Rollback failed'}`, ev.success ? 'ok' : 'err')
+    }
+  })
+
+  document.getElementById('console-section').classList.remove('busy')
+  busy = false
+  loadTools()
+}
+
 // ── Console ──────────────────────────────────────────────────────────────────
 function openConsole(title) {
   const area = document.getElementById('console-section')

package/src/webui/server.js

@@ -310,6 +310,7 @@ async function handleTools(_req, res) {
       launchCmd: t.launchCmd || null,
       canAutoInstall: !!AUTO_INSTALL[t.id],
       canUpgrade: !!UPGRADABLE_TOOLS.find(u => u.id === t.id),
+      npmPkg: UPGRADABLE_TOOLS.find(u => u.id === t.id)?.npmPkg || null,
     }
   }))
 
@@ -502,12 +503,30 @@ async function handleUpgrade(_req, res) {
       newVer = m ? m[1] : null
     } catch {}
 
-    // OpenClaw 升级后自动重启 Bridge + Gateway
+    // OpenClaw 升级后：Gateway → 更新 PID → Bridge
     if (ok && tool.id === 'openclaw') {
       try { execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 }) } catch {}
+      try { execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 }) } catch {}
       const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+      try {
+        const gPort = openclawTool?.getGatewayPort?.() || 18789
+        let gPid = null
+        if (process.platform === 'win32') {
+          const o = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gPort} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+          gPid = Number(o.split(/\r?\n/)[0]) || null
+        } else {
+          const o = execSync(`lsof -iTCP:${gPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+          gPid = Number(o) || null
+        }
+        if (gPid) {
+          const bridgeMod = require('../tools/openclaw-bridge')
+          const bc = bridgeMod.readBridgeConfig()
+          bc.gatewayPid = gPid
+          bc.gatewayStartedAt = new Date().toISOString()
+          fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
+        }
+      } catch {}
       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 })
@@ -661,11 +680,37 @@ async function handleToolUpgrade(req, res) {
 
   if (ok) {
     sseEmit(res, { type: 'progress', message: `✓ ${entry.name} 升级成功: ${localVer || '?'} → ${newVer || 'latest'}` })
-    // OpenClaw 升级后自动重启 Bridge + Gateway
+    // OpenClaw 升级后：先停 → 启动 Gateway（拿 PID）→ 更新 bridge config → 启动 Bridge
     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 {}
+      try {
+        execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 })
+        sseEmit(res, { type: 'progress', message: '✓ OpenClaw Gateway 已启动' })
+      } catch {
+        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 启动失败' })
+      }
+      // 获取 Gateway PID 写入 bridge config
+      try {
+        const gatewayPort = openclawTool?.getGatewayPort?.() || 18789
+        let gatewayPid = null
+        if (process.platform === 'win32') {
+          const out = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gatewayPort} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+          gatewayPid = Number(out.split(/\r?\n/)[0]) || null
+        } else {
+          const out = execSync(`lsof -iTCP:${gatewayPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+          gatewayPid = Number(out) || null
+        }
+        if (gatewayPid) {
+          const bridgeMod = require('../tools/openclaw-bridge')
+          const bc = bridgeMod.readBridgeConfig()
+          bc.gatewayPid = gatewayPid
+          bc.gatewayStartedAt = new Date().toISOString()
+          fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
+        }
+      } catch {}
+      // 启动 Bridge
       if (openclawTool?.ensureBridgeRunning) {
         try {
           openclawTool.ensureBridgeRunning()
@@ -674,18 +719,164 @@ async function handleToolUpgrade(req, res) {
           sseEmit(res, { type: 'progress', message: '⚠️ Bridge 启动失败' })
         }
       }
+    }
+  } else {
+    sseEmit(res, { type: 'progress', message: `✗ ${entry.name} 升级失败` })
+  }
+
+  sseEmit(res, { type: 'done', success: ok, localVer, newVer })
+  res.end()
+}
+
+// ── Single-tool rollback (SSE) ────────────────────────────────────────────────
+
+async function handleToolRollback(req, res) {
+  const body = await parseBody(req)
+  const { toolId } = body
+  const entry = UPGRADABLE_TOOLS.find(t => t.id === toolId)
+  if (!entry || !entry.npmPkg) return json(res, { error: '不支持回退此工具（仅限 npm 工具）' }, 400)
+
+  sseStart(res)
+
+  // 1. 获取当前本地版本
+  let localVer = null
+  try {
+    const out = execSync(entry.versionCmd, { stdio: 'pipe', timeout: 10000 }).toString().trim()
+    const m = out.match(/(\d+\.\d+\.\d+[\w.-]*)/)
+    localVer = m ? m[1] : null
+  } catch {}
+  sseEmit(res, { type: 'progress', message: `${entry.name} 当前版本: ${localVer || '未知'}` })
+
+  // 2. 从 npm registry 获取版本列表，找到倒数第二个
+  let targetVer = null
+  try {
+    sseEmit(res, { type: 'progress', message: '正在查询可用版本...' })
+    const r = await fetchWithRetry(`https://registry.npmjs.org/${entry.npmPkg}`, {}, 2, 15000)
+    if (r.ok) {
+      const data = await r.json()
+      const versions = Object.keys(data.versions || {})
+        .filter(v => !v.includes('alpha') && !v.includes('beta') && !v.includes('rc') && !v.includes('canary'))
+      if (versions.length >= 2) {
+        // 找到当前版本的前一个，或者倒数第二个
+        const currentIdx = localVer ? versions.indexOf(localVer) : -1
+        if (currentIdx > 0) {
+          targetVer = versions[currentIdx - 1]
+        } else {
+          targetVer = versions[versions.length - 2]
+        }
+      }
+    }
+  } catch (e) {
+    sseEmit(res, { type: 'progress', message: `⚠️ 查询版本失败: ${e.message}` })
+  }
+
+  if (!targetVer) {
+    sseEmit(res, { type: 'progress', message: '✗ 无法确定回退版本' })
+    sseEmit(res, { type: 'done', success: false })
+    return res.end()
+  }
+
+  sseEmit(res, { type: 'progress', message: `回退目标: ${localVer || '?'} → ${targetVer}` })
+
+  // 3. Windows: kill 进程 + 停止 daemon
+  if (entry.id === 'openclaw') {
+    try { execSync('openclaw daemon stop', { stdio: 'ignore', timeout: 10000 }) } catch {}
+  }
+  if (process.platform === 'win32' && entry.command) {
+    try {
+      execSync(`taskkill /F /IM ${entry.command}.exe /T`, { stdio: 'ignore', shell: true })
+      sseEmit(res, { type: 'progress', message: `已关闭 ${entry.name} 进程` })
+    } catch {}
+  }
+
+  // 4. 清理残留: npm cache + 删除 node_modules 目录
+  sseEmit(res, { type: 'progress', message: '正在清理残留文件...' })
+  try { execSync('npm cache clean --force', { stdio: 'ignore', timeout: 30000 }) } catch {}
+  try { execSync(`npm uninstall -g ${entry.npmPkg}`, { stdio: 'ignore', timeout: 30000 }) } catch {}
+  // Windows 上 npm uninstall 可能残留文件
+  if (process.platform === 'win32') {
+    const globalPrefix = String(execSync('npm prefix -g', { stdio: 'pipe', timeout: 5000 })).trim()
+    const modulePath = path.join(globalPrefix, 'node_modules', ...entry.npmPkg.split('/'))
+    try {
+      if (fs.existsSync(modulePath)) {
+        execSync(`rd /s /q "${modulePath}"`, { stdio: 'ignore', shell: true, timeout: 10000 })
+        sseEmit(res, { type: 'progress', message: '已清理残留目录' })
+      }
+    } catch {}
+  }
+
+  // 5. 安装目标版本
+  sseEmit(res, { type: 'progress', message: `正在安装 ${entry.npmPkg}@${targetVer}...` })
+  const installCmd = `npm install -g ${entry.npmPkg}@${targetVer}`
+  const ok = await new Promise(resolve => {
+    const child = spawn(installCmd, [], { shell: true })
+    const timer = setTimeout(() => {
+      sseEmit(res, { type: 'progress', message: `⚠️ 安装超时` })
+      try { child.kill('SIGKILL') } catch {}
+      resolve(false)
+    }, 5 * 60 * 1000)
+    child.stdout?.on('data', chunk => sseEmit(res, { type: 'output', text: chunk.toString() }))
+    child.stderr?.on('data', chunk => sseEmit(res, { type: 'output', text: chunk.toString() }))
+    child.on('close', code => { clearTimeout(timer); resolve(code === 0) })
+    child.on('error', () => { clearTimeout(timer); resolve(false) })
+  })
+
+  // 6. 验证版本
+  let newVer = null
+  try {
+    const out = execSync(entry.versionCmd, { stdio: 'pipe', timeout: 10000 }).toString().trim()
+    const m = out.match(/(\d+\.\d+\.\d+[\w.-]*)/)
+    newVer = m ? m[1] : null
+  } catch {}
+
+  if (ok) {
+    sseEmit(res, { type: 'progress', message: `✓ ${entry.name} 已回退: ${localVer || '?'} → ${newVer || targetVer}` })
+    // OpenClaw: 先启动 Gateway（拿 PID），更新 bridge config，再启动 Bridge
+    if (entry.id === 'openclaw') {
+      sseEmit(res, { type: 'progress', message: '正在重启 OpenClaw...' })
+      // 1. 启动 Gateway
       try {
         execSync('openclaw daemon start', { stdio: 'ignore', timeout: 30000 })
-        sseEmit(res, { type: 'progress', message: '✓ OpenClaw Gateway 已重启' })
+        sseEmit(res, { type: 'progress', message: '✓ OpenClaw Gateway 已启动' })
       } catch {
-        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 重启失败，请手动运行: openclaw daemon start' })
+        sseEmit(res, { type: 'progress', message: '⚠️ Gateway 启动失败' })
+      }
+      // 2. 获取 Gateway PID 并写入 bridge config，否则 bridge watchdog 会自杀
+      const openclawTool = TOOLS.find(t => t.id === 'openclaw')
+      try {
+        const gatewayPort = openclawTool?.getGatewayPort?.() || 18789
+        let gatewayPid = null
+        if (process.platform === 'win32') {
+          const out = execSync(`powershell -NonInteractive -Command "(Get-NetTCPConnection -LocalPort ${gatewayPort} -State Listen -ErrorAction SilentlyContinue).OwningProcess"`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+          gatewayPid = Number(out.split(/\r?\n/)[0]) || null
+        } else {
+          const out = execSync(`lsof -iTCP:${gatewayPort} -sTCP:LISTEN -t 2>/dev/null | head -1`, { stdio: 'pipe', timeout: 5000 }).toString().trim()
+          gatewayPid = Number(out) || null
+        }
+        if (gatewayPid) {
+          const bridgeMod = require('../tools/openclaw-bridge')
+          const bc = bridgeMod.readBridgeConfig()
+          bc.gatewayPid = gatewayPid
+          bc.gatewayStartedAt = new Date().toISOString()
+          fs.writeFileSync(bridgeMod.BRIDGE_CONFIG_FILE, JSON.stringify(bc, null, 2), 'utf8')
+          sseEmit(res, { type: 'progress', message: `Gateway PID: ${gatewayPid}` })
+        }
+      } catch {}
+      // 3. 启动 Bridge
+      if (openclawTool?.ensureBridgeRunning) {
+        try {
+          openclawTool.ensureBridgeRunning()
+          sseEmit(res, { type: 'progress', message: '✓ HolySheep Bridge 已启动' })
+        } catch {
+          sseEmit(res, { type: 'progress', message: '⚠️ Bridge 启动失败' })
+        }
       }
     }
   } else {
-    sseEmit(res, { type: 'progress', message: `✗ ${entry.name} 升级失败` })
+    sseEmit(res, { type: 'progress', message: `✗ 回退失败，请手动运行: ${installCmd}` })
   }
 
-  sseEmit(res, { type: 'done', success: ok, localVer, newVer })
+  sseEmit(res, { type: 'done', success: ok, localVer, newVer: newVer || targetVer })
   res.end()
 }
 
@@ -866,6 +1057,7 @@ async function handleRequest(req, res) {
     if (route === '/api/tool/configure' && req.method === 'POST') return await handleToolConfigure(req, res)
     if (route === '/api/tool/reset'     && req.method === 'POST') return await handleToolReset(req, res)
     if (route === '/api/tool/upgrade'   && req.method === 'POST') return await handleToolUpgrade(req, res)
+    if (route === '/api/tool/rollback'  && req.method === 'POST') return await handleToolRollback(req, res)
     if (route === '/api/tool/launch'    && req.method === 'POST') return await handleToolLaunch(req, res)
     if (route === '/api/claude-proxy/start' && req.method === 'POST') return await handleClaudeProxyStart(req, res)
     if (route === '/api/claude-proxy/stop'  && req.method === 'POST') return await handleClaudeProxyStop(req, res)