tools-cc 1.0.6 → 1.0.8

package/src/commands/template.ts

@@ -0,0 +1,160 @@
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import path from 'path';
+import { saveTemplate, listTemplates, removeTemplate, getTemplate } from '../core/template';
+import { loadProjectConfig } from '../core/config';
+import { importProjectConfig } from '../core/project';
+import { getSourcePath } from '../core/source';
+import { TEMPLATES_DIR, getProjectConfigPath, GLOBAL_CONFIG_DIR } from '../utils/path';
+import fs from 'fs-extra';
+
+/**
+ * 处理 template save 命令
+ */
+export async function handleTemplateSave(options: { name?: string }): Promise<void> {
+  const projectDir = process.cwd();
+  const configFile = getProjectConfigPath(projectDir);
+
+  // 检查项目配置是否存在
+  if (!(await fs.pathExists(configFile))) {
+    console.log(chalk.yellow('Project not initialized. Run `tools-cc use <source>` first.'));
+    return;
+  }
+
+  try {
+    // 读取项目配置
+    const config = await loadProjectConfig(projectDir);
+    if (!config) {
+      console.log(chalk.yellow('No project configuration found.'));
+      return;
+    }
+
+    // 确定模板名称
+    let templateName = options.name;
+    if (!templateName) {
+      templateName = path.basename(projectDir);
+    }
+
+    // 检查是否已存在
+    const existing = await getTemplate(templateName, TEMPLATES_DIR);
+    if (existing) {
+      const answers = await inquirer.prompt([
+        {
+          type: 'confirm',
+          name: 'overwrite',
+          message: `Template "${templateName}" already exists. Overwrite?`,
+          default: false
+        }
+      ]);
+      if (!answers.overwrite) {
+        console.log(chalk.gray('Cancelled.'));
+        return;
+      }
+    }
+
+    // 保存模板
+    const template = await saveTemplate(templateName, projectDir, config, TEMPLATES_DIR);
+    console.log(chalk.green(`✓ Template saved: ${template.name}`));
+  } catch (error) {
+    console.log(chalk.red(`✗ Failed to save template: ${error instanceof Error ? error.message : 'Unknown error'}`));
+  }
+}
+
+/**
+ * 处理 template list 命令
+ */
+export async function handleTemplateList(): Promise<void> {
+  const templates = await listTemplates(TEMPLATES_DIR);
+
+  if (templates.length === 0) {
+    console.log(chalk.gray('No templates saved.'));
+    return;
+  }
+
+  console.log(chalk.bold('Saved templates:'));
+  for (const template of templates) {
+    const date = new Date(template.savedAt).toLocaleDateString();
+    console.log(`  ${chalk.cyan(template.name.padEnd(20))} (saved: ${date})`);
+  }
+}
+
+/**
+ * 处理 template rm 命令
+ */
+export async function handleTemplateRemove(name: string): Promise<void> {
+  try {
+    await removeTemplate(name, TEMPLATES_DIR);
+    console.log(chalk.green(`✓ Template removed: ${name}`));
+  } catch (error) {
+    console.log(chalk.red(`✗ Failed to remove template: ${error instanceof Error ? error.message : 'Unknown error'}`));
+  }
+}
+
+/**
+ * 处理 template use 命令
+ */
+export async function handleTemplateUse(name?: string): Promise<void> {
+  const projectDir = process.cwd();
+  const configFile = getProjectConfigPath(projectDir);
+
+  // 检查项目是否已初始化
+  if (!(await fs.pathExists(configFile))) {
+    console.log(chalk.yellow('Project not initialized. Run `tools-cc use <source>` first.'));
+    return;
+  }
+
+  // 如果没有指定名称，显示选择列表
+  if (!name) {
+    const templates = await listTemplates(TEMPLATES_DIR);
+
+    if (templates.length === 0) {
+      console.log(chalk.gray('No templates saved.'));
+      return;
+    }
+
+    const answers = await inquirer.prompt([
+      {
+        type: 'list',
+        name: 'selectedTemplate',
+        message: 'Select a template to use:',
+        choices: templates.map(t => ({
+          name: `${t.name} (from: ${path.basename(t.sourceProject)})`,
+          value: t.name
+        }))
+      }
+    ]);
+    name = answers.selectedTemplate as string;
+  }
+
+  // 获取模板
+  const template = await getTemplate(name as string, TEMPLATES_DIR);
+  if (!template) {
+    console.log(chalk.red(`✗ Template not found: ${name}`));
+    return;
+  }
+
+  // 定义源路径解析函数
+  const resolveSourcePath = async (sourceName: string): Promise<string> => {
+    return await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
+  };
+
+  // 创建临时配置文件
+  const tempConfigPath = path.join(projectDir, '.toolscc-template-temp.json');
+  const exportConfig = {
+    version: '1.0',
+    type: 'project' as const,
+    config: template.config,
+    exportedAt: new Date().toISOString()
+  };
+
+  // 导入配置
+  try {
+    await fs.writeJson(tempConfigPath, exportConfig, { spaces: 2 });
+    await importProjectConfig(tempConfigPath, projectDir, resolveSourcePath);
+    console.log(chalk.green(`✓ Applied template: ${name}`));
+  } catch (error) {
+    console.log(chalk.red(`✗ Failed to apply template: ${error instanceof Error ? error.message : 'Unknown error'}`));
+  } finally {
+    await fs.remove(tempConfigPath);
+  }
+}

