@adversity/coding-tool-x 3.0.6 → 3.1.1

package/src/server/services/config-templates-service.js

@@ -22,7 +22,7 @@ const pluginsService = new PluginsService();
 const TEMPLATES_FILE = path.join(PATHS.config, 'config-templates.json');
 
 // 内置配置模板
-// aiConfigs 结构: { claude: { enabled, content }, codex: { enabled, content }, gemini: { enabled, content } }
+// aiConfigs 结构: { claude: { enabled, content }, codex: { enabled, content }, gemini: { enabled, content }, opencode: { enabled, content } }
 const BUILTIN_TEMPLATES = [
   {
     id: 'full-stack',
@@ -492,6 +492,57 @@ function ensureDir(dirPath) {
   }
 }
 
+function normalizeAiConfigs(aiConfigs = {}, claudeMd = null) {
+  const normalized = {
+    claude: { enabled: false, content: '' },
+    codex: { enabled: false, content: '' },
+    gemini: { enabled: false, content: '' },
+    opencode: { enabled: false, content: '' }
+  };
+
+  for (const key of Object.keys(normalized)) {
+    const cfg = aiConfigs?.[key];
+    if (cfg && typeof cfg === 'object') {
+      normalized[key] = {
+        enabled: !!cfg.enabled,
+        content: cfg.content || ''
+      };
+    }
+  }
+
+  if (claudeMd?.enabled && claudeMd?.content && !normalized.claude.content) {
+    normalized.claude = {
+      enabled: true,
+      content: claudeMd.content
+    };
+  }
+
+  // OpenCode defaults to Codex profile if not explicitly configured.
+  if (!normalized.opencode.content) {
+    const fallback = normalized.codex.content ? normalized.codex : normalized.claude;
+    normalized.opencode = {
+      enabled: !!fallback.enabled,
+      content: fallback.content || ''
+    };
+  }
+
+  return normalized;
+}
+
+function normalizeTemplate(template) {
+  if (!template || typeof template !== 'object') {
+    return template;
+  }
+
+  const normalized = { ...template };
+  normalized.aiConfigs = normalizeAiConfigs(template.aiConfigs, template.claudeMd);
+  if (!normalized.claudeMd) {
+    normalized.claudeMd = { enabled: false, content: '' };
+  }
+
+  return normalized;
+}
+
 /**
  * 加载配置模板
  */
@@ -502,8 +553,8 @@ function loadTemplates() {
       const data = JSON.parse(content);
       // 合并内置模板和用户模板
       return {
-        builtin: BUILTIN_TEMPLATES,
-        custom: data.custom || []
+        builtin: BUILTIN_TEMPLATES.map(normalizeTemplate),
+        custom: (data.custom || []).map(normalizeTemplate)
       };
     }
   } catch (error) {
@@ -511,7 +562,7 @@ function loadTemplates() {
   }
 
   return {
-    builtin: BUILTIN_TEMPLATES,
+    builtin: BUILTIN_TEMPLATES.map(normalizeTemplate),
     custom: []
   };
 }
