@tkpdx01/ccc 1.2.5 → 1.2.7

package/src/commands/index.js

@@ -1,10 +1,10 @@
-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 { syncCommand } from './sync.js';
-export { editCommand } from './edit.js';
-export { deleteCommand } from './delete.js';
-export { helpCommand, showHelp } from './help.js';
-
+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 { helpCommand, showHelp } from './help.js';
+

package/src/commands/list.js

@@ -1,58 +1,46 @@
-import fs from 'fs';
-import chalk from 'chalk';
-import Table from 'cli-table3';
-import { getProfiles, getDefaultProfile, getProfilePath } from '../profiles.js';
-
-export function listCommand(program) {
-  program
-    .command('list')
-    .alias('ls')
-    .description('列出所有 profiles')
-    .action(() => {
-      const profiles = getProfiles();
-      const defaultProfile = getDefaultProfile();
-
-      if (profiles.length === 0) {
-        console.log(chalk.yellow('没有可用的 profiles'));
-        console.log(chalk.gray('使用 "ccc import" 导入配置'));
-        return;
-      }
-
-      const table = new Table({
-        head: [chalk.cyan('#'), chalk.cyan('Profile'), chalk.cyan('ANTHROPIC_BASE_URL')],
-        style: { head: [], border: [] },
-        chars: {
-          'top': '─', 'top-mid': '┬', 'top-left': '┌', 'top-right': '┐',
-          'bottom': '─', 'bottom-mid': '┴', 'bottom-left': '└', 'bottom-right': '┘',
-          'left': '│', 'left-mid': '├', 'mid': '─', 'mid-mid': '┼',
-          'right': '│', 'right-mid': '┤', 'middle': '│'
-        }
-      });
-
-      profiles.forEach((p, index) => {
-        const isDefault = p === defaultProfile;
-        const profilePath = getProfilePath(p);
-        let baseUrl = chalk.gray('(未设置)');
-
-        try {
-          const content = fs.readFileSync(profilePath, 'utf-8');
-          // 用正则从 JSON 文件内容中提取 ANTHROPIC_BASE_URL
-          const match = content.match(/"ANTHROPIC_BASE_URL"\s*:\s*"([^"]+)"/);
-          if (match && match[1]) {
-            baseUrl = match[1];
-          }
-        } catch {
-          baseUrl = chalk.red('(读取失败)');
-        }
-
-        const num = isDefault ? chalk.green(`${index + 1}`) : chalk.gray(`${index + 1}`);
-        const name = isDefault ? chalk.green(`${p} *`) : p;
-        table.push([num, name, baseUrl]);
-      });
-
-      console.log();
-      console.log(table.toString());
-      console.log(chalk.gray(`\n  共 ${profiles.length} 个配置，* 表示默认，可用序号或名称启动\n`));
-    });
-}
-
+import chalk from 'chalk';
+import Table from 'cli-table3';
+import { getProfiles, getDefaultProfile, getProfileCredentials } from '../profiles.js';
+
+export function listCommand(program) {
+  program
+    .command('list')
+    .alias('ls')
+    .description('列出所有 profiles')
+    .action(() => {
+      const profiles = getProfiles();
+      const defaultProfile = getDefaultProfile();
+
+      if (profiles.length === 0) {
+        console.log(chalk.yellow('没有可用的 profiles'));
+        console.log(chalk.gray('使用 "ccc import" 导入配置'));
+        return;
+      }
+
+      const table = new Table({
+        head: [chalk.cyan('#'), chalk.cyan('Profile'), chalk.cyan('ANTHROPIC_BASE_URL')],
+        style: { head: [], border: [] },
+        chars: {
+          'top': '─', 'top-mid': '┬', 'top-left': '┌', 'top-right': '┐',
+          'bottom': '─', 'bottom-mid': '┴', 'bottom-left': '└', 'bottom-right': '┘',
+          'left': '│', 'left-mid': '├', 'mid': '─', 'mid-mid': '┼',
+          'right': '│', 'right-mid': '┤', 'middle': '│'
+        }
+      });
+
+      profiles.forEach((p, index) => {
+        const isDefault = p === defaultProfile;
+        const { apiUrl } = getProfileCredentials(p);
+        const baseUrl = 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]);
+      });
+
+      console.log();
+      console.log(table.toString());
+      console.log(chalk.gray(`\n  共 ${profiles.length} 个配置，* 表示默认，可用序号或名称启动\n`));
+    });
+}
+

package/src/commands/new.js

