@tkpdx01/ccc 1.3.7 → 1.6.0

package/src/launch.js

@@ -1,11 +1,14 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import { spawn } from 'child_process';
-import { 
-  getProfiles, 
-  getDefaultProfile, 
-  profileExists, 
-  getProfilePath 
+import {
+  getAllProfiles,
+  getDefaultProfile,
+  profileExists,
+  codexProfileExists,
+  getProfilePath,
+  getCodexProfileDir,
+  getCodexProfileCredentials
 } from './profiles.js';
 
 // 启动 claude
@@ -37,22 +40,73 @@ export function launchClaude(profileName, dangerouslySkipPermissions = false) {
   });
 }
 
+// 启动 codex
+export function launchCodex(profileName, dangerouslySkipPermissions = false) {
+  const codexHome = getCodexProfileDir(profileName);
+
+  if (!codexProfileExists(profileName)) {
+    console.log(chalk.red(`Profile "${profileName}" 不存在`));
+    console.log(chalk.yellow(`使用 "ccc list" 查看可用的 profiles`));
+    process.exit(1);
+  }
+
+  const { baseUrl } = getCodexProfileCredentials(profileName);
+
+  const args = [];
+  if (dangerouslySkipPermissions) {
+    args.push('--full-auto');
+  }
+
+  // 构建进程环境变量
+  const env = { ...process.env, CODEX_HOME: codexHome };
+  if (baseUrl && baseUrl !== 'https://api.openai.com/v1') {
+    env.OPENAI_BASE_URL = baseUrl;
+  }
+
+  console.log(chalk.green(`启动 Codex，使用配置: ${profileName}`));
+  console.log(chalk.gray(`CODEX_HOME=${codexHome} codex ${args.join(' ')}`));
+
+  const child = spawn('codex', args, {
+    stdio: 'inherit',
+    shell: true,
+    env
+  });
+
+  child.on('error', (err) => {
+    console.log(chalk.red(`启动失败: ${err.message}`));
+    process.exit(1);
+  });
+}
+
+// 根据 profile 类型自动选择启动方式
+export function launchProfile(profileName, type, dangerouslySkipPermissions = false) {
+  if (type === 'codex') {
+    launchCodex(profileName, dangerouslySkipPermissions);
+  } else {
+    launchClaude(profileName, dangerouslySkipPermissions);
+  }
+}
+
 // 交互式选择 profile
 export async function selectProfile(dangerouslySkipPermissions = false) {
-  const profiles = getProfiles();
+  const allProfiles = getAllProfiles();
 
-  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" 创建配置'));
     process.exit(0);
   }
 
   const defaultProfile = getDefaultProfile();
 
-  const choices = profiles.map((p, index) => ({
-    name: p === defaultProfile ? `${index + 1}. ${p} ${chalk.green('(默认)')}` : `${index + 1}. ${p}`,
-    value: p
-  }));
+  const choices = allProfiles.map((p, index) => {
+    const typeTag = p.type === 'codex' ? chalk.blue('[Codex]') : chalk.magenta('[Claude]');
+    const isDefault = p.name === defaultProfile;
+    const label = isDefault
+      ? `${index + 1}. ${typeTag} ${p.name} ${chalk.green('(默认)')}`
+      : `${index + 1}. ${typeTag} ${p.name}`;
+    return { name: label, value: p };
+  });
 
   const { profile } = await inquirer.prompt([
     {
@@ -60,10 +114,9 @@ export async function selectProfile(dangerouslySkipPermissions = false) {
       name: 'profile',
       message: '选择要使用的配置:',
       choices,
-      default: defaultProfile
+      default: allProfiles.findIndex(p => p.name === defaultProfile)
     }
   ]);
 
-  launchClaude(profile, dangerouslySkipPermissions);
+  launchProfile(profile.name, profile.type, dangerouslySkipPermissions);
 }
-

