tools-cc 1.0.4 → 1.0.5

package/README.md

@@ -36,6 +36,13 @@ tools-cc -s list
 cd my-project
 tools-cc use my-skills -p iflow claude
 
+# 4a. 或使用部分引入（只引入需要的 skills/commands/agents）
+tools-cc use my-skills/skills/a-skill
+tools-cc use my-skills -ls                 # 交互式选择
+
+# 4b. 或从配置文件快速导入
+tools-cc use -c project-config.json
+
 # 5. 查看项目状态
 tools-cc status
 
@@ -99,11 +106,47 @@ tools-cc sources scan                     # 扫描 sourcesDir 目录，自动发
 ### 项目配置
 
 ```bash
-tools-cc use [sources...] [-p tools...]   # 启用配置源并创建符号链接
+tools-cc use [sources...] [options]       # 启用配置源并创建符号链接
 tools-cc update [sources...]              # 同步配置源内容到项目 .toolscc 目录
 tools-cc list                             # 列出已启用的配置源
 tools-cc rm <source>                      # 禁用配置源
 tools-cc status                           # 查看项目状态
+tools-cc export [options]                 # 导出项目或全局配置
+```
+
+#### `use` 命令详解
+
+```bash
+# 整源引入（全部 skills/commands/agents）
+tools-cc use my-skills
+tools-cc use my-skills -p iflow claude    # 指定工具链接
+
+# 部分引入（路径语法）
+tools-cc use my-skills/skills/a-skill     # 引入单个 skill
+tools-cc use my-skills/commands/test      # 引入单个 command
+tools-cc use my-skills/agents/reviewer    # 引入单个 agent
+tools-cc use my-skills/skills/a my-skills/commands/test  # 引入多项
+
+# 交互式选择（-ls 参数）
+tools-cc use my-skills -ls                # 分组展示，勾选引入
+
+# 从配置文件导入
+tools-cc use -c project-config.json       # 快速恢复项目配置
+
+# 使用 "." 表示当前项目已配置的源（只创建链接，不复制内容）
+tools-cc use . -p iflow claude
+```
+
+#### `export` 命令详解
+
+```bash
+# 导出项目配置（包含具体选择）
+tools-cc export                           # 导出到 .toolscc-export.json
+tools-cc export -o my-config.json         # 指定输出路径
+
+# 导出全局配置
+tools-cc export --global                  # 导出到 .toolscc-global-export.json
+tools-cc export --global -o global.json   # 指定输出路径
 ```
 
 ### Config 管理
@@ -208,11 +251,23 @@ my-project/
 
 ```json
 {
-  "sources": ["my-skills"],
+  "sources": {
+    "my-skills": {
+      "skills": ["a-skill", "b-skill"],
+      "commands": ["test"],
+      "agents": ["*"]
+    }
+  },
   "links": ["iflow", "claude"]
 }
 ```
 
