tools-cc 1.0.4 → 1.0.6

package/src/index.ts

@@ -1,205 +1,216 @@
-#!/usr/bin/env node
-
-import { Command } from 'commander';
-import { handleConfigSet, handleConfigGet, handleConfigList } from './commands/config';
-import { handleSourceAdd, handleSourceList, handleSourceRemove, handleSourceUpdate, handleSourceScan } from './commands/source';
+#!/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
+
+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('-p, --projects <tools...>', 'Tools to link (iflow, claude, codebuddy, opencode, codex)')
+  .option('-l, --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);
-  });
-
-// 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();
+
+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();

package/src/types/config.ts

@@ -9,11 +9,66 @@ export interface GlobalConfig {
   sources: Record<string, SourceConfig>;
 }
 
+/**
+ * 源选择配置 - 指定从源中导入哪些 skills/commands/agents
+ */
+export interface SourceSelection {
+  skills: string[];
+  commands: string[];
+  agents: string[];
+}
+
+/**
+ * 新版项目配置 - sources 使用 Record 格式支持部分导入
+ */
 export interface ProjectConfig {
+  sources: Record<string, SourceSelection>;
+  links: string[];
+}
+
+/**
+ * 旧版项目配置 - sources 为字符串数组（向后兼容）
+ */
+export interface LegacyProjectConfig {
   sources: string[];
   links: string[];
 }
 
+/**
+ * 判断值是否为有效的 SourceSelection 对象
+ */
+export function isSourceSelection(value: unknown): value is SourceSelection {
+  if (typeof value !== 'object' || value === null) return false;
+  const obj = value as Record<string, unknown>;
+  return (
+    Array.isArray(obj.skills) &&
+    Array.isArray(obj.commands) &&
+    Array.isArray(obj.agents)
+  );
+}
+
+/**
+ * 将旧版项目配置转换为新版格式
+ * 如果 sources 是字符串数组，转换为 Record 格式，每个源默认导入全部内容
+ */
+export function normalizeProjectConfig(
+  config: LegacyProjectConfig | ProjectConfig
+): ProjectConfig {
+  // If sources is an array, convert to new format
+  if (Array.isArray(config.sources)) {
+    const newSources: Record<string, SourceSelection> = {};
+    for (const sourceName of config.sources) {
+      newSources[sourceName] = {
+        skills: ['*'],
+        commands: ['*'],
+        agents: ['*']
+      };
+    }
+    return { sources: newSources, links: config.links };
+  }
+  return config as ProjectConfig;
+}
+
 export interface Manifest {
   name: string;
   version: string;
@@ -25,3 +80,23 @@ export interface Manifest {
 export interface ToolConfig {
   linkName: string;
 }
+
+/**
+ * 项目配置导出格式
+ */
+export interface ExportConfig {
+  version: string;
+  type: 'project';
+  config: ProjectConfig;
+  exportedAt: string;
+}
+
+/**
+ * 全局配置导出格式
+ */
+export interface GlobalExportConfig {
+  version: string;
+  type: 'global';
+  config: GlobalConfig;
+  exportedAt: string;
+}

package/src/utils/parsePath.ts

@@ -0,0 +1,108 @@
+import { SourceSelection } from '../types/config';
+
+/**
+ * 解析后的源路径
+ */
+export interface ParsedSourcePath {
+  sourceName: string;
+  type?: 'skills' | 'commands' | 'agents';
+  itemName?: string;
+}
+
+/**
+ * 解析源路径字符串
+ * 
+ * 支持的格式：
+ * - 'my-skills' → { sourceName: 'my-skills' } (整个源)
+ * - 'my-skills/skills/a-skill' → { sourceName: 'my-skills', type: 'skills', itemName: 'a-skill' }
+ * - 'my-skills/commands/test' → { sourceName: 'my-skills', type: 'commands', itemName: 'test' }
+ * - 'other/agents/reviewer' → { sourceName: 'other', type: 'agents', itemName: 'reviewer' }
+ * 
+ * 无效路径只返回 sourceName
+ */
+export function parseSourcePath(input: string): ParsedSourcePath {
+  const parts = input.split('/');
+  
+  // 至少需要源名称
+  if (parts.length === 0 || input === '') {
+    return { sourceName: '' };
+  }
+  
+  const sourceName = parts[0];
+  
+  // 只有源名称，返回整个源
+  if (parts.length === 1) {
+    return { sourceName };
+  }
+  
+  // 检查第二部分是否为有效类型
+  const validTypes = ['skills', 'commands', 'agents'] as const;
+  const type = parts[1] as typeof validTypes[number];
+  
+  if (!validTypes.includes(type)) {
+    return { sourceName };
+  }
+  
+  // 检查第三部分（项目名称）
+  if (parts.length < 3 || !parts[2]) {
+    return { sourceName };
+  }
+  
+  return {
+    sourceName,
+    type,
+    itemName: parts[2]
+  };
+}
+
+/**
+ * 从路径数组构建选择配置
+ * 
+ * 将多个路径转换为 Record<string, SourceSelection> 格式
+ * 
+ * 示例：
+ * ['my-skills/skills/a', 'my-skills/skills/b', 'my-skills/commands/test']
+ * → { 'my-skills': { skills: ['a', 'b'], commands: ['test'], agents: [] } }
+ */
+export function buildSelectionFromPaths(paths: string[]): Record<string, SourceSelection> {
+  const result: Record<string, SourceSelection> = {};
+  
+  for (const path of paths) {
+    const parsed = parseSourcePath(path);
+    const { sourceName, type, itemName } = parsed;
+    
+    // 跳过空源名称
+    if (!sourceName) {
+      continue;
+    }
+    
+    // 初始化源选择（如果不存在）
+    if (!result[sourceName]) {
+      result[sourceName] = {
+        skills: [],
+        commands: [],
+        agents: []
+      };
+    }
+    
+    // 如果没有指定类型和项目名称，表示整个源
+    if (!type || !itemName) {
+      result[sourceName] = {
+        skills: ['*'],
+        commands: ['*'],
+        agents: ['*']
+      };
+      continue;
+    }
+    
+    // 添加项目到对应的类型数组（去重）
+    const selection = result[sourceName];
+    const targetArray = selection[type];
+    
+    if (!targetArray.includes(itemName)) {
+      targetArray.push(itemName);
+    }
+  }
+  
+  return result;
+}