@simonyea/holysheep-cli 1.7.66 → 1.7.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.66",
+  "version": "1.7.68",
   "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: '升级',
+    launch: '启动命令', upgradeOne: '升级', 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',
+    launch: 'Launch', upgradeOne: 'Upgrade', open: 'Open',
     updateAvailable: 'Update available', updateNow: 'Update now',
   },
 }
@@ -365,7 +365,8 @@ function renderToolCard(tool) {
     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>
+    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}
       <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>` : ''
@@ -423,6 +424,12 @@ async function doConfigureTool(id, name) {
   loadTools()
 }
 
+async function doLaunchTool(id) {
+  try {
+    await api('tool/launch', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ toolId: id }) })
+  } catch {}
+}
+
 async function doResetTool(id, name) {
   if (!confirm(t('confirmReset'))) return
   try {

package/src/webui/server.js

@@ -26,15 +26,20 @@ function maskKey(key) {
   return key.slice(0, 6) + '...' + key.slice(-4)
 }
 
-async function fetchWithRetry(url, opts = {}, retries = 3) {
+async function fetchWithRetry(url, opts = {}, retries = 3, timeoutMs = 20000) {
   const fetch = require('node-fetch')
   for (let i = 0; i < retries; i++) {
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), timeoutMs)
     try {
-      return await fetch(url, { timeout: 10000, ...opts })
+      const res = await fetch(url, { ...opts, signal: controller.signal })
+      clearTimeout(timer)
+      return res
     } catch (e) {
-      // DNS 暂时失败 (EAI_AGAIN) 或网络抖动，重试
-      if (i < retries - 1 && (e.code === 'EAI_AGAIN' || e.code === 'ETIMEDOUT' || e.code === 'ECONNRESET' || e.type === 'system')) {
-        await new Promise(r => setTimeout(r, 1500 * (i + 1)))
+      clearTimeout(timer)
+      const retryable = e.code === 'EAI_AGAIN' || e.code === 'ETIMEDOUT' || e.code === 'ECONNRESET' || e.code === 'ECONNREFUSED' || e.type === 'system' || e.name === 'AbortError'
+      if (i < retries - 1 && retryable) {
+        await new Promise(r => setTimeout(r, 2000 * (i + 1)))
         continue
       }
       throw e
@@ -615,6 +620,43 @@ async function handleToolReset(req, res) {
   }
 }
 
+// ── Launch tool in new terminal ───────────────────────────────────────────────
+
+async function handleToolLaunch(req, res) {
+  const body = await parseBody(req)
+  const { toolId } = body
+  const tool = TOOLS.find(t => t.id === toolId)
+  if (!tool) return json(res, { error: '未知工具' }, 400)
+
+  // OpenClaw: 打开浏览器 dashboard 而非终端
+  if (toolId === 'openclaw') {
+    const port = tool.getGatewayPort?.() || 18789
+    const url = `http://127.0.0.1:${port}/`
+    if (process.platform === 'darwin') spawn('open', [url], { detached: true, stdio: 'ignore' }).unref()
+    else if (process.platform === 'win32') spawn('cmd.exe', ['/c', 'start', '', url], { detached: true, stdio: 'ignore', shell: true }).unref()
+    else spawn('xdg-open', [url], { detached: true, stdio: 'ignore' }).unref()
+    return json(res, { ok: true, type: 'browser', url })
+  }
+
+  const cmd = tool.launchCmd
+  if (!cmd) return json(res, { error: '无启动命令' }, 400)
+
+  if (process.platform === 'darwin') {
+    spawn('osascript', ['-e', `tell app "Terminal" to do script "${cmd.replace(/"/g, '\\"')}"`], { detached: true, stdio: 'ignore' }).unref()
+  } else if (process.platform === 'win32') {
+    spawn('cmd.exe', ['/c', 'start', 'cmd.exe', '/k', cmd], { detached: true, stdio: 'ignore', shell: true }).unref()
+  } else {
+    const terms = ['x-terminal-emulator', 'gnome-terminal', 'xterm']
+    for (const term of terms) {
+      if (commandExists(term)) {
+        spawn(term, ['-e', cmd], { detached: true, stdio: 'ignore' }).unref()
+        break
+      }
+    }
+  }
+  json(res, { ok: true, type: 'terminal', cmd })
+}
+
 // ── Environment variables ────────────────────────────────────────────────────
 
 const HS_ENV_KEYS = ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL']
@@ -696,6 +738,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/launch'    && req.method === 'POST') return await handleToolLaunch(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)
     if (route === '/api/restart' && req.method === 'POST') {