@simonyea/holysheep-cli 1.7.28 → 1.7.30

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.28",
+  "version": "1.7.30",
   "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/index.js

@@ -4,15 +4,8 @@
 const { program } = require('commander')
 const chalk = require('chalk')
 const pkg = require('../package.json')
-const { installWindowsCliShims, ensureWindowsUserPathHasNpmBin } = require('./utils/shell')
 
-// Windows 用户：检测 npm bin 路径是否在 PATH 中
-if (process.platform === 'win32') {
-  try {
-    installWindowsCliShims()
-    ensureWindowsUserPathHasNpmBin()
-  } catch {}
-}
+
 
 // 异步检查最新版本（不阻塞主流程）
 function checkLatestVersion() {

package/src/utils/shell.js

@@ -82,7 +82,7 @@ function ensureWindowsUserPathHasNpmBin() {
   let currentPath = ''
   try {
     currentPath = execSync(
-      'powershell.exe -NoProfile -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"',
+      'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"',
       { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
     ).trim()
   } catch {
@@ -101,11 +101,17 @@ function ensureWindowsUserPathHasNpmBin() {
   try {
     const escapedPath = nextPath.replace(/'/g, "''")
     execSync(
-      `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
+      `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
       { stdio: 'ignore' }
     )
     return ['[用户 PATH] %APPDATA%\\npm']
   } catch {
+    try {
+      const chalk = require('chalk')
+      console.warn(chalk.yellow(
+        `  ⚠️  无法自动更新 PATH，请手动将以下路径加入系统环境变量 PATH：\n     ${npmBin}`
+      ))
+    } catch {}
     return []
   }
 }
@@ -119,11 +125,18 @@ function installWindowsCliShims() {
   const npmBin = path.join(appData, 'npm')
   fs.mkdirSync(npmBin, { recursive: true })
 
+  // 已 npm install -g：npm 自己生成的 hs.cmd 已可用，不覆盖
+  const globalEntry = path.join(npmBin, 'node_modules', '@simonyea', 'holysheep-cli', 'bin', 'hs.js')
+  if (fs.existsSync(globalEntry)) return []
+
   const cliSpec = `@simonyea/holysheep-cli@${pkg.version}`
+  // 优先使用本地安装的包（npm install -g 场景），避免依赖 PATH 中的 hs 命令
   const cmdContent = [
     '@echo off',
     'setlocal',
-    'if exist "%~dp0npx.cmd" (',
+    'if exist "%~dp0node_modules\\@simonyea\\holysheep-cli\\bin\\hs.js" (',
+    '  node "%~dp0node_modules\\@simonyea\\holysheep-cli\\bin\\hs.js" %*',
+    ') else if exist "%~dp0npx.cmd" (',
     `  call "%~dp0npx.cmd" ${cliSpec} %*`,
     ') else (',
     `  call npx ${cliSpec} %*`,
@@ -132,9 +145,12 @@ function installWindowsCliShims() {
   ].join('\r\n')
 
   const ps1Content = [
-    '$npxCmd = Join-Path $PSScriptRoot "npx.cmd"',
-    'if (Test-Path $npxCmd) {',
-    `  & $npxCmd "${cliSpec}" @args`,
+    '$dir = $PSScriptRoot',
+    '$localPkg = Join-Path $dir "node_modules\\@simonyea\\holysheep-cli\\bin\\hs.js"',
+    'if (Test-Path $localPkg) {',
+    '  & node $localPkg @args',
+    '} elseif (Test-Path (Join-Path $dir "npx.cmd")) {',
+    `  & (Join-Path $dir "npx.cmd") "${cliSpec}" @args`,
     '} else {',
     `  & npx "${cliSpec}" @args`,
     '}',