package/src/profiles.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 import os from 'os';
-import { CONFIG_DIR, PROFILES_DIR, DEFAULT_FILE, CLAUDE_SETTINGS_PATH } from './config.js';
+import { CONFIG_DIR, PROFILES_DIR, CODEX_PROFILES_DIR, DEFAULT_FILE, CLAUDE_SETTINGS_PATH, CODEX_HOME_PATH } from './config.js';
 
 function stringifyClaudeSettings(settings) {
   // Claude Code 默认 settings.json 使用 2 空格缩进，并以换行结尾（便于 diff/兼容各平台编辑器）
@@ -16,6 +16,9 @@ export function ensureDirs() {
   if (!fs.existsSync(PROFILES_DIR)) {
     fs.mkdirSync(PROFILES_DIR, { recursive: true });
   }
+  if (!fs.existsSync(CODEX_PROFILES_DIR)) {
+    fs.mkdirSync(CODEX_PROFILES_DIR, { recursive: true });
+  }
 }
 
 // 获取所有 profiles（按 a-z 排序）
@@ -135,7 +138,8 @@ export function ensureRequiredClaudeEnvSettings() {
   return ensureClaudeEnvSettings({
     CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC: '1',
     CLAUDE_CODE_ATTRIBUTION_HEADER: '0',
-    DISABLE_INSTALLATION_CHECKS: '1'
+    DISABLE_INSTALLATION_CHECKS: '1',
+    CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS: '1'
   });
 }
 
@@ -157,6 +161,12 @@ export function applyClaudeSettingsExtras(target) {
 
   let changed = false;
 
+  // 确保 hasCompletedOnboarding 为 true
+  if (target.hasCompletedOnboarding !== true) {
+    target.hasCompletedOnboarding = true;
+    changed = true;
+  }
+
   // 确保 attribution 禁用（commit/pr 为空字符串）
   if (!target.attribution || typeof target.attribution !== 'object' || Array.isArray(target.attribution)) {
     target.attribution = { commit: '', pr: '' };
@@ -246,6 +256,7 @@ export function createProfileFromTemplate(name, apiUrl, apiKey) {
   template.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1';
   template.env.CLAUDE_CODE_ATTRIBUTION_HEADER = '0';
   template.env.DISABLE_INSTALLATION_CHECKS = '1';
+  template.env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = '1';
 
   // 只设置 API 凭证到 env
   template.env.ANTHROPIC_AUTH_TOKEN = apiKey;
@@ -284,6 +295,7 @@ export function syncProfileWithTemplate(name) {
   newProfile.env.CLAUDE_CODE_DISABLE_NONESSENTIAL_TRAFFIC = '1';
   newProfile.env.CLAUDE_CODE_ATTRIBUTION_HEADER = '0';
   newProfile.env.DISABLE_INSTALLATION_CHECKS = '1';
+  newProfile.env.CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS = '1';
   applyClaudeSettingsExtras(newProfile);
 
   saveProfile(name, newProfile);
@@ -319,3 +331,221 @@ export function clearDefaultProfile() {
     fs.unlinkSync(DEFAULT_FILE);
   }
 }
+
+// ============================================================
+// Codex Profile 管理
+// ============================================================
+
+// 获取 Codex profile 目录路径
+export function getCodexProfileDir(name) {
+  return path.join(CODEX_PROFILES_DIR, name);
+}
+
+// 检查 Codex profile 是否存在
+export function codexProfileExists(name) {
+  const dir = getCodexProfileDir(name);
+  return fs.existsSync(path.join(dir, 'auth.json'));
+}
+
+// 获取所有 Codex profiles（按 a-z 排序）
+export function getCodexProfiles() {
+  ensureDirs();
+  if (!fs.existsSync(CODEX_PROFILES_DIR)) return [];
+  return fs.readdirSync(CODEX_PROFILES_DIR, { withFileTypes: true })
+    .filter(d => d.isDirectory() && fs.existsSync(path.join(CODEX_PROFILES_DIR, d.name, 'auth.json')))
+    .map(d => d.name)
+    .sort((a, b) => a.localeCompare(b, 'zh-CN', { sensitivity: 'base' }));
+}
+
+// 读取 Codex profile
+export function readCodexProfile(name) {
+  const dir = getCodexProfileDir(name);
+  const authPath = path.join(dir, 'auth.json');
+  const configPath = path.join(dir, 'config.toml');
+
+  if (!fs.existsSync(authPath)) return null;
+
+  try {
+    const auth = JSON.parse(fs.readFileSync(authPath, 'utf-8'));
+    const configToml = fs.existsSync(configPath) ? fs.readFileSync(configPath, 'utf-8') : '';
+    return { auth, configToml };
+  } catch {
+    return null;
+  }
+}
+
+// 保存 Codex profile
+export function saveCodexProfile(name, auth, configToml) {
+  ensureDirs();
+  const dir = getCodexProfileDir(name);
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+  fs.writeFileSync(path.join(dir, 'auth.json'), JSON.stringify(auth, null, 2) + '\n');
+  fs.writeFileSync(path.join(dir, 'config.toml'), configToml);
+}
+
+// 生成 Codex config.toml 内容
+export function generateCodexConfigToml(baseUrl, model) {
+  let lines = ['# Codex profile managed by ccc'];
+
+  if (model) {
+    lines.push(`model = "${model}"`);
+  }
+
+  if (baseUrl && baseUrl !== 'https://api.openai.com/v1') {
+    lines.push('');
+    lines.push('[model_providers.openai]');
+    lines.push(`name = "OpenAI"`);
+    lines.push(`base_url = "${baseUrl}"`);
+  }
+
+  lines.push('');
+  return lines.join('\n');
+}
+
+// 创建 Codex profile
+export function createCodexProfile(name, apiKey, baseUrl, model) {
+  const auth = {
+    auth_mode: 'apikey',
+    OPENAI_API_KEY: apiKey
+  };
+  const configToml = generateCodexConfigToml(baseUrl, model);
+  saveCodexProfile(name, auth, configToml);
+  return { auth, configToml };
+}
+
+// 获取 Codex profile 的凭证
+export function getCodexProfileCredentials(name) {
+  const profile = readCodexProfile(name);
+  if (!profile) return { apiKey: '', baseUrl: '', model: '' };
+
+  const apiKey = profile.auth?.OPENAI_API_KEY || '';
+
+  // 从 config.toml 解析 base_url 和 model
+  let baseUrl = '';
+  let model = '';
+  if (profile.configToml) {
+    const baseUrlMatch = profile.configToml.match(/base_url\s*=\s*"([^"]+)"/);
+    if (baseUrlMatch) baseUrl = baseUrlMatch[1];
+    const modelMatch = profile.configToml.match(/^model\s*=\s*"([^"]+)"/m);
+    if (modelMatch) model = modelMatch[1];
+  }
+
+  return { apiKey, baseUrl: baseUrl || 'https://api.openai.com/v1', model: model || '' };
+}
+
+// 删除 Codex profile
+export function deleteCodexProfile(name) {
+  const dir = getCodexProfileDir(name);
+  if (fs.existsSync(dir)) {
+    fs.rmSync(dir, { recursive: true });
+  }
+}
+
+// 同步 Codex profile（从 ~/.codex/ 模板同步，保留 API 凭证）
+export function syncCodexProfileWithTemplate(name) {
+  const templateConfigPath = path.join(CODEX_HOME_PATH, 'config.toml');
+  if (!fs.existsSync(templateConfigPath)) return null;
+
+  const current = readCodexProfile(name);
+  if (!current) return null;
+
+  // 读取模板 config.toml
+  let templateConfig = fs.readFileSync(templateConfigPath, 'utf-8');
+
+  // 保留当前 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}"`);
+    } else {
+      templateConfig = `model = "${model}"\n` + templateConfig;
+    }
+  }
+
+  saveCodexProfile(name, current.auth, templateConfig);
+  return { auth: current.auth, configToml: templateConfig };
+}
+
+// 应用 Claude profile 到 ~/.claude/settings.json
+export function applyClaudeProfile(name) {
+  const profile = readProfile(name);
+  if (!profile) return false;
+  fs.writeFileSync(CLAUDE_SETTINGS_PATH, stringifyClaudeSettings(profile));
+  return true;
+}
+
+// 应用 Codex profile 到 ~/.codex/
+export function applyCodexProfile(name) {
+  const profile = readCodexProfile(name);
+  if (!profile) return false;
+
+  if (!fs.existsSync(CODEX_HOME_PATH)) {
+    fs.mkdirSync(CODEX_HOME_PATH, { recursive: true });
+  }
+
+  // 写入 auth.json
+  fs.writeFileSync(
+    path.join(CODEX_HOME_PATH, 'auth.json'),
+    JSON.stringify(profile.auth, null, 2) + '\n'
+  );
+
+  // 写入 config.toml（如果有内容）
+  if (profile.configToml && profile.configToml.trim()) {
+    fs.writeFileSync(path.join(CODEX_HOME_PATH, 'config.toml'), profile.configToml);
+  }
+
+  return true;
+}
+
+// ============================================================
+// 统一 Profile 管理（Claude + Codex 混合）
+// ============================================================
+
+// 获取所有 profiles（混合 Claude 和 Codex），按名称排序
+export function getAllProfiles() {
+  const claudeProfiles = getProfiles().map(name => ({ name, type: 'claude' }));
+  const codexProfiles = getCodexProfiles().map(name => ({ name, type: 'codex' }));
+  return [...claudeProfiles, ...codexProfiles]
+    .sort((a, b) => a.name.localeCompare(b.name, 'zh-CN', { sensitivity: 'base' }));
+}
+
+// 根据序号或名称解析 profile（统一）
+export function resolveAnyProfile(input) {
+  const all = getAllProfiles();
+  const map = {};
+  all.forEach((p, i) => { map[i + 1] = p; });
+
+  // 尝试作为数字序号
+  const num = parseInt(input, 10);
+  if (!isNaN(num) && map[num]) {
+    return map[num];
+  }
+
+  // 作为名称查找
+  const found = all.find(p => p.name === input);
+  return found || null;
+}
+
+// 检查任意类型 profile 是否存在
+export function anyProfileExists(name) {
+  if (profileExists(name)) return { exists: true, type: 'claude' };
+  if (codexProfileExists(name)) return { exists: true, type: 'codex' };
+  return { exists: false, type: null };
+}

