@tkpdx01/ccc 1.6.3 → 1.6.6

package/README.md

@@ -40,6 +40,7 @@ ccc delete [profile] # Delete profile
 ccc sync [profile]   # Sync from template, preserve credentials
 ccc sync --all       # Sync all profiles
 ccc apply [profile]  # Write profile config to ~/.claude or ~/.codex
+ccc resettodefault   # Restore pre-apply ~/.codex and clean OPENAI env exports
 ```
 
 ### WebDAV Cloud Sync
@@ -69,7 +70,8 @@ Each profile is a directory containing `auth.json` + `config.toml`. Launched via
 CODEX_HOME=~/.ccc/codex-profiles/<name>/ codex
 ```
 
-No global environment variables are modified — everything is process-scoped.
+`ccc <profile>` 启动仍是进程级环境变量，不污染全局。
+`ccc apply`（Codex）会同步 `OPENAI_BASE_URL` / `OPENAI_API_KEY` 到 shell rc，并可用 `ccc resettodefault` 回滚。
 
 ### Storage
 
@@ -89,9 +91,9 @@ No global environment variables are modified — everything is process-scoped.
 - **Dual CLI support** — Claude Code + OpenAI Codex in one tool
 - **Unified index** — All profiles sorted together, launch by number
 - **Apply command** — Push a profile's config to `~/.claude` or `~/.codex`
+- **Reset to default** — Restore pre-apply Codex config and shell env exports
 - **Template sync** — Update from main settings, keep credentials
 - **Cloud sync** — E2E encrypted WebDAV sync across devices
-- **Zero env pollution** — API keys stored in config files, not shell env
 
 ## Security
 

package/index.js

@@ -17,6 +17,7 @@ import {
   deleteCommand,
   syncCommand,
   applyCommand,
+  resetToDefaultCommand,
   webdavCommand,
   helpCommand
 } from './src/commands/index.js';
@@ -27,7 +28,7 @@ const program = new Command();
 program
   .name('ccc')
   .description('Claude Code / Codex Settings Launcher - 管理多个 Claude Code 和 Codex 配置文件')
-  .version('1.6.0');
+  .version('1.6.6');
 
 // 注册所有命令
 listCommand(program);
@@ -38,6 +39,7 @@ editCommand(program);
 deleteCommand(program);
 syncCommand(program);
 applyCommand(program);
+resetToDefaultCommand(program);
 webdavCommand(program);
 helpCommand(program);
 
