@simonyea/holysheep-cli 1.7.1 → 1.7.3

package/package.json

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

@@ -11,7 +11,12 @@ const TOOLS = require('../tools')
 
 // 工具的自动安装命令（npm/pip）
 const AUTO_INSTALL = {
-  'claude-code': { cmd: 'npm install -g @anthropic-ai/claude-code', mgr: 'npm' },
+  'claude-code': {
+    cmd: process.platform === 'win32'
+      ? 'powershell -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',
+  },
   'codex':       { cmd: 'npm install -g @openai/codex',             mgr: 'npm' },
   'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli',        mgr: 'npm' },
   'opencode':    { cmd: 'npm install -g opencode-ai',               mgr: 'npm' },
@@ -19,6 +24,27 @@ const AUTO_INSTALL = {
   'aider':       { cmd: 'pip install aider-chat',                   mgr: 'pip' },
 }
 
+function getWindowsImmediateLaunchCmd(tool) {
+  if (process.platform !== 'win32' || !tool?.launchCmd) return null
+
+  const cmdBin = tool.launchCmd.split(' ')[0]
+
+  try {
+    const npmPrefix = execSync('npm prefix -g', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim()
+    if (npmPrefix) {
+      const directCmd = `${npmPrefix}\\${cmdBin}.cmd`
+      return `& "${directCmd}"`
+    }
+  } catch {}
+
+  const appData = process.env.APPDATA
+  if (appData) {
+    return `& "${appData}\\npm\\${cmdBin}.cmd"`
+  }
+
+  return null
+}
+
 function canAutoInstall(toolId) {
   return !!AUTO_INSTALL[toolId]
 }
@@ -37,10 +63,7 @@ async function tryAutoInstall(tool) {
 
   const spinner = ora(`正在安装 ${tool.name}...`).start()
   try {
-    const ret = spawnSync(info.cmd.split(' ')[0], info.cmd.split(' ').slice(1), {
-      stdio: 'inherit',
-      shell: true,
-    })
+    const ret = spawnSync(info.cmd, [], { stdio: 'inherit', shell: true })
     if (ret.status !== 0) {
       spinner.fail(`安装失败，请手动运行: ${chalk.cyan(info.cmd)}`)
       return false
@@ -290,10 +313,9 @@ async function setup(options) {
         })
       } else if (r.tool.launchCmd) {
         if (r.tool._winJustInstalled) {
-          const cmdBin = r.tool.launchCmd.split(' ')[0]
-          const cmdArgs = r.tool.launchCmd.split(' ').slice(1).join(' ')
-          const npxCmd = 'npx ' + cmdBin + (cmdArgs ? ' ' + cmdArgs : '')
-          console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(npxCmd)}`)
+          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)}`)
         } else {
           console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(r.tool.launchCmd)}`)
         }

package/src/commands/upgrade.js

@@ -12,8 +12,10 @@ const UPGRADABLE_TOOLS = [
     id: 'claude-code',
     command: 'claude',
     versionCmd: 'claude --version',
-    npmPkg: '@anthropic-ai/claude-code',
-    installCmd: 'npm install -g @anthropic-ai/claude-code@latest',
+    npmPkg: null,
+    installCmd: process.platform === 'win32'
+      ? 'powershell -NoProfile -ExecutionPolicy Bypass -Command "irm https://claude.ai/install.ps1 | iex"'
+      : 'curl -fsSL https://claude.ai/install.sh | bash',
   },
   {
     name: 'Codex CLI',
@@ -114,6 +116,18 @@ async function upgrade() {
 
     const latestVer = await getLatestVersion(tool.npmPkg)
 
+    if (!tool.npmPkg) {
+      console.log(`\r  ${chalk.yellow('↑')} ${chalk.yellow(tool.name.padEnd(18))} ${chalk.gray('v' + (localVer || '?'))} → ${chalk.cyan('official installer')}        `)
+      const success = runUpgrade(tool)
+      if (success) {
+        const newVer = getLocalVersion(tool)
+        console.log(`  ${chalk.green('✓')} ${chalk.green(tool.name)} 升级成功 → ${chalk.cyan('v' + (newVer || 'latest'))}`)
+        upgraded++
+      }
+      console.log()
+      continue
+    }
+
     if (!latestVer) {
       console.log(chalk.yellow(' 无法获取最新版本'))
       continue
@@ -142,7 +156,7 @@ async function upgrade() {
   if (!hasInstalled) {
     console.log(chalk.yellow('没有检测到已安装的 AI 编程工具。'))
     console.log(chalk.gray('支持的工具: Claude Code, Codex CLI, Gemini CLI'))
-    console.log(chalk.gray('安装示例: npm install -g @anthropic-ai/claude-code'))
+    console.log(chalk.gray(`安装示例: ${process.platform === 'win32' ? 'irm https://claude.ai/install.ps1 | iex' : 'curl -fsSL https://claude.ai/install.sh | bash'}`))
   } else if (upgraded > 0) {
     console.log(chalk.green(`✓ 升级了 ${upgraded} 个工具`))
   } else if (alreadyLatest > 0) {

package/src/tools/claude-code.js

@@ -107,7 +107,9 @@ module.exports = {
   getConfigPath() { return SETTINGS_FILE },
   hint: '通过 HolySheep 本地 Bridge 接入，支持热切换，无需重启终端',
   launchCmd: 'claude',
-  installCmd: 'npm install -g @anthropic-ai/claude-code',
+  installCmd: process.platform === 'win32'
+    ? 'irm https://claude.ai/install.ps1 | iex'
+    : 'curl -fsSL https://claude.ai/install.sh | bash',
   docsUrl: 'https://docs.anthropic.com/claude-code',
   getBridgePort() {
     return getConfiguredBridgePort()