tools-cc 1.0.4 → 1.0.5

package/src/core/project.ts

@@ -1,9 +1,18 @@
 import fs from 'fs-extra';
 import path from 'path';
-import { ProjectConfig } from '../types';
+import { ProjectConfig, LegacyProjectConfig, normalizeProjectConfig, SourceSelection, ExportConfig } from '../types';
 import { loadManifest } from './manifest';
 import { getToolsccDir, getProjectConfigPath } from '../utils/path';
 
+/**
+ * 默认选择配置 - 导入所有内容
+ */
+const DEFAULT_SELECTION: SourceSelection = {
+  skills: ['*'],
+  commands: ['*'],
+  agents: ['*']
+};
+
 export async function initProject(projectDir: string): Promise<void> {
   const toolsccDir = getToolsccDir(projectDir);
   const configFile = getProjectConfigPath(projectDir);
@@ -16,17 +25,45 @@ export async function initProject(projectDir: string): Promise<void> {
   // Create project config if not exists
   if (!(await fs.pathExists(configFile))) {
     const config: ProjectConfig = {
-      sources: [],
+      sources: {},
       links: []
     };
     await fs.writeJson(configFile, config, { spaces: 2 });
   }
 }
 
+/**
+ * 读取项目配置，自动处理新旧格式
+ */
+async function readProjectConfig(configFile: string): Promise<ProjectConfig> {
+  const rawConfig = await fs.readJson(configFile);
+  return normalizeProjectConfig(rawConfig);
+}
+
+/**
+ * 获取源名称列表（兼容新旧格式）
+ */
+function getSourceNames(config: ProjectConfig): string[] {
+  return Object.keys(config.sources);
+}
+
+/**
+ * 检查是否应该复制某项（根据选择配置）
+ */
+function shouldInclude(itemName: string, selection: string[]): boolean {
+  // 如果选择包含通配符，包含所有项
+  if (selection.includes('*')) {
+    return true;
+  }
+  // 否则检查是否在选择列表中
+  return selection.includes(itemName);
+}
+
 export async function useSource(
   sourceName: string,
   sourceDir: string,
-  projectDir: string
+  projectDir: string,
+  selection?: SourceSelection
 ): Promise<void> {
   // Input validation
   if (!sourceName || !sourceName.trim()) {
@@ -44,11 +81,19 @@ export async function useSource(
   // Ensure project is initialized
   await initProject(projectDir);
 
+  // 使用传入的选择配置或默认配置
+  const effectiveSelection: SourceSelection = selection ?? DEFAULT_SELECTION;
+
   // Copy/link skills (flattened with prefix)
   const sourceSkillsDir = path.join(sourceDir, 'skills');
   if (await fs.pathExists(sourceSkillsDir)) {
     const skills = await fs.readdir(sourceSkillsDir);
     for (const skill of skills) {
+      // 检查是否应该包含此 skill
+      if (!shouldInclude(skill, effectiveSelection.skills)) {
+        continue;
+      }
+
       const srcPath = path.join(sourceSkillsDir, skill);
       const name = `${sourceName}` == `${skill}` ? skill : `${sourceName}-${skill}`;
       const destPath = path.join(toolsccDir, 'skills', name);
@@ -64,25 +109,53 @@ export async function useSource(
   // Copy commands (in subdirectory by source name)
   const sourceCommandsDir = path.join(sourceDir, 'commands');
   if (await fs.pathExists(sourceCommandsDir)) {
-    const destDir = path.join(toolsccDir, 'commands', sourceName);
-    await fs.remove(destDir);
-    await fs.copy(sourceCommandsDir, destDir);
+    // 检查是否有选择 commands
+    if (effectiveSelection.commands.includes('*')) {
+      // 复制所有 commands
+      const destDir = path.join(toolsccDir, 'commands', sourceName);
+      await fs.remove(destDir);
+      await fs.copy(sourceCommandsDir, destDir);
+    } else if (effectiveSelection.commands.length > 0) {
+      // 只复制选中的 commands
+      const destDir = path.join(toolsccDir, 'commands', sourceName);
+      await fs.ensureDir(destDir);
+      
+      for (const cmdName of effectiveSelection.commands) {
+        const srcFile = path.join(sourceCommandsDir, `${cmdName}.md`);
+        if (await fs.pathExists(srcFile)) {
+          await fs.copy(srcFile, path.join(destDir, `${cmdName}.md`));
+        }
+      }
+    }
   }
 
   // Copy agents (in subdirectory by source name)
   const sourceAgentsDir = path.join(sourceDir, 'agents');
   if (await fs.pathExists(sourceAgentsDir)) {
-    const destDir = path.join(toolsccDir, 'agents', sourceName);
-    await fs.remove(destDir);
-    await fs.copy(sourceAgentsDir, destDir);
+    // 检查是否有选择 agents
+    if (effectiveSelection.agents.includes('*')) {
+      // 复制所有 agents
+      const destDir = path.join(toolsccDir, 'agents', sourceName);
+      await fs.remove(destDir);
+      await fs.copy(sourceAgentsDir, destDir);
+    } else if (effectiveSelection.agents.length > 0) {
+      // 只复制选中的 agents
+      const destDir = path.join(toolsccDir, 'agents', sourceName);
+      await fs.ensureDir(destDir);
+      
+      for (const agentName of effectiveSelection.agents) {
+        const srcFile = path.join(sourceAgentsDir, `${agentName}.md`);
+        if (await fs.pathExists(srcFile)) {
+          await fs.copy(srcFile, path.join(destDir, `${agentName}.md`));
+        }
+      }
+    }
   }
 
-  // Update project config
+  // Update project config - 保存实际使用的选择配置
   const configFile = getProjectConfigPath(projectDir);
-  const config: ProjectConfig = await fs.readJson(configFile);
-  if (!config.sources.includes(sourceName)) {
-    config.sources.push(sourceName);
-  }
+  const config = await readProjectConfig(configFile);
+  config.sources[sourceName] = effectiveSelection;
   await fs.writeJson(configFile, config, { spaces: 2 });
 }
 
@@ -115,13 +188,13 @@ export async function unuseSource(sourceName: string, projectDir: string): Promi
   // Update project config with error handling
   let config: ProjectConfig;
   try {
-    config = await fs.readJson(configFile);
+    config = await readProjectConfig(configFile);
   } catch (error) {
     // If config file doesn't exist or is invalid, nothing to update
     return;
   }
 
-  config.sources = config.sources.filter(s => s !== sourceName);
+  delete config.sources[sourceName];
   await fs.writeJson(configFile, config, { spaces: 2 });
 }
 
@@ -132,6 +205,73 @@ export async function listUsedSources(projectDir: string): Promise<string[]> {
     return [];
   }
 
-  const config: ProjectConfig = await fs.readJson(configFile);
-  return config.sources;
+  const config = await readProjectConfig(configFile);
+  return getSourceNames(config);
 }
+
+/**
+ * 导出项目配置到 JSON 文件
+ */
+export async function exportProjectConfig(
+  projectDir: string,
+  outputPath: string
+): Promise<void> {
+  const configFile = getProjectConfigPath(projectDir);
+
+  if (!(await fs.pathExists(configFile))) {
+    throw new Error('Project not initialized. Use `tools-cc use <source>` to get started.');
+  }
+
+  const config = await readProjectConfig(configFile);
+
+  const exportConfig: ExportConfig = {
+    version: '1.0',
+    type: 'project',
+    config,
+    exportedAt: new Date().toISOString()
+  };
+
+  await fs.writeJson(outputPath, exportConfig, { spaces: 2 });
+}
+
+/**
+ * 从 JSON 文件导入项目配置
+ */
+export async function importProjectConfig(
+  configPath: string,
+  projectDir: string,
+  resolveSourcePath: (sourceName: string) => Promise<string>
+): Promise<void> {
+  if (!(await fs.pathExists(configPath))) {
+    throw new Error(`Config file not found: ${configPath}`);
+  }
+
+  const exportConfig: ExportConfig = await fs.readJson(configPath);
+
+  // Validate version
+  if (exportConfig.version !== '1.0') {
+    throw new Error(`Unsupported config version: ${exportConfig.version}`);
+  }
+
+  // Validate type
+  if (exportConfig.type !== 'project') {
+    throw new Error(`Invalid config type: ${exportConfig.type}. Expected 'project'.`);
+  }
+
+  // Initialize project
+  await initProject(projectDir);
+
+  // Apply each source
+  for (const [sourceName, selection] of Object.entries(exportConfig.config.sources)) {
+    const sourceDir = await resolveSourcePath(sourceName);
+    await useSource(sourceName, sourceDir, projectDir, selection);
+  }
+
+  // Update links if present
+  if (exportConfig.config.links && exportConfig.config.links.length > 0) {
+    const configFile = getProjectConfigPath(projectDir);
+    const config = await readProjectConfig(configFile);
+    config.links = exportConfig.config.links;
+    await fs.writeJson(configFile, config, { spaces: 2 });
+  }
+}

package/src/index.ts

@@ -1,205 +1,217 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-import { handleConfigSet, handleConfigGet, handleConfigList } from './commands/config';
-import { handleSourceAdd, handleSourceList, handleSourceRemove, handleSourceUpdate, handleSourceScan } from './commands/source';
-import { handleUse, handleList, handleRemove, handleStatus, handleProjectUpdate } from './commands/use';
-import { showHelp } from './commands/help';
-import { GLOBAL_CONFIG_DIR } from './utils/path';
-
-const program = new Command();
-
-program
-  .name('tools-cc')
-  .description('CLI tool for managing skills/commands/agents across multiple AI coding tools')
-  .version('0.0.1');
-
-// Source management (shortcut options)
-program
-  .option('-s, --source <command> [args...]', 'Source management (shortcut)')
-  .option('-c, --config <command> [args...]', 'Config management (shortcut)');
-
-// Source subcommands (full command version)
-const sourceCmd = program
-  .command('sources')
-  .description('Source management');
-
-sourceCmd
-  .command('add <name> <path-or-url>')
-  .description('Add a source')
-  .action(async (name: string, pathOrUrl: string) => {
-    await handleSourceAdd(name, pathOrUrl);
-  });
-
-sourceCmd
-  .command('list')
-  .alias('ls')
-  .description('List all sources')
-  .action(async () => {
-    await handleSourceList();
-  });
-
-sourceCmd
-  .command('remove <name>')
-  .alias('rm')
-  .description('Remove a source')
-  .action(async (name: string) => {
-    await handleSourceRemove(name);
-  });
-
-sourceCmd
-  .command('update [name]')
-  .alias('up')
-  .alias('upgrade')
-  .description('Update source(s) with git pull')
-  .action(async (name?: string) => {
-    await handleSourceUpdate(name);
-  });
-
-sourceCmd
-  .command('scan')
-  .description('Scan sources directory and update configuration')
-  .action(async () => {
-    await handleSourceScan();
-  });
-
-// Config subcommands (full command version)
-const configCmd = program
-  .command('config')
-  .description('Config management');
-
-configCmd
-  .command('set <key> <value>')
-  .description('Set a config value')
-  .action(async (key: string, value: string) => {
-    await handleConfigSet(key, value);
-  });
-
-configCmd
-  .command('get <key>')
-  .description('Get a config value')
-  .action(async (key: string) => {
-    await handleConfigGet(key);
-  });
-
-configCmd
-  .command('list')
-  .description('Show full configuration')
-  .action(async () => {
-    await handleConfigList();
-  });
-
-// Project commands
-program
-  .command('use [sources...]')
-  .description('Use sources in current project')
-  .option('-p, --projects <tools...>', 'Tools to link (iflow, claude, codebuddy, opencode)')
-  .action(async (sources: string[], options) => {
-    await handleUse(sources, options);
-  });
-
-program
-  .command('list')
-  .description('List sources in use')
-  .action(async () => {
-    await handleList();
-  });
-
-program
-  .command('rm <source>')
-  .description('Remove a source from project')
-  .action(async (source: string) => {
-    await handleRemove(source);
-  });
-
-program
-  .command('status')
-  .description('Show project status')
-  .action(async () => {
-    await handleStatus();
-  });
-
-program
-  .command('update [sources...]')
-  .description('Update source(s) in current project')
-  .action(async (sources: string[]) => {
-    await handleProjectUpdate(sources);
-  });
-
-// Help command
-program
-  .command('help')
-  .description('Show bilingual help information')
-  .action(() => {
-    showHelp();
-  });
-
-// Main action handler for -s and -c options
-program
-  .action(async (options) => {
-    // Handle -s/--source
-    if (options.source) {
-      const [cmd, ...args] = options.source;
-      switch (cmd) {
-        case 'add':
-          if (args.length < 2) {
-            console.log('Usage: tools-cc -s add <name> <path-or-url>');
-            return;
-          }
-          await handleSourceAdd(args[0], args[1]);
-          break;
-        case 'list':
-        case 'ls':
-          await handleSourceList();
-          break;
-        case 'remove':
-        case 'rm':
-          if (args.length < 1) {
-            console.log('Usage: tools-cc -s remove <name>');
-            return;
-          }
-          await handleSourceRemove(args[0]);
-          break;
-        case 'update':
-        case 'up':
-        case 'upgrade':
-          await handleSourceUpdate(args[0]);
-          break;
-        case 'scan':
-          await handleSourceScan();
-          break;
-        default:
-          console.log(`Unknown source command: ${cmd}`);
-      }
-      return;
-    }
-    
-    // Handle -c/--config
-    if (options.config) {
-      const [cmd, ...args] = options.config;
-      switch (cmd) {
-        case 'set':
-          if (args.length < 2) {
-            console.log('Usage: tools-cc -c set <key> <value>');
-            return;
-          }
-          await handleConfigSet(args[0], args[1]);
-          break;
-        case 'get':
-          if (args.length < 1) {
-            console.log('Usage: tools-cc -c get <key>');
-            return;
-          }
-          await handleConfigGet(args[0]);
-          break;
-        default:
-          console.log(`Unknown config command: ${cmd}`);
-      }
-      return;
-    }
-    
-    // No options provided, show help
-    program.outputHelp();
-  });
-
-program.parseAsync();
+#!/usr/bin/env node
+
+import { Command } from 'commander';
+import { handleConfigSet, handleConfigGet, handleConfigList } from './commands/config';
+import { handleSourceAdd, handleSourceList, handleSourceRemove, handleSourceUpdate, handleSourceScan } from './commands/source';
+import { handleUse, handleList, handleRemove, handleStatus, handleProjectUpdate } from './commands/use';
+import { handleExport } from './commands/export';
+import { showHelp } from './commands/help';
+import { GLOBAL_CONFIG_DIR } from './utils/path';
+
+const program = new Command();
+
+program
+  .name('tools-cc')
+  .description('CLI tool for managing skills/commands/agents across multiple AI coding tools')
+  .version('0.0.1');
+
+// Source management (shortcut options)
+program
+  .option('-s, --source <command> [args...]', 'Source management (shortcut)')
+  .option('-c, --config <command> [args...]', 'Config management (shortcut)');
+
+// Source subcommands (full command version)
+const sourceCmd = program
+  .command('sources')
+  .description('Source management');
+
+sourceCmd
+  .command('add <name> <path-or-url>')
+  .description('Add a source')
+  .action(async (name: string, pathOrUrl: string) => {
+    await handleSourceAdd(name, pathOrUrl);
+  });
+
+sourceCmd
+  .command('list')
+  .alias('ls')
+  .description('List all sources')
+  .action(async () => {
+    await handleSourceList();
+  });
+
+sourceCmd
+  .command('remove <name>')
+  .alias('rm')
+  .description('Remove a source')
+  .action(async (name: string) => {
+    await handleSourceRemove(name);
+  });
+
+sourceCmd
+  .command('update [name]')
+  .alias('up')
+  .alias('upgrade')
+  .description('Update source(s) with git pull')
+  .action(async (name?: string) => {
+    await handleSourceUpdate(name);
+  });
+
+sourceCmd
+  .command('scan')
+  .description('Scan sources directory and update configuration')
+  .action(async () => {
+    await handleSourceScan();
+  });
+
+// Config subcommands (full command version)
+const configCmd = program
+  .command('config')
+  .description('Config management');
+
+configCmd
+  .command('set <key> <value>')
+  .description('Set a config value')
+  .action(async (key: string, value: string) => {
+    await handleConfigSet(key, value);
+  });
+
+configCmd
+  .command('get <key>')
+  .description('Get a config value')
+  .action(async (key: string) => {
+    await handleConfigGet(key);
+  });
+
+configCmd
+  .command('list')
+  .description('Show full configuration')
+  .action(async () => {
+    await handleConfigList();
+  });
+
+// Project commands
+program
+  .command('use [sources...]')
+  .description('Use sources in current project')
+  .option('-p, --projects <tools...>', 'Tools to link (iflow, claude, codebuddy, opencode)')
+  .option('-ls', 'Interactive selection mode for single source')
+  .option('-c, --config <file>', 'Import from config file')
+  .action(async (sources: string[], options) => {
+    await handleUse(sources, options);
+  });
+
+program
+  .command('list')
+  .description('List sources in use')
+  .action(async () => {
+    await handleList();
+  });
+
+program
+  .command('rm <source>')
+  .description('Remove a source from project')
+  .action(async (source: string) => {
+    await handleRemove(source);
+  });
+
+program
+  .command('status')
+  .description('Show project status')
+  .action(async () => {
+    await handleStatus();
+  });
+
+program
+  .command('update [sources...]')
+  .description('Update source(s) in current project')
+  .action(async (sources: string[]) => {
+    await handleProjectUpdate(sources);
+  });
+
+program
+  .command('export')
+  .description('Export project or global config')
+  .option('-o, --output <file>', 'Output file path')
+  .option('--global', 'Export global config')
+  .action(async (options) => {
+    await handleExport(options);
+  });
+
+// Help command
+program
+  .command('help')
+  .description('Show bilingual help information')
+  .action(() => {
+    showHelp();
+  });
+
+// Main action handler for -s and -c options
+program
+  .action(async (options) => {
+    // Handle -s/--source
+    if (options.source) {
+      const [cmd, ...args] = options.source;
+      switch (cmd) {
+        case 'add':
+          if (args.length < 2) {
+            console.log('Usage: tools-cc -s add <name> <path-or-url>');
+            return;
+          }
+          await handleSourceAdd(args[0], args[1]);
+          break;
+        case 'list':
+        case 'ls':
+          await handleSourceList();
+          break;
+        case 'remove':
+        case 'rm':
+          if (args.length < 1) {
+            console.log('Usage: tools-cc -s remove <name>');
+            return;
+          }
+          await handleSourceRemove(args[0]);
+          break;
+        case 'update':
+        case 'up':
+        case 'upgrade':
+          await handleSourceUpdate(args[0]);
+          break;
+        case 'scan':
+          await handleSourceScan();
+          break;
+        default:
+          console.log(`Unknown source command: ${cmd}`);
+      }
+      return;
+    }
+    
+    // Handle -c/--config
+    if (options.config) {
+      const [cmd, ...args] = options.config;
+      switch (cmd) {
+        case 'set':
+          if (args.length < 2) {
+            console.log('Usage: tools-cc -c set <key> <value>');
+            return;
+          }
+          await handleConfigSet(args[0], args[1]);
+          break;
+        case 'get':
+          if (args.length < 1) {
+            console.log('Usage: tools-cc -c get <key>');
+            return;
+          }
+          await handleConfigGet(args[0]);
+          break;
+        default:
+          console.log(`Unknown config command: ${cmd}`);
+      }
+      return;
+    }
+    
+    // No options provided, show help
+    program.outputHelp();
+  });
+
+program.parseAsync();