package/src/commands/use.ts

@@ -1,6 +1,7 @@
 import chalk from 'chalk';
 import inquirer from 'inquirer';
 import { useSource, unuseSource, listUsedSources, initProject, importProjectConfig } from '../core/project';
+import { normalizeProjectConfig } from '../types/config';
 import { getSourcePath, listSources } from '../core/source';
 import { scanSource } from '../core/manifest';
 import { createSymlink, isSymlink } from '../core/symlink';
@@ -368,11 +369,16 @@ export async function handleProjectUpdate(sourceNames?: string[]): Promise<void>
     return;
   }
   
-  const config = await fs.readJson(configFile);
+  const rawConfig = await fs.readJson(configFile);
+  // 使用 normalizeProjectConfig 处理旧版（数组）和新版（对象）格式
+  const config = normalizeProjectConfig(rawConfig);
   const configuredSources = Object.keys(config.sources || {});
   
-  let sourcesToUpdate = sourceNames && sourceNames.length > 0 
-    ? sourceNames 
+  // 过滤掉无效的源名称（如数字字符串），这些可能是 Commander.js 解析错误产生的
+  const validSourceNames = sourceNames?.filter(s => isNaN(Number(s))) || [];
+  
+  let sourcesToUpdate = validSourceNames.length > 0 
+    ? validSourceNames 
     : configuredSources;
   
   if (sourcesToUpdate.length === 0) {
@@ -380,9 +386,9 @@ export async function handleProjectUpdate(sourceNames?: string[]): Promise<void>
     return;
   }
   
-  // 验证指定的源是否存在于项目配置中
-  if (sourceNames && sourceNames.length > 0) {
-    const invalidSources = sourceNames.filter((s: string) => !configuredSources.includes(s));
+  // 验证指定的源是否存在于项目配置中（仅当用户明确指定了有效源名称时）
+  if (validSourceNames.length > 0) {
+    const invalidSources = validSourceNames.filter((s: string) => !configuredSources.includes(s));
     if (invalidSources.length > 0) {
       console.log(chalk.yellow(`Sources not in project: ${invalidSources.join(', ')}`));
     }

package/src/core/template.ts

@@ -0,0 +1,91 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { TemplateConfig, ProjectConfig } from '../types';
+
+/**
+ * 保存项目配置为模板
+ */
+export async function saveTemplate(
+  name: string,
+  sourceProject: string,
+  config: ProjectConfig,
+  templatesDir: string
+): Promise<TemplateConfig> {
+  if (!name || !name.trim()) {
+    throw new Error('Template name is required');
+  }
+
+  await fs.ensureDir(templatesDir);
+
+  const template: TemplateConfig = {
+    version: '1.0',
+    name,
+    sourceProject,
+    savedAt: new Date().toISOString(),
+    config
+  };
+
+  const templatePath = path.join(templatesDir, `${name}.json`);
+  await fs.writeJson(templatePath, template, { spaces: 2 });
+
+  return template;
+}
+
+/**
+ * 列出所有模板
+ */
+export async function listTemplates(templatesDir: string): Promise<TemplateConfig[]> {
+  if (!(await fs.pathExists(templatesDir))) {
+    return [];
+  }
+
+  const files = await fs.readdir(templatesDir);
+  const templates: TemplateConfig[] = [];
+
+  for (const file of files) {
+    if (file.endsWith('.json')) {
+      try {
+        const template = await fs.readJson(path.join(templatesDir, file));
+        if (template.version && template.name && template.config) {
+          templates.push(template);
+        }
+      } catch {
+        // Skip invalid files
+      }
+    }
+  }
+
+  return templates.sort((a, b) => b.savedAt.localeCompare(a.savedAt));
+}
+
+/**
+ * 获取指定模板
+ */
+export async function getTemplate(
+  name: string,
+  templatesDir: string
+): Promise<TemplateConfig | null> {
+  const templatePath = path.join(templatesDir, `${name}.json`);
+
+  if (!(await fs.pathExists(templatePath))) {
+    return null;
+  }
+
+  return await fs.readJson(templatePath);
+}
+
+/**
+ * 删除模板
+ */
+export async function removeTemplate(
+  name: string,
+  templatesDir: string
+): Promise<void> {
+  const templatePath = path.join(templatesDir, `${name}.json`);
+
+  if (!(await fs.pathExists(templatePath))) {
+    throw new Error(`Template not found: ${name}`);
+  }
+
+  await fs.remove(templatePath);
+}

package/src/index.ts

@@ -3,9 +3,10 @@
 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 { handleUse, handleList, handleRemove, handleStatus, handleProjectUpdate } from './commands/use';
+import { handleExport } from './commands/export';
+import { handleTemplateSave, handleTemplateList, handleTemplateRemove, handleTemplateUse } from './commands/template';
+import { showHelp } from './commands/help';
 
 const program = new Command();
 
@@ -89,16 +90,52 @@ configCmd
     await handleConfigList();
   });
 