@@ -51,7 +53,7 @@ program
 
     if (profile) {
       // 检查是否是子命令
-      if (['list', 'ls', 'use', 'show', 'new', 'edit', 'delete', 'rm', 'sync', 'apply', 'webdav', 'help'].includes(profile)) {
+      if (['list', 'ls', 'use', 'show', 'new', 'edit', 'delete', 'rm', 'sync', 'apply', 'resettodefault', 'webdav', 'help'].includes(profile)) {
         return; // 让子命令处理
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tkpdx01/ccc",
-  "version": "1.6.3",
+  "version": "1.6.6",
   "description": "Claude Code / Codex Settings Launcher - Manage multiple Claude Code and Codex profiles",
   "main": "index.js",
   "bin": {

package/src/codex-models.js

@@ -0,0 +1,133 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+
+const REQUEST_TIMEOUT_MS = 8000;
+const MANUAL_INPUT_VALUE = '__manual_input__';
+
+function normalizeBaseUrl(baseUrl) {
+  const trimmed = (baseUrl || '').trim();
+  return trimmed || 'https://api.openai.com/v1';
+}
+
+function buildModelsEndpoint(baseUrl) {
+  const normalized = normalizeBaseUrl(baseUrl).replace(/\/+$/, '');
+  if (normalized.endsWith('/models')) {
+    return normalized;
+  }
+
+  let url;
+  try {
+    url = new URL(normalized);
+  } catch {
+    return `${normalized}/models`;
+  }
+
+  const path = url.pathname || '/';
+  if (path === '/' || path === '') {
+    url.pathname = '/v1/models';
+  } else {
+    url.pathname = `${path.replace(/\/+$/, '')}/models`;
+  }
+  return url.toString();
+}
+
+export async function fetchOpenAIModelIds(baseUrl, apiKey) {
+  const token = (apiKey || '').trim();
+  if (!token) {
+    throw new Error('API Key 为空');
+  }
+
+  const endpoint = buildModelsEndpoint(baseUrl);
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+
+  try {
+    const response = await fetch(endpoint, {
+      method: 'GET',
+      headers: {
+        Authorization: `Bearer ${token}`,
+        Accept: 'application/json'
+      },
+      signal: controller.signal
+    });
+
+    if (!response.ok) {
+      const body = await response.text();
+      const snippet = body.replace(/\s+/g, ' ').slice(0, 120);
+      throw new Error(`HTTP ${response.status}${snippet ? `: ${snippet}` : ''}`);
+    }
+
+    const data = await response.json();
+    const models = Array.isArray(data?.data) ? data.data : [];
+
+    return models
+      .map(item => (typeof item?.id === 'string' ? item.id.trim() : ''))
+      .filter(Boolean)
+      .sort((a, b) => a.localeCompare(b));
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export async function promptCodexModel(baseUrl, apiKey, currentModel = '') {
+  const current = (currentModel || '').trim();
+
+  if (!(apiKey || '').trim()) {
+    const { model } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'model',
+        message: 'Model (留空使用默认):',
+        default: current
+      }
+    ]);
+    return model;
+  }
+
+  console.log(chalk.gray('正在获取模型列表...'));
+
+  try {
+    const modelIds = await fetchOpenAIModelIds(baseUrl, apiKey);
+    if (modelIds.length === 0) {
+      throw new Error('返回了空模型列表');
+    }
+
+    const choices = [
+      { name: '(默认模型)', value: '' },
+      ...modelIds.map(id => ({ name: id, value: id })),
+      { name: '手动输入模型 ID', value: MANUAL_INPUT_VALUE }
+    ];
+
+    let defaultChoice = '';
+    if (current) {
+      defaultChoice = modelIds.includes(current) ? current : MANUAL_INPUT_VALUE;
+    }
+
+    const { selectedModel } = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'selectedModel',
+        message: '选择模型:',
+        choices,
+        default: defaultChoice
+      }
+    ]);
+
+    if (selectedModel !== MANUAL_INPUT_VALUE) {
+      return selectedModel;
+    }
+  } catch (error) {
+    const reason = error?.name === 'AbortError' ? '请求超时' : (error?.message || '未知错误');
+    console.log(chalk.yellow(`获取模型列表失败，改为手动输入（${reason}）`));
+  }
+
+  const { model } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'model',
+      message: 'Model (留空使用默认):',
+      default: current
+    }
+  ]);
+  return model;
+}

package/src/commands/apply.js

@@ -69,8 +69,21 @@ export function applyCommand(program) {
         result = applyClaudeProfile(profileInfo.name);
       }
 
