@simonyea/holysheep-cli 1.7.54 → 1.7.56

package/src/webui/server.js

@@ -9,7 +9,7 @@ const fs = require('fs')
 const path = require('path')
 const { execSync, spawn } = require('child_process')
 const { loadConfig, saveConfig, getApiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, BASE_URL_CLAUDE_RELAY, SHOP_URL, CONFIG_FILE } = require('../utils/config')
-const { removeEnvFromShell } = require('../utils/shell')
+const { removeEnvFromShell, writeEnvToShell, getShellRcFiles } = require('../utils/shell')
 const { commandExists } = require('../utils/which')
 const TOOLS = require('../tools')
 const pkg = require('../../package.json')
@@ -441,6 +441,122 @@ async function handleToolInstall(req, res) {
   res.end()
 }
 
+// ── Single-tool configure (SSE) ──────────────────────────────────────────────
+
+async function handleToolConfigure(req, res) {
+  const body = await parseBody(req)
+  const { toolId } = body
+  const apiKey = getApiKey()
+  if (!apiKey) return json(res, { error: '未登录' }, 401)
+
+  const tool = TOOLS.find(t => t.id === toolId)
+  if (!tool) return json(res, { error: '未知工具' }, 400)
+
+  sseStart(res)
+
+  if (!tool.checkInstalled()) {
+    sseEmit(res, { type: 'error', message: `${tool.name} 未安装` })
+    sseEmit(res, { type: 'done', success: false })
+    return res.end()
+  }
+
+  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]',
+    'MiniMax-M2.7-highspeed', 'claude-haiku-4-5',
+  ]
+  const primaryModel = toolId === 'openclaw' ? 'claude-sonnet-4-6[1m]' : 'claude-sonnet-4-6'
+
+  sseEmit(res, { type: 'progress', message: `正在配置 ${tool.name}...` })
+
+  // 劫持 console.log/warn，将 tool.configure() 内部的进度消息转发为 SSE 事件
+  const origLog = console.log
+  const origWarn = console.warn
+  console.log = (...args) => {
+    const msg = args.map(a => typeof a === 'string' ? a : String(a)).join(' ')
+    const clean = msg.replace(/\x1b\[[0-9;]*m/g, '').trim()
+    if (clean) sseEmit(res, { type: 'progress', message: clean })
+  }
+  console.warn = console.log
+
+  try {
+    const result = tool.configure(apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, primaryModel, allModelIds)
+
+    if (result.envVars && Object.keys(result.envVars).length > 0) {
+      writeEnvToShell(result.envVars)
+      sseEmit(res, { type: 'progress', message: '已写入环境变量到 shell 配置' })
+    }
+
+    try { removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL']) } catch {}
+
+    if (result.manual) {
+      sseEmit(res, { type: 'result', status: 'manual', message: `${tool.name} 需要手动完成配置`, steps: result.steps })
+    } else if (result.warning) {
+      sseEmit(res, { type: 'result', status: 'warning', message: result.warning, file: result.file })
+    } else {
+      sseEmit(res, { type: 'result', status: 'ok', message: `${tool.name} 配置成功`, file: result.file, hot: result.hot })
+    }
+
+    sseEmit(res, { type: 'done', success: true, file: result.file, hot: result.hot, dashboardUrl: result.dashboardUrl || null })
+  } catch (e) {
+    sseEmit(res, { type: 'error', message: e.message })
+    sseEmit(res, { type: 'done', success: false })
+  } finally {
+    console.log = origLog
+    console.warn = origWarn
+  }
+  res.end()
+}
+
+// ── Single-tool reset ────────────────────────────────────────────────────────
+
+async function handleToolReset(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)
+  try {
+    tool.reset()
+    json(res, { success: true })
+  } catch (e) {
+    json(res, { success: false, error: e.message }, 500)
+  }
+}
+
+// ── Environment variables ────────────────────────────────────────────────────
+
+const HS_ENV_KEYS = ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL']
+const MARKER_START = '# >>> holysheep-cli managed >>>'
+
+function handleEnv(_req, res) {
+  const vars = {}
+  for (const k of HS_ENV_KEYS) {
+    const v = process.env[k]
+    vars[k] = v ? (k.includes('KEY') || k.includes('TOKEN') ? maskKey(v) : v) : null
+  }
+
+  const rcFiles = []
+  try {
+    for (const f of getShellRcFiles()) {
+      let has = false
+      try { has = fs.readFileSync(f, 'utf8').includes(MARKER_START) } catch {}
+      rcFiles.push({ path: f.replace(require('os').homedir(), '~'), hasManagedBlock: has })
+    }
+  } catch {}
+
+  json(res, { vars, rcFiles })
+}
+
+function handleEnvClean(_req, res) {
+  try {
+    const cleaned = removeEnvFromShell()
+    json(res, { success: true, cleaned })
+  } catch (e) {
+    json(res, { success: false, error: e.message }, 500)
+  }
+}
+
 // ── Models list ──────────────────────────────────────────────────────────────
 
 function handleModels(_req, res) {
@@ -448,7 +564,9 @@ function handleModels(_req, res) {
     { id: 'gpt-5.4',                label: 'GPT 5.4',              desc: '通用编码' },
     { id: 'gpt-5.3-codex-spark',    label: 'GPT 5.3 Codex Spark',  desc: '编码' },
     { id: 'claude-sonnet-4-6',      label: 'Sonnet 4.6',           desc: '均衡推荐' },
+    { id: 'claude-sonnet-4-6[1m]',  label: 'Sonnet 4.6 (1M)',      desc: '均衡推荐·100万上下文' },
     { id: 'claude-opus-4-6',        label: 'Opus 4.6',             desc: '强力旗舰' },
+    { id: 'claude-opus-4-6[1m]',    label: 'Opus 4.6 (1M)',        desc: '强力旗舰·100万上下文' },
     { id: 'MiniMax-M2.7-highspeed', label: 'MiniMax M2.7',         desc: '高速经济版' },
     { id: 'claude-haiku-4-5',       label: 'Haiku 4.5',            desc: '轻快便宜' },
   ])
