@simonyea/holysheep-cli 1.7.8 → 1.7.10

package/package.json

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

@@ -7,7 +7,11 @@ 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 {
+  writeEnvToShell,
+  ensureWindowsUserPathHasNpmBin,
+  installWindowsCliShims,
+} = require('../utils/shell')
 const { commandExists } = require('../utils/which')
 const TOOLS = require('../tools')
 
@@ -29,6 +33,10 @@ const AUTO_INSTALL = {
 function getWindowsImmediateLaunchCmd(tool) {
   if (process.platform !== 'win32' || !tool?.launchCmd) return null
 
+  if (/^npx\b/i.test(tool.launchCmd)) {
+    return tool.launchCmd
+  }
+
   const [cmdBin, ...cmdArgs] = tool.launchCmd.split(' ')
 
   try {
@@ -48,6 +56,10 @@ function getWindowsImmediateLaunchCmd(tool) {
 }
 
 function getPreferredCliPrefix() {
+  if (process.platform === 'win32') {
+    return 'npx @simonyea/holysheep-cli@latest'
+  }
+
   const mainEntry = String(require.main?.filename || '')
   const runningFromNpxCache =
     /[\\/]_npx[\\/]/i.test(mainEntry) ||
@@ -114,6 +126,14 @@ async function tryAutoInstall(tool) {
 }
 
 async function setup(options) {
+  let windowsCliArtifacts = []
+  if (process.platform === 'win32') {
+    windowsCliArtifacts = [
+      ...installWindowsCliShims(),
+      ...ensureWindowsUserPathHasNpmBin(),
+    ]
+  }
+
   console.log()
   console.log(chalk.bold('🐑  HolySheep CLI — 一键配置 AI 工具'))
   console.log(chalk.gray('━'.repeat(50)))
@@ -314,6 +334,11 @@ async function setup(options) {
     }
   }
 
+  if (process.platform === 'win32' && windowsCliArtifacts.length > 0) {
+    console.log(chalk.gray(`Windows 启动器已就绪: ${windowsCliArtifacts.map(item => chalk.cyan(item)).join(', ')}`))
+    console.log()
+  }
+
   // Step 6: 保存 API Key
   saveConfig({ apiKey })
 

package/src/index.js

@@ -4,12 +4,13 @@
 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') {
-  const { execSync } = require('child_process')
   try {
-    // 静默检查，只在首次遇到问题时才会走到这（因为已经能运行 node 了）
+    installWindowsCliShims()
+    ensureWindowsUserPathHasNpmBin()
   } catch {}
 }
 

package/src/utils/shell.js

@@ -109,6 +109,46 @@ function ensureWindowsUserPathHasNpmBin() {
   }
 }
 
+function installWindowsCliShims() {
+  if (process.platform !== 'win32') return []
+
+  const appData = process.env.APPDATA
+  if (!appData) return []
+
+  const npmBin = path.join(appData, 'npm')
+  fs.mkdirSync(npmBin, { recursive: true })
+
+  const cmdContent = [
+    '@echo off',
+    'setlocal',
+    'if exist "%~dp0npx.cmd" (',
+    '  call "%~dp0npx.cmd" @simonyea/holysheep-cli@latest %*',
+    ') else (',
+    '  call npx @simonyea/holysheep-cli@latest %*',
+    ')',
+    ''
+  ].join('\r\n')
+
+  const ps1Content = [
+    '$npxCmd = Join-Path $PSScriptRoot "npx.cmd"',
+    'if (Test-Path $npxCmd) {',
+    '  & $npxCmd "@simonyea/holysheep-cli@latest" @args',
+    '} else {',
+    '  & npx "@simonyea/holysheep-cli@latest" @args',
+    '}',
+    ''
+  ].join('\r\n')
+
+  const written = []
+  for (const name of ['hs', 'holysheep']) {
+    fs.writeFileSync(path.join(npmBin, `${name}.cmd`), cmdContent, 'utf8')
+    fs.writeFileSync(path.join(npmBin, `${name}.ps1`), ps1Content, 'utf8')
+    written.push(`[启动器] %APPDATA%\\npm\\${name}.cmd`)
+  }
+
+  return written
+}
+
 function writeEnvToShell(envVars) {
   // Windows: 用 setx 写入用户级环境变量（需重启终端生效）
   if (process.platform === 'win32') {
@@ -119,6 +159,7 @@ function writeEnvToShell(envVars) {
         written.push(`[系统环境变量] ${k}`)
       } catch {}
     }
+    written.push(...installWindowsCliShims())
     written.push(...ensureWindowsUserPathHasNpmBin())
     if (written.length > 0) {
       const chalk = require('chalk')
@@ -174,4 +215,10 @@ function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
-module.exports = { getShellRcFiles, writeEnvToShell, removeEnvFromShell, ensureWindowsUserPathHasNpmBin }
+module.exports = {
+  getShellRcFiles,
+  writeEnvToShell,
+  removeEnvFromShell,
+  ensureWindowsUserPathHasNpmBin,
+  installWindowsCliShims
+}