@simonyea/holysheep-cli 1.7.21 → 1.7.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.21",
+  "version": "1.7.23",
   "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/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)}`)
         }

package/src/tools/openclaw.js

@@ -205,10 +205,10 @@ function startBridge(port) {
   const scriptPath = path.join(__dirname, '..', 'index.js')
   // Windows: use shell+node command to avoid ERROR_FILE_NOT_FOUND with process.execPath
   // (Windows Store / nvm paths can be unresolvable when spawning detached)
+  // Windows: use 'node' (resolved via PATH by CreateProcess) without shell:true.
+  // shell:true spawns cmd.exe /c which exits after the command, breaking detach.
   const spawnCmd = isWin ? 'node' : process.execPath
-  const spawnOpts = isWin
-    ? { shell: true, detached: true, stdio: 'ignore', windowsHide: true }
-    : { detached: true, stdio: 'ignore' }
+  const spawnOpts = { detached: true, stdio: 'ignore', windowsHide: true }
   const child = spawn(spawnCmd, [scriptPath, 'openclaw-bridge', '--port', String(port)], spawnOpts)
   child.unref()
   return waitForBridge(port)
@@ -416,7 +416,7 @@ function normalizeRequestedModels(selectedModels) {
   return Array.from(new Set(requestedModels))
 }
 
-function buildManagedPlan(baseUrlBridge, primaryModel, selectedModels) {
+function buildManagedPlan(baseUrlBridge, apiKey, primaryModel, selectedModels) {
   const requestedModels = normalizeRequestedModels(selectedModels)
   const managedModelRefs = requestedModels.map((model) => `${OPENCLAW_PROVIDER_NAME}/${model}`)
   const fallbackPrimaryModel = pickPrimaryModel(primaryModel, requestedModels)
@@ -428,6 +428,7 @@ function buildManagedPlan(baseUrlBridge, primaryModel, selectedModels) {
     providers: {
       [OPENCLAW_PROVIDER_NAME]: {
         baseUrl: baseUrlBridge,
+        apiKey,
         api: 'openai-completions',
         models: requestedModels.map(buildModelEntry),
       },
@@ -445,10 +446,10 @@ function isHolySheepProvider(provider) {
   )
 }
 
-function writeManagedConfig(baseConfig, bridgeBaseUrl, primaryModel, selectedModels, gatewayPort) {
+function writeManagedConfig(baseConfig, bridgeBaseUrl, apiKey, primaryModel, selectedModels, gatewayPort) {
   fs.mkdirSync(OPENCLAW_DIR, { recursive: true })
 
-  const plan = buildManagedPlan(bridgeBaseUrl, primaryModel, selectedModels)
+  const plan = buildManagedPlan(bridgeBaseUrl, apiKey, primaryModel, selectedModels)
   const existingProviders = baseConfig?.models?.providers || {}
   const managedProviderIds = Object.entries(existingProviders)
     .filter(([providerId, provider]) => providerId === OPENCLAW_PROVIDER_NAME || isHolySheepProvider(provider))
@@ -692,6 +693,7 @@ module.exports = {
     const plan = writeManagedConfig(
       result.status === 0 ? readConfig() : {},
       bridgeBaseUrl,
+      apiKey,
       resolvedPrimaryModel,
       selectedModels,
       gatewayPort,