@@ -478,15 +596,16 @@ async function handleRequest(req, res) {
     if (route === '/api/status'  && req.method === 'GET')  return await handleStatus(req, res)
     if (route === '/api/login'   && req.method === 'POST') return await handleLogin(req, res)
     if (route === '/api/logout'  && req.method === 'POST') return await handleLogout(req, res)
-    if (route === '/api/whoami'  && req.method === 'GET')  return await handleWhoami(req, res)
     if (route === '/api/balance' && req.method === 'GET')  return await handleBalance(req, res)
     if (route === '/api/doctor'  && req.method === 'GET')  return await handleDoctor(req, res)
     if (route === '/api/tools'   && req.method === 'GET')  return await handleTools(req, res)
     if (route === '/api/models'  && req.method === 'GET')  return await handleModels(req, res)
-    if (route === '/api/setup'   && req.method === 'POST') return await handleSetup(req, res)
-    if (route === '/api/reset'   && req.method === 'POST') return await handleReset(req, res)
     if (route === '/api/upgrade' && req.method === 'POST') return await handleUpgrade(req, res)
-    if (route === '/api/tool/install' && req.method === 'POST') return await handleToolInstall(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/env'       && req.method === 'GET')  return handleEnv(req, res)
+    if (route === '/api/env/clean' && req.method === 'POST') return handleEnvClean(req, res)
 
     res.writeHead(404)
     res.end('Not Found')
@@ -498,9 +617,25 @@ async function handleRequest(req, res) {
 }
 
 function startServer(port) {
-  const server = http.createServer(handleRequest)
-  server.listen(port, '127.0.0.1')
-  return server
+  return new Promise((resolve, reject) => {
+    const server = http.createServer(handleRequest)
+    server.on('error', (err) => {
+      if (err.code === 'EADDRINUSE') {
+        // Try to kill stale process and retry once
+        try {
+          execSync(`lsof -ti:${port} | xargs kill -9`, { stdio: 'ignore' })
+        } catch {}
+        setTimeout(() => {
+          const retry = http.createServer(handleRequest)
+          retry.on('error', (err2) => reject(err2))
+          retry.listen(port, '127.0.0.1', () => resolve(retry))
+        }, 500)
+      } else {
+        reject(err)
+      }
+    })
+    server.listen(port, '127.0.0.1', () => resolve(server))
+  })
 }
 
 module.exports = { startServer }