@simonyea/holysheep-cli 1.7.58 → 1.7.60

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.58",
+  "version": "1.7.60",
   "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

@@ -199,6 +199,21 @@ function waitForBridge(port) {
   return false
 }
 
+function stopBridge() {
+  // 杀掉所有已有的 bridge 进程，避免重新配置时端口冲突
+  try {
+    if (isWin) {
+      execSync('taskkill /F /FI "WINDOWTITLE eq openclaw-bridge*" 2>nul', { shell: true, stdio: 'ignore' })
+      // 按命令行匹配
+      const out = execSync('wmic process where "commandline like \'%openclaw-bridge%\'" get processid', { shell: true, stdio: 'pipe', encoding: 'utf8' })
+      const pids = out.match(/\d+/g)
+      if (pids) pids.forEach(pid => { try { execSync(`taskkill /F /PID ${pid}`, { stdio: 'ignore' }) } catch {} })
+    } else {
+      execSync("pkill -f 'openclaw-bridge' 2>/dev/null || true", { shell: true, stdio: 'ignore' })
+    }
+  } catch {}
+}
+
 function startBridge(port) {
   if (waitForBridge(port)) return true
 
@@ -611,6 +626,14 @@ module.exports = {
     this._lastRuntimeCommand = runtime.command
     this._lastRuntimeVia = runtime.via
 
+    // 重新配置前先停掉旧的 Bridge 和 Gateway，释放端口
+    console.log(chalk.gray('  → 停止旧的 Bridge 和 Gateway...'))
+    stopBridge()
+    runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
+    // 等端口释放
+    const t0 = Date.now()
+    while (Date.now() - t0 < 1000) {}
+
     if (runtime.via === 'npx' && removeBrokenLaunchAgent()) {
       console.log(chalk.gray('  → 已清理旧的 OpenClaw 守护进程配置（失效的 npx 缓存路径）'))
     }
@@ -654,8 +677,6 @@ module.exports = {
     }
     const bridgeBaseUrl = getBridgeBaseUrl(bridgePort)
 
-    runOpenClaw(['gateway', 'stop'], { preferNpx: runtime.via === 'npx' })
-
     if (gatewayPort !== DEFAULT_GATEWAY_PORT) {
       console.log(chalk.yellow(`  ⚠️  端口 ${DEFAULT_GATEWAY_PORT} 已占用，自动切换到 ${gatewayPort}`))
       const listeners = listPortListeners(DEFAULT_GATEWAY_PORT)

package/src/webui/index.html

@@ -129,6 +129,9 @@ a:hover { text-decoration: underline; }
 .footer-links { display: flex; gap: 16px; justify-content: center; flex-wrap: wrap; font-size: 0.85rem; margin-bottom: 8px; }
 .footer-sub { font-size: 0.78rem; color: var(--text2); }
 
+/* Update banner */
+.update-banner { background: var(--primary-dim); border: 1px solid var(--primary); border-radius: 8px; padding: 10px 16px; margin-bottom: 16px; display: flex; align-items: center; justify-content: space-between; font-size: 0.85rem; }
+
 /* Misc */
 .loading { color: var(--text2); font-size: 0.85rem; }
 .hidden { display: none !important; }
@@ -184,7 +187,8 @@ const I18N = {
     installSuccess: '安装完成', installFailed: '安装失败',
     needLogin: '请先登录', cleanDone: '已清理',
     hotReload: '已生效，无需重启', needRestart: '重启终端后生效',
-    launch: '启动命令',
+    launch: '启动命令', upgradeOne: '升级',
+    updateAvailable: '有新版本可用', updateNow: '立即升级',
   },
   en: {
     loggedIn: 'Logged in', notLoggedIn: 'Not logged in', login: 'Login', logout: 'Logout',
@@ -206,7 +210,8 @@ 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',
+    launch: 'Launch', upgradeOne: 'Upgrade',
+    updateAvailable: 'Update available', updateNow: 'Update now',
   },
 }
 
@@ -251,6 +256,11 @@ async function loadAccount() {
 
   document.getElementById('version').textContent = 'v' + (s.version || '')
 
+  // 版本更新提示
+  if (s.updateAvailable) {
+    document.getElementById('version').innerHTML = `v${s.version} <span style="color:var(--primary);cursor:pointer" onclick="doUpgradeTool('holysheep','HolySheep CLI')" title="${t('updateNow')}">→ v${s.updateAvailable} ${t('updateNow')}</span>`
+  }
+
   if (s.loggedIn) {
     const hasBalance = !b.error && typeof b.balance === 'number'
     el.innerHTML = `<div class="card account-card account-logged-in">
@@ -333,12 +343,15 @@ function renderToolCard(tool) {
   } else if (!tool.configured) {
     dotClass = 'dot-warn'
     statusBadges = `<span class="badge badge-ok">${t('installed')}</span> <span class="badge badge-warn">${t('notConfigured')}</span>`
-    actions = `<button class="btn btn-primary btn-sm" onclick="doConfigureTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('configure')}</button>`
+    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}`
     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>` : ''
     actions = `<button class="btn btn-outline btn-sm" onclick="doConfigureTool('${tool.id}','${esc(tool.name)}')" ${busy ? 'disabled' : ''}>${t('reconfigure')}</button>
+      ${upgradeBtn}
       <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>` : ''
   }
@@ -445,6 +458,25 @@ async function doUpgrade() {
   loadTools()
 }
 
+async function doUpgradeTool(id, name) {
+  if (busy) return
+  busy = true
+  openConsole(`${t('upgradeOne')}: ${name}`)
+  document.getElementById('console-section').classList.add('busy')
+
+  await streamSSE('/api/tool/upgrade', { toolId: id }, (ev) => {
+    if (ev.type === 'progress') appendLog(ev.message, 'info')
+    else if (ev.type === 'output') appendLogRaw(ev.text)
+    else if (ev.type === 'done') {
+      appendLog(ev.success ? `\n✓ ${t('configSuccess')}` : `\n✗ ${t('configFailed')}`, 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

@@ -96,6 +96,7 @@ const AUTO_INSTALL = {
 // ── UPGRADABLE_TOOLS (from upgrade.js) ───────────────────────────────────────
 
 const UPGRADABLE_TOOLS = [
+  { name: 'HolySheep CLI', id: 'holysheep', command: 'hs', versionCmd: 'hs --version', npmPkg: '@simonyea/holysheep-cli', installCmd: 'npm install -g @simonyea/holysheep-cli@latest' },
   {
     name: 'Claude Code', id: 'claude-code', command: 'claude',
     versionCmd: 'claude --version', npmPkg: null,
@@ -104,19 +105,49 @@ const UPGRADABLE_TOOLS = [
       : 'curl -fsSL https://claude.ai/install.sh | bash',
   },
   { 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: '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: 'Gemini CLI', id: 'gemini-cli', command: 'gemini', versionCmd: 'gemini --version', npmPkg: '@google/gemini-cli', installCmd: 'npm install -g @google/gemini-cli@latest' },
 ]
 
+// ── Update check (cached, refreshes every 30min) ────────────────────────────
+
+let _latestVersion = null
+let _lastCheckTime = 0
+const UPDATE_CHECK_INTERVAL = 30 * 60 * 1000
+
+async function checkLatestVersion() {
+  const now = Date.now()
+  if (_latestVersion && now - _lastCheckTime < UPDATE_CHECK_INTERVAL) return _latestVersion
+  try {
+    const fetch = require('node-fetch')
+    const r = await fetch('https://registry.npmjs.org/@simonyea/holysheep-cli/latest', { timeout: 5000 })
+    if (r.ok) {
+      const data = await r.json()
+      _latestVersion = data.version || null
+      _lastCheckTime = now
+    }
+  } catch {}
+  return _latestVersion
+}
+
+// 启动时立即检查一次
+checkLatestVersion()
+
 // ── API Handlers ─────────────────────────────────────────────────────────────
 
 async function handleStatus(_req, res) {
   const apiKey = getApiKey()
   const config = loadConfig()
+  const latest = await checkLatestVersion()
   json(res, {
     loggedIn: !!apiKey,
     apiKey: apiKey ? maskKey(apiKey) : null,
     savedAt: config.savedAt || null,
     version: pkg.version,
+    latestVersion: latest || null,
+    updateAvailable: latest && latest !== pkg.version ? latest : null,
   })
 }
 
@@ -243,6 +274,7 @@ async function handleTools(_req, res) {
       hint: t.hint || null,
       launchCmd: t.launchCmd || null,
       canAutoInstall: !!AUTO_INSTALL[t.id],
+      canUpgrade: !!UPGRADABLE_TOOLS.find(u => u.id === t.id),
     }
   })
   json(res, tools)
@@ -466,11 +498,10 @@ async function handleToolConfigure(req, res) {
 
   const allModelIds = [
     'gpt-5.4', 'gpt-5.3-codex-spark',
-    'claude-sonnet-4-6', 'claude-sonnet-4-6[1m]',
-    'claude-opus-4-6', 'claude-opus-4-6[1m]',
+    'claude-sonnet-4-6', 'claude-opus-4-6',
     'MiniMax-M2.7-highspeed', 'claude-haiku-4-5',
   ]
-  const primaryModel = toolId === 'openclaw' ? 'claude-sonnet-4-6[1m]' : 'claude-sonnet-4-6'
+  const primaryModel = 'claude-sonnet-4-6'
 
   sseEmit(res, { type: 'progress', message: `正在配置 ${tool.name}...` })
 
@@ -510,6 +541,51 @@ async function handleToolConfigure(req, res) {
   })
 }
 
+// ── Single-tool upgrade (SSE) ────────────────────────────────────────────────
+
+async function handleToolUpgrade(req, res) {
+  const body = await parseBody(req)
+  const { toolId } = body
+  const entry = UPGRADABLE_TOOLS.find(t => t.id === toolId)
+  if (!entry) return json(res, { error: '不支持升级此工具' }, 400)
+
+  sseStart(res)
+
+  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] : out.split('\n')[0].slice(0, 30)
+  } catch {}
+
+  sseEmit(res, { type: 'progress', message: `${entry.name} 当前版本: ${localVer || '未知'}` })
+  sseEmit(res, { type: 'progress', message: `正在升级 ${entry.name}...` })
+
+  const ok = await new Promise(resolve => {
+    const child = spawn(entry.installCmd, [], { shell: true })
+    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 => resolve(code === 0))
+    child.on('error', () => resolve(false))
+  })
+
+  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 || 'latest'}` })
+  } else {
+    sseEmit(res, { type: 'progress', message: `✗ ${entry.name} 升级失败` })
+  }
+
+  sseEmit(res, { type: 'done', success: ok, localVer, newVer })
+  res.end()
+}
+
 // ── Single-tool reset ────────────────────────────────────────────────────────
 
 async function handleToolReset(req, res) {
@@ -605,6 +681,7 @@ async function handleRequest(req, res) {
     if (route === '/api/tool/install'   && req.method === 'POST') return await handleToolInstall(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/env'       && req.method === 'GET')  return handleEnv(req, res)
     if (route === '/api/env/clean' && req.method === 'POST') return handleEnvClean(req, res)