@simonyea/holysheep-cli 1.2.1 → 1.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "一键配置所有 AI 编程工具接入 HolySheep API — Claude Code / Codex / Gemini CLI / OpenCode / OpenClaw / Aider / Cursor",
   "keywords": [
     "claude",

package/src/utils/shell.js

@@ -41,6 +41,25 @@ function removeHsBlock(content) {
   return content.replace(re, '')
 }
 
+/**
+ * 移除 rc 文件里用户手动写的同名 export/set -gx 行
+ * 防止旧值在 holysheep-cli managed 块之后覆盖新值
+ */
+function removeStaleExports(content, keys, isFish = false) {
+  let result = content
+  for (const key of keys) {
+    if (isFish) {
+      // fish: set -gx KEY "..." 或 set -gx KEY ...
+      result = result.replace(new RegExp(`\\n?set\\s+-gx\\s+${escapeRegex(key)}\\s+[^\\n]*\\n?`, 'g'), '\n')
+    } else {
+      // bash/zsh: export KEY="..." 或 export KEY=...
+      result = result.replace(new RegExp(`\\n?export\\s+${escapeRegex(key)}=[^\\n]*\\n?`, 'g'), '\n')
+    }
+  }
+  // 清理多余空行
+  return result.replace(/\n{3,}/g, '\n\n')
+}
+
 function buildEnvBlock(envVars, isFish = false) {
   const lines = [MARKER_START]
   for (const [k, v] of Object.entries(envVars)) {
@@ -75,8 +94,12 @@ function writeEnvToShell(envVars) {
   for (const file of files) {
     let content = ''
     try { content = fs.readFileSync(file, 'utf8') } catch {}
-    content = removeHsBlock(content)
     const isFish = file.endsWith('config.fish')
+    // 1. 清理旧的 holysheep managed 块
+    content = removeHsBlock(content)
+    // 2. 清理用户手动写的同名 export（防止旧值覆盖新值）
+    content = removeStaleExports(content, Object.keys(envVars), isFish)
+    // 3. 追加新的 managed 块
     content += buildEnvBlock(envVars, isFish)
     fs.writeFileSync(file, content, 'utf8')
     written.push(file)
@@ -84,15 +107,24 @@ function writeEnvToShell(envVars) {
   return written
 }
 
-function removeEnvFromShell() {
+function removeEnvFromShell(extraKeys = []) {
+  // 默认清理的 key 列表（holysheep 相关的所有环境变量）
+  const HS_KEYS = [
+    'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL',
+    'OPENAI_API_KEY', 'OPENAI_BASE_URL',
+    'HOLYSHEEP_API_KEY',
+    ...extraKeys,
+  ]
   const files = getShellRcFiles()
   const cleaned = []
   for (const file of files) {
     if (!fs.existsSync(file)) continue
+    const isFish = file.endsWith('config.fish')
     let content = fs.readFileSync(file, 'utf8')
-    const cleaned_content = removeHsBlock(content)
-    if (cleaned_content !== content) {
-      fs.writeFileSync(file, cleaned_content, 'utf8')
+    let updated = removeHsBlock(content)
+    updated = removeStaleExports(updated, HS_KEYS, isFish)
+    if (updated !== content) {
+      fs.writeFileSync(file, updated, 'utf8')
       cleaned.push(file)
     }
   }