+// Template commands
+const templateCmd = program
+  .command('template')
+  .description('Template management')
+  .alias('tpl');
+
+templateCmd
+  .command('save')
+  .description('Save current project config as template')
+  .option('-n, --name <name>', 'Template name (default: project directory name)')
+  .action(async (options) => {
+    await handleTemplateSave(options);
+  });
+
+templateCmd
+  .command('list')
+  .alias('ls')
+  .description('List all saved templates')
+  .action(async () => {
+    await handleTemplateList();
+  });
+
+templateCmd
+  .command('rm <name>')
+  .description('Remove a template')
+  .action(async (name: string) => {
+    await handleTemplateRemove(name);
+  });
+
+templateCmd
+  .command('use [name]')
+  .description('Apply a template to current project')
+  .action(async (name?: string) => {
+    await handleTemplateUse(name);
+  });
+
 // Project commands
 program
-  .command('use [sources...]')
-  .description('Use sources in current project')
-  .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);
-  });
+  .command('use [sources...]')
+  .description('Use sources in current project')
+  .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')

package/src/types/config.ts

@@ -1,102 +1,113 @@
-export interface SourceConfig {
-  type: 'git' | 'local';
-  url?: string;
-  path?: string;
-}
-
-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 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;
-  skills?: string[];
-  commands?: string[];
-  agents?: string[];
-}
-
-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;
+export interface SourceConfig {
+  type: 'git' | 'local';
+  url?: string;
+  path?: string;
+}
+
+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 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;
+  skills?: string[];
+  commands?: string[];
+  agents?: string[];
+}
+
+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;
+}
+
+/**
+ * 模板配置格式
+ */
+export interface TemplateConfig {
+  version: string;
+  name: string;
+  sourceProject: string;
+  savedAt: string;
+  config: ProjectConfig;
 }

package/src/utils/path.ts

@@ -1,18 +1,23 @@
-import os from 'os';
-import path from 'path';
-
-export const GLOBAL_CONFIG_DIR = path.join(os.homedir(), '.tools-cc');
-export const GLOBAL_CONFIG_FILE = path.join(GLOBAL_CONFIG_DIR, 'config.json');
-
-export const DEFAULT_CONFIG = {
-  sourcesDir: path.join(GLOBAL_CONFIG_DIR, 'sources'),
-  sources: {}
-};
-
-export function getToolsccDir(projectDir: string): string {
-  return path.join(projectDir, '.toolscc');
-}
-
-export function getProjectConfigPath(projectDir: string): string {
-  return path.join(getToolsccDir(projectDir), 'config.json');
-}
+import os from 'os';
+import path from 'path';
+
+export const GLOBAL_CONFIG_DIR = path.join(os.homedir(), '.tools-cc');
+export const GLOBAL_CONFIG_FILE = path.join(GLOBAL_CONFIG_DIR, 'config.json');
+export const TEMPLATES_DIR = path.join(GLOBAL_CONFIG_DIR, 'templates');
+
+export const DEFAULT_CONFIG = {
+  sourcesDir: path.join(GLOBAL_CONFIG_DIR, 'sources'),
+  sources: {}
+};
+
+export function getTemplatePath(templateName: string): string {
+  return path.join(TEMPLATES_DIR, `${templateName}.json`);
+}
+
+export function getToolsccDir(projectDir: string): string {
+  return path.join(projectDir, '.toolscc');
+}
+
+export function getProjectConfigPath(projectDir: string): string {
+  return path.join(getToolsccDir(projectDir), 'config.json');
+}