@simonyea/holysheep-cli 1.7.98 → 1.7.100

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.98",
+  "version": "1.7.100",
   "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/tools/env-config.js

@@ -18,7 +18,10 @@
 'use strict'
 
 const { writeEnvToShell, removeEnvFromShell, getShellRcFiles } = require('../utils/shell')
+const { execSync } = require('child_process')
 const fs = require('fs')
+const path = require('path')
+const os = require('os')
 
 const MANAGED_KEYS = [
   'ANTHROPIC_API_KEY',
@@ -29,14 +32,29 @@ const MANAGED_KEYS = [
 ]
 
 const MARKER = '# >>> holysheep-cli managed >>>'
+const STATE_FILE = path.join(os.homedir(), '.holysheep', 'env-config.json')
+
+/**
+ * Windows: 从注册表读取用户级环境变量
+ */
+function winRegQuery(key) {
+  try {
+    const out = execSync(
+      `reg query "HKCU\\Environment" /v "${key}"`,
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 3000, windowsHide: true }
+    )
+    const match = out.match(/REG_\w+\s+(.+)/)
+    return match ? match[1].trim() : null
+  } catch {
+    return null
+  }
+}
 
 function isConfiguredInShell() {
   if (process.platform === 'win32') {
-    // Windows: 检查环境变量是否存在且包含 holysheep
-    return !!(
-      process.env.ANTHROPIC_BASE_URL?.includes('holysheep') ||
-      process.env.OPENAI_BASE_URL?.includes('holysheep')
-    )
+    // Windows: 查注册表（setx 写入后当前进程的 process.env 看不到）
+    const val = winRegQuery('ANTHROPIC_BASE_URL')
+    return !!(val && val.includes('holysheep'))
   }
 
   // Mac/Linux: 检查 shell rc 文件里是否有 managed 块
@@ -54,6 +72,18 @@ function isConfiguredInShell() {
   return false
 }
 
+function saveState(envVars) {
+  try {
+    const dir = path.dirname(STATE_FILE)
+    if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true })
+    fs.writeFileSync(STATE_FILE, JSON.stringify({ configuredAt: new Date().toISOString(), keys: Object.keys(envVars) }, null, 2), 'utf8')
+  } catch {}
+}
+
+function clearState() {
+  try { fs.unlinkSync(STATE_FILE) } catch {}
+}
+
 module.exports = {
   name: '全局环境变量',
   id: 'env-config',
@@ -76,18 +106,36 @@ module.exports = {
     }
 
     const written = writeEnvToShell(envVars)
+    saveState(envVars)
 
     return {
-      file: written[0] || 'shell env',
+      file: written.join(', ') || 'shell env',
       hot: false,
     }
   },
 
   reset() {
     removeEnvFromShell(MANAGED_KEYS)
+    clearState()
   },
 
   getConfigPath() { return null },
+
+  /**
+   * 获取已配置的环境变量值（Windows 从注册表读，其他从 process.env 读）
+   */
+  getConfiguredValues() {
+    const result = {}
+    for (const key of MANAGED_KEYS) {
+      if (process.platform === 'win32') {
+        result[key] = winRegQuery(key) || null
+      } else {
+        result[key] = process.env[key] || null
+      }
+    }
+    return result
+  },
+
   hint: '配置后 VS Code Claude 扩展、Cursor、Continue、Cline、Windsurf 等工具均可直接使用',
   launchCmd: null,
   docsUrl: 'https://holysheep.ai',

package/src/webui/configure-worker.js

@@ -41,10 +41,12 @@ process.on('message', (msg) => {
       process.send({ type: 'progress', message: '已写入环境变量到 shell 配置' })
     }
 
-    // 清理冲突环境变量
-    try {
-      removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL'])
-    } catch {}
+    // 清理冲突环境变量（env-config 工具本身就是写环境变量的，不清理）
+    if (msg.toolId !== 'env-config') {
+      try {
+        removeEnvFromShell(['ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL', 'OPENAI_API_KEY', 'OPENAI_BASE_URL'])
+      } catch {}
+    }
 
     process.send({
       type: 'result',

package/src/webui/server.js

@@ -702,8 +702,13 @@ const MARKER_START = '# >>> holysheep-cli managed >>>'
 
 function handleEnv(_req, res) {
   const vars = {}
+
+  // Windows: process.env 看不到 setx 写入的值，从注册表读
+  const envConfigTool = TOOLS.find(t => t.id === 'env-config')
+  const registryValues = (process.platform === 'win32' && envConfigTool?.getConfiguredValues?.()) || {}
+
   for (const k of HS_ENV_KEYS) {
-    const v = process.env[k]
+    const v = process.env[k] || registryValues[k] || null
     vars[k] = v ? (k.includes('KEY') || k.includes('TOKEN') ? maskKey(v) : v) : null
   }