tools-cc 1.0.4 → 1.0.6

package/src/commands/use.ts

@@ -1,9 +1,12 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
-import { useSource, unuseSource, listUsedSources, initProject } from '../core/project';
+import { useSource, unuseSource, listUsedSources, initProject, importProjectConfig } from '../core/project';
 import { getSourcePath, listSources } from '../core/source';
+import { scanSource } from '../core/manifest';
 import { createSymlink, isSymlink } from '../core/symlink';
 import { GLOBAL_CONFIG_DIR, getToolsccDir, getProjectConfigPath } from '../utils/path';
+import { parseSourcePath, buildSelectionFromPaths } from '../utils/parsePath';
+import type { SourceSelection } from '../types/config';
 import fs from 'fs-extra';
 import path from 'path';
 
@@ -11,69 +14,279 @@ const SUPPORTED_TOOLS: Record<string, string> = {
   iflow: '.iflow',
   claude: '.claude',
   codebuddy: '.codebuddy',
-  opencode: '.opencode'
+  opencode: '.opencode',
+  codex: '.codex'
 };
 
+/**
+ * use 命令选项
+ */
+export interface UseOptions {
+  projects?: string[];
+  ls?: boolean;
+  config?: string;
+}
+
+/**
+ * 处理 use 命令
+ * 
+ * 支持多种模式：
+ * 1. 配置导入模式: tools-cc use -c config.json
+ * 2. 交互选择模式: tools-cc use my-source --ls
+ * 3. 路径语法模式: tools-cc use my-source/skills/a-skill
+ * 4. 整体导入模式: tools-cc use my-source
+ * 5. 点模式: tools-cc use . (使用已配置源)
+ */
 export async function handleUse(
-  sourceNames: string[],
-  options: { projects?: string[] }
+  sourceSpecs: string[],
+  options: UseOptions
 ): Promise<void> {
   const projectDir = process.cwd();
-  
-  // 如果没有指定 source，进入交互模式
-  if (sourceNames.length === 0) {
-    const sources = await listSources(GLOBAL_CONFIG_DIR);
-    const sourceList = Object.keys(sources);
-    
-    if (sourceList.length === 0) {
-      console.log(chalk.yellow('No sources configured. Use `tools-cc -s add` to add one.'));
+  const toolsccDir = getToolsccDir(projectDir);
+  const configFile = getProjectConfigPath(projectDir);
+
+  // 1. 配置导入模式
+  if (options.config) {
+    await handleConfigImportMode(options.config, projectDir, options.projects);
+    return;
+  }
+
+  // 2. 点模式：使用当前项目已配置的源
+  if (sourceSpecs.length === 1 && sourceSpecs[0] === '.') {
+    await handleDotMode(projectDir, toolsccDir, configFile, options.projects);
+    return;
+  }
+
+  // 3. 交互选择模式：单个源 + --ls 选项
+  if (options.ls && sourceSpecs.length === 1) {
+    const parsed = parseSourcePath(sourceSpecs[0]);
+    // 只有源名称时才进入交互模式
+    if (!parsed.type && parsed.sourceName) {
+      await handleInteractiveMode(parsed.sourceName, projectDir, options.projects);
       return;
     }
-    
-    const answers = await inquirer.prompt([
-      {
-        type: 'checkbox',
-        name: 'selectedSources',
-        message: 'Select sources to use:',
-        choices: sourceList
-      }
-    ]);
-    
-    sourceNames = answers.selectedSources;
   }
-  
-  if (sourceNames.length === 0) {
-    console.log(chalk.gray('No sources selected.'));
-    return;
+
+  // 4. 无参数时显示源选择列表
+  if (sourceSpecs.length === 0) {
+    sourceSpecs = await selectSourcesInteractively();
+    if (sourceSpecs.length === 0) {
+      console.log(chalk.gray('No sources selected.'));
+      return;
+    }
   }
-  
+
+  // 5. 解析路径语法并构建选择配置
+  const selectionMap = buildSelectionFromPaths(sourceSpecs);
+
   // 初始化项目
   await initProject(projectDir);
-  
-  // 启用每个配置源
-  for (const sourceName of sourceNames) {
+
+  // 应用每个源的选择配置
+  for (const [sourceName, selection] of Object.entries(selectionMap)) {
     try {
       const sourcePath = await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
-      await useSource(sourceName, sourcePath, projectDir);
+      await useSource(sourceName, sourcePath, projectDir, selection);
       console.log(chalk.green(`✓ Using source: ${sourceName}`));
     } catch (error) {
       console.log(chalk.red(`✗ Failed to use ${sourceName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
     }
   }
-  
+
   // 创建符号链接
-  const tools = options.projects || Object.keys(SUPPORTED_TOOLS);
-  const toolsccDir = getToolsccDir(projectDir);
-  
+  await createToolLinks(projectDir, toolsccDir, configFile, options.projects);
+}
+
+/**
+ * 配置导入模式
+ */
+async function handleConfigImportMode(
+  configPath: string,
+  projectDir: string,
+  projects?: string[]
+): Promise<void> {
+  try {
+    const toolsccDir = getToolsccDir(projectDir);
+    const configFile = getProjectConfigPath(projectDir);
+
+    // 解析配置文件路径
+    const resolvedPath = path.resolve(configPath);
+
+    // 定义源路径解析函数
+    const resolveSourcePath = async (sourceName: string): Promise<string> => {
+      return await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
+    };
+
+    // 导入配置
+    await importProjectConfig(resolvedPath, projectDir, resolveSourcePath);
+    console.log(chalk.green(`✓ Imported config from: ${resolvedPath}`));
+
+    // 创建符号链接
+    await createToolLinks(projectDir, toolsccDir, configFile, projects);
+  } catch (error) {
+    console.log(chalk.red(`✗ Failed to import config: ${error instanceof Error ? error.message : 'Unknown error'}`));
+  }
+}
+
+/**
+ * 点模式：使用已配置源创建符号链接
+ */
+async function handleDotMode(
+  projectDir: string,
+  toolsccDir: string,
+  configFile: string,
+  projects?: string[]
+): Promise<void> {
+  if (!(await fs.pathExists(configFile))) {
+    console.log(chalk.yellow('Project not initialized. Run `tools-cc use <source>` first.'));
+    return;
+  }
+
+  const config = await fs.readJson(configFile);
+  const configuredSources = Object.keys(config.sources || {});
+
+  if (configuredSources.length === 0) {
+    console.log(chalk.yellow('No sources configured in this project. Run `tools-cc use <source>` to add one.'));
+    return;
+  }
+
+  console.log(chalk.cyan(`Using existing sources: ${configuredSources.join(', ')}`));
+  await createToolLinks(projectDir, toolsccDir, configFile, projects);
+}
+
+/**
+ * 交互选择模式：显示技能/命令/代理选择列表
+ */
+async function handleInteractiveMode(
+  sourceName: string,
+  projectDir: string,
+  projects?: string[]
+): Promise<void> {
+  try {
+    const sourcePath = await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
+    const manifest = await scanSource(sourcePath);
+
+    // 构建选项列表
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const choices: any[] = [];
+
+    // Skills 区
+    if (manifest.skills && manifest.skills.length > 0) {
+      choices.push(new inquirer.Separator(`--- Skills (${manifest.skills.length}) ---`));
+      for (const skill of manifest.skills) {
+        choices.push({ name: skill, value: `skills/${skill}` });
+      }
+    }
+
+    // Commands 区
+    if (manifest.commands && manifest.commands.length > 0) {
+      choices.push(new inquirer.Separator(`--- Commands (${manifest.commands.length}) ---`));
+      for (const cmd of manifest.commands) {
+        choices.push({ name: cmd, value: `commands/${cmd}` });
+      }
+    }
+
+    // Agents 区
+    if (manifest.agents && manifest.agents.length > 0) {
+      choices.push(new inquirer.Separator(`--- Agents (${manifest.agents.length}) ---`));
+      for (const agent of manifest.agents) {
+        choices.push({ name: agent, value: `agents/${agent}` });
+      }
+    }
+
+    if (choices.length === 0) {
+      console.log(chalk.yellow(`No items found in source: ${sourceName}`));
+      return;
+    }
+
+    // 显示选择列表
+    const answers = await inquirer.prompt([
+      {
+        type: 'checkbox',
+        name: 'selectedItems',
+        message: `Select items from ${sourceName}:`,
+        choices,
+        pageSize: 15
+      }
+    ]);
+
+    if (answers.selectedItems.length === 0) {
+      console.log(chalk.gray('No items selected.'));
+      return;
+    }
+
+    // 将选择转换为 SourceSelection
+    const selection: SourceSelection = {
+      skills: [],
+      commands: [],
+      agents: []
+    };
+
+    for (const item of answers.selectedItems) {
+      const [type, name] = item.split('/');
+      if (type === 'skills') selection.skills.push(name);
+      else if (type === 'commands') selection.commands.push(name);
+      else if (type === 'agents') selection.agents.push(name);
+    }
+
+    // 初始化项目并应用选择
+    await initProject(projectDir);
+    await useSource(sourceName, sourcePath, projectDir, selection);
+    console.log(chalk.green(`✓ Using source: ${sourceName}`));
+
+    // 创建符号链接
+    const toolsccDir = getToolsccDir(projectDir);
+    const configFile = getProjectConfigPath(projectDir);
+    await createToolLinks(projectDir, toolsccDir, configFile, projects);
+  } catch (error) {
+    console.log(chalk.red(`✗ Failed to use ${sourceName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
+  }
+}
+
+/**
+ * 显示源选择列表并返回用户选择
+ */
+async function selectSourcesInteractively(): Promise<string[]> {
+  const sources = await listSources(GLOBAL_CONFIG_DIR);
+  const sourceList = Object.keys(sources);
+
+  if (sourceList.length === 0) {
+    console.log(chalk.yellow('No sources configured. Use `tools-cc -s add` to add one.'));
+    return [];
+  }
+
+  const answers = await inquirer.prompt([
+    {
+      type: 'checkbox',
+      name: 'selectedSources',
+      message: 'Select sources to use:',
+      choices: sourceList
+    }
+  ]);
+
+  return answers.selectedSources;
+}
+
+/**
+ * 创建工具符号链接
+ */
+async function createToolLinks(
+  projectDir: string,
+  toolsccDir: string,
+  configFile: string,
+  projects?: string[]
+): Promise<void> {
+  const tools = projects || Object.keys(SUPPORTED_TOOLS);
+
   for (const tool of tools) {
     const linkName = SUPPORTED_TOOLS[tool];
     if (!linkName) {
       console.log(chalk.yellow(`Unknown tool: ${tool}`));
       continue;
     }
-    
+
     const linkPath = path.join(projectDir, linkName);
-    
+
     try {
       await createSymlink(toolsccDir, linkPath, true);
       console.log(chalk.green(`✓ Linked: ${linkName} -> .toolscc`));
@@ -81,9 +294,8 @@ export async function handleUse(
       console.log(chalk.red(`✗ Failed to link ${linkName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
     }
   }
-  
+
   // 更新项目配置
-  const configFile = getProjectConfigPath(projectDir);
   const config = await fs.readJson(configFile);
   const existingLinks = config.links || [];
   config.links = [...new Set([...existingLinks, ...tools])];
@@ -157,9 +369,11 @@ export async function handleProjectUpdate(sourceNames?: string[]): Promise<void>
   }
   
   const config = await fs.readJson(configFile);
+  const configuredSources = Object.keys(config.sources || {});
+  
   let sourcesToUpdate = sourceNames && sourceNames.length > 0 
     ? sourceNames 
-    : config.sources || [];
+    : configuredSources;
   
   if (sourcesToUpdate.length === 0) {
     console.log(chalk.gray('No sources to update.'));
@@ -168,18 +382,20 @@ export async function handleProjectUpdate(sourceNames?: string[]): Promise<void>
   
   // 验证指定的源是否存在于项目配置中
   if (sourceNames && sourceNames.length > 0) {
-    const invalidSources = sourceNames.filter((s: string) => !config.sources.includes(s));
+    const invalidSources = sourceNames.filter((s: string) => !configuredSources.includes(s));
     if (invalidSources.length > 0) {
       console.log(chalk.yellow(`Sources not in project: ${invalidSources.join(', ')}`));
     }
-    sourcesToUpdate = sourcesToUpdate.filter((s: string) => config.sources.includes(s));
+    sourcesToUpdate = sourcesToUpdate.filter((s: string) => configuredSources.includes(s));
   }
   
   // 更新每个配置源
   for (const sourceName of sourcesToUpdate) {
     try {
       const sourcePath = await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
-      await useSource(sourceName, sourcePath, projectDir);
+      // 使用保存的选择配置进行更新
+      const selection = config.sources[sourceName];
+      await useSource(sourceName, sourcePath, projectDir, selection);
       console.log(chalk.green(`✓ Updated source: ${sourceName}`));
     } catch (error) {
       console.log(chalk.red(`✗ Failed to update ${sourceName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
@@ -187,4 +403,4 @@ export async function handleProjectUpdate(sourceNames?: string[]): Promise<void>
   }
   
   console.log(chalk.green(`\n✓ Project update complete`));
-}
+}

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 });
+  }
+}