coding-tool-x 3.3.6 → 3.3.8

package/src/server/services/codex-settings-manager.js

@@ -3,26 +3,27 @@ const path = require('path');
 const os = require('os');
 const toml = require('toml');
 const tomlStringify = require('@iarna/toml').stringify;
-const { resolvePreferredHomeDir, isWindowsLikePlatform } = require('../../utils/home-dir');
+const { resolvePreferredHomeDir } = require('../../utils/home-dir');
+const { NATIVE_PATHS } = require('../../config/paths');
 
 const HOME_DIR = resolvePreferredHomeDir(process.platform, process.env, os.homedir());
 
 // Codex 配置文件路径
 function getConfigPath() {
-  return path.join(HOME_DIR, '.codex', 'config.toml');
+  return NATIVE_PATHS.codex.config;
 }
 
 function getAuthPath() {
-  return path.join(HOME_DIR, '.codex', 'auth.json');
+  return NATIVE_PATHS.codex.auth;
 }
 
 // 备份文件路径
 function getConfigBackupPath() {
-  return path.join(HOME_DIR, '.codex', 'config.toml.cc-tool-backup');
+  return NATIVE_PATHS.codex.configBackup;
 }
 
 function getAuthBackupPath() {
-  return path.join(HOME_DIR, '.codex', 'auth.json.cc-tool-backup');
+  return NATIVE_PATHS.codex.authBackup;
 }
 
 // 检查配置文件是否存在
@@ -39,172 +40,6 @@ function hasBackup() {
   return fs.existsSync(getConfigBackupPath()) || fs.existsSync(getAuthBackupPath());
 }
 
