@tkpdx01/ccc 1.3.7 → 1.6.0

package/src/commands/index.js

@@ -1,11 +1,11 @@
 export { listCommand } from './list.js';
 export { useCommand } from './use.js';
 export { showCommand } from './show.js';
-export { importCommand } from './import.js';
 export { newCommand } from './new.js';
 export { editCommand } from './edit.js';
 export { deleteCommand } from './delete.js';
 export { syncCommand } from './sync.js';
+export { applyCommand } from './apply.js';
 export { webdavCommand } from './webdav.js';
 export { helpCommand, showHelp } from './help.js';
 

package/src/commands/list.js

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import Table from 'cli-table3';
-import { getProfiles, getDefaultProfile, getProfileCredentials } from '../profiles.js';
+import { getAllProfiles, getDefaultProfile, getProfileCredentials, getCodexProfileCredentials } from '../profiles.js';
 
 export function listCommand(program) {
   program
@@ -8,17 +8,17 @@ export function listCommand(program) {
     .alias('ls')
     .description('列出所有 profiles')
     .action(() => {
-      const profiles = getProfiles();
+      const allProfiles = getAllProfiles();
       const defaultProfile = getDefaultProfile();
 
-      if (profiles.length === 0) {
+      if (allProfiles.length === 0) {
         console.log(chalk.yellow('没有可用的 profiles'));
-        console.log(chalk.gray('使用 "ccc import" 导入配置'));
+        console.log(chalk.gray('使用 "ccc new" 创建配置'));
         return;
       }
 
       const table = new Table({
-        head: [chalk.cyan('#'), chalk.cyan('Profile'), chalk.cyan('ANTHROPIC_BASE_URL')],
+        head: [chalk.cyan('#'), chalk.cyan('类型'), chalk.cyan('Profile'), chalk.cyan('API URL')],
         style: { head: [], border: [] },
         chars: {
           'top': '─', 'top-mid': '┬', 'top-left': '┌', 'top-right': '┐',
@@ -28,19 +28,26 @@ export function listCommand(program) {
         }
       });
 
-      profiles.forEach((p, index) => {
-        const isDefault = p === defaultProfile;
-        const { apiUrl } = getProfileCredentials(p);
-        const baseUrl = apiUrl || chalk.gray('(未设置)');
+      allProfiles.forEach((p, index) => {
+        const isDefault = p.name === defaultProfile;
+
+        let apiUrl;
+        if (p.type === 'codex') {
+          const creds = getCodexProfileCredentials(p.name);
+          apiUrl = creds.baseUrl || chalk.gray('(未设置)');
+        } else {
+          const creds = getProfileCredentials(p.name);
+          apiUrl = creds.apiUrl || chalk.gray('(未设置)');
+        }
 
         const num = isDefault ? chalk.green(`${index + 1}`) : chalk.gray(`${index + 1}`);
-        const name = isDefault ? chalk.green(`${p} *`) : p;
-        table.push([num, name, baseUrl]);
+        const typeTag = p.type === 'codex' ? chalk.blue('Codex') : chalk.magenta('Claude');
+        const name = isDefault ? chalk.green(`${p.name} *`) : p.name;
+        table.push([num, typeTag, name, apiUrl]);
       });
 
       console.log();
       console.log(table.toString());
-      console.log(chalk.gray(`\n  共 ${profiles.length} 个配置，* 表示默认，可用序号或名称启动\n`));
+      console.log(chalk.gray(`\n  共 ${allProfiles.length} 个配置，* 表示默认，可用序号或名称启动\n`));
     });
 }
-

package/src/commands/new.js

@@ -3,12 +3,16 @@ import inquirer from 'inquirer';
 import {
   ensureDirs,
   getProfiles,
+  getAllProfiles,
   profileExists,
+  codexProfileExists,
+  anyProfileExists,
   createProfileFromTemplate,
+  createCodexProfile,
   setDefaultProfile,
   ensureClaudeSettingsExtras
 } from '../profiles.js';
-import { launchClaude } from '../launch.js';
+import { launchClaude, launchCodex } from '../launch.js';
 
 const RESERVED_PROFILE_NAMES = [
   'list',
@@ -22,6 +26,7 @@ const RESERVED_PROFILE_NAMES = [
   'delete',
   'rm',
   'sync',
+  'apply',
   'webdav',
   'help'
 ];
@@ -44,8 +49,21 @@ function validateProfileName(input) {
 export function newCommand(program) {
   program
     .command('new [name]')
-    .description('创建新的配置（基于 ~/.claude/settings.json，在 env 中设置 API 凭证）')
+    .description('创建新的配置（Claude 或 Codex）')
     .action(async (name) => {
+      // 选择 profile 类型
+      const { profileType } = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'profileType',
+          message: '配置类型:',
+          choices: [
+            { name: `${chalk.magenta('[Claude]')} Claude Code`, value: 'claude' },
+            { name: `${chalk.blue('[Codex]')}  OpenAI Codex`, value: 'codex' }
+          ]
+        }
+      ]);
+
       // 如果没有提供名称，询问
       if (!name) {
         const { profileName } = await inquirer.prompt([
@@ -65,13 +83,15 @@ export function newCommand(program) {
         }
       }
 
-      // 检查是否已存在
-      if (profileExists(name)) {
+      // 检查是否已存在（跨类型检查）
+      const existing = anyProfileExists(name);
+      if (existing.exists) {
+        const existingType = existing.type === 'codex' ? 'Codex' : 'Claude';
         const { overwrite } = await inquirer.prompt([
           {
             type: 'confirm',
             name: 'overwrite',
-            message: `配置 "${name}" 已存在，是否覆盖?`,
+            message: `配置 "${name}" 已存在（${existingType} 类型），是否覆盖?`,
             default: false
           }
         ]);
@@ -81,69 +101,140 @@ export function newCommand(program) {
         }
       }
 
-      const { apiUrl, apiKey, finalName } = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'apiUrl',
-          message: 'ANTHROPIC_BASE_URL:',
-          default: 'https://api.anthropic.com'
-        },
-        {
-          type: 'input',
-          name: 'apiKey',
-          message: 'ANTHROPIC_AUTH_TOKEN:',
-          default: ''
-        },
-        {
-          type: 'input',
-          name: 'finalName',
-          message: 'Profile 名称:',
-          default: name,
-          validate: validateProfileName
+      if (profileType === 'codex') {
+        // Codex profile 创建
+        const answers = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'apiKey',
+            message: 'OPENAI_API_KEY:',
+            default: ''
+          },
+          {
+            type: 'input',
+            name: 'baseUrl',
+            message: 'Base URL:',
+            default: 'https://api.openai.com/v1'
+          },
+          {
+            type: 'input',
+            name: 'model',
+            message: 'Model (留空使用默认):',
+            default: ''
+          },
+          {
+            type: 'input',
+            name: 'finalName',
+            message: 'Profile 名称:',
+            default: name,
+            validate: validateProfileName
+          }
+        ]);
+
+        const finalName = answers.finalName;
+        if (finalName !== name) {
+          const check = anyProfileExists(finalName);
+          if (check.exists) {
+            const { overwriteNew } = await inquirer.prompt([
+              {
+                type: 'confirm',
+                name: 'overwriteNew',
+                message: `配置 "${finalName}" 已存在，是否覆盖?`,
+                default: false
+              }
+            ]);
+            if (!overwriteNew) {
+              console.log(chalk.yellow('已取消'));
+              process.exit(0);
+            }
+          }
         }
-      ]);
 
-      // 如果名称改变了，检查新名称是否存在
-      if (finalName !== name && profileExists(finalName)) {
-        const { overwriteNew } = await inquirer.prompt([
+        ensureDirs();
+        createCodexProfile(finalName, answers.apiKey, answers.baseUrl, answers.model);
+        console.log(chalk.green(`\n✓ Codex 配置 "${finalName}" 已创建`));
+
+        const allProfiles = getAllProfiles();
+        if (allProfiles.length === 1) {
+          setDefaultProfile(finalName);
+          console.log(chalk.green(`✓ 已设为默认配置`));
+        }
+
+        const { useNow } = await inquirer.prompt([
           {
             type: 'confirm',
-            name: 'overwriteNew',
-            message: `配置 "${finalName}" 已存在，是否覆盖?`,
+            name: 'useNow',
+            message: '是否立即启动 Codex?',
             default: false
           }
         ]);
-        if (!overwriteNew) {
-          console.log(chalk.yellow('已取消'));
-          process.exit(0);
+        if (useNow) {
+          launchCodex(finalName);
         }
-      }
+      } else {
+        // Claude profile 创建（保持原逻辑）
+        const { apiUrl, apiKey, finalName } = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'apiUrl',
+            message: 'ANTHROPIC_BASE_URL:',
+            default: 'https://api.anthropic.com'
+          },
+          {
+            type: 'input',
+            name: 'apiKey',
+            message: 'ANTHROPIC_AUTH_TOKEN:',
+            default: ''
+          },
+          {
+            type: 'input',
+            name: 'finalName',
+            message: 'Profile 名称:',
+            default: name,
+            validate: validateProfileName
+          }
+        ]);
 
-      ensureDirs();
-      ensureClaudeSettingsExtras();
-      createProfileFromTemplate(finalName, apiUrl, apiKey);
-      console.log(chalk.green(`\n✓ 配置 "${finalName}" 已创建（基于 ~/.claude/settings.json）`));
+        if (finalName !== name) {
+          const check = anyProfileExists(finalName);
+          if (check.exists) {
+            const { overwriteNew } = await inquirer.prompt([
+              {
+                type: 'confirm',
+                name: 'overwriteNew',
+                message: `配置 "${finalName}" 已存在，是否覆盖?`,
+                default: false
+              }
+            ]);
+            if (!overwriteNew) {
+              console.log(chalk.yellow('已取消'));
+              process.exit(0);
+            }
+          }
+        }
 
-      // 如果是第一个 profile，设为默认
-      const profiles = getProfiles();
-      if (profiles.length === 1) {
-        setDefaultProfile(finalName);
-        console.log(chalk.green(`✓ 已设为默认配置`));
-      }
+        ensureDirs();
+        ensureClaudeSettingsExtras();
+        createProfileFromTemplate(finalName, apiUrl, apiKey);
+        console.log(chalk.green(`\n✓ Claude 配置 "${finalName}" 已创建（基于 ~/.claude/settings.json）`));
 
-      // 询问是否立即使用
-      const { useNow } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'useNow',
-          message: '是否立即启动 Claude?',
-          default: false
+        const allProfiles = getAllProfiles();
+        if (allProfiles.length === 1) {
+          setDefaultProfile(finalName);
+          console.log(chalk.green(`✓ 已设为默认配置`));
         }
-      ]);
 
-      if (useNow) {
-        launchClaude(finalName);
+        const { useNow } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'useNow',
+            message: '是否立即启动 Claude?',
+            default: false
+          }
+        ]);
+        if (useNow) {
+          launchClaude(finalName);
+        }
       }
     });
 }