package/src/utils.js

@@ -1,56 +1,3 @@
-// 从文本中提取 URL 和 token
-export function extractFromText(text) {
-  // 提取 URL
-  const urlRegex = /https?:\/\/[^\s"'<>]+/gi;
-  const urls = text.match(urlRegex) || [];
-
-  // 提取 sk token
-  const tokenRegex = /sk-[a-zA-Z0-9_-]+/g;
-  const tokens = text.match(tokenRegex) || [];
-
-  return { urls, tokens };
-}
-
-// 从 URL 获取域名作为名称（去掉协议和www子域名）
-export function getDomainName(url) {
-  try {
-    const urlObj = new URL(url);
-    // 获取完整域名
-    let hostname = urlObj.hostname;
-    // 移除 www. 前缀
-    hostname = hostname.replace(/^www\./, '');
-    return hostname;
-  } catch {
-    return null;
-  }
-}
-
-// 生成安全的 profile 名称
-export function sanitizeProfileName(name) {
-  return name
-    .replace(/[<>:"/\\|?*]/g, '_')  // 替换 Windows 非法字符
-    .replace(/\s+/g, '_')           // 替换空格
-    .replace(/_+/g, '_')            // 合并多个下划线
-    .replace(/^_|_$/g, '')          // 去除首尾下划线
-    .substring(0, 50);              // 限制长度
-}
-
-// 将导入的配置转换为影子配置格式（只包含 API 凭证）
-export function convertToClaudeSettings(provider, template) {
-  const config = provider.settingsConfig || {};
-
-  // 从 env 中提取 API 信息
-  const env = config.env || {};
-  const apiKey = env.ANTHROPIC_AUTH_TOKEN || env.ANTHROPIC_API_KEY || config.apiKey || '';
-  const apiUrl = env.ANTHROPIC_BASE_URL || config.apiUrl || provider.websiteUrl || '';
-
-  // 影子配置只存储 API 凭证，不用 env 包裹
-  return {
-    ANTHROPIC_AUTH_TOKEN: apiKey,
-    ANTHROPIC_BASE_URL: apiUrl
-  };
-}
-
 // 格式化显示配置值
 export function formatValue(key, value) {
   if ((key === 'apiKey' || key === 'ANTHROPIC_AUTH_TOKEN') && value) {