+**说明：**
+- `sources` 记录每个源具体引入了哪些内容
+- `["*"]` 表示引入该类型全部内容
+- `[]` 表示不引入该类型任何内容
+```
+
 ## 许可证
 
 MIT

package/dist/commands/export.d.ts

@@ -0,0 +1,7 @@
+/**
+ * 导出项目或全局配置
+ */
+export declare function handleExport(options: {
+    output?: string;
+    global?: boolean;
+}): Promise<void>;

package/dist/commands/export.js

@@ -0,0 +1,57 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleExport = handleExport;
+const chalk_1 = __importDefault(require("chalk"));
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const project_1 = require("../core/project");
+const config_1 = require("../core/config");
+const path_2 = require("../utils/path");
+/**
+ * 导出项目或全局配置
+ */
+async function handleExport(options) {
+    try {
+        if (options.global) {
+            // 导出全局配置
+            await exportGlobalConfig(options.output);
+        }
+        else {
+            // 导出项目配置
+            await exportProjectConfigCmd(options.output);
+        }
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        console.log(chalk_1.default.red(`✗ Export failed: ${message}`));
+        throw error;
+    }
+}
+/**
+ * 导出项目配置
+ */
+async function exportProjectConfigCmd(outputPath) {
+    const projectDir = process.cwd();
+    const outputFile = outputPath ?? path_1.default.join(projectDir, '.toolscc-export.json');
+    await (0, project_1.exportProjectConfig)(projectDir, outputFile);
+    console.log(chalk_1.default.green(`✓ Project config exported to: ${outputFile}`));
+}
+/**
+ * 导出全局配置
+ */
+async function exportGlobalConfig(outputPath) {
+    const projectDir = process.cwd();
+    const outputFile = outputPath ?? path_1.default.join(projectDir, '.toolscc-global-export.json');
+    const config = await (0, config_1.loadGlobalConfig)(path_2.GLOBAL_CONFIG_DIR);
+    const exportConfig = {
+        version: '1.0',
+        type: 'global',
+        config,
+        exportedAt: new Date().toISOString()
+    };
+    await fs_extra_1.default.writeJson(outputFile, exportConfig, { spaces: 2 });
+    console.log(chalk_1.default.green(`✓ Global config exported to: ${outputFile}`));
+}

package/dist/commands/use.d.ts

@@ -1,6 +1,22 @@
-export declare function handleUse(sourceNames: string[], options: {
+/**
+ * use 命令选项
+ */
+export interface UseOptions {
     projects?: string[];
-}): Promise<void>;
+    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 declare function handleUse(sourceSpecs: string[], options: UseOptions): Promise<void>;
 export declare function handleList(): Promise<void>;
 export declare function handleRemove(sourceName: string): Promise<void>;
 export declare function handleStatus(): Promise<void>;

package/dist/commands/use.js

@@ -12,8 +12,10 @@ const chalk_1 = __importDefault(require("chalk"));
 const inquirer_1 = __importDefault(require("inquirer"));
 const project_1 = require("../core/project");
 const source_1 = require("../core/source");
+const manifest_1 = require("../core/manifest");
 const symlink_1 = require("../core/symlink");
 const path_1 = require("../utils/path");
+const parsePath_1 = require("../utils/parsePath");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_2 = __importDefault(require("path"));
 const SUPPORTED_TOOLS = {
@@ -22,37 +24,64 @@ const SUPPORTED_TOOLS = {
     codebuddy: '.codebuddy',
     opencode: '.opencode'
 };
-async function handleUse(sourceNames, options) {
+/**
+ * 默认选择配置 - 导入所有内容
+ */
+const DEFAULT_SELECTION = {
+    skills: ['*'],
+    commands: ['*'],
+    agents: ['*']
+};
+/**
+ * 处理 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 . (使用已配置源)
+ */
+async function handleUse(sourceSpecs, options) {
     const projectDir = process.cwd();
-    // 如果没有指定 source，进入交互模式
-    if (sourceNames.length === 0) {
-        const sources = await (0, source_1.listSources)(path_1.GLOBAL_CONFIG_DIR);
-        const sourceList = Object.keys(sources);
-        if (sourceList.length === 0) {
-            console.log(chalk_1.default.yellow('No sources configured. Use `tools-cc -s add` to add one.'));
+    const toolsccDir = (0, path_1.getToolsccDir)(projectDir);
+    const configFile = (0, path_1.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 = (0, parsePath_1.parseSourcePath)(sourceSpecs[0]);
+        // 只有源名称时才进入交互模式
+        if (!parsed.type && parsed.sourceName) {
+            await handleInteractiveMode(parsed.sourceName, projectDir, options.projects);
             return;
         }
-        const answers = await inquirer_1.default.prompt([
-            {
-                type: 'checkbox',
-                name: 'selectedSources',
-                message: 'Select sources to use:',
-                choices: sourceList
-            }
-        ]);
-        sourceNames = answers.selectedSources;
     }
-    if (sourceNames.length === 0) {
-        console.log(chalk_1.default.gray('No sources selected.'));
-        return;
+    // 4. 无参数时显示源选择列表
+    if (sourceSpecs.length === 0) {
+        sourceSpecs = await selectSourcesInteractively();
+        if (sourceSpecs.length === 0) {
+            console.log(chalk_1.default.gray('No sources selected.'));
+            return;
+        }
     }
+    // 5. 解析路径语法并构建选择配置
+    const selectionMap = (0, parsePath_1.buildSelectionFromPaths)(sourceSpecs);
     // 初始化项目
     await (0, project_1.initProject)(projectDir);
-    // 启用每个配置源
-    for (const sourceName of sourceNames) {
+    // 应用每个源的选择配置
+    for (const [sourceName, selection] of Object.entries(selectionMap)) {
         try {
             const sourcePath = await (0, source_1.getSourcePath)(sourceName, path_1.GLOBAL_CONFIG_DIR);
-            await (0, project_1.useSource)(sourceName, sourcePath, projectDir);
+            await (0, project_1.useSource)(sourceName, sourcePath, projectDir, selection);
             console.log(chalk_1.default.green(`✓ Using source: ${sourceName}`));
         }
         catch (error) {
@@ -60,8 +89,150 @@ async function handleUse(sourceNames, options) {
         }
     }
     // 创建符号链接
-    const tools = options.projects || Object.keys(SUPPORTED_TOOLS);
-    const toolsccDir = (0, path_1.getToolsccDir)(projectDir);
+    await createToolLinks(projectDir, toolsccDir, configFile, options.projects);
+}
+/**
+ * 配置导入模式
+ */
+async function handleConfigImportMode(configPath, projectDir, projects) {
+    try {
+        const toolsccDir = (0, path_1.getToolsccDir)(projectDir);
+        const configFile = (0, path_1.getProjectConfigPath)(projectDir);
+        // 解析配置文件路径
+        const resolvedPath = path_2.default.resolve(configPath);
+        // 定义源路径解析函数
+        const resolveSourcePath = async (sourceName) => {
+            return await (0, source_1.getSourcePath)(sourceName, path_1.GLOBAL_CONFIG_DIR);
+        };
+        // 导入配置
+        await (0, project_1.importProjectConfig)(resolvedPath, projectDir, resolveSourcePath);
+        console.log(chalk_1.default.green(`✓ Imported config from: ${resolvedPath}`));
+        // 创建符号链接
+        await createToolLinks(projectDir, toolsccDir, configFile, projects);
+    }
+    catch (error) {
+        console.log(chalk_1.default.red(`✗ Failed to import config: ${error instanceof Error ? error.message : 'Unknown error'}`));
+    }
+}
+/**
+ * 点模式：使用已配置源创建符号链接
+ */
+async function handleDotMode(projectDir, toolsccDir, configFile, projects) {
+    if (!(await fs_extra_1.default.pathExists(configFile))) {
+        console.log(chalk_1.default.yellow('Project not initialized. Run `tools-cc use <source>` first.'));
+        return;
+    }
+    const config = await fs_extra_1.default.readJson(configFile);
+    const configuredSources = Object.keys(config.sources || {});
+    if (configuredSources.length === 0) {
+        console.log(chalk_1.default.yellow('No sources configured in this project. Run `tools-cc use <source>` to add one.'));
+        return;
+    }
+    console.log(chalk_1.default.cyan(`Using existing sources: ${configuredSources.join(', ')}`));
+    await createToolLinks(projectDir, toolsccDir, configFile, projects);
+}
+/**
+ * 交互选择模式：显示技能/命令/代理选择列表
+ */
+async function handleInteractiveMode(sourceName, projectDir, projects) {
+    try {
+        const sourcePath = await (0, source_1.getSourcePath)(sourceName, path_1.GLOBAL_CONFIG_DIR);
+        const manifest = await (0, manifest_1.scanSource)(sourcePath);
+        // 构建选项列表
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const choices = [];
+        // Skills 组
+        if (manifest.skills && manifest.skills.length > 0) {
+            choices.push(new inquirer_1.default.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_1.default.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_1.default.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_1.default.yellow(`No items found in source: ${sourceName}`));
+            return;
+        }
+        // 显示选择列表
+        const answers = await inquirer_1.default.prompt([
+            {
+                type: 'checkbox',
+                name: 'selectedItems',
+                message: `Select items from ${sourceName}:`,
+                choices,
+                pageSize: 15
+            }
+        ]);
+        if (answers.selectedItems.length === 0) {
+            console.log(chalk_1.default.gray('No items selected.'));
+            return;
+        }
+        // 将选择转换为 SourceSelection
+        const selection = {
+            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 (0, project_1.initProject)(projectDir);
+        await (0, project_1.useSource)(sourceName, sourcePath, projectDir, selection);
+        console.log(chalk_1.default.green(`✓ Using source: ${sourceName}`));
+        // 创建符号链接
+        const toolsccDir = (0, path_1.getToolsccDir)(projectDir);
+        const configFile = (0, path_1.getProjectConfigPath)(projectDir);
+        await createToolLinks(projectDir, toolsccDir, configFile, projects);
+    }
+    catch (error) {
+        console.log(chalk_1.default.red(`✗ Failed to use ${sourceName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
+    }
+}
+/**
+ * 显示源选择列表并返回用户选择
+ */
+async function selectSourcesInteractively() {
+    const sources = await (0, source_1.listSources)(path_1.GLOBAL_CONFIG_DIR);
+    const sourceList = Object.keys(sources);
+    if (sourceList.length === 0) {
+        console.log(chalk_1.default.yellow('No sources configured. Use `tools-cc -s add` to add one.'));
+        return [];
+    }
+    const answers = await inquirer_1.default.prompt([
+        {
+            type: 'checkbox',
+            name: 'selectedSources',
+            message: 'Select sources to use:',
+            choices: sourceList
+        }
+    ]);
+    return answers.selectedSources;
+}
+/**
+ * 创建工具符号链接
+ */
+async function createToolLinks(projectDir, toolsccDir, configFile, projects) {
+    const tools = projects || Object.keys(SUPPORTED_TOOLS);
     for (const tool of tools) {
         const linkName = SUPPORTED_TOOLS[tool];
         if (!linkName) {
@@ -78,7 +249,6 @@ async function handleUse(sourceNames, options) {
         }
     }
     // 更新项目配置
-    const configFile = (0, path_1.getProjectConfigPath)(projectDir);
     const config = await fs_extra_1.default.readJson(configFile);
     const existingLinks = config.links || [];
     config.links = [...new Set([...existingLinks, ...tools])];
@@ -141,26 +311,29 @@ async function handleProjectUpdate(sourceNames) {
         return;
     }
     const config = await fs_extra_1.default.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_1.default.gray('No sources to update.'));
         return;
     }
     // 验证指定的源是否存在于项目配置中
     if (sourceNames && sourceNames.length > 0) {
-        const invalidSources = sourceNames.filter((s) => !config.sources.includes(s));
+        const invalidSources = sourceNames.filter((s) => !configuredSources.includes(s));
         if (invalidSources.length > 0) {
             console.log(chalk_1.default.yellow(`Sources not in project: ${invalidSources.join(', ')}`));
         }
-        sourcesToUpdate = sourcesToUpdate.filter((s) => config.sources.includes(s));
+        sourcesToUpdate = sourcesToUpdate.filter((s) => configuredSources.includes(s));
     }
     // 更新每个配置源
     for (const sourceName of sourcesToUpdate) {
         try {
             const sourcePath = await (0, source_1.getSourcePath)(sourceName, path_1.GLOBAL_CONFIG_DIR);
-            await (0, project_1.useSource)(sourceName, sourcePath, projectDir);
+            // 使用保存的选择配置进行更新
+            const selection = config.sources[sourceName];
+            await (0, project_1.useSource)(sourceName, sourcePath, projectDir, selection);
             console.log(chalk_1.default.green(`✓ Updated source: ${sourceName}`));
         }
         catch (error) {

package/dist/core/project.d.ts

@@ -1,4 +1,13 @@
+import { SourceSelection } from '../types';
 export declare function initProject(projectDir: string): Promise<void>;
-export declare function useSource(sourceName: string, sourceDir: string, projectDir: string): Promise<void>;
+export declare function useSource(sourceName: string, sourceDir: string, projectDir: string, selection?: SourceSelection): Promise<void>;
 export declare function unuseSource(sourceName: string, projectDir: string): Promise<void>;
 export declare function listUsedSources(projectDir: string): Promise<string[]>;
+/**
+ * 导出项目配置到 JSON 文件
+ */
+export declare function exportProjectConfig(projectDir: string, outputPath: string): Promise<void>;
+/**
+ * 从 JSON 文件导入项目配置
+ */
+export declare function importProjectConfig(configPath: string, projectDir: string, resolveSourcePath: (sourceName: string) => Promise<string>): Promise<void>;