@@ -569,6 +620,7 @@ function createCustomTemplate(template) {
     name: template.name,
     description: template.description || '',
     claudeMd: template.claudeMd || { enabled: false, content: '' },
+    aiConfigs: normalizeAiConfigs(template.aiConfigs, template.claudeMd),
     skills: template.skills || [],
     rules: template.rules || [],
     commands: template.commands || [],
@@ -579,10 +631,10 @@ function createCustomTemplate(template) {
     createdAt: new Date().toISOString()
   };
 
-  custom.push(newTemplate);
+  custom.push(normalizeTemplate(newTemplate));
   saveCustomTemplates(custom);
 
-  return newTemplate;
+  return normalizeTemplate(newTemplate);
 }
 
 /**
@@ -599,6 +651,7 @@ function updateCustomTemplate(id, updates) {
   custom[index] = {
     ...custom[index],
     ...updates,
+    aiConfigs: normalizeAiConfigs(updates.aiConfigs || custom[index].aiConfigs, updates.claudeMd || custom[index].claudeMd),
     id: custom[index].id, // 保持 ID 不变
     isBuiltin: false,
     updatedAt: new Date().toISOString()
@@ -817,12 +870,51 @@ function generateRuleContent(rule) {
   return content + (rule.body || '');
 }
 
+/**
+ * 转换为 OpenCode MCP 结构（local/remote）
+ */
+function convertToOpenCodeMcpSpec(spec = {}) {
+  const type = spec.type || 'stdio';
+
+  if (type === 'local' || type === 'remote') {
+    return { ...spec };
+  }
+
+  if (type === 'stdio') {
+    const command = [];
+    if (spec.command) command.push(spec.command);
+    if (Array.isArray(spec.args)) command.push(...spec.args);
+
+    const result = {
+      type: 'local',
+      command
+    };
+
+    if (spec.env && typeof spec.env === 'object') {
+      result.environment = spec.env;
+    }
+    if (spec.cwd) {
+      result.cwd = spec.cwd;
+    }
+    return result;
+  }
+
+  const result = {
+    type: 'remote',
+    url: spec.url || ''
+  };
+  if (spec.headers && typeof spec.headers === 'object') {
+    result.headers = spec.headers;
+  }
+  return result;
+}
+
 /**
  * 应用模板到项目目录（完整应用，写入实际文件）
  * @param {string} targetDir - 目标项目目录
  * @param {string} templateId - 模板 ID
  * @param {object} options - 可选配置
- * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini']
+ * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini', 'opencode']
  * @param {string} options.aiConfigType - (兼容旧版) 单个 AI 配置类型
  */
 function applyTemplateToProject(targetDir, templateId, options = {}) {
@@ -856,7 +948,8 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
   const aiConfigMap = {
     claude: { fileName: 'CLAUDE.md', name: 'Claude' },
     codex: { fileName: 'AGENTS.md', name: 'Codex' },
-    gemini: { fileName: 'GEMINI.md', name: 'Gemini' }
+    gemini: { fileName: 'GEMINI.md', name: 'Gemini' },
+    opencode: { fileName: '.opencode/AGENTS.md', name: 'OpenCode' }
   };
 
   // 遍历所有选中的 AI 配置类型
@@ -872,6 +965,7 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     if (aiConfig?.enabled && aiConfig?.content) {
       const configInfo = aiConfigMap[aiConfigType];
       const configPath = path.join(targetDir, configInfo.fileName);
+      ensureDir(path.dirname(configPath));
       fs.writeFileSync(configPath, aiConfig.content, 'utf-8');
       results.aiConfigs.push({ applied: true, path: configInfo.fileName, type: configInfo.name, key: aiConfigType });
     }
@@ -879,34 +973,54 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
 
   // 2. 写入 Agents
   if (template.agents?.length > 0) {
-    const agentsDir = path.join(targetDir, '.claude', 'agents');
-    ensureDir(agentsDir);
+    const agentTargets = [
+      { baseDir: path.join(targetDir, '.claude', 'agents'), prefix: '.claude/agents' },
+      { baseDir: path.join(targetDir, '.opencode', 'agents'), prefix: '.opencode/agents' }
+    ];
+
+    for (const target of agentTargets) {
+      ensureDir(target.baseDir);
+    }
+
     for (const agent of template.agents) {
       const content = generateAgentContent(agent);
       const fileName = agent.fileName || agent.name.toLowerCase().replace(/\s+/g, '-');
-      const filePath = path.join(agentsDir, `${fileName}.md`);
-      fs.writeFileSync(filePath, content, 'utf-8');
-      results.agents.files.push(`.claude/agents/${fileName}.md`);
+      for (const target of agentTargets) {
+        const filePath = path.join(target.baseDir, `${fileName}.md`);
+        fs.writeFileSync(filePath, content, 'utf-8');
+        results.agents.files.push(`${target.prefix}/${fileName}.md`);
+      }
       results.agents.applied++;
     }
   }
 
   // 3. 写入 Commands
   if (template.commands?.length > 0) {
-    const commandsDir = path.join(targetDir, '.claude', 'commands');
-    ensureDir(commandsDir);
+    const commandTargets = [
+      { baseDir: path.join(targetDir, '.claude', 'commands'), prefix: '.claude/commands' },
+      { baseDir: path.join(targetDir, '.opencode', 'commands'), prefix: '.opencode/commands' }
+    ];
+
+    for (const target of commandTargets) {
+      ensureDir(target.baseDir);
+    }
+
     for (const command of template.commands) {
       const content = generateCommandContent(command);
-      const targetCmdDir = command.namespace
-        ? path.join(commandsDir, command.namespace)
-        : commandsDir;
-      ensureDir(targetCmdDir);
-      const filePath = path.join(targetCmdDir, `${command.name}.md`);
-      fs.writeFileSync(filePath, content, 'utf-8');
-      const relativePath = command.namespace
-        ? `.claude/commands/${command.namespace}/${command.name}.md`
-        : `.claude/commands/${command.name}.md`;
-      results.commands.files.push(relativePath);
+
+      for (const target of commandTargets) {
+        const targetCmdDir = command.namespace
+          ? path.join(target.baseDir, command.namespace)
+          : target.baseDir;
+        ensureDir(targetCmdDir);
+        const filePath = path.join(targetCmdDir, `${command.name}.md`);
+        fs.writeFileSync(filePath, content, 'utf-8');
+        const relativePath = command.namespace
+          ? `${target.prefix}/${command.namespace}/${command.name}.md`
+          : `${target.prefix}/${command.name}.md`;
+        results.commands.files.push(relativePath);
+      }
+
       results.commands.applied++;
     }
   }
@@ -938,13 +1052,16 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
     results.plugins.items = template.plugins.map(p => p.name);
   }
 
