@simonyea/holysheep-cli 1.7.6 → 1.7.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "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

@@ -5,8 +5,10 @@ const inquirer  = require('inquirer')
 const chalk     = require('chalk')
 const ora       = require('ora')
 const { execSync, spawnSync } = require('child_process')
+const pkg = require('../../package.json')
 const { saveConfig, getApiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, SHOP_URL } = require('../utils/config')
 const { writeEnvToShell, ensureWindowsUserPathHasNpmBin } = require('../utils/shell')
+const { commandExists } = require('../utils/which')
 const TOOLS = require('../tools')
 
 // 工具的自动安装命令（npm/pip）
@@ -45,6 +47,28 @@ function getWindowsImmediateLaunchCmd(tool) {
   return null
 }
 
+function getPreferredCliPrefix() {
+  const mainEntry = String(require.main?.filename || '')
+  const runningFromNpxCache =
+    /[\\/]_npx[\\/]/i.test(mainEntry) ||
+    /[\\/]npm-cache[\\/]/i.test(mainEntry)
+
+  if (runningFromNpxCache) {
+    return `npx @simonyea/holysheep-cli@${pkg.version}`
+  }
+
+  return commandExists('hs')
+    ? 'hs'
+    : `npx @simonyea/holysheep-cli@${pkg.version}`
+}
+
+function getPreferredLaunchCmd(tool) {
+  if (!tool?.launchCmd) return null
+  if (!tool.launchCmd.startsWith('hs')) return tool.launchCmd
+  const prefix = getPreferredCliPrefix()
+  return tool.launchCmd.replace(/^hs\b/, prefix)
+}
+
 function canAutoInstall(toolId) {
   return !!AUTO_INSTALL[toolId]
 }
@@ -317,12 +341,13 @@ async function setup(options) {
           console.log(`    ${chalk.gray(`   ${i + 1}.`)} ${chalk.cyan.bold(s.cmd)}  ${chalk.gray(s.note)}`)
         })
       } else if (r.tool.launchCmd) {
+        const preferredLaunchCmd = getPreferredLaunchCmd(r.tool)
         if (r.tool._winJustInstalled) {
-          const immediateCmd = getWindowsImmediateLaunchCmd(r.tool)
-          console.log(`    ${chalk.gray('▶  立即启动:')} ${chalk.cyan.bold(immediateCmd || r.tool.launchCmd)}`)
-          console.log(`    ${chalk.gray('▶  新开终端后:')} ${chalk.cyan.bold(r.tool.launchCmd)}`)
+          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 {
-          console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(r.tool.launchCmd)}`)
+          console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(preferredLaunchCmd || r.tool.launchCmd)}`)
         }
         if (r.tool.launchNote) console.log(`    ${chalk.gray('   ' + r.tool.launchNote)}`)
       } else if (r.tool.launchNote) {
@@ -343,9 +368,10 @@ async function setup(options) {
     console.log()
   }
 
-  console.log(chalk.gray('如需切换其他工具，运行: hs setup'))
-  console.log(chalk.gray('查看余额: hs balance'))
-  console.log(chalk.gray('检查配置: hs doctor'))
+  const cliPrefix = getPreferredCliPrefix()
+  console.log(chalk.gray(`如需切换其他工具，运行: ${cliPrefix} setup`))
+  console.log(chalk.gray(`查看余额: ${cliPrefix} balance`))
+  console.log(chalk.gray(`检查配置: ${cliPrefix} doctor`))
   console.log()
 
   // 注册引导 banner