@simonyea/holysheep-cli 1.7.96 → 1.7.98

package/package.json

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

@@ -386,18 +386,20 @@ async function setup(options) {
     }
   }
 
-  // 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(', ')}`))
-    }
-  } catch {}
-  if (process.platform === 'win32') {
-    const removed = removeWindowsUserEnvVars(staleKeys)
-    if (removed.length > 0) {
-      console.log(chalk.gray(`已移除过时环境变量: ${removed.map(item => chalk.cyan(item)).join(', ')}`))
+  // Step 5: 清理 shell 环境变量（跳过已选全局环境变量工具的情况）
+  if (!toolIds.includes('env-config')) {
+    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(', ')}`))
+      }
+    } catch {}
+    if (process.platform === 'win32') {
+      const removed = removeWindowsUserEnvVars(staleKeys)
+      if (removed.length > 0) {
+        console.log(chalk.gray(`已移除过时环境变量: ${removed.map(item => chalk.cyan(item)).join(', ')}`))
+      }
     }
   }
 

package/src/tools/claude-process-proxy.js

@@ -47,6 +47,26 @@ function getControlPlaneUrl(config) {
 
 const leaseCache = new Map()
 
+function isRetryableNodeLeaseError(err) {
+  const message = String(err?.message || '')
+  return [
+    'No session lease',
+    'ECONNREFUSED',
+    'ECONNRESET',
+    'socket hang up',
+    'ETIMEDOUT',
+    'EHOSTUNREACH',
+    'ENETUNREACH',
+    'Upstream proxy CONNECT failed',
+    'No available Claude accounts support the requested model',
+    'No available Claude accounts',
+    'Bad Gateway',
+    'HTTP 502',
+    'HTTP 503',
+    'HTTP 504'
+  ].some((token) => message.includes(token))
+}
+
 async function readJsonResponse(response) {
   const chunks = []
   for await (const chunk of response) chunks.push(Buffer.from(chunk))
@@ -211,10 +231,9 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
       await doForward(getCachedLease(sessionId))
     } catch (err) {
       if (clientRes.headersSent) return
-      // 只在没有 lease 缓存时重试（首次连接或 lease 过期）
-      // 网络超时/连接错误不重试 — 让 Claude Code 自己处理重试，避免重复 API 请求
-      const noLease = !leaseCache.has(sessionId) || (err && err.message && err.message.includes('No session lease'))
-      if (noLease) {
+      const shouldRefreshLease =
+        !leaseCache.has(sessionId) || (err && isRetryableNodeLeaseError(err))
+      if (shouldRefreshLease) {
         try {
           const config = readConfig(configPath)
           leaseCache.delete(sessionId)
@@ -267,8 +286,9 @@ function createProcessProxyServer({ sessionId, configPath = CONFIG_PATH }) {
     try {
       await doConnect(getCachedLease(sessionId))
     } catch (err) {
-      const noLease = !leaseCache.has(sessionId) || (err && err.message && err.message.includes('No session lease'))
-      if (noLease) {
+      const shouldRefreshLease =
+        !leaseCache.has(sessionId) || (err && isRetryableNodeLeaseError(err))
+      if (shouldRefreshLease) {
         try {
           const config = readConfig(configPath)
           leaseCache.delete(sessionId)

package/src/tools/env-config.js

@@ -0,0 +1,94 @@
+/**
+ * 全局环境变量适配器
+ *
+ * 一键将 HolySheep API 配置写入系统环境变量，
+ * 让所有读取标准 env 的编程工具（VS Code Claude 扩展、Cursor、Continue、Cline、Windsurf 等）
+ * 无需单独配置即可使用 HolySheep 中继。
+ *
+ * 写入的环境变量:
+ *   ANTHROPIC_API_KEY     — Anthropic SDK 标准 key
+ *   ANTHROPIC_AUTH_TOKEN  — Claude Code 优先读取
+ *   ANTHROPIC_BASE_URL    — Anthropic API 基地址（不带 /v1）
+ *   OPENAI_API_KEY        — OpenAI SDK 标准 key
+ *   OPENAI_BASE_URL       — OpenAI API 基地址（带 /v1）
+ *
+ * Mac/Linux: 写入 .zshrc / .bashrc / config.fish（holysheep managed 块）
+ * Windows:   通过 setx 写入用户级环境变量（需重启终端生效）
+ */
+'use strict'
+
+const { writeEnvToShell, removeEnvFromShell, getShellRcFiles } = require('../utils/shell')
+const fs = require('fs')
+
+const MANAGED_KEYS = [
+  'ANTHROPIC_API_KEY',
+  'ANTHROPIC_AUTH_TOKEN',
+  'ANTHROPIC_BASE_URL',
+  'OPENAI_API_KEY',
+  'OPENAI_BASE_URL',
+]
+
+const MARKER = '# >>> holysheep-cli managed >>>'
+
+function isConfiguredInShell() {
+  if (process.platform === 'win32') {
+    // Windows: 检查环境变量是否存在且包含 holysheep
+    return !!(
+      process.env.ANTHROPIC_BASE_URL?.includes('holysheep') ||
+      process.env.OPENAI_BASE_URL?.includes('holysheep')
+    )
+  }
+
+  // Mac/Linux: 检查 shell rc 文件里是否有 managed 块
+  try {
+    const files = getShellRcFiles()
+    for (const file of files) {
+      try {
+        const content = fs.readFileSync(file, 'utf8')
+        if (content.includes(MARKER) && content.includes('holysheep')) {
+          return true
+        }
+      } catch {}
+    }
+  } catch {}
+  return false
+}
+
+module.exports = {
+  name: '全局环境变量',
+  id: 'env-config',
+
+  checkInstalled() {
+    return true // 不依赖任何 CLI，总是可用
+  },
+
+  isConfigured() {
+    return isConfiguredInShell()
+  },
+
+  configure(apiKey, baseUrlAnthropic, baseUrlOpenAI) {
+    const envVars = {
+      ANTHROPIC_API_KEY: apiKey,
+      ANTHROPIC_AUTH_TOKEN: apiKey,
+      ANTHROPIC_BASE_URL: baseUrlAnthropic,
+      OPENAI_API_KEY: apiKey,
+      OPENAI_BASE_URL: baseUrlOpenAI,
+    }
+
+    const written = writeEnvToShell(envVars)
+
+    return {
+      file: written[0] || 'shell env',
+      hot: false,
+    }
+  },
+
+  reset() {
+    removeEnvFromShell(MANAGED_KEYS)
+  },
+
+  getConfigPath() { return null },
+  hint: '配置后 VS Code Claude 扩展、Cursor、Continue、Cline、Windsurf 等工具均可直接使用',
+  launchCmd: null,
+  docsUrl: 'https://holysheep.ai',
+}

package/src/tools/index.js

@@ -7,4 +7,5 @@ module.exports = [
   require('./droid'),
   require('./opencode'),
   require('./openclaw'),
+  require('./env-config'),
 ]

package/src/webui/server.js

@@ -402,13 +402,15 @@ async function handleSetup(req, res) {
     }
   }
 
-  // Step 5: Clean env vars
-  try {
-    const cleaned = removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL'])
-    if (cleaned.length) {
-      sseEmit(res, { type: 'progress', step: 'clean-env', status: 'ok', message: `已清理环境变量: ${cleaned.join(', ')}` })
-    }
-  } catch {}
+  // Step 5: Clean env vars (skip if env-config tool is selected)
+  if (!selectedToolIds.includes('env-config')) {
+    try {
+      const cleaned = removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL'])
+      if (cleaned.length) {
+        sseEmit(res, { type: 'progress', step: 'clean-env', status: 'ok', message: `已清理环境变量: ${cleaned.join(', ')}` })
+      }
+    } catch {}
+  }
 
   // Done
   const ok = results.filter(r => r.status === 'ok').length