-  // 6. 写入 MCP 配置到 .mcp.json
-  if (template.mcpServers?.length > 0) {
+  // 6. 写入 MCP/OpenCode 配置
+  const hasMcp = template.mcpServers?.length > 0;
+  const hasPlugins = template.plugins?.length > 0;
+  if (hasMcp || hasPlugins) {
     const mcpConfig = { mcpServers: {} };
+    const opencodeConfig = { mcp: {}, plugin: [] };
     const allServers = mcpService.getAllServers();
     const presets = mcpService.getPresets();
 
-    for (const serverId of template.mcpServers) {
+    for (const serverId of template.mcpServers || []) {
       // 先从已配置的服务器中查找
       let serverSpec = allServers[serverId]?.server;
       // 如果没有，从预设中查找
@@ -956,6 +1073,7 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
       }
       if (serverSpec) {
         mcpConfig.mcpServers[serverId] = serverSpec;
+        opencodeConfig.mcp[serverId] = convertToOpenCodeMcpSpec(serverSpec);
         results.mcpServers.applied++;
       }
     }
@@ -964,6 +1082,16 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
       const mcpPath = path.join(targetDir, '.mcp.json');
       fs.writeFileSync(mcpPath, JSON.stringify(mcpConfig, null, 2), 'utf-8');
     }
+
+    if (hasPlugins) {
+      opencodeConfig.plugin = (template.plugins || []).map(p => p.name).filter(Boolean);
+    }
+    if (Object.keys(opencodeConfig.mcp).length > 0 || opencodeConfig.plugin.length > 0) {
+      const opencodeDir = path.join(targetDir, '.opencode');
+      ensureDir(opencodeDir);
+      const opencodePath = path.join(opencodeDir, 'opencode.json');
+      fs.writeFileSync(opencodePath, JSON.stringify(opencodeConfig, null, 2), 'utf-8');
+    }
   }
 
   // 7. 创建配置记录文件
