@simonyea/holysheep-cli 1.7.27 → 1.7.29

package/package.json

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

@@ -329,20 +329,12 @@ async function setup(options) {
     }
   }
 
-  // Step 5: 写入环境变量
-  // 策略：所有工具尽量用各自 JSON/config 文件，减少 shell 污染。
-  // 例外：Codex Rust 版必须通过 env_key 读取一个环境变量，使用 HOLYSHEEP_API_KEY。
-  const needsCodexEnv = toConfigureTools.some(t => t.id === 'codex')
-  if (needsCodexEnv) {
-    Object.assign(envVarsToWrite, { HOLYSHEEP_API_KEY: apiKey })
-  }
-
-  // 清理旧版本写入的过时 shell 变量（ANTHROPIC_API_KEY / OPENAI_API_KEY 等）
+  // Step 5: 清理 shell 环境变量（所有工具改用 JSON/config 文件配置，不再写 shell）
   const staleKeys = ['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL']
   try {
     const cleaned = removeEnvFromShell(staleKeys)
     if (cleaned.length > 0) {
-      console.log(chalk.gray(`已清理过时 shell 变量: ${cleaned.map(f => chalk.cyan(f)).join(', ')}`))
+      console.log(chalk.gray(`已清理 shell 中的过时变量: ${cleaned.map(f => chalk.cyan(f)).join(', ')}`))
     }
   } catch {}
   if (process.platform === 'win32') {
@@ -352,16 +344,6 @@ async function setup(options) {
     }
   }
 
-  if (Object.keys(envVarsToWrite).length > 0) {
-    const spinner = ora('写入环境变量到 shell 配置文件...').start()
-    try {
-      const written = writeEnvToShell(envVarsToWrite)
-      spinner.succeed(`环境变量已写入: ${written.map(f => chalk.cyan(f)).join(', ')}`)
-    } catch (e) {
-      spinner.fail(`写入环境变量失败: ${e.message}`)
-    }
-  }
-
   if (process.platform === 'win32' && windowsCliArtifacts.length > 0) {
     console.log(chalk.gray(`Windows 启动器已就绪: ${windowsCliArtifacts.map(item => chalk.cyan(item)).join(', ')}`))
     console.log()

package/src/tools/aider.js

@@ -70,4 +70,9 @@ model: openai/${model}
   launchCmd: 'aider',
   installCmd: 'pip install aider-chat',
   docsUrl: 'https://aider.chat',
+  envVars: (apiKey, baseUrlOpenAI) => ({
+    OPENAI_API_KEY: apiKey,
+    OPENAI_BASE_URL: baseUrlOpenAI,
+    AIDER_OPENAI_API_BASE: baseUrlOpenAI,
+  }),
 }

package/src/tools/codex.js

@@ -90,7 +90,7 @@ function isConfiguredInToml() {
   return content.includes('model_provider = "holysheep"') &&
          content.includes('base_url') &&
          content.includes('holysheep.ai') &&
-         (content.includes('env_key = "HOLYSHEEP_API_KEY"') || content.includes('env_key = "OPENAI_API_KEY"'))
+         content.includes('env_key = "OPENAI_API_KEY"')
 }
 
 /**
@@ -113,7 +113,7 @@ function writeTomlConfig(apiKey, baseUrlOpenAI, model) {
     `[model_providers.holysheep]`,
     `name = "HolySheep"`,
     `base_url = "${baseUrlOpenAI}"`,
-    `env_key = "HOLYSHEEP_API_KEY"`,
+    `env_key = "OPENAI_API_KEY"`,
     `wire_api = "responses"`,
     '',
   ].join('\n')
@@ -138,7 +138,7 @@ function writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model) {
     jsonConfig.model_providers.holysheep = {
       name: 'HolySheep',
       base_url: baseUrlOpenAI,
-      env_key: 'HOLYSHEEP_API_KEY',
+      env_key: 'OPENAI_API_KEY',
       wire_api: 'responses',
     }
     jsonConfig.providers.holysheep = {
@@ -171,6 +171,7 @@ module.exports = {
     return {
       file: CONFIG_FILE,
       hot:  false,
+      envVars: { OPENAI_API_KEY: apiKey },
     }
   },
   reset() {

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 []
   }
 }
@@ -120,10 +126,13 @@ function installWindowsCliShims() {
   fs.mkdirSync(npmBin, { recursive: true })
 
   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 +141,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`,
     '}',