pumpkinai-config 1.0.16 → 1.0.18

package/claude-api.js

@@ -134,78 +134,142 @@ function installClaude() {
   }
 }
 
-// 创建 .claude 目录和配置文件
-function createClaudeConfig(apiKey) {
-  log('\n[配置] 创建 Claude 配置文件...', 'cyan');
+// 设置系统用户环境变量
+function setupEnvironmentVariables(apiKey) {
+  log('\n[配置] 设置系统用户环境变量...', 'cyan');
 
-  // 获取实际用户的 home 目录
+  const osType = getOS();
   let homeDir;
   if (process.platform !== 'win32' && process.env.SUDO_USER) {
-    // Linux/Mac 使用 sudo 时,获取实际用户的 home 目录
     const actualUser = process.env.SUDO_USER;
     homeDir = process.platform === 'darwin' ? `/Users/${actualUser}` : `/home/${actualUser}`;
   } else {
     homeDir = os.homedir();
   }
 
-  const claudeDir = path.join(homeDir, '.claude');
-  const settingsPath = path.join(claudeDir, 'settings.json');
-  const configPath = path.join(claudeDir, 'config.json');
+  // 静默删除旧的配置文件
   const oldConfigPath = path.join(homeDir, '.claude.json');
   const oldConfigBackupPath = path.join(homeDir, '.claude.json.backup');
-
   try {
-    // 删除旧的配置文件(不提示用户)
     if (fs.existsSync(oldConfigPath)) {
       fs.unlinkSync(oldConfigPath);
     }
     if (fs.existsSync(oldConfigBackupPath)) {
       fs.unlinkSync(oldConfigBackupPath);
     }
+  } catch (error) {}
+
+  // 需要设置的环境变量
+  const envVars = {
+    ANTHROPIC_AUTH_TOKEN: apiKey,
+    ANTHROPIC_BASE_URL: "https://new.aicode.us.com",
+    CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS:"1"
+  };
+
+  try {
+    if (osType === 'windows') {
+      // Windows: 使用 setx 设置用户环境变量（永久生效）
+      for (const [key, value] of Object.entries(envVars)) {
+        try {
+          execSync(`setx ${key} "${value}"`, { stdio: 'pipe' });
+          log(`[成功] 设置环境变量: ${key}`, 'green');
+        } catch (error) {
+          log(`[错误] 设置环境变量 ${key} 失败: ${error.message}`, 'red');
+          return false;
+        }
+      }
+      log('[提示] 请重新打开终端使环境变量生效', 'yellow');
+      return true;
+
+    } else if (osType === 'mac') {
+      // macOS: 写入 ~/.zshrc
+      const zshrcPath = path.join(homeDir, '.zshrc');
+      let zshrcContent = '';
+      if (fs.existsSync(zshrcPath)) {
+        zshrcContent = fs.readFileSync(zshrcPath, 'utf8');
+      }
+
+      // 构建环境变量行
+      let envLines = '\n# Claude Code 环境变量 (pumpkinai)\n';
+      for (const [key, value] of Object.entries(envVars)) {
+        const envLine = `export ${key}="${value}"`;
+        if (!zshrcContent.includes(`export ${key}=`)) {
+          envLines += envLine + '\n';
+          log(`[成功] 添加环境变量: ${key}`, 'green');
+        } else {
+          // 替换已存在的环境变量
+          const regex = new RegExp(`export ${key}=.*`, 'g');
+          zshrcContent = zshrcContent.replace(regex, envLine);
+          log(`[更新] 更新环境变量: ${key}`, 'yellow');
+        }
+      }
+
+      // 写入文件
+      if (envLines !== '\n# Claude Code 环境变量 (pumpkinai)\n') {
+        const newContent = zshrcContent + envLines;
+        fs.writeFileSync(zshrcPath, newContent, 'utf8');
+      } else {
+        fs.writeFileSync(zshrcPath, zshrcContent, 'utf8');
+      }
+
+      // 修改文件所有者
+      if (process.env.SUDO_USER) {
+        const actualUser = process.env.SUDO_USER;
+        try {
+          execSync(`chown ${actualUser}:staff ${zshrcPath}`);
+        } catch (error) {}
+      }
+
+      log(`[成功] 环境变量已写入: ${zshrcPath}`, 'green');
+      log('[提示] 请重新打开终端或运行: source ~/.zshrc', 'yellow');
+      return true;
 
-    // 创建 .claude 目录
-    if (!fs.existsSync(claudeDir)) {
-      fs.mkdirSync(claudeDir, { recursive: true });
-      log(`[成功] 创建目录: ${claudeDir}`, 'green');
     } else {
-      log(`[提示] 目录已存在: ${claudeDir}`, 'yellow');
-    }
+      // Linux: 写入 ~/.bashrc
+      const bashrcPath = path.join(homeDir, '.bashrc');
+      let bashrcContent = '';
+      if (fs.existsSync(bashrcPath)) {
+        bashrcContent = fs.readFileSync(bashrcPath, 'utf8');
+      }
 
-    // 创建 settings.json 配置 (删除了 ANTHROPIC_DEFAULT_HAIKU_MODEL)
-    const settings = {
-      env: {
-        ANTHROPIC_AUTH_TOKEN: apiKey,
-        ANTHROPIC_BASE_URL: "https://new.aicode.us.com",
-        ANTHROPIC_SMALL_FAST_MODEL: "claude-3-5-haiku-20241022",
+      // 构建环境变量行
+      let envLines = '\n# Claude Code 环境变量 (pumpkinai)\n';
+      for (const [key, value] of Object.entries(envVars)) {
+        const envLine = `export ${key}="${value}"`;
+        if (!bashrcContent.includes(`export ${key}=`)) {
+          envLines += envLine + '\n';
+          log(`[成功] 添加环境变量: ${key}`, 'green');
+        } else {
+          // 替换已存在的环境变量
+          const regex = new RegExp(`export ${key}=.*`, 'g');
+          bashrcContent = bashrcContent.replace(regex, envLine);
+          log(`[更新] 更新环境变量: ${key}`, 'yellow');
+        }
       }
-    };
-
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
-    log(`[成功] 创建配置文件: ${settingsPath}`, 'green');
-
-    // 创建 config.json 配置
-    const config = {
-      primaryApiKey: "1"
-    };
-
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
-    log(`[成功] 创建配置文件: ${configPath}`, 'green');
-
-    // 如果是通过 sudo 运行的,修改文件所有者
-    if (process.platform !== 'win32' && process.env.SUDO_USER) {
-      const actualUser = process.env.SUDO_USER;
-      const group = process.platform === 'darwin' ? 'staff' : actualUser;
-      try {
-        execSync(`chown -R ${actualUser}:${group} ${claudeDir}`);
-        log(`[成功] 设置文件所有者为: ${actualUser}`, 'green');
-      } catch (error) {
-        log(`[警告] 无法设置文件所有者: ${error.message}`, 'yellow');
+
+      // 写入文件
+      if (envLines !== '\n# Claude Code 环境变量 (pumpkinai)\n') {
+        const newContent = bashrcContent + envLines;
+        fs.writeFileSync(bashrcPath, newContent, 'utf8');
+      } else {
+        fs.writeFileSync(bashrcPath, bashrcContent, 'utf8');
       }
+
+      // 修改文件所有者
+      if (process.env.SUDO_USER) {
+        const actualUser = process.env.SUDO_USER;
+        try {
+          execSync(`chown ${actualUser}:${actualUser} ${bashrcPath}`);
+        } catch (error) {}
+      }
+
+      log(`[成功] 环境变量已写入: ${bashrcPath}`, 'green');
+      log('[提示] 请重新打开终端或运行: source ~/.bashrc', 'yellow');
+      return true;
     }
 
-    return true;
   } catch (error) {
-    log(`[错误] 创建配置文件失败: ${error.message}`, 'red');
+    log(`[错误] 设置环境变量失败: ${error.message}`, 'red');
     return false;
   }
 }
@@ -228,14 +292,14 @@ async function configureEnvironment() {
     return false;
   }
 
-  return createClaudeConfig(apiKey);
+  return setupEnvironmentVariables(apiKey);
 }
 
 // 显示完成信息
 function showCompletionInfo() {
   const osType = getOS();
 
-  // 获取配置文件路径
+  // 获取 home 目录
   let homeDir;
   if (process.platform !== 'win32' && process.env.SUDO_USER) {
     const actualUser = process.env.SUDO_USER;
@@ -243,9 +307,6 @@ function showCompletionInfo() {
   } else {
     homeDir = os.homedir();
   }
-  const claudeDir = path.join(homeDir, '.claude');
-  const settingsPath = path.join(claudeDir, 'settings.json');
-  const configPath = path.join(claudeDir, 'config.json');
 
   log('\n', 'reset');
   log('=' + '='.repeat(68) + '=', 'yellow');
@@ -254,15 +315,21 @@ function showCompletionInfo() {
 
   log('\n[已完成操作]', 'cyan');
   log('  * 安装 @anthropic-ai/claude-code', 'green');
-  log('  * 创建配置文件 settings.json', 'green');
-  log('  * 创建配置文件 config.json', 'green');
+  log('  * 设置用户环境变量 ANTHROPIC_AUTH_TOKEN', 'green');
+  log('  * 设置用户环境变量 ANTHROPIC_BASE_URL', 'green');
+  log('  * 设置用户环境变量 ANTHROPIC_SMALL_FAST_MODEL', 'green');
 
-  log('\n[配置文件路径]', 'cyan');
-  log('  settings.json (可在此处修改key和域名url):', 'reset');
-  log(`  ${settingsPath}`, 'yellow');
-  log('', 'reset');
-  log('  config.json:', 'reset');
-  log(`  ${configPath}`, 'yellow');
+  log('\n[环境变量配置]', 'cyan');
+  if (osType === 'windows') {
+    log('  环境变量已通过 setx 设置到用户环境变量', 'reset');
+    log('  可在 系统属性 -> 高级 -> 环境变量 中查看', 'yellow');
+  } else if (osType === 'mac') {
+    log('  环境变量已写入: ~/.zshrc', 'reset');
+    log(`  ${path.join(homeDir, '.zshrc')}`, 'yellow');
+  } else {
+    log('  环境变量已写入: ~/.bashrc', 'reset');
+    log(`  ${path.join(homeDir, '.bashrc')}`, 'yellow');
+  }
 
   log('\n[启动方式]', 'cyan');
 
@@ -331,5 +398,6 @@ if (require.main === module) {
 module.exports = {
   main,
   installClaude,
-  configureEnvironment
+  configureEnvironment,
+  setupEnvironmentVariables
 };

package/claude-setup.js

@@ -134,232 +134,137 @@ function installClaude() {
   }
 }
 
-// 创建 .claude 目录和配置文件
-function createClaudeConfig(apiKey) {
-  log('\n[配置] 创建 Claude 配置文件...', 'cyan');
+// 设置系统用户环境变量
+function setupEnvironmentVariables(apiKey) {
+  log('\n[配置] 设置系统用户环境变量...', 'cyan');
 
-  // 获取实际用户的 home 目录
+  const osType = getOS();
   let homeDir;
   if (process.platform !== 'win32' && process.env.SUDO_USER) {
-    // Linux/Mac 使用 sudo 时，获取实际用户的 home 目录
     const actualUser = process.env.SUDO_USER;
     homeDir = process.platform === 'darwin' ? `/Users/${actualUser}` : `/home/${actualUser}`;
   } else {
     homeDir = os.homedir();
   }
 
-  const claudeDir = path.join(homeDir, '.claude');
-  const settingsPath = path.join(claudeDir, 'settings.json');
-  const configPath = path.join(claudeDir, 'config.json');
+  // 静默删除旧的配置文件
   const oldConfigPath = path.join(homeDir, '.claude.json');
   const oldConfigBackupPath = path.join(homeDir, '.claude.json.backup');
-
   try {
-    // 删除旧的配置文件（不提示用户）
     if (fs.existsSync(oldConfigPath)) {
       fs.unlinkSync(oldConfigPath);
     }
     if (fs.existsSync(oldConfigBackupPath)) {
       fs.unlinkSync(oldConfigBackupPath);
     }
+  } catch (error) {}
 
-    // 创建 .claude 目录
-    if (!fs.existsSync(claudeDir)) {
-      fs.mkdirSync(claudeDir, { recursive: true });
-      log(`[成功] 创建目录: ${claudeDir}`, 'green');
-    } else {
-      log(`[提示] 目录已存在: ${claudeDir}`, 'yellow');
-    }
-
-    // 创建 settings.json 配置
-    const settings = {
-      env: {
-        ANTHROPIC_AUTH_TOKEN: apiKey,
-        ANTHROPIC_BASE_URL: "https://code.ppchat.vip",
-        ANTHROPIC_SMALL_FAST_MODEL: "claude-3-5-haiku-20241022"
-      }
-    };
-
-    fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2), 'utf8');
-    log(`[成功] 创建配置文件: ${settingsPath}`, 'green');
-
-    // 创建 config.json 配置
-    const config = {
-      primaryApiKey: "1"
-    };
-
-    fs.writeFileSync(configPath, JSON.stringify(config, null, 2), 'utf8');
-    log(`[成功] 创建配置文件: ${configPath}`, 'green');
-
-    // 如果是通过 sudo 运行的，修改文件所有者
-    if (process.platform !== 'win32' && process.env.SUDO_USER) {
-      const actualUser = process.env.SUDO_USER;
-      const group = process.platform === 'darwin' ? 'staff' : actualUser;
-      try {
-        execSync(`chown -R ${actualUser}:${group} ${claudeDir}`);
-        log(`[成功] 设置文件所有者为: ${actualUser}`, 'green');
-      } catch (error) {
-        log(`[警告] 无法设置文件所有者: ${error.message}`, 'yellow');
-      }
-    }
-
-    return true;
-  } catch (error) {
-    log(`[错误] 创建配置文件失败: ${error.message}`, 'red');
-    return false;
-  }
-}
-
-// 配置 Claude
-async function configureEnvironment() {
-  log('\n[配置] 配置 API Key...', 'cyan');
-
-  // 显示粘贴提示
-  if (process.platform === 'win32') {
-    log('[提示] Windows 粘贴方式:', 'yellow');
-    log('       • CMD/PowerShell: 鼠标右键 或 Shift+Insert', 'yellow');
-
-  }
-
-  const apiKey = await getUserInput('请输入你的 Claude API Key (sk-xxx): ');
-
-  if (!apiKey || !apiKey.startsWith('sk-')) {
-    log('[错误] API Key 格式不正确，应该以 sk- 开头', 'red');
-    return false;
-  }
-
-  return createClaudeConfig(apiKey);
-}
-
-// 配置环境变量到系统
-function setupEnvironmentVariable() {
-  log('\n[配置] 设置系统环境变量...', 'cyan');
-
-  const osType = getOS();
-  let homeDir;
-  if (process.platform !== 'win32' && process.env.SUDO_USER) {
-    const actualUser = process.env.SUDO_USER;
-    homeDir = process.platform === 'darwin' ? `/Users/${actualUser}` : `/home/${actualUser}`;
-  } else {
-    homeDir = os.homedir();
-  }
-
-  const envVarLine = 'export CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS="1"';
+  // 需要设置的环境变量
+  const envVars = {
+    ANTHROPIC_AUTH_TOKEN: apiKey,
+    ANTHROPIC_BASE_URL: "https://code.ppchat.vip",
+    CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS:"1"
+  };
 
   try {
     if (osType === 'windows') {
       // Windows: 使用 setx 设置用户环境变量（永久生效）
-      try {
-        execSync('setx CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS "1"', { stdio: 'pipe' });
-        log('[成功] 已设置 Windows 用户环境变量', 'green');
-        log('[提示] 请重新打开终端使环境变量生效', 'yellow');
-        return true;
-      } catch (error) {
-        log('[警告] 无法使用 setx 设置环境变量', 'yellow');
-
-        // 创建 PowerShell Profile 配置
+      for (const [key, value] of Object.entries(envVars)) {
         try {
-          const psProfileCmd = 'echo $PROFILE';
-          const profilePath = execSync(psProfileCmd, { encoding: 'utf8', shell: 'powershell.exe' }).trim();
-
-          // 确保 Profile 目录存在
-          const profileDir = path.dirname(profilePath);
-          if (!fs.existsSync(profileDir)) {
-            fs.mkdirSync(profileDir, { recursive: true });
-          }
-
-          // 读取现有 Profile 内容
-          let profileContent = '';
-          if (fs.existsSync(profilePath)) {
-            profileContent = fs.readFileSync(profilePath, 'utf8');
-          }
-
-          // 检查是否已存在该环境变量配置
-          const psEnvLine = '$env:CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS = "1"';
-          if (!profileContent.includes('CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS')) {
-            // 追加环境变量到 Profile
-            const newContent = profileContent + (profileContent ? '\n' : '') +
-                             '# Claude Code 环境变量\n' + psEnvLine + '\n';
-            fs.writeFileSync(profilePath, newContent, 'utf8');
-            log(`[成功] 已添加环境变量到 PowerShell Profile: ${profilePath}`, 'green');
-            log('[提示] 请重新打开 PowerShell 使环境变量生效', 'yellow');
-          } else {
-            log('[提示] PowerShell Profile 中已存在该环境变量', 'yellow');
-          }
-          return true;
-        } catch (psError) {
-          log(`[警告] PowerShell Profile 配置失败: ${psError.message}`, 'yellow');
-          log('[提示] 请联系淘宝或者技术客服解决', 'yellow');
+          execSync(`setx ${key} "${value}"`, { stdio: 'pipe' });
+          log(`[成功] 设置环境变量: ${key}`, 'green');
+        } catch (error) {
+          log(`[错误] 设置环境变量 ${key} 失败: ${error.message}`, 'red');
           return false;
         }
       }
+      log('[提示] 请重新打开终端使环境变量生效', 'yellow');
+      return true;
 
     } else if (osType === 'mac') {
       // macOS: 写入 ~/.zshrc
       const zshrcPath = path.join(homeDir, '.zshrc');
-
-      // 读取现有内容
       let zshrcContent = '';
       if (fs.existsSync(zshrcPath)) {
         zshrcContent = fs.readFileSync(zshrcPath, 'utf8');
       }
 
-      // 检查是否已存在该环境变量
-      if (!zshrcContent.includes('CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS')) {
-        // 追加环境变量
-        const newContent = zshrcContent + (zshrcContent && !zshrcContent.endsWith('\n') ? '\n' : '') +
-                         '# Claude Code 环境变量\n' + envVarLine + '\n';
-        fs.writeFileSync(zshrcPath, newContent, 'utf8');
-        log(`[成功] 已添加环境变量到: ${zshrcPath}`, 'green');
-
-        // 如果是通过 sudo 运行的，修改文件所有者
-        if (process.env.SUDO_USER) {
-          const actualUser = process.env.SUDO_USER;
-          try {
-            execSync(`chown ${actualUser}:staff ${zshrcPath}`);
-          } catch (error) {
-          }
+      // 构建环境变量行
+      let envLines = '\n# Claude Code 环境变量 (pumpkinai)\n';
+      for (const [key, value] of Object.entries(envVars)) {
+        const envLine = `export ${key}="${value}"`;
+        if (!zshrcContent.includes(`export ${key}=`)) {
+          envLines += envLine + '\n';
+          log(`[成功] 添加环境变量: ${key}`, 'green');
+        } else {
+          // 替换已存在的环境变量
+          const regex = new RegExp(`export ${key}=.*`, 'g');
+          zshrcContent = zshrcContent.replace(regex, envLine);
+          log(`[更新] 更新环境变量: ${key}`, 'yellow');
         }
+      }
 
-        log('[提示] 环境变量将在新终端窗口中生效', 'yellow');
-        log('[提示] 如需在当前终端立即生效，请运行: source ~/.zshrc', 'yellow');
+      // 写入文件
+      if (envLines !== '\n# Claude Code 环境变量 (pumpkinai)\n') {
+        const newContent = zshrcContent + envLines;
+        fs.writeFileSync(zshrcPath, newContent, 'utf8');
       } else {
-        log('[提示] ~/.zshrc 中已存在该环境变量', 'yellow');
+        fs.writeFileSync(zshrcPath, zshrcContent, 'utf8');
       }
+
+      // 修改文件所有者
+      if (process.env.SUDO_USER) {
+        const actualUser = process.env.SUDO_USER;
+        try {
+          execSync(`chown ${actualUser}:staff ${zshrcPath}`);
+        } catch (error) {}
+      }
+
+      log(`[成功] 环境变量已写入: ${zshrcPath}`, 'green');
+      log('[提示] 请重新打开终端或运行: source ~/.zshrc', 'yellow');
       return true;
 
     } else {
       // Linux: 写入 ~/.bashrc
       const bashrcPath = path.join(homeDir, '.bashrc');
-
-      // 读取现有内容
       let bashrcContent = '';
       if (fs.existsSync(bashrcPath)) {
         bashrcContent = fs.readFileSync(bashrcPath, 'utf8');
       }
 
-      // 检查是否已存在该环境变量
-      if (!bashrcContent.includes('CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS')) {
-        // 追加环境变量
-        const newContent = bashrcContent + (bashrcContent && !bashrcContent.endsWith('\n') ? '\n' : '') +
-                         '# Claude Code 环境变量\n' + envVarLine + '\n';
-        fs.writeFileSync(bashrcPath, newContent, 'utf8');
-        log(`[成功] 已添加环境变量到: ${bashrcPath}`, 'green');
-
-        // 如果是通过 sudo 运行的，修改文件所有者
-        if (process.env.SUDO_USER) {
-          const actualUser = process.env.SUDO_USER;
-          try {
-            execSync(`chown ${actualUser}:${actualUser} ${bashrcPath}`);
-          } catch (error) {
-          }
+      // 构建环境变量行
+      let envLines = '\n# Claude Code 环境变量 (pumpkinai)\n';
+      for (const [key, value] of Object.entries(envVars)) {
+        const envLine = `export ${key}="${value}"`;
+        if (!bashrcContent.includes(`export ${key}=`)) {
+          envLines += envLine + '\n';
+          log(`[成功] 添加环境变量: ${key}`, 'green');
+        } else {
+          // 替换已存在的环境变量
+          const regex = new RegExp(`export ${key}=.*`, 'g');
+          bashrcContent = bashrcContent.replace(regex, envLine);
+          log(`[更新] 更新环境变量: ${key}`, 'yellow');
         }
+      }
 
-        log('[提示] 环境变量将在新终端窗口中生效', 'yellow');
-        log('[提示] 如需在当前终端立即生效，请运行: source ~/.bashrc', 'yellow');
+      // 写入文件
+      if (envLines !== '\n# Claude Code 环境变量 (pumpkinai)\n') {
+        const newContent = bashrcContent + envLines;
+        fs.writeFileSync(bashrcPath, newContent, 'utf8');
       } else {
-        log('[提示] ~/.bashrc 中已存在该环境变量', 'yellow');
+        fs.writeFileSync(bashrcPath, bashrcContent, 'utf8');
+      }
+
+      // 修改文件所有者
+      if (process.env.SUDO_USER) {
+        const actualUser = process.env.SUDO_USER;
+        try {
+          execSync(`chown ${actualUser}:${actualUser} ${bashrcPath}`);
+        } catch (error) {}
       }
+
+      log(`[成功] 环境变量已写入: ${bashrcPath}`, 'green');
+      log('[提示] 请重新打开终端或运行: source ~/.bashrc', 'yellow');
       return true;
     }
 
@@ -369,11 +274,32 @@ function setupEnvironmentVariable() {
   }
 }
 
+// 配置 Claude
+async function configureEnvironment() {
+  log('\n[配置] 配置 API Key...', 'cyan');
+
+  // 显示粘贴提示
+  if (process.platform === 'win32') {
+    log('[提示] Windows 粘贴方式:', 'yellow');
+    log('       • CMD/PowerShell: 鼠标右键 或 Shift+Insert', 'yellow');
+
+  }
+
+  const apiKey = await getUserInput('请输入你的 Claude API Key (sk-xxx): ');
+
+  if (!apiKey || !apiKey.startsWith('sk-')) {
+    log('[错误] API Key 格式不正确，应该以 sk- 开头', 'red');
+    return false;
+  }
+
+  return setupEnvironmentVariables(apiKey);
+}
+
 // 显示完成信息
 function showCompletionInfo() {
   const osType = getOS();
 
-  // 获取配置文件路径
+  // 获取 home 目录
   let homeDir;
   if (process.platform !== 'win32' && process.env.SUDO_USER) {
     const actualUser = process.env.SUDO_USER;
@@ -381,9 +307,6 @@ function showCompletionInfo() {
   } else {
     homeDir = os.homedir();
   }
-  const claudeDir = path.join(homeDir, '.claude');
-  const settingsPath = path.join(claudeDir, 'settings.json');
-  const configPath = path.join(claudeDir, 'config.json');
 
   log('\n', 'reset');
   log('=' + '='.repeat(68) + '=', 'yellow');
@@ -392,16 +315,21 @@ function showCompletionInfo() {
 
   log('\n[已完成操作]', 'cyan');
   log('  * 安装 @anthropic-ai/claude-code', 'green');
-  log('  * 创建配置文件 settings.json', 'green');
-  log('  * 创建配置文件 config.json', 'green');
-  log('  * 设置系统环境变量 CLAUDE_CODE_DISABLE_EXPERIMENTAL_BETAS=1', 'green');
+  log('  * 设置用户环境变量 ANTHROPIC_AUTH_TOKEN', 'green');
+  log('  * 设置用户环境变量 ANTHROPIC_BASE_URL', 'green');
+  log('  * 设置用户环境变量 ANTHROPIC_SMALL_FAST_MODEL', 'green');
 
-  log('\n[配置文件路径]', 'cyan');
-  log('  settings.json (可在此处修改key和域名url):', 'reset');
-  log(`  ${settingsPath}`, 'yellow');
-  log('', 'reset');
-  log('  config.json:', 'reset');
-  log(`  ${configPath}`, 'yellow');
+  log('\n[环境变量配置]', 'cyan');
+  if (osType === 'windows') {
+    log('  环境变量已通过 setx 设置到用户环境变量', 'reset');
+    log('  可在 系统属性 -> 高级 -> 环境变量 中查看', 'yellow');
+  } else if (osType === 'mac') {
+    log('  环境变量已写入: ~/.zshrc', 'reset');
+    log(`  ${path.join(homeDir, '.zshrc')}`, 'yellow');
+  } else {
+    log('  环境变量已写入: ~/.bashrc', 'reset');
+    log(`  ${path.join(homeDir, '.bashrc')}`, 'yellow');
+  }
 
   log('\n[启动方式]', 'cyan');
 
@@ -446,16 +374,13 @@ async function main() {
       log('\n[提示] 安装失败，但你可以继续配置环境变量', 'yellow');
     }
 
-    // 2. 配置 API Key
+    // 2. 配置 API Key (会自动设置环境变量)
     const configSuccess = await configureEnvironment();
     if (!configSuccess) {
       process.exit(1);
     }
 
-    // 3. 设置系统环境变量
-    setupEnvironmentVariable();
-
-    // 4. 显示完成信息
+    // 3. 显示完成信息
     showCompletionInfo();
 
   } catch (error) {
@@ -474,5 +399,5 @@ module.exports = {
   main,
   installClaude,
   configureEnvironment,
-  setupEnvironmentVariable
+  setupEnvironmentVariables
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pumpkinai-config",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "PumpkinAI 一键安装配置工具 - 支持 Codex 和 Claude Code",
   "main": "codex-setup.js",
   "bin": {