-      if (result) {
+      const success = profileInfo.type === 'codex'
+        ? Boolean(result && (result.success ?? result))
+        : Boolean(result);
+
+      if (success) {
         console.log(chalk.green(`\n✓ ${typeLabel} 配置 "${profileInfo.name}" 已应用到 ${targetDir}`));
+
+        if (profileInfo.type === 'codex' && result?.envSync?.filePath) {
+          const home = process.env.HOME || '';
+          const rcPathDisplay = home && result.envSync.filePath.startsWith(home)
+            ? `~${result.envSync.filePath.slice(home.length)}`
+            : result.envSync.filePath;
+          console.log(chalk.gray(`  已同步 OPENAI_BASE_URL / OPENAI_API_KEY 到 ${rcPathDisplay}`));
+          console.log(chalk.gray(`  当前终端可执行: source ${rcPathDisplay}`));
+        }
       } else {
         console.log(chalk.red(`\n✗ 应用失败`));
         process.exit(1);

package/src/commands/edit.js

@@ -4,8 +4,6 @@ import inquirer from 'inquirer';
 import {
   getAllProfiles,
   getDefaultProfile,
-  profileExists,
-  codexProfileExists,
   anyProfileExists,
   getProfilePath,
   readProfile,
@@ -22,6 +20,7 @@ import {
   createCodexProfile,
   deleteCodexProfile
 } from '../profiles.js';
+import { promptCodexModel } from '../codex-models.js';
 
 export function editCommand(program) {
   program
@@ -67,18 +66,12 @@ export function editCommand(program) {
         const { apiKey: currentApiKey, baseUrl: currentBaseUrl, model: currentModel } = getCodexProfileCredentials(profileInfo.name);
 
         console.log(chalk.cyan(`\n当前配置 (${profileInfo.name}) ${chalk.blue('[Codex]')}:`));
-        console.log(chalk.gray(`  OPENAI_API_KEY: ${currentApiKey ? currentApiKey.substring(0, 10) + '...' : '未设置'}`));
         console.log(chalk.gray(`  Base URL: ${currentBaseUrl || '未设置'}`));
+        console.log(chalk.gray(`  OPENAI_API_KEY: ${currentApiKey ? currentApiKey.substring(0, 10) + '...' : '未设置'}`));
         console.log(chalk.gray(`  Model: ${currentModel || '(默认)'}`));
         console.log();
 
-        const { apiKey, baseUrl, model, newName } = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'apiKey',
-            message: 'OPENAI_API_KEY:',
-            default: currentApiKey || ''
-          },
+        const { apiKey, baseUrl, newName } = await inquirer.prompt([
           {
             type: 'input',
             name: 'baseUrl',
@@ -87,9 +80,9 @@ export function editCommand(program) {
           },
           {
             type: 'input',
-            name: 'model',
-            message: 'Model (留空使用默认):',
-            default: currentModel || ''
+            name: 'apiKey',
+            message: 'OPENAI_API_KEY:',
+            default: currentApiKey || ''
           },
           {
             type: 'input',
@@ -98,6 +91,7 @@ export function editCommand(program) {
             default: profileInfo.name
           }
         ]);
+        const model = await promptCodexModel(baseUrl, apiKey, currentModel || '');
 
         if (newName && newName !== profileInfo.name) {
           const check = anyProfileExists(newName);

package/src/commands/help.js

@@ -19,6 +19,7 @@ export function showHelp() {
   console.log(chalk.gray('    ccc sync [profile]     ') + '从模板同步配置（保留 API 凭证）');
   console.log(chalk.gray('    ccc sync --all         ') + '同步所有配置');
   console.log(chalk.gray('    ccc apply [profile]    ') + '将配置应用到默认目录（~/.claude 或 ~/.codex）');
+  console.log(chalk.gray('    ccc resettodefault     ') + '恢复 apply 前的 ~/.codex 配置并移除 OPENAI 环境变量');
   console.log(chalk.gray('    ccc edit [profile]     ') + '编辑配置');
   console.log(chalk.gray('    ccc delete, rm [name]  ') + '删除配置');
   console.log(chalk.gray('    ccc help               ') + '显示此帮助信息');
@@ -42,7 +43,7 @@ export function showHelp() {
   console.log(chalk.gray('    ccc new                ') + '交互式创建，选择 Claude 或 Codex 类型');
   console.log(chalk.gray('    ccc new myprofile      ') + '指定名称创建，随后选择类型并填写凭证');
   console.log(chalk.gray('    ') + chalk.dim('Claude 需要: ANTHROPIC_BASE_URL + ANTHROPIC_AUTH_TOKEN'));
-  console.log(chalk.gray('    ') + chalk.dim('Codex  需要: OPENAI_API_KEY + Base URL + Model（可选）'));
+  console.log(chalk.gray('    ') + chalk.dim('Codex  需要: Base URL + OPENAI_API_KEY + Model（可从接口拉取后选择）'));
   console.log();
 
   console.log(chalk.yellow('  示例:'));

package/src/commands/index.js

@@ -6,6 +6,6 @@ export { editCommand } from './edit.js';
 export { deleteCommand } from './delete.js';
 export { syncCommand } from './sync.js';
 export { applyCommand } from './apply.js';
+export { resetToDefaultCommand } from './resettodefault.js';
 export { webdavCommand } from './webdav.js';
 export { helpCommand, showHelp } from './help.js';
-

package/src/commands/new.js

@@ -2,10 +2,7 @@ import chalk from 'chalk';
 import inquirer from 'inquirer';
 import {
   ensureDirs,
-  getProfiles,
   getAllProfiles,
-  profileExists,
-  codexProfileExists,
   anyProfileExists,
   createProfileFromTemplate,
   createCodexProfile,
@@ -13,6 +10,7 @@ import {
   ensureClaudeSettingsExtras
 } from '../profiles.js';
 import { launchClaude, launchCodex } from '../launch.js';
+import { promptCodexModel } from '../codex-models.js';
 
 const RESERVED_PROFILE_NAMES = [
   'list',
@@ -27,6 +25,7 @@ const RESERVED_PROFILE_NAMES = [
   'rm',
   'sync',
   'apply',
+  'resettodefault',
   'webdav',
   'help'
 ];
@@ -104,12 +103,6 @@ export function newCommand(program) {
       if (profileType === 'codex') {
         // Codex profile 创建
         const answers = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'apiKey',
-            message: 'OPENAI_API_KEY:',
-            default: ''
-          },
           {
             type: 'input',
             name: 'baseUrl',
@@ -118,8 +111,8 @@ export function newCommand(program) {
           },
           {
             type: 'input',
-            name: 'model',
-            message: 'Model (留空使用默认):',
+            name: 'apiKey',
+            message: 'OPENAI_API_KEY:',
             default: ''
           },
           {
@@ -130,6 +123,7 @@ export function newCommand(program) {
             validate: validateProfileName
           }
         ]);
+        const model = await promptCodexModel(answers.baseUrl, answers.apiKey, '');
 
         const finalName = answers.finalName;
         if (finalName !== name) {
@@ -151,7 +145,7 @@ export function newCommand(program) {
         }
 
         ensureDirs();
-        createCodexProfile(finalName, answers.apiKey, answers.baseUrl, answers.model);
+        createCodexProfile(finalName, answers.apiKey, answers.baseUrl, model);
         console.log(chalk.green(`\n✓ Codex 配置 "${finalName}" 已创建`));
 
         const allProfiles = getAllProfiles();

package/src/commands/resettodefault.js

@@ -0,0 +1,42 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { resetCodexDefaultProfile } from '../profiles.js';
+
+export function resetToDefaultCommand(program) {
+  program
+    .command('resettodefault')
+    .description('恢复 apply 前的 ~/.codex 配置，并移除 OPENAI 相关环境变量')
+    .action(async () => {
+      const { confirm } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'confirm',
+          message: '恢复 ~/.codex 到 apply 前状态，并清理 OPENAI 环境变量？',
+          default: false
+        }
+      ]);
+
+      if (!confirm) {
+        console.log(chalk.yellow('已取消'));
+        process.exit(0);
+      }
+
+      const result = resetCodexDefaultProfile();
+      if (!result.success) {
+        if (result.reason === 'no_backup') {
+          console.log(chalk.yellow('未找到可恢复的备份（请先执行一次 ccc apply <codex-profile>）'));
+          process.exit(0);
+        }
+        console.log(chalk.red('恢复失败：备份状态文件损坏'));
+        process.exit(1);
+      }
+
+      const home = process.env.HOME || '';
+      const rcPathDisplay = home && result.shellRcPath.startsWith(home)
+        ? `~${result.shellRcPath.slice(home.length)}`
+        : result.shellRcPath;
+
+      console.log(chalk.green('✓ 已恢复 ~/.codex 原始配置'));
+      console.log(chalk.green(`✓ 已清理/还原 ${rcPathDisplay} 中的 OPENAI 环境变量`));
+    });
+}

package/src/profiles.js

@@ -336,6 +336,218 @@ export function clearDefaultProfile() {
 // Codex Profile 管理
 // ============================================================
 
+const OPENAI_DEFAULT_BASE_URL = 'https://api.openai.com/v1';
+const CCC_OPENAI_COMPAT_PROVIDER = 'ccc_openai';
+const CODEX_RESET_DIR = path.join(CODEX_HOME_PATH, '.ccc-reset-default');
+const CODEX_RESET_AUTH_BACKUP = path.join(CODEX_RESET_DIR, 'auth.json.original');
+const CODEX_RESET_CONFIG_BACKUP = path.join(CODEX_RESET_DIR, 'config.toml.original');
+const CODEX_RESET_META_PATH = path.join(CODEX_RESET_DIR, 'meta.json');
+
+function normalizeBaseUrl(baseUrl) {
+  return (baseUrl || '').trim().replace(/\/+$/, '');
+}
+
+function isCustomOpenAIBaseUrl(baseUrl) {
+  const normalized = normalizeBaseUrl(baseUrl);
+  return normalized && normalized !== normalizeBaseUrl(OPENAI_DEFAULT_BASE_URL);
+}
+
+function extractBaseUrlFromConfigToml(configToml) {
+  if (!configToml) return OPENAI_DEFAULT_BASE_URL;
+  const baseUrlMatch = configToml.match(/base_url\s*=\s*"([^"]+)"/);
+  return baseUrlMatch ? baseUrlMatch[1] : OPENAI_DEFAULT_BASE_URL;
+}
+
+function upsertTomlKey(block, key, valueLiteral) {
+  const keyPattern = new RegExp(`^\\s*${key}\\s*=\\s*.*$`, 'm');
+  if (keyPattern.test(block)) {
+    return block.replace(keyPattern, `${key} = ${valueLiteral}`);
+  }
+  return `${block.trimEnd()}\n${key} = ${valueLiteral}\n`;
+}
+
+function escapeRegExp(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+
+function escapeShellSingleQuote(value) {
+  return String(value ?? '').replace(/'/g, `'\"'\"'`);
+}
+
+function getPreferredShellRcPath() {
+  const shellPath = (process.env.SHELL || '').toLowerCase();
+  if (shellPath.includes('zsh')) {
+    return path.join(os.homedir(), '.zshrc');
+  }
+  if (shellPath.includes('bash')) {
+    return path.join(os.homedir(), '.bashrc');
+  }
+  return path.join(os.homedir(), '.profile');
+}
+
+function stripShellExport(content, key) {
+  const pattern = new RegExp(`^\\s*export\\s+${escapeRegExp(key)}=.*(?:\\r?\\n)?`, 'gm');
+  return content.replace(pattern, '');
+}
+
+function extractShellExportLine(content, key) {
+  const pattern = new RegExp(`^\\s*export\\s+${escapeRegExp(key)}=.*$`, 'm');
+  const match = content.match(pattern);
+  return match ? match[0] : '';
+}
+
+function upsertShellExport(content, key, rawValue) {
+  if (rawValue === undefined || rawValue === null || rawValue === '') {
+    return { content, changed: false };
+  }
+
+  const line = `export ${key}='${escapeShellSingleQuote(rawValue)}'`;
+  let nextContent = stripShellExport(content, key);
+  if (nextContent && !nextContent.endsWith('\n')) {
+    nextContent += '\n';
+  }
+  nextContent += `${line}\n`;
+  return { content: nextContent, changed: nextContent !== content };
+}
+
+function upsertShellExportLine(content, key, line) {
+  let nextContent = stripShellExport(content, key);
+  if (!line) {
+    return { content: nextContent, changed: nextContent !== content };
+  }
+  if (nextContent && !nextContent.endsWith('\n')) {
+    nextContent += '\n';
+  }
+  nextContent += `${line}\n`;
+  return { content: nextContent, changed: nextContent !== content };
+}
+
+function ensureCodexResetBackup(shellRcPath) {
+  if (fs.existsSync(CODEX_RESET_META_PATH)) {
+    return;
+  }
+
+  if (!fs.existsSync(CODEX_RESET_DIR)) {
+    fs.mkdirSync(CODEX_RESET_DIR, { recursive: true });
+  }
+
+  const authPath = path.join(CODEX_HOME_PATH, 'auth.json');
+  const configPath = path.join(CODEX_HOME_PATH, 'config.toml');
+  const authExisted = fs.existsSync(authPath);
+  const configExisted = fs.existsSync(configPath);
+
+  if (authExisted) {
+    fs.copyFileSync(authPath, CODEX_RESET_AUTH_BACKUP);
+  }
+  if (configExisted) {
+    fs.copyFileSync(configPath, CODEX_RESET_CONFIG_BACKUP);
+  }
+
+  const rcContent = fs.existsSync(shellRcPath) ? fs.readFileSync(shellRcPath, 'utf-8') : '';
+  const meta = {
+    version: 1,
+    createdAt: new Date().toISOString(),
+    authExisted,
+    configExisted,
+    shellRcPath,
+    originalExports: {
+      OPENAI_BASE_URL: extractShellExportLine(rcContent, 'OPENAI_BASE_URL'),
+      OPENAI_API_KEY: extractShellExportLine(rcContent, 'OPENAI_API_KEY')
+    }
+  };
+
+  fs.writeFileSync(CODEX_RESET_META_PATH, JSON.stringify(meta, null, 2) + '\n');
+}
+
+function syncCodexEnvToShell(baseUrl, apiKey, shellRcPath) {
+  const rcPath = shellRcPath || getPreferredShellRcPath();
+  const current = fs.existsSync(rcPath) ? fs.readFileSync(rcPath, 'utf-8') : '';
+
+  let next = current;
+  let changed = false;
+
+  const baseUrlResult = upsertShellExport(next, 'OPENAI_BASE_URL', baseUrl);
+  next = baseUrlResult.content;
+  changed = changed || baseUrlResult.changed;
+
+  const apiKeyResult = upsertShellExport(next, 'OPENAI_API_KEY', apiKey);
+  next = apiKeyResult.content;
+  changed = changed || apiKeyResult.changed;
+
+  if (changed) {
+    fs.writeFileSync(rcPath, next);
+  }
+
+  return { filePath: rcPath, changed };
+}
+
+function normalizeCodexAuthForApply(auth) {
+  if (!auth || typeof auth !== 'object' || Array.isArray(auth)) {
+    return auth;
+  }
+  const apiKey = typeof auth.OPENAI_API_KEY === 'string' ? auth.OPENAI_API_KEY : '';
+  if (apiKey) {
+    return { auth_mode: 'apikey', OPENAI_API_KEY: apiKey };
+  }
+  return auth;
+}
+
+function ensureCodexOpenAICompatConfig(configToml, baseUrl) {
+  if (!isCustomOpenAIBaseUrl(baseUrl)) {
+    return configToml;
+  }
+
+  const normalizedBaseUrl = normalizeBaseUrl(baseUrl);
+  let output = configToml || '# Codex profile managed by ccc\n';
+  const firstSectionMatch = output.match(/^\s*\[[^\]]+\]/m);
+  const firstSectionIndex = firstSectionMatch && firstSectionMatch.index !== undefined
+    ? firstSectionMatch.index
+    : output.length;
+
+  let preamble = output.slice(0, firstSectionIndex);
+  const rest = output.slice(firstSectionIndex);
+
+  // 如果用户显式指定了非 openai provider，尊重用户配置，不自动覆盖
+  const providerMatch = preamble.match(/^\s*model_provider\s*=\s*"([^"]+)"/m);
+  if (providerMatch && !['openai', CCC_OPENAI_COMPAT_PROVIDER].includes(providerMatch[1])) {
+    return output;
+  }
+
+  if (providerMatch) {
+    preamble = preamble.replace(
+      /^\s*model_provider\s*=\s*"([^"]+)"/m,
+      `model_provider = "${CCC_OPENAI_COMPAT_PROVIDER}"`
+    );
+  } else {
+    preamble = `${preamble.replace(/\s*$/, '\n')}model_provider = "${CCC_OPENAI_COMPAT_PROVIDER}"\n`;
+  }
+
+  if (rest.trim()) {
+    output = `${preamble.trimEnd()}\n\n${rest.replace(/^\s*/, '')}`;
+  } else {
+    output = `${preamble.trimEnd()}\n`;
+  }
+
+  const sectionPattern = new RegExp(
+    `\\[model_providers\\.${CCC_OPENAI_COMPAT_PROVIDER}\\][\\s\\S]*?(?=\\n\\[|$)`
+  );
+
+  if (sectionPattern.test(output)) {
+    output = output.replace(sectionPattern, (section) => {
+      let next = section;
+      next = upsertTomlKey(next, 'name', '"OpenAI Compatible"');
+      next = upsertTomlKey(next, 'base_url', `"${normalizedBaseUrl}"`);
+      next = upsertTomlKey(next, 'wire_api', '"responses"');
+      next = upsertTomlKey(next, 'requires_openai_auth', 'true');
+      return next.trimEnd();
+    });
+  } else {
+    output = `${output.trimEnd()}\n\n[model_providers.${CCC_OPENAI_COMPAT_PROVIDER}]\nname = "OpenAI Compatible"\nbase_url = "${normalizedBaseUrl}"\nwire_api = "responses"\nrequires_openai_auth = true\n`;
+  }
+
+  return `${output.trimEnd()}\n`;
+}
+
 // 获取 Codex profile 目录路径
 export function getCodexProfileDir(name) {
   return path.join(CODEX_PROFILES_DIR, name);
@@ -388,16 +600,20 @@ export function saveCodexProfile(name, auth, configToml) {
 // 生成 Codex config.toml 内容
 export function generateCodexConfigToml(baseUrl, model) {
   let lines = ['# Codex profile managed by ccc'];
+  const normalizedBaseUrl = normalizeBaseUrl(baseUrl) || OPENAI_DEFAULT_BASE_URL;
 
   if (model) {
     lines.push(`model = "${model}"`);
   }
 
-  if (baseUrl && baseUrl !== 'https://api.openai.com/v1') {
+  if (isCustomOpenAIBaseUrl(normalizedBaseUrl)) {
+    lines.push(`model_provider = "${CCC_OPENAI_COMPAT_PROVIDER}"`);
     lines.push('');
-    lines.push('[model_providers.openai]');
-    lines.push(`name = "OpenAI"`);
-    lines.push(`base_url = "${baseUrl}"`);
+    lines.push(`[model_providers.${CCC_OPENAI_COMPAT_PROVIDER}]`);
+    lines.push('name = "OpenAI Compatible"');
+    lines.push(`base_url = "${normalizedBaseUrl}"`);
+    lines.push('wire_api = "responses"');
+    lines.push('requires_openai_auth = true');
   }
 
   lines.push('');
@@ -432,7 +648,7 @@ export function getCodexProfileCredentials(name) {
     if (modelMatch) model = modelMatch[1];
   }
 
-  return { apiKey, baseUrl: baseUrl || 'https://api.openai.com/v1', model: model || '' };
+  return { apiKey, baseUrl: baseUrl || OPENAI_DEFAULT_BASE_URL, model: model || '' };
 }
 
 // 删除 Codex profile
@@ -457,20 +673,6 @@ export function syncCodexProfileWithTemplate(name) {
   // 保留当前 profile 的 base_url 和 model
   const { baseUrl, model } = getCodexProfileCredentials(name);
 
-  // 在模板基础上覆盖 base_url 和 model
-  // 如果当前 profile 有自定义 base_url，追加到模板
-  if (baseUrl && baseUrl !== 'https://api.openai.com/v1') {
-    // 检查模板是否已有 [model_providers.openai] 节
-    if (templateConfig.includes('[model_providers.openai]')) {
-      templateConfig = templateConfig.replace(
-        /(\[model_providers\.openai\][^\[]*?)base_url\s*=\s*"[^"]*"/,
-        `$1base_url = "${baseUrl}"`
-      );
-    } else {
-      templateConfig += `\n[model_providers.openai]\nbase_url = "${baseUrl}"\n`;
-    }
-  }
-
   if (model) {
     if (templateConfig.match(/^model\s*=/m)) {
       templateConfig = templateConfig.replace(/^model\s*=\s*"[^"]*"/m, `model = "${model}"`);
@@ -479,6 +681,9 @@ export function syncCodexProfileWithTemplate(name) {
     }
   }
 
+  // 对第三方 base_url 自动补齐 provider 兼容配置，避免依赖 OPENAI_BASE_URL 环境变量
+  templateConfig = ensureCodexOpenAICompatConfig(templateConfig, baseUrl);
+
   saveCodexProfile(name, current.auth, templateConfig);
   return { auth: current.auth, configToml: templateConfig };
 }
@@ -496,6 +701,13 @@ export function applyCodexProfile(name) {
   const profile = readCodexProfile(name);
   if (!profile) return false;
 
+  const shellRcPath = getPreferredShellRcPath();
+  const baseUrl = extractBaseUrlFromConfigToml(profile.configToml);
+  const apiKey = profile.auth?.OPENAI_API_KEY || '';
+
+  // 首次 apply 时备份 ~/.codex 与 shell env 现场，供 resettodefault 回滚
+  ensureCodexResetBackup(shellRcPath);
+
   if (!fs.existsSync(CODEX_HOME_PATH)) {
     fs.mkdirSync(CODEX_HOME_PATH, { recursive: true });
   }
@@ -503,15 +715,75 @@ export function applyCodexProfile(name) {
   // 写入 auth.json
   fs.writeFileSync(
     path.join(CODEX_HOME_PATH, 'auth.json'),
-    JSON.stringify(profile.auth, null, 2) + '\n'
+    JSON.stringify(normalizeCodexAuthForApply(profile.auth), null, 2) + '\n'
   );
 
   // 写入 config.toml（如果有内容）
   if (profile.configToml && profile.configToml.trim()) {
-    fs.writeFileSync(path.join(CODEX_HOME_PATH, 'config.toml'), profile.configToml);
+    const compatConfig = ensureCodexOpenAICompatConfig(profile.configToml, baseUrl);
+    fs.writeFileSync(path.join(CODEX_HOME_PATH, 'config.toml'), compatConfig);
   }
 
-  return true;
+  const envSync = syncCodexEnvToShell(baseUrl, apiKey, shellRcPath);
+
+  return { success: true, envSync };
+}
+
+// 恢复 apply 前的 ~/.codex 配置，并移除/还原相关 OPENAI 环境变量
+export function resetCodexDefaultProfile() {
+  if (!fs.existsSync(CODEX_RESET_META_PATH)) {
+    return { success: false, reason: 'no_backup' };
+  }
+
+  let meta;
+  try {
+    meta = JSON.parse(fs.readFileSync(CODEX_RESET_META_PATH, 'utf-8'));
+  } catch {
+    return { success: false, reason: 'invalid_backup' };
+  }
+
+  if (!fs.existsSync(CODEX_HOME_PATH)) {
+    fs.mkdirSync(CODEX_HOME_PATH, { recursive: true });
+  }
+
+  const authPath = path.join(CODEX_HOME_PATH, 'auth.json');
+  const configPath = path.join(CODEX_HOME_PATH, 'config.toml');
+
+  if (meta.authExisted && fs.existsSync(CODEX_RESET_AUTH_BACKUP)) {
+    fs.copyFileSync(CODEX_RESET_AUTH_BACKUP, authPath);
+  } else if (fs.existsSync(authPath)) {
+    fs.unlinkSync(authPath);
+  }
+
+  if (meta.configExisted && fs.existsSync(CODEX_RESET_CONFIG_BACKUP)) {
+    fs.copyFileSync(CODEX_RESET_CONFIG_BACKUP, configPath);
+  } else if (fs.existsSync(configPath)) {
+    fs.unlinkSync(configPath);
+  }
+
+  const shellRcPath = meta.shellRcPath || getPreferredShellRcPath();
+  const rcExists = fs.existsSync(shellRcPath);
+  const rcBefore = rcExists ? fs.readFileSync(shellRcPath, 'utf-8') : '';
+  let rcAfter = rcBefore;
+
+  const originalBaseUrlLine = meta.originalExports?.OPENAI_BASE_URL || '';
+  const originalApiKeyLine = meta.originalExports?.OPENAI_API_KEY || '';
+
+  rcAfter = upsertShellExportLine(rcAfter, 'OPENAI_BASE_URL', originalBaseUrlLine).content;
+  rcAfter = upsertShellExportLine(rcAfter, 'OPENAI_API_KEY', originalApiKeyLine).content;
+
+  const envChanged = rcAfter !== rcBefore;
+  if (envChanged || (!rcExists && (originalBaseUrlLine || originalApiKeyLine))) {
+    fs.writeFileSync(shellRcPath, rcAfter);
+  }
+
+  fs.rmSync(CODEX_RESET_DIR, { recursive: true, force: true });
+
+  return {
+    success: true,
+    shellRcPath,
+    envChanged
+  };
 }
 
 // ============================================================