@simonyea/holysheep-cli 1.7.26 → 1.7.27

package/package.json

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

@@ -44,6 +44,7 @@ async function runClaude(args = []) {
 
   const env = {
     ...process.env,
+    ANTHROPIC_API_KEY: undefined,   // 防止与 ANTHROPIC_AUTH_TOKEN 冲突
     ANTHROPIC_AUTH_TOKEN: apiKey,
     ANTHROPIC_BASE_URL: BASE_URL_ANTHROPIC,
     CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1',

package/src/commands/setup.js

@@ -9,6 +9,7 @@ const pkg = require('../../package.json')
 const { saveConfig, getApiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, SHOP_URL } = require('../utils/config')
 const {
   writeEnvToShell,
+  removeEnvFromShell,
   ensureWindowsUserPathHasNpmBin,
   installWindowsCliShims,
   removeWindowsUserEnvVars,
@@ -328,25 +329,26 @@ async function setup(options) {
     }
   }
 
-  // Step 5: 写入通用环境变量
-  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,
-      })
+  // 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 等）
+  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(', ')}`))
     }
-    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,
-        })
-      }
+  } catch {}
+  if (process.platform === 'win32') {
+    const removed = removeWindowsUserEnvVars(staleKeys)
+    if (removed.length > 0) {
+      console.log(chalk.gray(`已移除过时环境变量: ${removed.map(item => chalk.cyan(item)).join(', ')}`))
     }
   }
 
@@ -360,14 +362,6 @@ 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()

package/src/tools/aider.js

@@ -70,10 +70,4 @@ model: openai/${model}
   launchCmd: 'aider',
   installCmd: 'pip install aider-chat',
   docsUrl: 'https://aider.chat',
-  // Aider 优先用环境变量
-  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 = "OPENAI_API_KEY"')
+         (content.includes('env_key = "HOLYSHEEP_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 = "OPENAI_API_KEY"`,
+    `env_key = "HOLYSHEEP_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: 'OPENAI_API_KEY',
+      env_key: 'HOLYSHEEP_API_KEY',
       wire_api: 'responses',
     }
     jsonConfig.providers.holysheep = {
@@ -171,9 +171,6 @@ module.exports = {
     return {
       file: CONFIG_FILE,
       hot:  false,
-      envVars: {
-        OPENAI_API_KEY:   apiKey,
-      },
     }
   },
   reset() {