@simonyea/holysheep-cli 1.7.100 → 1.7.101

package/package.json

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

@@ -35,16 +35,43 @@ const MARKER = '# >>> holysheep-cli managed >>>'
 const STATE_FILE = path.join(os.homedir(), '.holysheep', 'env-config.json')
 
 /**
- * Windows: 从注册表读取用户级环境变量
+ * Windows: 用 PowerShell 写入用户级环境变量（比 setx 更可靠）
  */
-function winRegQuery(key) {
+function winSetEnvVar(key, value) {
+  try {
+    execSync(
+      `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('${key}', '${value}', 'User')"`,
+      { stdio: 'ignore', timeout: 10000, windowsHide: true }
+    )
+    return true
+  } catch {
+    return false
+  }
+}
+
+/**
+ * Windows: 用 PowerShell 删除用户级环境变量
+ */
+function winRemoveEnvVar(key) {
+  try {
+    execSync(
+      `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('${key}', $null, 'User')"`,
+      { stdio: 'ignore', timeout: 10000, windowsHide: true }
+    )
+  } catch {}
+}
+
+/**
+ * Windows: 用 PowerShell 读取用户级环境变量
+ */
+function winGetEnvVar(key) {
   try {
     const out = execSync(
-      `reg query "HKCU\\Environment" /v "${key}"`,
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 3000, windowsHide: true }
+      `powershell.exe -NoProfile -Command "[Environment]::GetEnvironmentVariable('${key}', 'User')"`,
+      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000, windowsHide: true }
     )
-    const match = out.match(/REG_\w+\s+(.+)/)
-    return match ? match[1].trim() : null
+    const val = (out || '').trim()
+    return val || null
   } catch {
     return null
   }
@@ -52,8 +79,7 @@ function winRegQuery(key) {
 
 function isConfiguredInShell() {
   if (process.platform === 'win32') {
-    // Windows: 查注册表（setx 写入后当前进程的 process.env 看不到）
-    const val = winRegQuery('ANTHROPIC_BASE_URL')
+    const val = winGetEnvVar('ANTHROPIC_BASE_URL')
     return !!(val && val.includes('holysheep'))
   }
 
@@ -105,7 +131,20 @@ module.exports = {
       OPENAI_BASE_URL: baseUrlOpenAI,
     }
 
-    const written = writeEnvToShell(envVars)
+    let written
+    if (process.platform === 'win32') {
+      // Windows: 用 PowerShell 直接写用户级环境变量
+      written = []
+      for (const [k, v] of Object.entries(envVars)) {
+        if (winSetEnvVar(k, v)) {
+          written.push(k)
+        }
+      }
+    } else {
+      // Mac/Linux: 写入 shell rc 文件
+      written = writeEnvToShell(envVars)
+    }
+
     saveState(envVars)
 
     return {
@@ -115,7 +154,11 @@ module.exports = {
   },
 
   reset() {
-    removeEnvFromShell(MANAGED_KEYS)
+    if (process.platform === 'win32') {
+      for (const k of MANAGED_KEYS) winRemoveEnvVar(k)
+    } else {
+      removeEnvFromShell(MANAGED_KEYS)
+    }
     clearState()
   },
 
@@ -128,7 +171,7 @@ module.exports = {
     const result = {}
     for (const key of MANAGED_KEYS) {
       if (process.platform === 'win32') {
-        result[key] = winRegQuery(key) || null
+        result[key] = winGetEnvVar(key) || null
       } else {
         result[key] = process.env[key] || null
       }