@simonyea/holysheep-cli 1.7.9 → 1.7.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.9",
+  "version": "1.7.11",
   "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,12 @@ 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,
+  removeWindowsUserEnvVars,
+} = require('../utils/shell')
 const { commandExists } = require('../utils/which')
 const TOOLS = require('../tools')
 
@@ -53,7 +58,7 @@ function getWindowsImmediateLaunchCmd(tool) {
 
 function getPreferredCliPrefix() {
   if (process.platform === 'win32') {
-    return 'npx @simonyea/holysheep-cli@latest'
+    return 'hs'
   }
 
   const mainEntry = String(require.main?.filename || '')
@@ -122,6 +127,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)))
@@ -137,8 +150,8 @@ async function setup(options) {
     console.log(chalk.gray(`   （¥10 起充，按量计费，支持微信/支付宝）`))
     console.log(chalk.gray(`提示：可先运行 ${chalk.cyan('hs login')} 登录并保存 Key，之后 setup 将自动读取。`))
     if (process.platform === 'win32') {
-      console.log(chalk.gray(`  ⚠️  Windows 用户：如果 ${chalk.cyan('hs')} 命令找不到，请用以下方式运行：`))
-      console.log(chalk.gray(`     ${chalk.white('npx @simonyea/holysheep-cli login')}  （无需安装，直接用）`))
+      console.log(chalk.gray(`  ⚠️  Windows 用户：如果 ${chalk.cyan('hs')} 命令暂时找不到，请先运行：`))
+      console.log(chalk.gray(`     ${chalk.white('npx @simonyea/holysheep-cli@latest login')}`))
       console.log(chalk.gray(`     或重启终端后再试`))
     }
     console.log()
@@ -302,14 +315,25 @@ async function setup(options) {
   }
 
   // Step 5: 写入通用环境变量
-  const needsEnvVars = toConfigureTools.some(t => t.id === 'codex' || t.id === 'aider')
-  if (needsEnvVars || Object.keys(envVarsToWrite).length > 0) {
-    Object.assign(envVarsToWrite, {
-      ANTHROPIC_API_KEY: apiKey,
-      ANTHROPIC_BASE_URL: BASE_URL_ANTHROPIC,
-      OPENAI_API_KEY: apiKey,
-      OPENAI_BASE_URL: BASE_URL_OPENAI,
-    })
+  const needsAnthropicEnv = toConfigureTools.some(t => t.id === 'claude-code')
+  const needsOpenAIEnv = toConfigureTools.some(t => t.id === 'codex' || t.id === 'aider')
+  if (needsAnthropicEnv || needsOpenAIEnv || Object.keys(envVarsToWrite).length > 0) {
+    if (needsAnthropicEnv) {
+      Object.assign(envVarsToWrite, {
+        ANTHROPIC_API_KEY: apiKey,
+        ANTHROPIC_BASE_URL: BASE_URL_ANTHROPIC,
+      })
+    }
+    if (needsOpenAIEnv) {
+      Object.assign(envVarsToWrite, {
+        OPENAI_API_KEY: apiKey,
+      })
+      if (toConfigureTools.some(t => t.id === 'aider')) {
+        Object.assign(envVarsToWrite, {
+          OPENAI_BASE_URL: BASE_URL_OPENAI,
+        })
+      }
+    }
   }
 
   if (Object.keys(envVarsToWrite).length > 0) {
@@ -322,6 +346,19 @@ async function setup(options) {
     }
   }
 
+  if (process.platform === 'win32' && toConfigureTools.some(t => t.id === 'codex') && !toConfigureTools.some(t => t.id === 'aider')) {
+    const removed = removeWindowsUserEnvVars(['OPENAI_BASE_URL'])
+    if (removed.length > 0) {
+      console.log(chalk.gray(`已移除过时环境变量: ${removed.map(item => chalk.cyan(item)).join(', ')}`))
+      console.log()
+    }
+  }
+
+  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/tools/codex.js

@@ -12,10 +12,11 @@
  *   [model_providers.holysheep]
  *   name = "HolySheep"
  *   base_url = "https://api.holysheep.ai/v1"
- *   api_key = "cr_xxx"
+ *   env_key = "OPENAI_API_KEY"
+ *   wire_api = "responses"
  *
  * 注意：旧的 config.json 会被 Rust Codex 忽略！
- * 注意：使用 api_key 而非 env_key，避免 Windows 上需要重启终端才能生效的问题
+ * 注意：Rust Codex 当前读取 env_key，不读取自定义 api_key 字段。
  */
 const fs   = require('fs')
 const path = require('path')
@@ -88,7 +89,8 @@ function isConfiguredInToml() {
   const content = readTomlConfig()
   return content.includes('model_provider = "holysheep"') &&
          content.includes('base_url') &&
-         content.includes('holysheep.ai')
+         content.includes('holysheep.ai') &&
+         content.includes('env_key = "OPENAI_API_KEY"')
 }
 
 /**
@@ -111,7 +113,8 @@ function writeTomlConfig(apiKey, baseUrlOpenAI, model) {
     `[model_providers.holysheep]`,
     `name = "HolySheep"`,
     `base_url = "${baseUrlOpenAI}"`,
-    `api_key = "${apiKey}"`,
+    `env_key = "OPENAI_API_KEY"`,
+    `wire_api = "responses"`,
     '',
   ].join('\n')
 
@@ -135,12 +138,13 @@ function writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model) {
     jsonConfig.model_providers.holysheep = {
       name: 'HolySheep',
       base_url: baseUrlOpenAI,
-      api_key: apiKey,
+      env_key: 'OPENAI_API_KEY',
+      wire_api: 'responses',
     }
     jsonConfig.providers.holysheep = {
       name: 'HolySheep',
       baseURL: baseUrlOpenAI,
-      apiKey,
+      envKey: 'OPENAI_API_KEY',
     }
     fs.writeFileSync(CONFIG_FILE_JSON, JSON.stringify(jsonConfig, null, 2), 'utf8')
   } catch {}
@@ -169,7 +173,6 @@ module.exports = {
       hot:  false,
       envVars: {
         OPENAI_API_KEY:   apiKey,
-        OPENAI_BASE_URL:  baseUrlOpenAI,
       },
     }
   },

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')
@@ -146,6 +187,22 @@ function writeEnvToShell(envVars) {
   return written
 }
 
+function removeWindowsUserEnvVars(keys = []) {
+  if (process.platform !== 'win32') return []
+
+  const removed = []
+  for (const key of keys) {
+    try {
+      execSync(
+        `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('${key}', $null, 'User')"`,
+        { stdio: 'ignore' }
+      )
+      removed.push(`[系统环境变量] ${key}`)
+    } catch {}
+  }
+  return removed
+}
+
 function removeEnvFromShell(extraKeys = []) {
   // 默认清理的 key 列表（holysheep 相关的所有环境变量）
   const HS_KEYS = [
@@ -174,4 +231,11 @@ function escapeRegex(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
 }
 
-module.exports = { getShellRcFiles, writeEnvToShell, removeEnvFromShell, ensureWindowsUserPathHasNpmBin }
+module.exports = {
+  getShellRcFiles,
+  writeEnvToShell,
+  removeEnvFromShell,
+  ensureWindowsUserPathHasNpmBin,
+  installWindowsCliShims,
+  removeWindowsUserEnvVars
+}