@simonyea/holysheep-cli 1.7.22 → 1.7.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.22",
+  "version": "1.7.24",
   "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,8 +1,10 @@
 'use strict'
 
 const { spawn } = require('child_process')
+const crypto = require('crypto')
 const {
   BASE_URL_ANTHROPIC,
+  BASE_URL_CLAUDE_RELAY,
   getApiKey,
 } = require('../utils/config')
 const {
@@ -10,8 +12,62 @@ const {
   getLocalProxyUrl,
   startProcessProxy,
   readConfig,
+  writeConfig,
 } = require('../tools/claude-process-proxy')
 
+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
+  }
+
+  if (changed) {
+    writeConfig(next)
+    return next
+  }
+  return config
+}
+
 async function runClaude(args = []) {
   const config = readConfig()
   const apiKey = config.apiKey || getApiKey()
@@ -19,6 +75,8 @@ async function runClaude(args = []) {
     throw new Error('Missing API Key. Run hs setup first.')
   }
 
+  ensureClaudeProxyConfig(apiKey)
+
   const { server, port, sessionId } = startProcessProxy({})
   const proxyUrl = getLocalProxyUrl(port)
 

package/src/commands/setup.js

@@ -56,11 +56,22 @@ function getWindowsImmediateLaunchCmd(tool) {
   return null
 }
 
-function getPreferredCliPrefix() {
-  if (process.platform === 'win32') {
-    return 'hs'
+// 检测当前 shell 里的 hs 命令是否已包含 claude 子命令
+function isHsClaudeAvailable() {
+  try {
+    const out = execSync('hs --help', {
+      encoding: 'utf8',
+      timeout: 4000,
+      shell: process.platform === 'win32',
+      stdio: ['ignore', 'pipe', 'ignore'],
+    })
+    return out.includes('claude')
+  } catch {
+    return false
   }
+}
 
+function getPreferredCliPrefix() {
   const mainEntry = String(require.main?.filename || '')
   const runningFromNpxCache =
     /[\\/]_npx[\\/]/i.test(mainEntry) ||
@@ -394,6 +405,11 @@ async function setup(options) {
           const immediateCmd = getWindowsImmediateLaunchCmd({ ...r.tool, launchCmd: preferredLaunchCmd || r.tool.launchCmd })
           console.log(`    ${chalk.gray('▶  立即启动:')} ${chalk.cyan.bold(immediateCmd || preferredLaunchCmd || r.tool.launchCmd)}`)
           console.log(`    ${chalk.gray('▶  新开终端后:')} ${chalk.cyan.bold(preferredLaunchCmd || r.tool.launchCmd)}`)
+        } else if (r.tool.id === 'claude-code' && !isHsClaudeAvailable()) {
+          // hs claude 在当前 shell 不可用（hs 未安装或版本过旧），显示两条命令
+          const npxCmd = `npx @simonyea/holysheep-cli@${pkg.version} claude`
+          console.log(`    ${chalk.gray('▶  立即启动:')} ${chalk.cyan.bold(npxCmd)}`)
+          console.log(`    ${chalk.gray('▶  新开终端后:')} ${chalk.cyan.bold('hs claude')}`)
         } else {
           console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(preferredLaunchCmd || r.tool.launchCmd)}`)
         }