@@ -995,7 +1123,7 @@ function applyTemplateToProject(targetDir, templateId, options = {}) {
  * @param {string} targetDir - 目标项目目录
  * @param {string} templateId - 模板 ID
  * @param {object} options - 可选配置
- * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini']
+ * @param {string|string[]} options.aiConfigTypes - 选择的 AI 配置类型数组: ['claude', 'codex', 'gemini', 'opencode']
  * @param {string} options.aiConfigType - (兼容旧版) 单个 AI 配置类型
  */
 function previewTemplateApplication(targetDir, templateId, options = {}) {
@@ -1031,7 +1159,8 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
   const aiConfigMap = {
     claude: { fileName: 'CLAUDE.md', name: 'Claude' },
     codex: { fileName: 'AGENTS.md', name: 'Codex' },
-    gemini: { fileName: 'GEMINI.md', name: 'Gemini' }
+    gemini: { fileName: 'GEMINI.md', name: 'Gemini' },
+    opencode: { fileName: '.opencode/AGENTS.md', name: 'OpenCode' }
   };
 
   // 遍历所有选中的 AI 配置类型
@@ -1064,12 +1193,18 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
   if (template.agents?.length > 0) {
     for (const agent of template.agents) {
       const fileName = agent.fileName || agent.name.toLowerCase().replace(/\s+/g, '-');
-      const relativePath = `.claude/agents/${fileName}.md`;
-      const fullPath = path.join(targetDir, relativePath);
-      if (fs.existsSync(fullPath)) {
-        preview.willOverwrite.push(relativePath);
-      } else {
-        preview.willCreate.push(relativePath);
+      const relativePaths = [
+        `.claude/agents/${fileName}.md`,
+        `.opencode/agents/${fileName}.md`
+      ];
+
+      for (const relativePath of relativePaths) {
+        const fullPath = path.join(targetDir, relativePath);
+        if (fs.existsSync(fullPath)) {
+          preview.willOverwrite.push(relativePath);
+        } else {
+          preview.willCreate.push(relativePath);
+        }
       }
       preview.summary.agents++;
     }
@@ -1078,14 +1213,22 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
   // 检查 Commands
   if (template.commands?.length > 0) {
     for (const command of template.commands) {
-      const relativePath = command.namespace
-        ? `.claude/commands/${command.namespace}/${command.name}.md`
-        : `.claude/commands/${command.name}.md`;
-      const fullPath = path.join(targetDir, relativePath);
-      if (fs.existsSync(fullPath)) {
-        preview.willOverwrite.push(relativePath);
-      } else {
-        preview.willCreate.push(relativePath);
+      const relativePaths = [
+        command.namespace
+          ? `.claude/commands/${command.namespace}/${command.name}.md`
+          : `.claude/commands/${command.name}.md`,
+        command.namespace
+          ? `.opencode/commands/${command.namespace}/${command.name}.md`
+          : `.opencode/commands/${command.name}.md`
+      ];
+
+      for (const relativePath of relativePaths) {
+        const fullPath = path.join(targetDir, relativePath);
+        if (fs.existsSync(fullPath)) {
+          preview.willOverwrite.push(relativePath);
+        } else {
+          preview.willCreate.push(relativePath);
+        }
       }
       preview.summary.commands++;
     }
@@ -1107,15 +1250,25 @@ function previewTemplateApplication(targetDir, templateId, options = {}) {
     }
   }
 
-  // 检查 MCP
-  if (template.mcpServers?.length > 0) {
-    const mcpPath = path.join(targetDir, '.mcp.json');
-    if (fs.existsSync(mcpPath)) {
-      preview.willOverwrite.push('.mcp.json');
+  // 检查 MCP / OpenCode 配置
+  if (template.mcpServers?.length > 0 || template.plugins?.length > 0) {
+    if (template.mcpServers?.length > 0) {
+      const mcpPath = path.join(targetDir, '.mcp.json');
+      if (fs.existsSync(mcpPath)) {
+        preview.willOverwrite.push('.mcp.json');
+      } else {
+        preview.willCreate.push('.mcp.json');
+      }
+    }
+
+    const opencodeConfigPath = path.join(targetDir, '.opencode/opencode.json');
+    if (fs.existsSync(opencodeConfigPath)) {
+      preview.willOverwrite.push('.opencode/opencode.json');
     } else {
-      preview.willCreate.push('.mcp.json');
+      preview.willCreate.push('.opencode/opencode.json');
     }
-    preview.summary.mcpServers = template.mcpServers.length;
+
+    preview.summary.mcpServers = template.mcpServers?.length || 0;
   }
 
   // 统计 Plugins（插件不写入文件，只记录数量）

package/src/server/services/env-checker.js

@@ -2,7 +2,7 @@
  * 环境变量检测服务
  *
  * 检测系统中可能导致 API 配置冲突的环境变量
- * 支持 macOS/Linux 的 shell 配置文件检测
+ * 支持 macOS/Linux/Windows 的 shell 配置文件检测
  */
 
 const fs = require('fs');
@@ -43,13 +43,23 @@ const EXACT_SENSITIVE_VARS = [
 ];
 
 // 需要检测的 shell 配置文件
-const SHELL_CONFIG_FILES = [
-  '.bashrc',
-  '.bash_profile',
-  '.zshrc',
-  '.zprofile',
-  '.profile'
-];
+const SHELL_CONFIG_FILES = process.platform === 'win32'
+  ? [
+      '.bashrc',
+      '.bash_profile',
+      '.zshrc',
+      '.zprofile',
+      '.profile',
+      path.join('Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'),
+      path.join('Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1')
+    ]
+  : [
+      '.bashrc',
+      '.bash_profile',
+      '.zshrc',
+      '.zprofile',
+      '.profile'
+    ];
 
 // 系统级配置文件
 const SYSTEM_CONFIG_FILES = [
@@ -120,7 +130,7 @@ function checkShellConfigs(keywords) {
   const homeDir = os.homedir();
 
   for (const fileName of SHELL_CONFIG_FILES) {
-    const filePath = path.join(homeDir, fileName);
+    const filePath = path.isAbsolute(fileName) ? fileName : path.join(homeDir, fileName);
     const fileConflicts = parseConfigFile(filePath, keywords);
     conflicts.push(...fileConflicts);
   }
@@ -165,10 +175,14 @@ function parseConfigFile(filePath, keywords) {
         continue;
       }
 
-      // 匹配 export VAR=value 或 VAR=value 格式
+      // 匹配 sh/bash/zsh 的 export VAR=value 或 VAR=value
       const exportMatch = trimmed.match(/^(?:export\s+)?([A-Z_][A-Z0-9_]*)=(.*)$/);
-      if (exportMatch) {
-        const [, varName, varValue] = exportMatch;
+      // 匹配 PowerShell 的 $env:VAR = value
+      const psMatch = trimmed.match(/^\$env:([A-Z_][A-Z0-9_]*)\s*=\s*(.*)$/i);
+      const matched = exportMatch || psMatch;
+
+      if (matched) {
+        const [, varName, varValue] = matched;
 
         if (matchesKeywords(varName, keywords)) {
           conflicts.push({

package/src/server/services/env-manager.js

@@ -6,15 +6,77 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
+const { PATHS, ensureStorageDirMigrated } = require('../../config/paths');
 
 // 备份目录
-const BACKUP_DIR = path.join(os.homedir(), '.claude', 'cc-tool', 'env-backups');
+const BACKUP_DIR = PATHS.envBackups;
+
+function ensureParentDir(filePath) {
+  const dirPath = path.dirname(filePath);
+  if (!fs.existsSync(dirPath)) {
+    fs.mkdirSync(dirPath, { recursive: true });
+  }
+}
+
+function writeFileAtomic(filePath, content) {
+  ensureParentDir(filePath);
+  const tempPath = `${filePath}.tmp-${process.pid}-${Date.now()}`;
+
+  try {
+    fs.writeFileSync(tempPath, content, 'utf-8');
+    fs.renameSync(tempPath, filePath);
+  } finally {
+    if (fs.existsSync(tempPath)) {
+      try {
+        fs.unlinkSync(tempPath);
+      } catch (cleanupErr) {
+        // ignore cleanup errors
+      }
+    }
+  }
+}
+
+function escapeRegex(value) {
+  return String(value || '').replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function isPowerShellProfile(filePath) {
+  return String(filePath || '').toLowerCase().endsWith('.ps1');
+}
+
+function matchesVarAssignment(line, varName, usePowerShell) {
+  if (!line || !varName) {
+    return false;
+  }
+
+  const escaped = escapeRegex(varName);
+  const regex = usePowerShell
+    ? new RegExp(`^\\s*\\$env:${escaped}\\s*=`, 'i')
+    : new RegExp(`^\\s*(?:export\\s+)?${escaped}=`);
+  return regex.test(line.trim());
+}
+
+function formatExportLine(varName, value, usePowerShell) {
+  if (usePowerShell) {
+    const escapedValue = String(value ?? '')
+      .replace(/`/g, '``')
+      .replace(/"/g, '`"');
+    return `$env:${varName} = "${escapedValue}"`;
+  }
+
+  const escapedValue = String(value ?? '')
+    .replace(/\\/g, '\\\\')
+    .replace(/"/g, '\\"')
+    .replace(/\$/g, '\\$')
+    .replace(/`/g, '\\`');
+  return `export ${varName}="${escapedValue}"`;
+}
 
 /**
  * 确保备份目录存在
  */
 function ensureBackupDir() {
+  ensureStorageDirMigrated();
   if (!fs.existsSync(BACKUP_DIR)) {
     fs.mkdirSync(BACKUP_DIR, { recursive: true });
   }
@@ -112,9 +174,14 @@ function getOriginalValue(conflict) {
 
     if (line) {
       const match = line.match(/^(?:export\s+)?[A-Z_][A-Z0-9_]*=(.*)$/);
-      if (match) {
+      if (match && match[1] !== undefined) {
         return cleanValue(match[1]);
       }
+
+      const psMatch = line.match(/^\s*\$env:[A-Z_][A-Z0-9_]*\s*=\s*(.*)$/i);
+      if (psMatch && psMatch[1] !== undefined) {
+        return cleanValue(psMatch[1]);
+      }
     }
   } catch (err) {
     // 忽略
@@ -162,18 +229,44 @@ function removeVarsFromFile(filePath, vars) {
   }
 
   const content = fs.readFileSync(filePath, 'utf-8');
-  const lines = content.split('\n');
+  const lines = content.split(/\r?\n/);
+  const usePowerShell = isPowerShellProfile(filePath);
+
+  // 收集要删除的行号（优先使用行号，行号不匹配时按变量名回退）
+  const lineNumbersToRemove = new Set();
+  for (const item of vars) {
+    const varName = String(item.varName || '').trim();
+    if (!varName) continue;
+
+    const lineIndex = Number(item.lineNumber) - 1;
+    if (
+      Number.isInteger(lineIndex) &&
+      lineIndex >= 0 &&
+      lineIndex < lines.length &&
+      matchesVarAssignment(lines[lineIndex], varName, usePowerShell)
+    ) {
+      lineNumbersToRemove.add(lineIndex);
+      continue;
+    }
 
-  // 收集要删除的行号
-  const lineNumbersToRemove = new Set(vars.map(v => v.lineNumber));
+    const fallbackIndex = lines.findIndex(line => matchesVarAssignment(line, varName, usePowerShell));
+    if (fallbackIndex >= 0) {
+      lineNumbersToRemove.add(fallbackIndex);
+    }
+  }
 
-  // 过滤掉要删除的行
-  const newLines = lines.filter((_, index) => !lineNumbersToRemove.has(index + 1));
+  if (lineNumbersToRemove.size === 0) {
+    console.log(`[EnvManager] No matching vars found in ${filePath}, skip writing`);
+    return;
+  }
 
-  // 写回文件
-  fs.writeFileSync(filePath, newLines.join('\n'), 'utf-8');
+  const newLines = lines.filter((_, index) => !lineNumbersToRemove.has(index));
+  const nextContent = newLines.join('\n');
+  if (nextContent !== content) {
+    writeFileAtomic(filePath, nextContent);
+  }
 
-  console.log(`[EnvManager] Removed ${vars.length} var(s) from ${filePath}`);
+  console.log(`[EnvManager] Removed ${lineNumbersToRemove.size} var(s) from ${filePath}`);
 }
 
 /**
@@ -255,21 +348,36 @@ function restoreFromBackup(backupPath) {
  * 恢复环境变量到文件
  */
 function restoreVarToFile(filePath, varName, value) {
+  const usePowerShell = isPowerShellProfile(filePath);
+  const exportLine = formatExportLine(varName, value, usePowerShell);
   let content = '';
 
   if (fs.existsSync(filePath)) {
     content = fs.readFileSync(filePath, 'utf-8');
-    // 确保末尾有换行
-    if (!content.endsWith('\n')) {
-      content += '\n';
+  }
+
+  const lines = content ? content.split(/\r?\n/) : [];
+  let replaced = false;
+
+  for (let i = 0; i < lines.length; i++) {
+    if (matchesVarAssignment(lines[i], varName, usePowerShell)) {
+      lines[i] = exportLine;
+      replaced = true;
     }
   }
 
-  // 添加环境变量
-  const exportLine = `export ${varName}="${value}"`;
-  content += exportLine + '\n';
+  if (!replaced) {
+    while (lines.length > 0 && lines[lines.length - 1].trim() === '') {
+      lines.pop();
+    }
+    if (lines.length > 0) {
+      lines.push('');
+    }
+    lines.push(exportLine);
+  }
 
-  fs.writeFileSync(filePath, content, 'utf-8');
+  const nextContent = `${lines.join('\n')}\n`;
+  writeFileAtomic(filePath, nextContent);
 
   console.log(`[EnvManager] Restored ${varName} to ${filePath}`);
 }