@simonyea/holysheep-cli 1.7.26 → 1.7.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.26",
+  "version": "1.7.28",
   "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,43 +329,18 @@ 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,
-      })
-    }
-    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) {
-    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}`)
+  // 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(', ')}`))
     }
-  }
-
-  if (process.platform === 'win32' && toConfigureTools.some(t => t.id === 'codex') && !toConfigureTools.some(t => t.id === 'aider')) {
-    const removed = removeWindowsUserEnvVars(['OPENAI_BASE_URL'])
+  } catch {}
+  if (process.platform === 'win32') {
+    const removed = removeWindowsUserEnvVars(staleKeys)
     if (removed.length > 0) {
       console.log(chalk.gray(`已移除过时环境变量: ${removed.map(item => chalk.cyan(item)).join(', ')}`))
-      console.log()
     }
   }
 

package/src/tools/aider.js

@@ -70,7 +70,6 @@ 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,

package/src/tools/codex.js

@@ -171,9 +171,7 @@ module.exports = {
     return {
       file: CONFIG_FILE,
       hot:  false,
-      envVars: {
-        OPENAI_API_KEY:   apiKey,
-      },
+      envVars: { OPENAI_API_KEY: apiKey },
     }
   },
   reset() {