@tkpdx01/ccc 1.2.5 → 1.2.7

package/src/commands/sync.js

@@ -1,168 +1,93 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import { 
-  getProfiles, 
-  profileExists, 
-  getProfilePath, 
-  readProfile, 
-  saveProfile, 
-  getClaudeSettingsTemplate 
-} from '../profiles.js';
-
-export function syncCommand(program) {
-  program
-    .command('sync [profile]')
-    .description('从 ~/.claude/settings.json 同步设置（保留 API 配置）')
-    .option('-a, --all', '同步所有配置')
-    .action(async (profile, options) => {
-      const template = getClaudeSettingsTemplate();
-
-      if (!template) {
-        console.log(chalk.red('✗ 未找到模板文件: ~/.claude/settings.json'));
-        console.log(chalk.gray('  请确保该文件存在'));
-        process.exit(1);
-      }
-
-      const profiles = getProfiles();
-      if (profiles.length === 0) {
-        console.log(chalk.yellow('没有可用的配置'));
-        process.exit(0);
-      }
-
-      // 需要保留的字段（每个 profile 独立的设置）
-      const preserveKeys = ['apiUrl', 'apiKey', 'includeCoAuthoredBy', 'model'];
-
-      // 同步单个配置的函数
-      const syncProfile = (name) => {
-        const currentSettings = readProfile(name);
-
-        // 保留指定字段
-        const preserved = {};
-        preserveKeys.forEach(key => {
-          if (currentSettings[key] !== undefined) {
-            preserved[key] = currentSettings[key];
-          }
-        });
-
-        // 确保 includeCoAuthoredBy 为 false
-        if (preserved.includeCoAuthoredBy === undefined) {
-          preserved.includeCoAuthoredBy = false;
-        }
-
-        // 合并：模板 + 保留的字段
-        const newSettings = {
-          ...template,
-          ...preserved
-        };
-
-        saveProfile(name, newSettings);
-        return { name, preserved };
-      };
-
-      if (options.all) {
-        // 同步所有配置
-        console.log(chalk.cyan(`同步所有配置 (${profiles.length} 个)...\n`));
-
-        const { confirm } = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'confirm',
-            message: `确定要同步所有 ${profiles.length} 个配置吗?`,
-            default: false
-          }
-        ]);
-
-        if (!confirm) {
-          console.log(chalk.yellow('已取消'));
-          process.exit(0);
-        }
-
-        profiles.forEach(name => {
-          const result = syncProfile(name);
-          console.log(chalk.green(`✓ ${name}`) + chalk.gray(` (保留: ${Object.keys(result.preserved).join(', ')})`));
-        });
-
-        console.log(chalk.green(`\n✓ 已同步 ${profiles.length} 个配置`));
-      } else {
-        // 同步单个配置
-        if (!profile) {
-          const { selectedProfile } = await inquirer.prompt([
-            {
-              type: 'list',
-              name: 'selectedProfile',
-              message: '选择要同步的配置:',
-              choices: [...profiles, new inquirer.Separator(), { name: '同步全部', value: '__all__' }]
-            }
-          ]);
-
-          if (selectedProfile === '__all__') {
-            // 递归调用同步全部
-            const { confirm } = await inquirer.prompt([
-              {
-                type: 'confirm',
-                name: 'confirm',
-                message: `确定要同步所有 ${profiles.length} 个配置吗?`,
-                default: false
-              }
-            ]);
-
-            if (!confirm) {
-              console.log(chalk.yellow('已取消'));
-              process.exit(0);
-            }
-
-            profiles.forEach(name => {
-              const result = syncProfile(name);
-              console.log(chalk.green(`✓ ${name}`) + chalk.gray(` (保留: ${Object.keys(result.preserved).join(', ')})`));
-            });
-
-            console.log(chalk.green(`\n✓ 已同步 ${profiles.length} 个配置`));
-            return;
-          }
-
-          profile = selectedProfile;
-        }
-
-        if (!profileExists(profile)) {
-          console.log(chalk.red(`配置 "${profile}" 不存在`));
-          process.exit(1);
-        }
-
-        // 显示将要进行的更改
-        const currentSettings = readProfile(profile);
-
-        console.log(chalk.cyan(`\n同步配置: ${profile}`));
-        console.log(chalk.gray('将保留以下字段:'));
-        preserveKeys.forEach(key => {
-          const value = currentSettings[key];
-          if (value !== undefined) {
-            const display = key === 'apiKey' ? value.substring(0, 10) + '...' : value;
-            console.log(chalk.gray(`  ${key}: ${display}`));
-          }
-        });
-
-        const templateKeys = Object.keys(template).filter(k => !preserveKeys.includes(k));
-        console.log(chalk.gray('\n将从模板同步:'));
-        console.log(chalk.gray(`  ${templateKeys.join(', ') || '(无)'}`));
-        console.log();
-
-        const { confirm } = await inquirer.prompt([
-          {
-            type: 'confirm',
-            name: 'confirm',
-            message: '确认同步?',
-            default: true
-          }
-        ]);
-
-        if (!confirm) {
-          console.log(chalk.yellow('已取消'));
-          process.exit(0);
-        }
-
-        syncProfile(profile);
-        console.log(chalk.green(`\n✓ 配置 "${profile}" 已同步`));
-      }
-    });
-}
-
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import {
+  getProfiles,
+  syncProfileWithTemplate,
+  getClaudeSettingsTemplate,
+  resolveProfile
+} from '../profiles.js';
+
+export function syncCommand(program) {
+  program
+    .command('sync [profile]')
+    .description('同步 ~/.claude/settings.json 到 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 profiles = getProfiles();
+
+      if (profiles.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 吗?`,
+            default: false
+          }
+        ]);
+
+        if (!confirm) {
+          console.log(chalk.yellow('已取消'));
+          process.exit(0);
+        }
+
+        console.log(chalk.cyan('\n开始同步所有 profiles...\n'));
+
+        let successCount = 0;
+        for (const p of profiles) {
+          const result = syncProfileWithTemplate(p);
+          if (result) {
+            console.log(chalk.green(`  ✓ ${p}`));
+            successCount++;
+          } else {
+            console.log(chalk.red(`  ✗ ${p} (同步失败)`));
+          }
+        }
+
+        console.log(chalk.green(`\n✓ 已同步 ${successCount}/${profiles.length} 个 profiles`));
+        return;
+      }
+
+      // 同步单个 profile
+      if (!profile) {
+        const { selectedProfile } = await inquirer.prompt([
+          {
+            type: 'list',
+            name: 'selectedProfile',
+            message: '选择要同步的配置:',
+            choices: profiles
+          }
+        ]);
+        profile = selectedProfile;
+      } else {
+        const resolved = resolveProfile(profile);
+        if (!resolved) {
+          console.log(chalk.red(`Profile "${profile}" 不存在`));
+          process.exit(1);
+        }
+        profile = resolved;
+      }
+
+      const result = syncProfileWithTemplate(profile);
+      if (result) {
+        console.log(chalk.green(`\n✓ Profile "${profile}" 已同步（保留了 API 凭证）`));
+      } else {
+        console.log(chalk.red(`\n✗ 同步失败`));
+        process.exit(1);
+      }
+    });
+}

package/src/commands/use.js

@@ -1,19 +1,19 @@
-import chalk from 'chalk';
-import { profileExists, setDefaultProfile } from '../profiles.js';
-
-export function useCommand(program) {
-  program
-    .command('use <profile>')
-    .description('设置默认 profile')
-    .action((profile) => {
-      if (!profileExists(profile)) {
-        console.log(chalk.red(`Profile "${profile}" 不存在`));
-        console.log(chalk.yellow(`使用 "ccc list" 查看可用的 profiles`));
-        process.exit(1);
-      }
-
-      setDefaultProfile(profile);
-      console.log(chalk.green(`✓ 默认 profile 已设置为 "${profile}"`));
-    });
-}
-
+import chalk from 'chalk';
+import { profileExists, setDefaultProfile } from '../profiles.js';
+
+export function useCommand(program) {
+  program
+    .command('use <profile>')
+    .description('设置默认 profile')
+    .action((profile) => {
+      if (!profileExists(profile)) {
+        console.log(chalk.red(`Profile "${profile}" 不存在`));
+        console.log(chalk.yellow(`使用 "ccc list" 查看可用的 profiles`));
+        process.exit(1);
+      }
+
+      setDefaultProfile(profile);
+      console.log(chalk.green(`✓ 默认 profile 已设置为 "${profile}"`));
+    });
+}
+

package/src/config.js

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

package/src/launch.js

@@ -1,69 +1,69 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import { spawn } from 'child_process';
-import { 
-  getProfiles, 
-  getDefaultProfile, 
-  profileExists, 
-  getProfilePath 
-} from './profiles.js';
-
-// 启动 claude
-export function launchClaude(profileName, dangerouslySkipPermissions = false) {
-  const profilePath = getProfilePath(profileName);
-
-  if (!profileExists(profileName)) {
-    console.log(chalk.red(`Profile "${profileName}" 不存在`));
-    console.log(chalk.yellow(`使用 "ccc list" 查看可用的 profiles`));
-    process.exit(1);
-  }
-
-  const args = ['--settings', profilePath];
-  if (dangerouslySkipPermissions) {
-    args.push('--dangerously-skip-permissions');
-  }
-
-  console.log(chalk.green(`启动 Claude Code，使用配置: ${profileName}`));
-  console.log(chalk.gray(`命令: claude ${args.join(' ')}`));
-
-  const child = spawn('claude', args, {
-    stdio: 'inherit',
-    shell: true
-  });
-
-  child.on('error', (err) => {
-    console.log(chalk.red(`启动失败: ${err.message}`));
-    process.exit(1);
-  });
-}
-
-// 交互式选择 profile
-export async function selectProfile(dangerouslySkipPermissions = false) {
-  const profiles = getProfiles();
-
-  if (profiles.length === 0) {
-    console.log(chalk.yellow('没有可用的 profiles'));
-    console.log(chalk.gray('使用 "ccc import" 导入配置'));
-    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 { profile } = await inquirer.prompt([
-    {
-      type: 'list',
-      name: 'profile',
-      message: '选择要使用的配置:',
-      choices,
-      default: defaultProfile
-    }
-  ]);
-
-  launchClaude(profile, dangerouslySkipPermissions);
-}
-
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { spawn } from 'child_process';
+import { 
+  getProfiles, 
+  getDefaultProfile, 
+  profileExists, 
+  getProfilePath 
+} from './profiles.js';
+
+// 启动 claude
+export function launchClaude(profileName, dangerouslySkipPermissions = false) {
+  const profilePath = getProfilePath(profileName);
+
+  if (!profileExists(profileName)) {
+    console.log(chalk.red(`Profile "${profileName}" 不存在`));
+    console.log(chalk.yellow(`使用 "ccc list" 查看可用的 profiles`));
+    process.exit(1);
+  }
+
+  const args = ['--settings', profilePath];
+  if (dangerouslySkipPermissions) {
+    args.push('--dangerously-skip-permissions');
+  }
+
+  console.log(chalk.green(`启动 Claude Code，使用配置: ${profileName}`));
+  console.log(chalk.gray(`命令: claude ${args.join(' ')}`));
+
+  const child = spawn('claude', args, {
+    stdio: 'inherit',
+    shell: true
+  });
+
+  child.on('error', (err) => {
+    console.log(chalk.red(`启动失败: ${err.message}`));
+    process.exit(1);
+  });
+}
+
+// 交互式选择 profile
+export async function selectProfile(dangerouslySkipPermissions = false) {
+  const profiles = getProfiles();
+
+  if (profiles.length === 0) {
+    console.log(chalk.yellow('没有可用的 profiles'));
+    console.log(chalk.gray('使用 "ccc import" 导入配置'));
+    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 { profile } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'profile',
+      message: '选择要使用的配置:',
+      choices,
+      default: defaultProfile
+    }
+  ]);
+
+  launchClaude(profile, dangerouslySkipPermissions);
+}
+