bhg-helper 1.0.1 → 1.0.3

package/api/app.ts

@@ -14,7 +14,6 @@ import backupRoutes from './routes/backups.js'
 import logRoutes from './routes/logs.js'
 import providerRoutes from './routes/providers.js'
 import relayRoutes from './routes/relay.js'
-import installRoutes from './routes/install.js'
 
 const app: express.Application = express()
 
@@ -35,13 +34,13 @@ app.use('/api/backups', backupRoutes)
 app.use('/api/logs', logRoutes)
 app.use('/api/providers', providerRoutes)
 app.use('/api/relay', relayRoutes)
-app.use('/api/install', installRoutes)
 
 app.get('/api/health', (_req: Request, res: Response) => {
   res.json({ ok: true, data: { bhgHelperDir: BHG_HELPER_DIR } })
 })
 
 app.use((error: Error, _req: Request, res: Response, _next: NextFunction) => {
+  void _next
   log('ERR', 'http', error.message)
   res.status(500).json({ ok: false, error: error.message })
 })

package/api/relay/protocol.ts

@@ -239,8 +239,6 @@ export interface AnthropicStreamEvent {
   [key: string]: unknown
 }
 
-const UUID_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i
-
 function makeId(): string {
   // 用 crypto.randomUUID 如果存在
   if (typeof globalThis.crypto?.randomUUID === 'function') {
@@ -278,7 +276,6 @@ export function* openAIStreamToAnthropicEvents(
   let finishReason: string | null = null
   let hasText = false
   let toolBlockIndex = -1
-  let toolInputBuffer = ''
   let toolId: string | null = null
   let toolName: string | null = null
   const usedModel = openAIChunks[0]?.model ?? model
@@ -357,7 +354,6 @@ export function* openAIStreamToAnthropicEvents(
           }
         }
         if (tc.function?.arguments) {
-          toolInputBuffer += tc.function.arguments
           yield {
             type: 'content_block_delta',
             index: toolBlockIndex,

package/cli/cli.js

@@ -1,14 +1,15 @@
 #!/usr/bin/env node
 /**
  * BHG-helper CLI — 命令行交互菜单
- * 一级菜单：模型选择 / 工具配置 / 语言配置 / BHG-helper UI / 退出
+ * 一级菜单：模型选择 / 工具配置 / 语言配置 / 退出
  */
 
 import { select, confirm, input } from '@inquirer/prompts'
-import { execSync } from 'node:child_process'
+import { execSync, spawn } from 'node:child_process'
 import os from 'node:os'
 import path from 'node:path'
 import fs from 'node:fs'
+import { fileURLToPath } from 'node:url'
 
 // ── 色彩 ──────────────────────────────────────────────────────
 const C = { r: '\x1b[0m', bold: '\x1b[1m', cyan: '\x1b[36m', green: '\x1b[32m', yellow: '\x1b[33m', dim: '\x1b[2m', red: '\x1b[31m' }
@@ -16,7 +17,8 @@ const theme = { prefix: `${C.cyan}?${C.r}` }
 
 // ── 常量 ──────────────────────────────────────────────────────
 const RELAY_PORT = 8787
-const UI_URL = 'http://localhost:5173'
+const API_URL = 'http://127.0.0.1:3001'
+const PROJECT_ROOT = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '..')
 const BHG_HELPER_DIR = path.join(os.homedir(), '.bhg-helper')
 const RELAY_CONFIG_FILE = path.join(BHG_HELPER_DIR, 'relay.config.json')
 const CLAUDE_SETTINGS_FILE = path.join(os.homedir(), '.claude', 'settings.json')
@@ -108,10 +110,40 @@ function checkInstalled(cmd) {
   } catch { return false }
 }
 
-function openBrowser(url) {
+async function apiPost(pathname) {
+  const res = await fetch(`${API_URL}${pathname}`, { method: 'POST' })
+  return res.ok
+}
+
+async function apiHealth() {
   try {
-    execSync(`start "" "${url}"`, { shell: true })
-  } catch { /* */ }
+    const controller = new AbortController()
+    const timer = setTimeout(() => controller.abort(), 800)
+    const res = await fetch(`${API_URL}/api/health`, { signal: controller.signal })
+    clearTimeout(timer)
+    return res.ok
+  } catch {
+    return false
+  }
+}
+
+async function ensureBackend() {
+  if (await apiHealth()) return true
+  const npmCmd = process.platform === 'win32' ? 'npm.cmd' : 'npm'
+  const child = spawn(npmCmd, ['run', 'server:raw'], {
+    cwd: PROJECT_ROOT,
+    detached: true,
+    stdio: 'ignore',
+    shell: false,
+  })
+  child.unref()
+  await new Promise(resolve => setTimeout(resolve, 1500))
+  return await apiHealth()
+}
+
+async function ensureRelay() {
+  if (!(await ensureBackend())) return false
+  return await apiPost('/api/relay/start')
 }
 
 // ── 打印头部 ──────────────────────────────────────────────────
@@ -121,8 +153,7 @@ function printHeader() {
   const apiOk = hasApiConfig()
   const model = getCurrentModel()
   console.log(`  ${C.dim}API${C.r}   ${apiOk ? `${C.green}已配置${C.r}` : `${C.red}未配置${C.r}`}`)
-  console.log(`  ${C.dim}模型${C.r}   ${C.cyan}${model}${C.r}`)
-  console.log(`  ${C.dim}UI${C.r}    ${UI_URL}\n`)
+  console.log(`  ${C.dim}模型${C.r}   ${C.cyan}${model}${C.r}\n`)
 }
 
 // ── 一级菜单 ──────────────────────────────────────────────────
@@ -133,7 +164,6 @@ async function mainMenu() {
       { name: '模型选择', value: 'model', description: '切换模型 / 输入 API Key' },
       { name: '工具配置', value: 'tools', description: '配置各 AI 编程工具' },
       { name: '语言配置', value: 'lang', description: '界面语言设置' },
-      { name: `${C.yellow}BHG-helper 网页界面${C.r}`, value: 'ui', description: '打开网页控制台' },
       { name: `${C.dim}──────────${C.r}`, value: '---', disabled: true },
       { name: '退出', value: 'exit' },
     ],
@@ -224,7 +254,12 @@ async function modelMenu() {
 
     const next = { ...(cfg || {}), deepseekApiKey: newKey, port: cfg?.port || RELAY_PORT, deepseekBaseUrl: cfg?.deepseekBaseUrl || 'https://api.deepseek.com', modelMap: cfg?.modelMap || { 'deepseek-v4-pro': 'deepseek-v4-pro', 'deepseek-chat': 'deepseek-v4-pro' }, spoofProvider: cfg?.spoofProvider || 'deepseek', verbose: cfg?.verbose ?? true }
     saveConfig(next)
-    console.log(`\n  ${C.green}✓ API Key 已保存${C.r}\n`)
+    console.log(`\n  ${C.green}✓ API Key 已保存${C.r}`)
+
+    // 自动启动中转服务
+    console.log(`  ${C.dim}正在启动中转服务...${C.r}`)
+    const relayOk = await ensureRelay()
+    console.log(`  ${relayOk ? C.green + '✓ 中转服务已启动' + C.r : C.yellow + '中转服务启动失败（可稍后手动启动）' + C.r}\n`)
     await confirm({ message: '按回车继续...', theme })
     return 'back'
   }
@@ -254,13 +289,6 @@ async function toolsMenu() {
   if (choice === 'exit') return 'exit'
   if (choice === 'back') return 'back'
 
-  if (choice === 'ui') {
-    openBrowser(UI_URL)
-    console.log(`\n  ${C.green}✓ 浏览器已打开 → ${UI_URL}${C.r}\n`)
-    await confirm({ message: '按回车继续...', theme })
-    return 'back'
-  }
-
   return await toolDetailMenu(choice)
 }
 
@@ -268,18 +296,11 @@ async function toolsMenu() {
 async function toolDetailMenu(toolKey) {
   const tool = TOOLS[toolKey]
 
-  // Cursor / Continue / Trae — 无 CLI，只引导去 UI
+  // Cursor / Continue / Trae — 无 CLI，显示安装方式
   if (!tool.cmd) {
     console.log(`\n  ${C.bold}${tool.name}${C.r} — ${tool.desc}`)
     console.log(`  ${C.dim}安装方式：${tool.install}${C.r}`)
-    console.log(`  ${C.yellow}${tool.name} 需要在 BHG-helper 网页界面配置${C.r}\n`)
-
-    const openUi = await confirm({ message: '打开 BHG-helper 网页界面？', default: true, theme })
-    if (openUi) {
-      openBrowser(UI_URL)
-      console.log(`  ${C.green}✓ 浏览器已打开${C.r}`)
-    }
-    console.log()
+    console.log(`  ${C.yellow}当前纯命令行版暂不自动配置 ${tool.name}${C.r}\n`)
     await confirm({ message: '按回车继续...', theme })
     return 'back'
   }
@@ -330,6 +351,13 @@ async function toolDetailMenu(toolKey) {
       return 'back'
     }
 
+    const relayOk = await ensureRelay()
+    if (!relayOk) {
+      console.log(`\n  ${C.red}中转服务启动失败，请重新运行 BHG-helper。${C.r}\n`)
+      await confirm({ message: '按回车继续...', theme })
+      return 'back'
+    }
+
     // 写入 ~/.claude/settings.json（Claude Code 专用）
     if (toolKey === 'claude') {
       const currentModel = getCurrentModel()
@@ -435,11 +463,6 @@ async function main() {
         break
       }
 
-      case 'ui':
-        openBrowser(UI_URL)
-        console.log(`\n  ${C.green}✓ 浏览器已打开 → ${UI_URL}${C.r}\n`)
-        await confirm({ message: '按回车继续...', theme })
-        break
     }
   }
 }