-const INVALID_ENV_NAME_PATTERN = /[\r\n]/;
-const SHELL_MARKER_PREFIX = '# Added by Coding-Tool for Codex';
-
-function normalizeEnvName(envName) {
-  const normalized = String(envName || '').trim();
-  if (!normalized || INVALID_ENV_NAME_PATTERN.test(normalized)) {
-    return null;
-  }
-  return normalized;
-}
-
-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, 'utf8');
-    fs.renameSync(tempPath, filePath);
-  } finally {
-    if (fs.existsSync(tempPath)) {
-      try {
-        fs.unlinkSync(tempPath);
-      } catch (cleanupErr) {
-        // ignore cleanup errors
-      }
-    }
-  }
-}
-
-function normalizeHomePath(filePath) {
-  const normalizedPath = String(filePath || '').replace(/\\/g, '/');
-  const normalizedHome = HOME_DIR.replace(/\\/g, '/');
-  if (normalizedPath.startsWith(normalizedHome)) {
-    return `~${normalizedPath.slice(normalizedHome.length)}`;
-  }
-  return filePath;
-}
-
-function compactBlankLines(lines) {
-  const compacted = [];
-  let previousIsBlank = false;
-
-  for (const line of lines) {
-    const isBlank = line.trim() === '';
-    if (isBlank) {
-      if (!previousIsBlank) {
-        compacted.push('');
-      }
-      previousIsBlank = true;
-      continue;
-    }
-
-    compacted.push(line);
-    previousIsBlank = false;
-  }
-
-  while (compacted.length > 0 && compacted[compacted.length - 1].trim() === '') {
-    compacted.pop();
-  }
-
-  return compacted;
-}
-
-function isPowerShellProfile(filePath) {
-  return String(filePath || '').toLowerCase().endsWith('.ps1');
-}
-
-function getShellConfigCandidates() {
-  const homeDir = HOME_DIR;
-  const shell = String(process.env.SHELL || '').toLowerCase();
-  const candidates = [];
-
-  if (isWindowsLikePlatform(process.platform, process.env)) {
-    const oneDriveDir = process.env.OneDrive || process.env.ONEDRIVE || '';
-
-    if (shell.includes('zsh')) {
-      candidates.push(path.join(homeDir, '.zshrc'));
-    }
-
-    if (shell.includes('bash')) {
-      candidates.push(path.join(homeDir, '.bashrc'));
-      candidates.push(path.join(homeDir, '.bash_profile'));
-    }
-
-    candidates.push(path.join(homeDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'));
-    candidates.push(path.join(homeDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'));
-    if (oneDriveDir) {
-      candidates.push(path.join(oneDriveDir, 'Documents', 'PowerShell', 'Microsoft.PowerShell_profile.ps1'));
-      candidates.push(path.join(oneDriveDir, 'Documents', 'WindowsPowerShell', 'Microsoft.PowerShell_profile.ps1'));
-    }
-    candidates.push(path.join(homeDir, '.bashrc'));
-    candidates.push(path.join(homeDir, '.profile'));
-  } else if (shell.includes('zsh')) {
-    candidates.push(path.join(homeDir, '.zshrc'));
-    candidates.push(path.join(homeDir, '.zprofile'));
-    candidates.push(path.join(homeDir, '.profile'));
-  } else if (shell.includes('bash')) {
-    if (process.platform === 'darwin') {
-      candidates.push(path.join(homeDir, '.bash_profile'));
-      candidates.push(path.join(homeDir, '.bashrc'));
-    } else {
-      candidates.push(path.join(homeDir, '.bashrc'));
-      candidates.push(path.join(homeDir, '.bash_profile'));
-    }
-    candidates.push(path.join(homeDir, '.profile'));
-  } else {
-    candidates.push(path.join(homeDir, '.zshrc'));
-    candidates.push(path.join(homeDir, '.bashrc'));
-    candidates.push(path.join(homeDir, '.bash_profile'));
-    candidates.push(path.join(homeDir, '.profile'));
-  }
-
-  return [...new Set(candidates)];
-}
-
-function getShellReloadCommand(configPath) {
-  if (!configPath) {
-    return isWindowsLikePlatform(process.platform, process.env) ? '重启终端' : 'source ~/.zshrc';
-  }
-
-  const displayPath = normalizeHomePath(configPath);
-  const normalized = String(displayPath || '').replace(/\\/g, '/').toLowerCase();
-
-  if (normalized.endsWith('microsoft.powershell_profile.ps1')) {
-    return '. $PROFILE';
-  }
-  if (normalized.endsWith('/.zshrc')) {
-    return 'source ~/.zshrc';
-  }
-  if (normalized.endsWith('/.bash_profile')) {
-    return 'source ~/.bash_profile';
-  }
-  if (normalized.endsWith('/.bashrc')) {
-    return 'source ~/.bashrc';
-  }
-  if (normalized.endsWith('/.profile')) {
-    return 'source ~/.profile';
-  }
-
-  if (isWindowsLikePlatform(process.platform, process.env)) {
-    return '. $PROFILE';
-  }
-
-  return `source ${displayPath}`;
-}
-
-function escapeShellValue(value) {
-  return String(value ?? '')
-    .replace(/\\/g, '\\\\')
-    .replace(/"/g, '\\"')
-    .replace(/\$/g, '\\$')
-    .replace(/`/g, '\\`');
-}
-
-function escapePowerShellValue(value) {
-  return String(value ?? '')
-    .replace(/`/g, '``')
-    .replace(/"/g, '`"');
-}
 
 // 读取 config.toml
 function readConfig() {
@@ -359,10 +194,7 @@ function restoreSettings() {
       fs.unlinkSync(getAuthBackupPath());
     }
 
-    // 清理 shell 配置文件中的环境变量（可选，不影响恢复结果）
-    removeEnvFromShell('CC_PROXY_KEY');
-
-    // 同步删除当前进程的环境变量，使恢复立即生效（无需新开终端）
+    // auth.json 已恢复，同步删除当前进程的环境变量
     delete process.env.CC_PROXY_KEY;
 
     console.log('Codex settings restored from backup');
@@ -372,161 +204,6 @@ function restoreSettings() {
   }
 }
 
-// 获取用户的 shell 配置文件路径
-function getShellConfigPath() {
-  const candidates = getShellConfigCandidates();
-  const existing = candidates.find(filePath => fs.existsSync(filePath));
-  return existing || candidates[0];
-}
-
-// 注入环境变量到 shell 配置文件
-function injectEnvToShell(envName, envValue) {
-  const normalizedEnvName = normalizeEnvName(envName);
-  if (!normalizedEnvName) {
-    return {
-      success: false,
-      error: `Invalid environment variable name: ${envName}`,
-      isFirstTime: false
-    };
-  }
-
-  const configPath = getShellConfigPath();
-  const marker = `${SHELL_MARKER_PREFIX} [${normalizedEnvName}]`;
-  const usePowerShell = isPowerShellProfile(configPath);
-  const exportLine = usePowerShell
-    ? `$env:${normalizedEnvName} = "${escapePowerShellValue(envValue)}"`
-    : `export ${normalizedEnvName}="${escapeShellValue(envValue)}"`;
-
-  try {
-    let content = '';
-    if (fs.existsSync(configPath)) {
-      content = fs.readFileSync(configPath, 'utf8');
-    }
-
-    const envKeyEscaped = String(normalizedEnvName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const envLineRegex = usePowerShell
-      ? new RegExp(`^\\s*\\$env:${envKeyEscaped}\\s*=`, 'i')
-      : new RegExp(`^\\s*(?:export\\s+)?${envKeyEscaped}=`);
-
-    const originalLines = content ? content.split(/\r?\n/) : [];
-    const cleanedLines = [];
-    let existed = false;
-
-    for (let i = 0; i < originalLines.length; i++) {
-      const currentLine = originalLines[i];
-      const trimmedLine = currentLine.trim();
-
-      if (trimmedLine === marker) {
-        const nextLine = originalLines[i + 1] || '';
-        if (envLineRegex.test(nextLine.trim())) {
-          i += 1;
-        }
-        existed = true;
-        continue;
-      }
-
-      if (envLineRegex.test(trimmedLine)) {
-        existed = true;
-        continue;
-      }
-
-      cleanedLines.push(currentLine);
-    }
-
-    while (cleanedLines.length > 0 && cleanedLines[cleanedLines.length - 1].trim() === '') {
-      cleanedLines.pop();
-    }
-
-    if (cleanedLines.length > 0) {
-      cleanedLines.push('');
-    }
-
-    cleanedLines.push(marker, exportLine);
-
-    const nextContent = `${cleanedLines.join('\n')}\n`;
-    if (nextContent !== content) {
-      writeFileAtomic(configPath, nextContent);
-    }
-
-    // 同步更新当前进程的环境变量，使变更立即生效（无需新开终端）
-    process.env[normalizedEnvName] = String(envValue ?? '');
-
-    return { success: true, path: configPath, isFirstTime: !existed };
-  } catch (err) {
-    // 不抛出错误，只是警告，因为这不是致命问题
-    console.warn(`[Codex] Failed to inject env to shell config: ${err.message}`);
-    return { success: false, error: err.message, isFirstTime: false };
-  }
-}
-
-// 从 shell 配置文件移除环境变量
-function removeEnvFromShell(envName) {
-  const normalizedEnvName = normalizeEnvName(envName);
-  if (!normalizedEnvName) {
-    return {
-      success: false,
-      error: `Invalid environment variable name: ${envName}`
-    };
-  }
-
-  const configPath = getShellConfigPath();
-
-  try {
-    if (!fs.existsSync(configPath)) {
-      return { success: true };
-    }
-
-    const content = fs.readFileSync(configPath, 'utf8');
-    const usePowerShell = isPowerShellProfile(configPath);
-    const marker = `${SHELL_MARKER_PREFIX} [${normalizedEnvName}]`;
-    const envKeyEscaped = String(normalizedEnvName).replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
-    const envLineRegex = usePowerShell
-      ? new RegExp(`^\\s*\\$env:${envKeyEscaped}\\s*=`, 'i')
-      : new RegExp(`^\\s*(?:export\\s+)?${envKeyEscaped}=`);
-
-    const originalLines = content ? content.split(/\r?\n/) : [];
-    const cleanedLines = [];
-    let changed = false;
-
-    for (let i = 0; i < originalLines.length; i++) {
-      const currentLine = originalLines[i];
-      const trimmedLine = currentLine.trim();
-
-      if (trimmedLine === marker) {
-        const nextLine = originalLines[i + 1] || '';
-        if (envLineRegex.test(nextLine.trim())) {
-          i += 1;
-        }
-        changed = true;
-        continue;
-      }
-
-      if (envLineRegex.test(trimmedLine)) {
-        changed = true;
-        continue;
-      }
-
-      cleanedLines.push(currentLine);
-    }
-
-    if (!changed) {
-      return { success: true };
-    }
-
-    const normalized = compactBlankLines(cleanedLines);
-    const nextContent = normalized.length > 0 ? `${normalized.join('\n')}\n` : '';
-    writeFileAtomic(configPath, nextContent);
-
-    // 同步删除当前进程的环境变量，使变更立即生效（无需新开终端）
-    delete process.env[normalizedEnvName];
-
-    return { success: true };
-  } catch (err) {
-    console.warn(`[Codex] Failed to remove env from shell config: ${err.message}`);
-    return { success: false, error: err.message };
-  }
-}
-
 // 设置代理配置
 function setProxyConfig(proxyPort) {
   try {
@@ -560,24 +237,15 @@ function setProxyConfig(proxyPort) {
     auth.CC_PROXY_KEY = 'PROXY_KEY';
     writeAuth(auth);
 
-    // 注入环境变量到 shell 配置文件（解决某些系统环境变量优先级问题）
-    const shellInjectResult = injectEnvToShell('CC_PROXY_KEY', 'PROXY_KEY');
-
-    // 同步更新当前进程的环境变量，使代理立即生效（无需新开终端）
-    process.env.CC_PROXY_KEY = 'PROXY_KEY';
-
-    // 获取 shell 配置文件路径用于提示信息
-    const shellConfigPath = shellInjectResult.path || getShellConfigPath();
-    const sourceCommand = getShellReloadCommand(shellConfigPath);
-
+    // auth.json 已写入 CC_PROXY_KEY，Codex 优先读取 auth.json，无需注入 shell 配置文件
     console.log(`Codex settings updated to use proxy on port ${proxyPort}`);
     return {
       success: true,
       port: proxyPort,
-      envInjected: shellInjectResult.success,
-      isFirstTime: shellInjectResult.isFirstTime,
-      shellConfigPath: shellConfigPath,
-      sourceCommand: sourceCommand
+      envInjected: true,
+      isFirstTime: false,
+      shellConfigPath: null,
+      sourceCommand: null
     };
   } catch (err) {
     throw new Error('Failed to set proxy config: ' + err.message);
@@ -652,8 +320,4 @@ module.exports = {
   setProxyConfig,
   isProxyConfig,
   getCurrentProxyPort,
-  // 导出环境变量注入函数供其他模块使用
-  getShellConfigPath,
-  injectEnvToShell,
-  removeEnvFromShell
 };