-

package/src/commands/show.js

@@ -1,11 +1,15 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import { 
-  getProfiles, 
-  getDefaultProfile, 
-  profileExists, 
-  getProfilePath, 
-  readProfile 
+import {
+  getAllProfiles,
+  getDefaultProfile,
+  anyProfileExists,
+  resolveAnyProfile,
+  getProfilePath,
+  getCodexProfileDir,
+  readProfile,
+  readCodexProfile,
+  getCodexProfileCredentials
 } from '../profiles.js';
 import { formatValue } from '../utils.js';
 
@@ -14,55 +18,81 @@ export function showCommand(program) {
     .command('show [profile]')
     .description('显示 profile 的完整配置')
     .action(async (profile) => {
-      const profiles = getProfiles();
+      const allProfiles = getAllProfiles();
 
-      if (profiles.length === 0) {
+      if (allProfiles.length === 0) {
         console.log(chalk.yellow('没有可用的 profiles'));
         process.exit(0);
       }
 
-      // 如果没有指定 profile，交互选择
+      let profileInfo;
+
       if (!profile) {
         const defaultProfile = getDefaultProfile();
-        const { selectedProfile } = await inquirer.prompt([
+        const choices = allProfiles.map(p => {
+          const typeTag = p.type === 'codex' ? chalk.blue('[Codex]') : chalk.magenta('[Claude]');
+          return { name: `${typeTag} ${p.name}`, value: p };
+        });
+
+        const { selected } = await inquirer.prompt([
           {
             type: 'list',
-            name: 'selectedProfile',
+            name: 'selected',
             message: '选择要查看的配置:',
-            choices: profiles,
-            default: defaultProfile
+            choices,
+            default: allProfiles.findIndex(p => p.name === defaultProfile)
           }
         ]);
-        profile = selectedProfile;
+        profileInfo = selected;
+      } else {
+        profileInfo = resolveAnyProfile(profile);
+        if (!profileInfo) {
+          console.log(chalk.red(`Profile "${profile}" 不存在`));
+          process.exit(1);
+        }
       }
 
-      if (!profileExists(profile)) {
-        console.log(chalk.red(`Profile "${profile}" 不存在`));
-        process.exit(1);
-      }
+      const isDefault = getDefaultProfile() === profileInfo.name;
+
+      if (profileInfo.type === 'codex') {
+        const dir = getCodexProfileDir(profileInfo.name);
+        const codexProfile = readCodexProfile(profileInfo.name);
+        const { apiKey, baseUrl, model } = getCodexProfileCredentials(profileInfo.name);
 
-      const profilePath = getProfilePath(profile);
-      const settings = readProfile(profile);
-      const isDefault = getDefaultProfile() === profile;
+        console.log(chalk.cyan.bold(`\n  Profile: ${profileInfo.name}`) + ` ${chalk.blue('[Codex]')}` + (isDefault ? chalk.green(' (默认)') : ''));
+        console.log(chalk.gray(`  路径: ${dir}\n`));
 
-      console.log(chalk.cyan.bold(`\n  Profile: ${profile}`) + (isDefault ? chalk.green(' (默认)') : ''));
-      console.log(chalk.gray(`  路径: ${profilePath}\n`));
+        console.log(`  ${chalk.cyan('OPENAI_API_KEY')}: ${chalk.yellow(apiKey ? apiKey.substring(0, 15) + '...' : '未设置')}`);
+        console.log(`  ${chalk.cyan('Base URL')}: ${chalk.white(baseUrl)}`);
+        console.log(`  ${chalk.cyan('Model')}: ${chalk.white(model || '(默认)')}`);
 
-      // 格式化显示配置
-      Object.entries(settings).forEach(([key, value]) => {
-        const formattedValue = formatValue(key, value);
-        if ((key === 'apiKey' || key === 'ANTHROPIC_AUTH_TOKEN') && value) {
-          console.log(`  ${chalk.cyan(key)}: ${chalk.yellow(formattedValue)}`);
-        } else if (typeof value === 'boolean') {
-          console.log(`  ${chalk.cyan(key)}: ${value ? chalk.green(formattedValue) : chalk.red(formattedValue)}`);
-        } else if (typeof value === 'object') {
-          console.log(`  ${chalk.cyan(key)}: ${chalk.gray(formattedValue)}`);
-        } else {
-          console.log(`  ${chalk.cyan(key)}: ${chalk.white(formattedValue)}`);
+        if (codexProfile?.configToml) {
+          console.log(`\n  ${chalk.cyan('config.toml')}:`);
+          codexProfile.configToml.split('\n').forEach(line => {
+            console.log(`    ${chalk.gray(line)}`);
+          });
         }
-      });
+      } else {
+        const profilePath = getProfilePath(profileInfo.name);
+        const settings = readProfile(profileInfo.name);
+
+        console.log(chalk.cyan.bold(`\n  Profile: ${profileInfo.name}`) + ` ${chalk.magenta('[Claude]')}` + (isDefault ? chalk.green(' (默认)') : ''));
+        console.log(chalk.gray(`  路径: ${profilePath}\n`));
+
+        Object.entries(settings).forEach(([key, value]) => {
+          const formattedValue = formatValue(key, value);
+          if ((key === 'apiKey' || key === 'ANTHROPIC_AUTH_TOKEN') && value) {
+            console.log(`  ${chalk.cyan(key)}: ${chalk.yellow(formattedValue)}`);
+          } else if (typeof value === 'boolean') {
+            console.log(`  ${chalk.cyan(key)}: ${value ? chalk.green(formattedValue) : chalk.red(formattedValue)}`);
+          } else if (typeof value === 'object') {
+            console.log(`  ${chalk.cyan(key)}: ${chalk.gray(formattedValue)}`);
+          } else {
+            console.log(`  ${chalk.cyan(key)}: ${chalk.white(formattedValue)}`);
+          }
+        });
+      }
 
       console.log();
     });
 }
-

package/src/commands/sync.js

@@ -1,41 +1,39 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import {
+  getAllProfiles,
   getProfiles,
+  getCodexProfiles,
   syncProfileWithTemplate,
+  syncCodexProfileWithTemplate,
   getClaudeSettingsTemplate,
-  resolveProfile
+  resolveAnyProfile
 } from '../profiles.js';
+import { CODEX_HOME_PATH } from '../config.js';
+import fs from 'fs';
+import path from 'path';
 
 export function syncCommand(program) {
   program
     .command('sync [profile]')
-    .description('同步 ~/.claude/settings.json 到 profile（保留 API 凭证）')
+    .description('同步模板配置到 profile（保留 API 凭证）')
     .option('-a, --all', '同步所有 profiles')
     .action(async (profile, options) => {
-      // 检查主配置是否存在
-      const template = getClaudeSettingsTemplate();
-      if (!template) {
-        console.log(chalk.red('未找到 ~/.claude/settings.json'));
-        console.log(chalk.gray('请确保 Claude Code 已正确安装'));
-        process.exit(1);
-      }
+      const allProfiles = getAllProfiles();
 
-      const profiles = getProfiles();
-
-      if (profiles.length === 0) {
+      if (allProfiles.length === 0) {
         console.log(chalk.yellow('没有可用的 profiles'));
         console.log(chalk.gray('使用 "ccc new" 创建配置'));
         process.exit(0);
       }
 
-      // 同步所有 profiles
+      // 同步所有
       if (options.all) {
         const { confirm } = await inquirer.prompt([
           {
             type: 'confirm',
             name: 'confirm',
-            message: `确定要同步所有 ${profiles.length} 个 profiles 吗?`,
+            message: `确定要同步所有 ${allProfiles.length} 个 profiles 吗?`,
             default: false
           }
         ]);
@@ -48,43 +46,85 @@ export function syncCommand(program) {
         console.log(chalk.cyan('\n开始同步所有 profiles...\n'));
 
         let successCount = 0;
-        for (const p of profiles) {
-          const result = syncProfileWithTemplate(p);
+        for (const p of allProfiles) {
+          let result;
+          if (p.type === 'codex') {
+            const codexConfigPath = path.join(CODEX_HOME_PATH, 'config.toml');
+            if (!fs.existsSync(codexConfigPath)) {
+              console.log(chalk.yellow(`  ⚠ ${chalk.blue('[Codex]')} ${p.name} (无 ~/.codex/config.toml 模板，跳过)`));
+              continue;
+            }
+            result = syncCodexProfileWithTemplate(p.name);
+          } else {
+            const template = getClaudeSettingsTemplate();
+            if (!template) {
+              console.log(chalk.yellow(`  ⚠ ${chalk.magenta('[Claude]')} ${p.name} (无 ~/.claude/settings.json 模板，跳过)`));
+              continue;
+            }
+            result = syncProfileWithTemplate(p.name);
+          }
+
           if (result) {
-            console.log(chalk.green(`  ✓ ${p}`));
+            const typeTag = p.type === 'codex' ? chalk.blue('[Codex]') : chalk.magenta('[Claude]');
+            console.log(chalk.green(`  ✓ ${typeTag} ${p.name}`));
             successCount++;
           } else {
-            console.log(chalk.red(`  ✗ ${p} (同步失败)`));
+            console.log(chalk.red(`  ✗ ${p.name} (同步失败)`));
           }
         }
 
-        console.log(chalk.green(`\n✓ 已同步 ${successCount}/${profiles.length} 个 profiles`));
+        console.log(chalk.green(`\n✓ 已同步 ${successCount}/${allProfiles.length} 个 profiles`));
         return;
       }
 
-      // 同步单个 profile
+      // 同步单个
+      let profileInfo;
+
       if (!profile) {
-        const { selectedProfile } = await inquirer.prompt([
+        const choices = allProfiles.map(p => {
+          const typeTag = p.type === 'codex' ? chalk.blue('[Codex]') : chalk.magenta('[Claude]');
+          return { name: `${typeTag} ${p.name}`, value: p };
+        });
+
+        const { selected } = await inquirer.prompt([
           {
             type: 'list',
-            name: 'selectedProfile',
+            name: 'selected',
             message: '选择要同步的配置:',
-            choices: profiles
+            choices
           }
         ]);
-        profile = selectedProfile;
+        profileInfo = selected;
       } else {
-        const resolved = resolveProfile(profile);
-        if (!resolved) {
+        profileInfo = resolveAnyProfile(profile);
+        if (!profileInfo) {
           console.log(chalk.red(`Profile "${profile}" 不存在`));
           process.exit(1);
         }
-        profile = resolved;
       }
 
-      const result = syncProfileWithTemplate(profile);
+      let result;
+      if (profileInfo.type === 'codex') {
+        const codexConfigPath = path.join(CODEX_HOME_PATH, 'config.toml');
+        if (!fs.existsSync(codexConfigPath)) {
+          console.log(chalk.red('未找到 ~/.codex/config.toml'));
+          console.log(chalk.gray('请确保 Codex CLI 已正确配置'));
+          process.exit(1);
+        }
+        result = syncCodexProfileWithTemplate(profileInfo.name);
+      } else {
+        const template = getClaudeSettingsTemplate();
+        if (!template) {
+          console.log(chalk.red('未找到 ~/.claude/settings.json'));
+          console.log(chalk.gray('请确保 Claude Code 已正确安装'));
+          process.exit(1);
+        }
+        result = syncProfileWithTemplate(profileInfo.name);
+      }
+
+      const typeLabel = profileInfo.type === 'codex' ? 'Codex' : 'Claude';
       if (result) {
-        console.log(chalk.green(`\n✓ Profile "${profile}" 已同步（保留了 API 凭证）`));
+        console.log(chalk.green(`\n✓ ${typeLabel} Profile "${profileInfo.name}" 已同步（保留了 API 凭证）`));
       } else {
         console.log(chalk.red(`\n✗ 同步失败`));
         process.exit(1);

package/src/commands/use.js

@@ -1,19 +1,20 @@
 import chalk from 'chalk';
-import { profileExists, setDefaultProfile } from '../profiles.js';
+import { anyProfileExists, resolveAnyProfile, setDefaultProfile } from '../profiles.js';
 
 export function useCommand(program) {
   program
     .command('use <profile>')
     .description('设置默认 profile')
     .action((profile) => {
-      if (!profileExists(profile)) {
+      const resolved = resolveAnyProfile(profile);
+      if (!resolved) {
         console.log(chalk.red(`Profile "${profile}" 不存在`));
         console.log(chalk.yellow(`使用 "ccc list" 查看可用的 profiles`));
         process.exit(1);
       }
 
-      setDefaultProfile(profile);
-      console.log(chalk.green(`✓ 默认 profile 已设置为 "${profile}"`));
+      const typeTag = resolved.type === 'codex' ? chalk.blue('[Codex]') : chalk.magenta('[Claude]');
+      setDefaultProfile(resolved.name);
+      console.log(chalk.green(`✓ 默认 profile 已设置为 ${typeTag} "${resolved.name}"`));
     });
 }
-

package/src/config.js

@@ -4,6 +4,8 @@ import os from 'os';
 // 配置文件存储目录
 export const CONFIG_DIR = path.join(os.homedir(), '.ccc');
 export const PROFILES_DIR = path.join(CONFIG_DIR, 'profiles');
+export const CODEX_PROFILES_DIR = path.join(CONFIG_DIR, 'codex-profiles');
 export const DEFAULT_FILE = path.join(CONFIG_DIR, 'default');
 export const CLAUDE_SETTINGS_PATH = path.join(os.homedir(), '.claude', 'settings.json');
+export const CODEX_HOME_PATH = path.join(os.homedir(), '.codex');