@simonyea/holysheep-cli 1.7.5 → 1.7.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "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,17 +5,19 @@ 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 } = require('../utils/shell')
+const { writeEnvToShell, ensureWindowsUserPathHasNpmBin } = require('../utils/shell')
+const { commandExists } = require('../utils/which')
 const TOOLS = require('../tools')
 
 // 工具的自动安装命令（npm/pip）
 const AUTO_INSTALL = {
   'claude-code': {
     cmd: process.platform === 'win32'
-      ? 'powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://claude.ai/install.ps1 | iex"'
+      ? 'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "irm https://claude.ai/install.ps1 | iex"'
       : 'curl -fsSL https://claude.ai/install.sh | bash',
-    mgr: process.platform === 'win32' ? 'powershell' : 'bash',
+    mgr: process.platform === 'win32' ? 'powershell.exe' : 'bash',
   },
   'codex':       { cmd: 'npm install -g @openai/codex',             mgr: 'npm' },
   'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli',        mgr: 'npm' },
@@ -45,6 +47,19 @@ function getWindowsImmediateLaunchCmd(tool) {
   return null
 }
 
+function getPreferredCliPrefix() {
+  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]
 }
@@ -55,7 +70,11 @@ async function tryAutoInstall(tool) {
 
   // 检查 npm/pip 是否可用
   try {
-    execSync(`${info.mgr} --version`, { stdio: 'ignore' })
+    if (process.platform === 'win32' && info.mgr.toLowerCase() === 'powershell.exe') {
+      execSync('where powershell.exe', { stdio: 'ignore' })
+    } else {
+      execSync(`${info.mgr} --version`, { stdio: 'ignore' })
+    }
   } catch {
     console.log(chalk.red(`  ✗ 未找到 ${info.mgr}，无法自动安装 ${tool.name}`))
     return false
@@ -75,6 +94,7 @@ async function tryAutoInstall(tool) {
       console.log(chalk.yellow(`  ⚠ 安装后未检测到命令，尝试直接配置...`))
     }
     if (process.platform === 'win32') {
+      ensureWindowsUserPathHasNpmBin()
       tool._winJustInstalled = true  // 标记为 Windows 刚装的，摘要里特殊处理
     }
     return true  // 安装成功就视为可配置
@@ -312,12 +332,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) {
@@ -338,9 +359,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

package/src/utils/shell.js

@@ -4,6 +4,7 @@
 const fs = require('fs')
 const path = require('path')
 const os = require('os')
+const { execSync } = require('child_process')
 
 const MARKER_START = '# >>> holysheep-cli managed >>>'
 const MARKER_END   = '# <<< holysheep-cli managed <<<'
@@ -70,10 +71,47 @@ function buildEnvBlock(envVars, isFish = false) {
   return '\n' + lines.join('\n') + '\n'
 }
 
+function ensureWindowsUserPathHasNpmBin() {
+  if (process.platform !== 'win32') return []
+
+  const appData = process.env.APPDATA
+  if (!appData) return []
+
+  const npmBin = path.join(appData, 'npm')
+  let currentPath = ''
+  try {
+    currentPath = execSync(
+      'powershell.exe -NoProfile -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"',
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
+    ).trim()
+  } catch {
+    currentPath = process.env.PATH || ''
+  }
+
+  const parts = currentPath
+    .split(';')
+    .map((item) => item.trim())
+    .filter(Boolean)
+
+  const hasNpmBin = parts.some((item) => item.toLowerCase() === npmBin.toLowerCase())
+  if (hasNpmBin) return []
+
+  const nextPath = [...parts, npmBin].join(';')
+  try {
+    const escapedPath = nextPath.replace(/'/g, "''")
+    execSync(
+      `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
+      { stdio: 'ignore' }
+    )
+    return ['[用户 PATH] %APPDATA%\\npm']
+  } catch {
+    return []
+  }
+}
+
 function writeEnvToShell(envVars) {
   // Windows: 用 setx 写入用户级环境变量（需重启终端生效）
   if (process.platform === 'win32') {
-    const { execSync } = require('child_process')
     const written = []
     for (const [k, v] of Object.entries(envVars)) {
       try {
@@ -81,6 +119,7 @@ function writeEnvToShell(envVars) {
         written.push(`[系统环境变量] ${k}`)
       } catch {}
     }
+    written.push(...ensureWindowsUserPathHasNpmBin())
     if (written.length > 0) {
       const chalk = require('chalk')
       console.log(chalk.yellow('\n  ⚠️  Windows 环境变量已写入，需要重启终端后生效'))
@@ -135,4 +174,4 @@ function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
-module.exports = { getShellRcFiles, writeEnvToShell, removeEnvFromShell }
+module.exports = { getShellRcFiles, writeEnvToShell, removeEnvFromShell, ensureWindowsUserPathHasNpmBin }