@simonyea/holysheep-cli 1.7.24 → 1.7.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.24",
+  "version": "1.7.26",
   "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/commands/claude.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const { spawn } = require('child_process')
-const crypto = require('crypto')
 const {
   BASE_URL_ANTHROPIC,
   BASE_URL_CLAUDE_RELAY,
@@ -14,52 +13,15 @@ const {
   readConfig,
   writeConfig,
 } = require('../tools/claude-process-proxy')
+const claudeCodeTool = require('../tools/claude-code')
 
 function ensureClaudeProxyConfig(apiKey) {
   const config = readConfig()
-  const next = { ...config }
-  let changed = false
-
-  if (!next.apiKey && apiKey) {
-    next.apiKey = apiKey
-    changed = true
-  }
-  if (!next.baseUrlAnthropic) {
-    next.baseUrlAnthropic = BASE_URL_ANTHROPIC
-    changed = true
-  }
-  if (!next.controlPlaneUrl) {
-    next.controlPlaneUrl = next.relayUrl || BASE_URL_CLAUDE_RELAY
-    changed = true
-  }
-  if (!next.relayUrl) {
-    next.relayUrl = BASE_URL_CLAUDE_RELAY
-    changed = true
-  }
-  if (!next.bridgeId) {
-    next.bridgeId = crypto.randomUUID()
-    changed = true
-  }
-  if (!next.deviceId) {
-    next.deviceId = crypto.randomUUID()
-    changed = true
-  }
-  if (!next.bridgeSecret) {
-    next.bridgeSecret = crypto.randomBytes(32).toString('hex')
-    changed = true
-  }
-  if (!next.installSource) {
-    next.installSource = 'holysheep-cli'
-    changed = true
-  }
-  if (!next.proxyMode) {
-    next.proxyMode = 'claude-process'
-    changed = true
-  }
-  if (!next.processProxyPort) {
-    next.processProxyPort = config.processProxyPort || 14556
-    changed = true
-  }
+  const next = claudeCodeTool.buildBridgeConfig(apiKey, BASE_URL_ANTHROPIC, {
+    ...config,
+    relayUrl: config.relayUrl || BASE_URL_CLAUDE_RELAY,
+  })
+  const changed = JSON.stringify(next) !== JSON.stringify(config)
 
   if (changed) {
     writeConfig(next)

package/src/commands/doctor.js

@@ -204,9 +204,15 @@ function printClaudeProcessProxyDetails(tool) {
   const proxyConfig = typeof tool.getProcessProxyConfig === 'function' ? tool.getProcessProxyConfig() : {}
   const relayUrl = proxyConfig.controlPlaneUrl || proxyConfig.relayUrl || BASE_URL_CLAUDE_RELAY
   const mode = proxyConfig.proxyMode || 'unknown'
+  const hasBridgeSecret = Boolean(proxyConfig.bridgeSecret)
+  const hasBridgeIds = Boolean(proxyConfig.bridgeId && proxyConfig.deviceId)
+  const hasProcessPort = Boolean(proxyConfig.processProxyPort)
   console.log(`    ${chalk.gray('↳')} ${chalk.gray(`Claude 启动方式：hs claude`)}`)
   console.log(`    ${chalk.gray('↳')} ${chalk.gray(`Claude 代理模式：${mode}`)}`)
   console.log(`    ${chalk.gray('↳')} ${chalk.gray(`Claude Relay: ${relayUrl || '未配置'}`)}`)
+  console.log(`    ${hasBridgeSecret ? chalk.green('↳') : chalk.yellow('↳')} ${hasBridgeSecret ? chalk.green('Bridge secret 已配置') : chalk.yellow('Bridge secret 缺失')}`)
+  console.log(`    ${hasBridgeIds ? chalk.green('↳') : chalk.yellow('↳')} ${hasBridgeIds ? chalk.green('Bridge ID / Device ID 已配置') : chalk.yellow('Bridge ID / Device ID 缺失')}`)
+  console.log(`    ${hasProcessPort ? chalk.green('↳') : chalk.yellow('↳')} ${hasProcessPort ? chalk.green(`Claude process proxy 端口：${proxyConfig.processProxyPort}`) : chalk.yellow('Claude process proxy 端口缺失')}`)
 }
 
 function maskKey(key) {

package/src/commands/setup.js

@@ -317,6 +317,9 @@ async function setup(options) {
       } else {
         if (result.envVars) Object.assign(envVarsToWrite, result.envVars)
         spinner.succeed(`${chalk.green(tool.name)} ${chalk.gray(result.file ? `→ ${result.file}` : '')}`)
+        if (Array.isArray(result.extraFiles) && result.extraFiles.length > 0) {
+          console.log(chalk.gray(`  ↳ 附加配置: ${result.extraFiles.join(', ')}`))
+        }
         results.push({ tool, status: 'ok', result })
       }
     } catch (e) {

package/src/index.js

@@ -181,22 +181,21 @@ program
     process.exit(code)
   })
 
-// 默认：无命令时显示帮助 + 提示 setup
-program
-  .action(() => {
-    printBanner()
-    console.log()
-    console.log(chalk.cyan('快速开始:'))
-    console.log(`  ${chalk.bold('hs login')}    登录并保存 API Key`)
-    console.log(`  ${chalk.bold('hs setup')}    一键配置所有 AI 工具`)
-    console.log(`  ${chalk.bold('hs whoami')}   查看当前登录状态`)
-    console.log(`  ${chalk.bold('hs doctor')}   检查配置状态`)
-    console.log(`  ${chalk.bold('hs balance')}  查看账户余额`)
-    console.log(`  ${chalk.bold('hs upgrade')}  升级 Claude Code / Codex / Gemini CLI`)
-    console.log(`  ${chalk.bold('hs tools')}    查看支持的工具列表`)
-    console.log()
-    console.log(chalk.gray(`注册账号: https://holysheep.ai`))
-    console.log()
-  })
-
 program.parse(process.argv)
+
+// 默认：无子命令时显示帮助 + 提示 setup
+if (process.argv.slice(2).length === 0) {
+  printBanner()
+  console.log()
+  console.log(chalk.cyan('快速开始:'))
+  console.log(`  ${chalk.bold('hs login')}    登录并保存 API Key`)
+  console.log(`  ${chalk.bold('hs setup')}    一键配置所有 AI 工具`)
+  console.log(`  ${chalk.bold('hs whoami')}   查看当前登录状态`)
+  console.log(`  ${chalk.bold('hs doctor')}   检查配置状态`)
+  console.log(`  ${chalk.bold('hs balance')}  查看账户余额`)
+  console.log(`  ${chalk.bold('hs upgrade')}  升级 Claude Code / Codex / Gemini CLI`)
+  console.log(`  ${chalk.bold('hs tools')}    查看支持的工具列表`)
+  console.log()
+  console.log(chalk.gray(`注册账号: https://holysheep.ai`))
+  console.log()
+}

package/src/tools/claude-code.js

@@ -20,6 +20,25 @@ const { readConfig, writeConfig } = require('./claude-process-proxy')
 
 const SETTINGS_FILE = path.join(os.homedir(), '.claude', 'settings.json')
 
+function buildBridgeConfig(apiKey, baseUrl, bridge = {}) {
+  const relayUrl = bridge.relayUrl || BASE_URL_CLAUDE_RELAY || ''
+  return {
+    port: bridge.port || 14555,
+    processProxyPort: bridge.processProxyPort || 14556,
+    apiKey,
+    baseUrlAnthropic: baseUrl || BASE_URL_ANTHROPIC,
+    controlPlaneUrl: bridge.controlPlaneUrl || relayUrl || baseUrl || BASE_URL_ANTHROPIC,
+    relayUrl: relayUrl || bridge.controlPlaneUrl || baseUrl || BASE_URL_ANTHROPIC,
+    bridgeId: bridge.bridgeId || crypto.randomUUID(),
+    deviceId: bridge.deviceId || crypto.randomUUID(),
+    bridgeSecret: bridge.bridgeSecret || crypto.randomBytes(32).toString('hex'),
+    nodeId: bridge.nodeId || '',
+    sessionMode: bridge.sessionMode || 'pinned-node',
+    installSource: bridge.installSource || 'holysheep-cli',
+    proxyMode: 'claude-process',
+  }
+}
+
 function readSettings() {
   try {
     const raw = fs.readFileSync(SETTINGS_FILE, 'utf8')
@@ -50,27 +69,15 @@ module.exports = {
       s.env?.ANTHROPIC_BASE_URL === BASE_URL_ANTHROPIC &&
       bridge.apiKey &&
       bridge.bridgeSecret &&
-      bridge.controlPlaneUrl
+      bridge.controlPlaneUrl &&
+      bridge.bridgeId &&
+      bridge.deviceId &&
+      bridge.processProxyPort
     )
   },
   configure(apiKey, baseUrl) {
-    const bridge = readConfig()
-    const relayUrl = bridge.relayUrl || BASE_URL_CLAUDE_RELAY || ''
-    writeConfig({
-      port: bridge.port || 14555,
-      processProxyPort: bridge.processProxyPort || 14556,
-      apiKey,
-      baseUrlAnthropic: baseUrl || BASE_URL_ANTHROPIC,
-      controlPlaneUrl: relayUrl || baseUrl || BASE_URL_ANTHROPIC,
-      relayUrl,
-      bridgeId: bridge.bridgeId || crypto.randomUUID(),
-      deviceId: bridge.deviceId || crypto.randomUUID(),
-      bridgeSecret: bridge.bridgeSecret || crypto.randomBytes(32).toString('hex'),
-      nodeId: bridge.nodeId || '',
-      sessionMode: bridge.sessionMode || 'pinned-node',
-      installSource: 'holysheep-cli',
-      proxyMode: 'claude-process',
-    })
+    const bridgeConfig = buildBridgeConfig(apiKey, baseUrl, readConfig())
+    writeConfig(bridgeConfig)
 
     const settings = readSettings()
     if (!settings.env) settings.env = {}
@@ -82,7 +89,11 @@ module.exports = {
     delete settings.env.ANTHROPIC_API_KEY
     delete settings.env.HOLYSHEEP_CLAUDE_BRIDGE
     writeSettings(settings)
-    return { file: SETTINGS_FILE, hot: true }
+    return {
+      file: SETTINGS_FILE,
+      hot: true,
+      extraFiles: ['~/.holysheep/claude-proxy.json'],
+    }
   },
   reset() {
     const settings = readSettings()
@@ -106,4 +117,5 @@ module.exports = {
   getProcessProxyConfig() {
     return readConfig()
   },
+  buildBridgeConfig,
 }

package/src/utils/shell.js

@@ -5,6 +5,7 @@ const fs = require('fs')
 const path = require('path')
 const os = require('os')
 const { execSync } = require('child_process')
+const pkg = require('../../package.json')
 
 const MARKER_START = '# >>> holysheep-cli managed >>>'
 const MARKER_END   = '# <<< holysheep-cli managed <<<'
@@ -118,13 +119,14 @@ function installWindowsCliShims() {
   const npmBin = path.join(appData, 'npm')
   fs.mkdirSync(npmBin, { recursive: true })
 
+  const cliSpec = `@simonyea/holysheep-cli@${pkg.version}`
   const cmdContent = [
     '@echo off',
     'setlocal',
     'if exist "%~dp0npx.cmd" (',
-    '  call "%~dp0npx.cmd" @simonyea/holysheep-cli@latest %*',
+    `  call "%~dp0npx.cmd" ${cliSpec} %*`,
     ') else (',
-    '  call npx @simonyea/holysheep-cli@latest %*',
+    `  call npx ${cliSpec} %*`,
     ')',
     ''
   ].join('\r\n')
@@ -132,9 +134,9 @@ function installWindowsCliShims() {
   const ps1Content = [
     '$npxCmd = Join-Path $PSScriptRoot "npx.cmd"',
     'if (Test-Path $npxCmd) {',
-    '  & $npxCmd "@simonyea/holysheep-cli@latest" @args',
+    `  & $npxCmd "${cliSpec}" @args`,
     '} else {',
-    '  & npx "@simonyea/holysheep-cli@latest" @args',
+    `  & npx "${cliSpec}" @args`,
     '}',
     ''
   ].join('\r\n')