@@ -1,143 +1,109 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import { 
-  ensureDirs, 
-  getProfiles, 
-  profileExists, 
-  saveProfile, 
-  setDefaultProfile, 
-  getClaudeSettingsTemplate 
-} from '../profiles.js';
-import { launchClaude } from '../launch.js';
-
-export function newCommand(program) {
-  program
-    .command('new [name]')
-    .description('基于 ~/.claude/settings.json 模板创建新配置')
-    .action(async (name) => {
-      const template = getClaudeSettingsTemplate();
-
-      // 显示模板状态
-      if (template) {
-        console.log(chalk.green('✓ 检测到模板文件: ~/.claude/settings.json'));
-        console.log(chalk.gray('  将基于此模板创建新配置\n'));
-      } else {
-        console.log(chalk.yellow('! 未找到模板文件: ~/.claude/settings.json'));
-        console.log(chalk.gray('  将创建空白配置\n'));
-      }
-
-      // 如果没有提供名称，询问
-      if (!name) {
-        const { profileName } = await inquirer.prompt([
-          {
-            type: 'input',
-            name: 'profileName',
-            message: '配置名称:',
-            validate: (input) => input.trim() ? true : '请输入配置名称'
-          }
-        ]);
-        name = profileName;
-      }
-
-      // 检查是否已存在
-      if (profileExists(name)) {
-        const { overwrite } = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'overwrite',
-            message: `配置 "${name}" 已存在，是否覆盖?`,
-            default: false
-          }
-        ]);
-        if (!overwrite) {
-          console.log(chalk.yellow('已取消'));
-          process.exit(0);
-        }
-      }
-
-      // 基于模板创建，但需要用户填写 API 信息
-      const baseSettings = template || {};
-
-      // 显示模板中已有的设置（如果有）
-      if (template) {
-        console.log(chalk.cyan('模板中的现有设置:'));
-        if (template.apiUrl) console.log(chalk.gray(`  API URL: ${template.apiUrl}`));
-        if (template.apiKey) console.log(chalk.gray(`  API Key: ${template.apiKey.substring(0, 10)}...`));
-        const otherKeys = Object.keys(template).filter(k => !['apiUrl', 'apiKey'].includes(k));
-        if (otherKeys.length > 0) {
-          console.log(chalk.gray(`  其他设置: ${otherKeys.join(', ')}`));
-        }
-        console.log();
-      }
-
-      const { apiUrl, apiKey, finalName } = await inquirer.prompt([
-        {
-          type: 'input',
-          name: 'apiUrl',
-          message: 'API URL:',
-          default: baseSettings.apiUrl || 'https://api.anthropic.com'
-        },
-        {
-          type: 'input',
-          name: 'apiKey',
-          message: 'API Key:',
-          default: baseSettings.apiKey || ''
-        },
-        {
-          type: 'input',
-          name: 'finalName',
-          message: 'Profile 名称:',
-          default: name
-        }
-      ]);
-
-      // 如果名称改变了，检查新名称是否存在
-      if (finalName !== name && profileExists(finalName)) {
-        const { overwriteNew } = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'overwriteNew',
-            message: `配置 "${finalName}" 已存在，是否覆盖?`,
-            default: false
-          }
-        ]);
-        if (!overwriteNew) {
-          console.log(chalk.yellow('已取消'));
-          process.exit(0);
-        }
-      }
-
-      // 合并设置：保留模板中的其他设置，覆盖 API 相关设置
-      const newSettings = {
-        ...baseSettings,
-        apiUrl,
-        apiKey
-      };
-
-      ensureDirs();
-      saveProfile(finalName, newSettings);
-      console.log(chalk.green(`\n✓ 配置 "${finalName}" 已创建`));
-
-      // 如果是第一个 profile，设为默认
-      const profiles = getProfiles();
-      if (profiles.length === 1) {
-        setDefaultProfile(finalName);
-        console.log(chalk.green(`✓ 已设为默认配置`));
-      }
-
-      // 询问是否立即使用
-      const { useNow } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'useNow',
-          message: '是否立即启动 Claude?',
-          default: false
-        }
-      ]);
-
-      if (useNow) {
-        launchClaude(finalName);
-      }
-    });
-}
-
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import {
+  ensureDirs,
+  getProfiles,
+  profileExists,
+  createProfileFromTemplate,
+  setDefaultProfile
+} from '../profiles.js';
+import { launchClaude } from '../launch.js';
+
+export function newCommand(program) {
+  program
+    .command('new [name]')
+    .description('创建新的配置（基于 ~/.claude/settings.json，在 env 中设置 API 凭证）')
+    .action(async (name) => {
+      // 如果没有提供名称，询问
+      if (!name) {
+        const { profileName } = await inquirer.prompt([
+          {
+            type: 'input',
+            name: 'profileName',
+            message: '配置名称:',
+            validate: (input) => input.trim() ? true : '请输入配置名称'
+          }
+        ]);
+        name = profileName;
+      }
+
+      // 检查是否已存在
+      if (profileExists(name)) {
+        const { overwrite } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'overwrite',
+            message: `配置 "${name}" 已存在，是否覆盖?`,
+            default: false
+          }
+        ]);
+        if (!overwrite) {
+          console.log(chalk.yellow('已取消'));
+          process.exit(0);
+        }
+      }
+
+      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
+        }
+      ]);
+
+      // 如果名称改变了，检查新名称是否存在
+      if (finalName !== name && profileExists(finalName)) {
+        const { overwriteNew } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'overwriteNew',
+            message: `配置 "${finalName}" 已存在，是否覆盖?`,
+            default: false
+          }
+        ]);
+        if (!overwriteNew) {
+          console.log(chalk.yellow('已取消'));
+          process.exit(0);
+        }
+      }
+
+      ensureDirs();
+      createProfileFromTemplate(finalName, apiUrl, apiKey);
+      console.log(chalk.green(`\n✓ 配置 "${finalName}" 已创建（基于 ~/.claude/settings.json）`));
+
+      // 如果是第一个 profile，设为默认
+      const profiles = getProfiles();
+      if (profiles.length === 1) {
+        setDefaultProfile(finalName);
+        console.log(chalk.green(`✓ 已设为默认配置`));
+      }
+
+      // 询问是否立即使用
+      const { useNow } = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'useNow',
+          message: '是否立即启动 Claude?',
+          default: false
+        }
+      ]);
+
+      if (useNow) {
+        launchClaude(finalName);
+      }
+    });
+}
+

