tools-cc 1.0.4 → 1.0.6

package/dist/core/project.js

@@ -7,10 +7,21 @@ exports.initProject = initProject;
 exports.useSource = useSource;
 exports.unuseSource = unuseSource;
 exports.listUsedSources = listUsedSources;
+exports.exportProjectConfig = exportProjectConfig;
+exports.importProjectConfig = importProjectConfig;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
+const types_1 = require("../types");
 const manifest_1 = require("./manifest");
 const path_2 = require("../utils/path");
+/**
+ * 默认选择配置 - 导入所有内容
+ */
+const DEFAULT_SELECTION = {
+    skills: ['*'],
+    commands: ['*'],
+    agents: ['*']
+};
 async function initProject(projectDir) {
     const toolsccDir = (0, path_2.getToolsccDir)(projectDir);
     const configFile = (0, path_2.getProjectConfigPath)(projectDir);
@@ -21,13 +32,37 @@ async function initProject(projectDir) {
     // Create project config if not exists
     if (!(await fs_extra_1.default.pathExists(configFile))) {
         const config = {
-            sources: [],
+            sources: {},
             links: []
         };
         await fs_extra_1.default.writeJson(configFile, config, { spaces: 2 });
     }
 }
-async function useSource(sourceName, sourceDir, projectDir) {
+/**
+ * 读取项目配置，自动处理新旧格式
+ */
+async function readProjectConfig(configFile) {
+    const rawConfig = await fs_extra_1.default.readJson(configFile);
+    return (0, types_1.normalizeProjectConfig)(rawConfig);
+}
+/**
+ * 获取源名称列表（兼容新旧格式）
+ */
+function getSourceNames(config) {
+    return Object.keys(config.sources);
+}
+/**
+ * 检查是否应该复制某项（根据选择配置）
+ */
+function shouldInclude(itemName, selection) {
+    // 如果选择包含通配符，包含所有项
+    if (selection.includes('*')) {
+        return true;
+    }
+    // 否则检查是否在选择列表中
+    return selection.includes(itemName);
+}
+async function useSource(sourceName, sourceDir, projectDir, selection) {
     // Input validation
     if (!sourceName || !sourceName.trim()) {
         throw new Error('Source name is required');
@@ -40,11 +75,17 @@ async function useSource(sourceName, sourceDir, projectDir) {
     const manifest = await (0, manifest_1.loadManifest)(sourceDir);
     // Ensure project is initialized
     await initProject(projectDir);
+    // 使用传入的选择配置或默认配置
+    const effectiveSelection = selection ?? DEFAULT_SELECTION;
     // Copy/link skills (flattened with prefix)
     const sourceSkillsDir = path_1.default.join(sourceDir, 'skills');
     if (await fs_extra_1.default.pathExists(sourceSkillsDir)) {
         const skills = await fs_extra_1.default.readdir(sourceSkillsDir);
         for (const skill of skills) {
+            // 检查是否应该包含此 skill
+            if (!shouldInclude(skill, effectiveSelection.skills)) {
+                continue;
+            }
             const srcPath = path_1.default.join(sourceSkillsDir, skill);
             const name = `${sourceName}` == `${skill}` ? skill : `${sourceName}-${skill}`;
             const destPath = path_1.default.join(toolsccDir, 'skills', name);
@@ -57,23 +98,51 @@ async function useSource(sourceName, sourceDir, projectDir) {
     // Copy commands (in subdirectory by source name)
     const sourceCommandsDir = path_1.default.join(sourceDir, 'commands');
     if (await fs_extra_1.default.pathExists(sourceCommandsDir)) {
-        const destDir = path_1.default.join(toolsccDir, 'commands', sourceName);
-        await fs_extra_1.default.remove(destDir);
-        await fs_extra_1.default.copy(sourceCommandsDir, destDir);
+        // 检查是否有选择 commands
+        if (effectiveSelection.commands.includes('*')) {
+            // 复制所有 commands
+            const destDir = path_1.default.join(toolsccDir, 'commands', sourceName);
+            await fs_extra_1.default.remove(destDir);
+            await fs_extra_1.default.copy(sourceCommandsDir, destDir);
+        }
+        else if (effectiveSelection.commands.length > 0) {
+            // 只复制选中的 commands
+            const destDir = path_1.default.join(toolsccDir, 'commands', sourceName);
+            await fs_extra_1.default.ensureDir(destDir);
+            for (const cmdName of effectiveSelection.commands) {
+                const srcFile = path_1.default.join(sourceCommandsDir, `${cmdName}.md`);
+                if (await fs_extra_1.default.pathExists(srcFile)) {
+                    await fs_extra_1.default.copy(srcFile, path_1.default.join(destDir, `${cmdName}.md`));
+                }
+            }
+        }
     }
     // Copy agents (in subdirectory by source name)
     const sourceAgentsDir = path_1.default.join(sourceDir, 'agents');
     if (await fs_extra_1.default.pathExists(sourceAgentsDir)) {
-        const destDir = path_1.default.join(toolsccDir, 'agents', sourceName);
-        await fs_extra_1.default.remove(destDir);
-        await fs_extra_1.default.copy(sourceAgentsDir, destDir);
+        // 检查是否有选择 agents
+        if (effectiveSelection.agents.includes('*')) {
+            // 复制所有 agents
+            const destDir = path_1.default.join(toolsccDir, 'agents', sourceName);
+            await fs_extra_1.default.remove(destDir);
+            await fs_extra_1.default.copy(sourceAgentsDir, destDir);
+        }
+        else if (effectiveSelection.agents.length > 0) {
+            // 只复制选中的 agents
+            const destDir = path_1.default.join(toolsccDir, 'agents', sourceName);
+            await fs_extra_1.default.ensureDir(destDir);
+            for (const agentName of effectiveSelection.agents) {
+                const srcFile = path_1.default.join(sourceAgentsDir, `${agentName}.md`);
+                if (await fs_extra_1.default.pathExists(srcFile)) {
+                    await fs_extra_1.default.copy(srcFile, path_1.default.join(destDir, `${agentName}.md`));
+                }
+            }
+        }
     }
-    // Update project config
+    // Update project config - 保存实际使用的选择配置
     const configFile = (0, path_2.getProjectConfigPath)(projectDir);
-    const config = await fs_extra_1.default.readJson(configFile);
-    if (!config.sources.includes(sourceName)) {
-        config.sources.push(sourceName);
-    }
+    const config = await readProjectConfig(configFile);
+    config.sources[sourceName] = effectiveSelection;
     await fs_extra_1.default.writeJson(configFile, config, { spaces: 2 });
 }
 async function unuseSource(sourceName, projectDir) {
@@ -100,13 +169,13 @@ async function unuseSource(sourceName, projectDir) {
     // Update project config with error handling
     let config;
     try {
-        config = await fs_extra_1.default.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_extra_1.default.writeJson(configFile, config, { spaces: 2 });
 }
 async function listUsedSources(projectDir) {
@@ -114,6 +183,54 @@ async function listUsedSources(projectDir) {
     if (!(await fs_extra_1.default.pathExists(configFile))) {
         return [];
     }
-    const config = await fs_extra_1.default.readJson(configFile);
-    return config.sources;
+    const config = await readProjectConfig(configFile);
+    return getSourceNames(config);
+}
+/**
+ * 导出项目配置到 JSON 文件
+ */
+async function exportProjectConfig(projectDir, outputPath) {
+    const configFile = (0, path_2.getProjectConfigPath)(projectDir);
+    if (!(await fs_extra_1.default.pathExists(configFile))) {
+        throw new Error('Project not initialized. Use `tools-cc use <source>` to get started.');
+    }
+    const config = await readProjectConfig(configFile);
+    const exportConfig = {
+        version: '1.0',
+        type: 'project',
+        config,
+        exportedAt: new Date().toISOString()
+    };
+    await fs_extra_1.default.writeJson(outputPath, exportConfig, { spaces: 2 });
+}
+/**
+ * 从 JSON 文件导入项目配置
+ */
+async function importProjectConfig(configPath, projectDir, resolveSourcePath) {
+    if (!(await fs_extra_1.default.pathExists(configPath))) {
+        throw new Error(`Config file not found: ${configPath}`);
+    }
+    const exportConfig = await fs_extra_1.default.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 = (0, path_2.getProjectConfigPath)(projectDir);
+        const config = await readProjectConfig(configFile);
+        config.links = exportConfig.config.links;
+        await fs_extra_1.default.writeJson(configFile, config, { spaces: 2 });
+    }
 }

package/dist/index.js

@@ -5,6 +5,7 @@ const commander_1 = require("commander");
 const config_1 = require("./commands/config");
 const source_1 = require("./commands/source");
 const use_1 = require("./commands/use");
+const export_1 = require("./commands/export");
 const help_1 = require("./commands/help");
 const program = new commander_1.Command();
 program
@@ -79,7 +80,9 @@ configCmd
 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, options) => {
     await (0, use_1.handleUse)(sources, options);
 });
@@ -107,6 +110,14 @@ program
     .action(async (sources) => {
     await (0, use_1.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 (0, export_1.handleExport)(options);
+});
 // Help command
 program
     .command('help')

package/dist/types/config.d.ts

@@ -7,10 +7,37 @@ export interface GlobalConfig {
     sourcesDir: string;
     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 declare function isSourceSelection(value: unknown): value is SourceSelection;
+/**
+ * 将旧版项目配置转换为新版格式
+ * 如果 sources 是字符串数组，转换为 Record 格式，每个源默认导入全部内容
+ */
+export declare function normalizeProjectConfig(config: LegacyProjectConfig | ProjectConfig): ProjectConfig;
 export interface Manifest {
     name: string;
     version: string;
@@ -21,3 +48,21 @@ 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/dist/types/config.js

@@ -1,2 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.isSourceSelection = isSourceSelection;
+exports.normalizeProjectConfig = normalizeProjectConfig;
+/**
+ * 判断值是否为有效的 SourceSelection 对象
+ */
+function isSourceSelection(value) {
+    if (typeof value !== 'object' || value === null)
+        return false;
+    const obj = value;
+    return (Array.isArray(obj.skills) &&
+        Array.isArray(obj.commands) &&
+        Array.isArray(obj.agents));
+}
+/**
+ * 将旧版项目配置转换为新版格式
+ * 如果 sources 是字符串数组，转换为 Record 格式，每个源默认导入全部内容
+ */
+function normalizeProjectConfig(config) {
+    // If sources is an array, convert to new format
+    if (Array.isArray(config.sources)) {
+        const newSources = {};
+        for (const sourceName of config.sources) {
+            newSources[sourceName] = {
+                skills: ['*'],
+                commands: ['*'],
+                agents: ['*']
+            };
+        }
+        return { sources: newSources, links: config.links };
+    }
+    return config;
+}

package/dist/utils/parsePath.d.ts

@@ -0,0 +1,31 @@
+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 declare function parseSourcePath(input: string): ParsedSourcePath;
+/**
+ * 从路径数组构建选择配置
+ *
+ * 将多个路径转换为 Record<string, SourceSelection> 格式
+ *
+ * 示例：
+ * ['my-skills/skills/a', 'my-skills/skills/b', 'my-skills/commands/test']
+ * → { 'my-skills': { skills: ['a', 'b'], commands: ['test'], agents: [] } }
+ */
+export declare function buildSelectionFromPaths(paths: string[]): Record<string, SourceSelection>;

package/dist/utils/parsePath.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseSourcePath = parseSourcePath;
+exports.buildSelectionFromPaths = buildSelectionFromPaths;
+/**
+ * 解析源路径字符串
+ *
+ * 支持的格式：
+ * - '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
+ */
+function parseSourcePath(input) {
+    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'];
+    const type = parts[1];
+    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: [] } }
+ */
+function buildSelectionFromPaths(paths) {
+    const result = {};
+    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;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tools-cc",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "tools-cc [options] <command> [args]",
   "main": "index.js",
   "directories": {
@@ -12,7 +12,10 @@
     "start": "node dist/index.js",
     "test": "vitest",
     "test:run": "vitest run",
-    "release": "npm publish && git tag v%npm_package_version% && git push origin v%npm_package_version% && gh release create v%npm_package_version% --title v%npm_package_version% --generate-notes"
+    "tag:create": "git tag v%npm_package_version% && git push github v%npm_package_version%",
+    "publish:npm": "npm publish",
+    "release:gh": "gh release create v%npm_package_version% --title v%npm_package_version% --generate-notes",
+    "release": "npm run tag:create && npm run publish:npm && npm run release:gh"
   },
   "bin": {
     "tools-cc": "./dist/index.js"

package/src/commands/export.ts

@@ -0,0 +1,60 @@
+import chalk from 'chalk';
+import path from 'path';
+import fs from 'fs-extra';
+import { exportProjectConfig } from '../core/project';
+import { loadGlobalConfig } from '../core/config';
+import { GLOBAL_CONFIG_DIR } from '../utils/path';
+import { GlobalExportConfig } from '../types/config';
+
+/**
+ * 导出项目或全局配置
+ */
+export async function handleExport(options: {
+  output?: string;
+  global?: boolean;
+}): Promise<void> {
+  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.red(`✗ Export failed: ${message}`));
+    throw error;
+  }
+}
+
+/**
+ * 导出项目配置
+ */
+async function exportProjectConfigCmd(outputPath?: string): Promise<void> {
+  const projectDir = process.cwd();
+  const outputFile = outputPath ?? path.join(projectDir, '.toolscc-export.json');
+
+  await exportProjectConfig(projectDir, outputFile);
+  console.log(chalk.green(`✓ Project config exported to: ${outputFile}`));
+}
+
+/**
+ * 导出全局配置
+ */
+async function exportGlobalConfig(outputPath?: string): Promise<void> {
+  const projectDir = process.cwd();
+  const outputFile = outputPath ?? path.join(projectDir, '.toolscc-global-export.json');
+
+  const config = await loadGlobalConfig(GLOBAL_CONFIG_DIR);
+
+  const exportConfig: GlobalExportConfig = {
+    version: '1.0',
+    type: 'global',
+    config,
+    exportedAt: new Date().toISOString()
+  };
+
+  await fs.writeJson(outputFile, exportConfig, { spaces: 2 });
+  console.log(chalk.green(`✓ Global config exported to: ${outputFile}`));
+}

package/src/commands/help.ts

@@ -9,7 +9,7 @@ ${chalk.bold.cyan('════════════════════
 
 ${chalk.bold('DESCRIPTION / 描述')}
   A CLI tool for managing skills/commands/agents configurations across multiple
-  AI coding tools (iflow, claude, codebuddy, opencode, etc.) via symlinks.
+  AI coding tools (iflow, claude, codebuddy, opencode, codex, etc.) via symlinks.
   
   一个用于统一管理多个 AI 编程工具配置的命令行工具，通过符号链接机制避免重复配置。
 
@@ -50,6 +50,7 @@ ${chalk.bold('SUPPORTED TOOLS / 支持的工具')}
   claude     → .claude
   codebuddy  → .codebuddy
   opencode   → .opencode
+  codex      → .codex
 
 ${chalk.bold('EXAMPLES / 示例')}
   ${chalk.gray('# Add a git source / 添加 Git 配置源')}
@@ -62,7 +63,7 @@ ${chalk.bold('EXAMPLES / 示例')}
   tools-cc sources list
 
   ${chalk.gray('# Use sources in project / 在项目中启用配置源')}
-  tools-cc use my-skills -p iflow claude
+  tools-cc use my-skills -p iflow claude codex
 
   ${chalk.gray('# Check project status / 检查项目状态')}
   tools-cc status