package/src/commands/show.js

@@ -1,68 +1,68 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import { 
-  getProfiles, 
-  getDefaultProfile, 
-  profileExists, 
-  getProfilePath, 
-  readProfile 
-} from '../profiles.js';
-import { formatValue } from '../utils.js';
-
-export function showCommand(program) {
-  program
-    .command('show [profile]')
-    .description('显示 profile 的完整配置')
-    .action(async (profile) => {
-      const profiles = getProfiles();
-
-      if (profiles.length === 0) {
-        console.log(chalk.yellow('没有可用的 profiles'));
-        process.exit(0);
-      }
-
-      // 如果没有指定 profile，交互选择
-      if (!profile) {
-        const defaultProfile = getDefaultProfile();
-        const { selectedProfile } = await inquirer.prompt([
-          {
-            type: 'list',
-            name: 'selectedProfile',
-            message: '选择要查看的配置:',
-            choices: profiles,
-            default: defaultProfile
-          }
-        ]);
-        profile = selectedProfile;
-      }
-
-      if (!profileExists(profile)) {
-        console.log(chalk.red(`Profile "${profile}" 不存在`));
-        process.exit(1);
-      }
-
-      const profilePath = getProfilePath(profile);
-      const settings = readProfile(profile);
-      const isDefault = getDefaultProfile() === profile;
-
-      console.log(chalk.cyan.bold(`\n  Profile: ${profile}`) + (isDefault ? chalk.green(' (默认)') : ''));
-      console.log(chalk.gray(`  路径: ${profilePath}\n`));
-
-      // 格式化显示配置
-      Object.entries(settings).forEach(([key, value]) => {
-        const formattedValue = formatValue(key, value);
-        if (key === 'apiKey' && 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();
-    });
-}
-
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { 
+  getProfiles, 
+  getDefaultProfile, 
+  profileExists, 
+  getProfilePath, 
+  readProfile 
+} from '../profiles.js';
+import { formatValue } from '../utils.js';
+
+export function showCommand(program) {
+  program
+    .command('show [profile]')
+    .description('显示 profile 的完整配置')
+    .action(async (profile) => {
+      const profiles = getProfiles();
+
+      if (profiles.length === 0) {
+        console.log(chalk.yellow('没有可用的 profiles'));
+        process.exit(0);
+      }
+
+      // 如果没有指定 profile，交互选择
+      if (!profile) {
+        const defaultProfile = getDefaultProfile();
+        const { selectedProfile } = await inquirer.prompt([
+          {
+            type: 'list',
+            name: 'selectedProfile',
+            message: '选择要查看的配置:',
+            choices: profiles,
+            default: defaultProfile
+          }
+        ]);
+        profile = selectedProfile;
+      }
+
+      if (!profileExists(profile)) {
+        console.log(chalk.red(`Profile "${profile}" 不存在`));
+        process.exit(1);
+      }
+
+      const profilePath = getProfilePath(profile);
+      const settings = readProfile(profile);
+      const isDefault = getDefaultProfile() === profile;
+
+      console.log(chalk.cyan.bold(`\n  Profile: ${profile}`) + (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();
+    });
+}
+