tools-cc 1.0.0 → 1.0.3

package/src/commands/use.ts

@@ -1,147 +1,190 @@
-import chalk from 'chalk';
-import inquirer from 'inquirer';
-import { useSource, unuseSource, listUsedSources, initProject } from '../core/project';
-import { getSourcePath, listSources } from '../core/source';
-import { createSymlink, isSymlink } from '../core/symlink';
-import { GLOBAL_CONFIG_DIR, getToolsccDir } from '../utils/path';
-import fs from 'fs-extra';
-import path from 'path';
-
-const SUPPORTED_TOOLS: Record<string, string> = {
-  iflow: '.iflow',
-  claude: '.claude',
-  codebuddy: '.codebuddy',
-  opencode: '.opencode'
-};
-
-export async function handleUse(
-  sourceNames: string[],
-  options: { projects?: string[] }
-): 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.'));
-      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;
-  }
-  
-  // 初始化项目
-  await initProject(projectDir);
-  
-  // 启用每个配置源
-  for (const sourceName of sourceNames) {
-    try {
-      const sourcePath = await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
-      await useSource(sourceName, sourcePath, projectDir);
-      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);
-  
-  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`));
-    } catch (error) {
-      console.log(chalk.red(`✗ Failed to link ${linkName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
-    }
-  }
-  
-  // 更新项目配置
-  const configFile = path.join(projectDir, 'tools-cc.json');
-  const config = await fs.readJson(configFile);
-  const existingLinks = config.links || [];
-  config.links = [...new Set([...existingLinks, ...tools])];
-  await fs.writeJson(configFile, config, { spaces: 2 });
-}
-
-export async function handleList(): Promise<void> {
-  const projectDir = process.cwd();
-  const sources = await listUsedSources(projectDir);
-  
-  if (sources.length === 0) {
-    console.log(chalk.gray('No sources in use. Run `tools-cc use <source-name>` to add one.'));
-    return;
-  }
-  
-  console.log(chalk.bold('Sources in use:'));
-  for (const source of sources) {
-    console.log(`  ${chalk.cyan(source)}`);
-  }
-}
-
-export async function handleRemove(sourceName: string): Promise<void> {
-  const projectDir = process.cwd();
-  
-  try {
-    await unuseSource(sourceName, projectDir);
-    console.log(chalk.green(`✓ Removed source: ${sourceName}`));
-  } catch (error) {
-    console.log(chalk.red(`✗ ${error instanceof Error ? error.message : 'Unknown error'}`));
-  }
-}
-
-export async function handleStatus(): Promise<void> {
-  const projectDir = process.cwd();
-  const sources = await listUsedSources(projectDir);
-  
-  console.log(chalk.bold('\nProject Status:'));
-  console.log(chalk.gray(`  Directory: ${projectDir}`));
-  
-  // 检查 .toolscc
-  const toolsccDir = getToolsccDir(projectDir);
-  console.log(`  .toolscc: ${await fs.pathExists(toolsccDir) ? chalk.green('exists') : chalk.red('not found')}`);
-  
-  // 检查 sources
-  console.log(`  Sources: ${sources.length > 0 ? sources.map(s => chalk.cyan(s)).join(', ') : chalk.gray('none')}`);
-  
-  // 检查 links
-  const configFile = path.join(projectDir, 'tools-cc.json');
-  if (await fs.pathExists(configFile)) {
-    const config = await fs.readJson(configFile);
-    console.log(`  Links:`);
-    for (const tool of config.links || []) {
-      const linkName = SUPPORTED_TOOLS[tool];
-      if (!linkName) continue;
-      const linkPath = path.join(projectDir, linkName);
-      const isLink = await isSymlink(linkPath);
-      console.log(`    ${tool}: ${isLink ? chalk.green('linked') : chalk.red('not linked')}`);
-    }
-  }
-  console.log();
-}
+import chalk from 'chalk';
+import inquirer from 'inquirer';
+import { useSource, unuseSource, listUsedSources, initProject } from '../core/project';
+import { getSourcePath, listSources } from '../core/source';
+import { createSymlink, isSymlink } from '../core/symlink';
+import { GLOBAL_CONFIG_DIR, getToolsccDir, getProjectConfigPath } from '../utils/path';
+import fs from 'fs-extra';
+import path from 'path';
+
+const SUPPORTED_TOOLS: Record<string, string> = {
+  iflow: '.iflow',
+  claude: '.claude',
+  codebuddy: '.codebuddy',
+  opencode: '.opencode'
+};
+
+export async function handleUse(
+  sourceNames: string[],
+  options: { projects?: string[] }
+): 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.'));
+      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;
+  }
+  
+  // 初始化项目
+  await initProject(projectDir);
+  
+  // 启用每个配置源
+  for (const sourceName of sourceNames) {
+    try {
+      const sourcePath = await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
+      await useSource(sourceName, sourcePath, projectDir);
+      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);
+  
+  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`));
+    } catch (error) {
+      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])];
+  await fs.writeJson(configFile, config, { spaces: 2 });
+}
+
+export async function handleList(): Promise<void> {
+  const projectDir = process.cwd();
+  const sources = await listUsedSources(projectDir);
+  
+  if (sources.length === 0) {
+    console.log(chalk.gray('No sources in use. Run `tools-cc use <source-name>` to add one.'));
+    return;
+  }
+  
+  console.log(chalk.bold('Sources in use:'));
+  for (const source of sources) {
+    console.log(`  ${chalk.cyan(source)}`);
+  }
+}
+
+export async function handleRemove(sourceName: string): Promise<void> {
+  const projectDir = process.cwd();
+  
+  try {
+    await unuseSource(sourceName, projectDir);
+    console.log(chalk.green(`✓ Removed source: ${sourceName}`));
+  } catch (error) {
+    console.log(chalk.red(`✗ ${error instanceof Error ? error.message : 'Unknown error'}`));
+  }
+}
+
+export async function handleStatus(): Promise<void> {
+  const projectDir = process.cwd();
+  const sources = await listUsedSources(projectDir);
+  
+  console.log(chalk.bold('\nProject Status:'));
+  console.log(chalk.gray(`  Directory: ${projectDir}`));
+  
+  // 检查 .toolscc
+  const toolsccDir = getToolsccDir(projectDir);
+  console.log(`  .toolscc: ${await fs.pathExists(toolsccDir) ? chalk.green('exists') : chalk.red('not found')}`);
+  
+  // 检查 sources
+  console.log(`  Sources: ${sources.length > 0 ? sources.map(s => chalk.cyan(s)).join(', ') : chalk.gray('none')}`);
+  
+  // 检查 links
+  const configFile = getProjectConfigPath(projectDir);
+  if (await fs.pathExists(configFile)) {
+    const config = await fs.readJson(configFile);
+    console.log(`  Links:`);
+    for (const tool of config.links || []) {
+      const linkName = SUPPORTED_TOOLS[tool];
+      if (!linkName) continue;
+      const linkPath = path.join(projectDir, linkName);
+      const isLink = await isSymlink(linkPath);
+      console.log(`    ${tool}: ${isLink ? chalk.green('linked') : chalk.red('not linked')}`);
+    }
+  }
+  console.log();
+}
+
+export async function handleProjectUpdate(sourceNames?: 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;
+  }
+  
+  const config = await fs.readJson(configFile);
+  let sourcesToUpdate = sourceNames && sourceNames.length > 0 
+    ? sourceNames 
+    : config.sources || [];
+  
+  if (sourcesToUpdate.length === 0) {
+    console.log(chalk.gray('No sources to update.'));
+    return;
+  }
+  
+  // 验证指定的源是否存在于项目配置中
+  if (sourceNames && sourceNames.length > 0) {
+    const invalidSources = sourceNames.filter((s: string) => !config.sources.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));
+  }
+  
+  // 更新每个配置源
+  for (const sourceName of sourcesToUpdate) {
+    try {
+      const sourcePath = await getSourcePath(sourceName, GLOBAL_CONFIG_DIR);
+      await useSource(sourceName, sourcePath, projectDir);
+      console.log(chalk.green(`✓ Updated source: ${sourceName}`));
+    } catch (error) {
+      console.log(chalk.red(`✗ Failed to update ${sourceName}: ${error instanceof Error ? error.message : 'Unknown error'}`));
+    }
+  }
+  
+  console.log(chalk.green(`\n✓ Project update complete`));
+}

package/src/core/source.ts

@@ -1,100 +1,184 @@
-import fs from 'fs-extra';
-import path from 'path';
-import { execSync } from 'child_process';
-import { loadGlobalConfig, saveGlobalConfig } from './config';
-import { SourceConfig } from '../types';
-
-export async function addSource(
-  name: string, 
-  sourcePath: string, 
-  configDir: string
-): Promise<SourceConfig> {
-  const config = await loadGlobalConfig(configDir);
-  
-  // 判断是 git url 还是本地路径
-  const isGit = sourcePath.startsWith('http') || sourcePath.startsWith('git@');
-  
-  let sourceConfig: SourceConfig;
-  
-  if (isGit) {
-    // Clone git repo
-    const cloneDir = path.join(config.sourcesDir, name);
-    console.log(`Cloning ${sourcePath} to ${cloneDir}...`);
-    
-    await fs.ensureDir(config.sourcesDir);
-    execSync(`git clone ${sourcePath} "${cloneDir}"`, { stdio: 'inherit' });
-    
-    sourceConfig = { type: 'git', url: sourcePath };
-  } else {
-    // 本地路径
-    const absolutePath = path.resolve(sourcePath);
-    if (!(await fs.pathExists(absolutePath))) {
-      throw new Error(`Path does not exist: ${absolutePath}`);
-    }
-    sourceConfig = { type: 'local', path: absolutePath };
-  }
-  
-  config.sources[name] = sourceConfig;
-  await saveGlobalConfig(config, configDir);
-  
-  return sourceConfig;
-}
-
-export async function listSources(configDir: string): Promise<Record<string, SourceConfig>> {
-  const config = await loadGlobalConfig(configDir);
-  return config.sources;
-}
-
-export async function removeSource(name: string, configDir: string): Promise<void> {
-  const config = await loadGlobalConfig(configDir);
-  
-  if (!config.sources[name]) {
-    throw new Error(`Source not found: ${name}`);
-  }
-  
-  const source = config.sources[name];
-  
-  // 如果是 git 类型，清理克隆目录
-  if (source.type === 'git') {
-    const cloneDir = path.join(config.sourcesDir, name);
-    if (await fs.pathExists(cloneDir)) {
-      console.log(`Removing cloned directory: ${cloneDir}`);
-      await fs.remove(cloneDir);
-    }
-  }
-  
-  delete config.sources[name];
-  await saveGlobalConfig(config, configDir);
-}
-
-export async function updateSource(name: string, configDir: string): Promise<void> {
-  const config = await loadGlobalConfig(configDir);
-  const source = config.sources[name];
-  
-  if (!source) {
-    throw new Error(`Source not found: ${name}`);
-  }
-  
-  if (source.type === 'git') {
-    const cloneDir = path.join(config.sourcesDir, name);
-    console.log(`Updating ${name}...`);
-    execSync(`git -C "${cloneDir}" pull`, { stdio: 'inherit' });
-  } else {
-    console.log(`Source ${name} is local, no update needed.`);
-  }
-}
-
-export async function getSourcePath(name: string, configDir: string): Promise<string> {
-  const config = await loadGlobalConfig(configDir);
-  const source = config.sources[name];
-  
-  if (!source) {
-    throw new Error(`Source not found: ${name}`);
-  }
-  
-  if (source.type === 'local') {
-    return source.path!;
-  }
-  
-  return path.join(config.sourcesDir, name);
-}
+import fs from 'fs-extra';
+import path from 'path';
+import { execSync } from 'child_process';
+import { loadGlobalConfig, saveGlobalConfig } from './config';
+import { SourceConfig } from '../types';
+
+export async function addSource(
+  name: string, 
+  sourcePath: string, 
+  configDir: string
+): Promise<SourceConfig> {
+  const config = await loadGlobalConfig(configDir);
+  
+  // 判断是 git url 还是本地路径
+  const isGit = sourcePath.startsWith('http') || sourcePath.startsWith('git@');
+  
+  let sourceConfig: SourceConfig;
+  
+  if (isGit) {
+    // Clone git repo
+    const cloneDir = path.join(config.sourcesDir, name);
+    console.log(`Cloning ${sourcePath} to ${cloneDir}...`);
+    
+    await fs.ensureDir(config.sourcesDir);
+    execSync(`git clone ${sourcePath} "${cloneDir}"`, { stdio: 'inherit' });
+    
+    sourceConfig = { type: 'git', url: sourcePath };
+  } else {
+    // 本地路径
+    const absolutePath = path.resolve(sourcePath);
+    if (!(await fs.pathExists(absolutePath))) {
+      throw new Error(`Path does not exist: ${absolutePath}`);
+    }
+    sourceConfig = { type: 'local', path: absolutePath };
+  }
+  
+  config.sources[name] = sourceConfig;
+  await saveGlobalConfig(config, configDir);
+  
+  return sourceConfig;
+}
+
+export async function listSources(configDir: string): Promise<Record<string, SourceConfig>> {
+  const config = await loadGlobalConfig(configDir);
+  return config.sources;
+}
+
+export async function removeSource(name: string, configDir: string): Promise<void> {
+  const config = await loadGlobalConfig(configDir);
+  
+  if (!config.sources[name]) {
+    throw new Error(`Source not found: ${name}`);
+  }
+  
+  const source = config.sources[name];
+  
+  // 如果是 git 类型，清理克隆目录
+  if (source.type === 'git') {
+    const cloneDir = path.join(config.sourcesDir, name);
+    if (await fs.pathExists(cloneDir)) {
+      console.log(`Removing cloned directory: ${cloneDir}`);
+      await fs.remove(cloneDir);
+    }
+  }
+  
+  delete config.sources[name];
+  await saveGlobalConfig(config, configDir);
+}
+
+export async function updateSource(name: string, configDir: string): Promise<void> {
+  const config = await loadGlobalConfig(configDir);
+  const source = config.sources[name];
+  
+  if (!source) {
+    throw new Error(`Source not found: ${name}`);
+  }
+  
+  if (source.type === 'git') {
+    const cloneDir = path.join(config.sourcesDir, name);
+    console.log(`Updating ${name}...`);
+    execSync(`git -C "${cloneDir}" pull`, { stdio: 'inherit' });
+  } else {
+    console.log(`Source ${name} is local, no update needed.`);
+  }
+}
+
+export async function getSourcePath(name: string, configDir: string): Promise<string> {
+  const config = await loadGlobalConfig(configDir);
+  const source = config.sources[name];
+  
+  if (!source) {
+    throw new Error(`Source not found: ${name}`);
+  }
+  
+  if (source.type === 'local') {
+    return source.path!;
+  }
+  
+  return path.join(config.sourcesDir, name);
+}
+
+export interface ScanResult {
+  added: string[];
+  updated: string[];
+  skipped: string[];
+}
+
+export async function scanSources(configDir: string): Promise<ScanResult> {
+  const config = await loadGlobalConfig(configDir);
+  const result: ScanResult = { added: [], updated: [], skipped: [] };
+  
+  // 确保 sourcesDir 存在
+  if (!(await fs.pathExists(config.sourcesDir))) {
+    await fs.ensureDir(config.sourcesDir);
+    return result;
+  }
+  
+  // 获取 sourcesDir 下的所有文件夹
+  const entries = await fs.readdir(config.sourcesDir, { withFileTypes: true });
+  const directories = entries
+    .filter(entry => entry.isDirectory())
+    .map(entry => entry.name);
+  
+  // 检查每个 git source 的克隆目录是否还存在
+  for (const [name, source] of Object.entries(config.sources)) {
+    if (source.type === 'git') {
+      const cloneDir = path.join(config.sourcesDir, name);
+      if (!(await fs.pathExists(cloneDir))) {
+        // 克隆目录不存在，从配置中移除
+        delete config.sources[name];
+        console.log(`Removed missing git source: ${name}`);
+      }
+    }
+  }
+  
+  // 扫描目录并更新配置
+  for (const dirName of directories) {
+    const dirPath = path.join(config.sourcesDir, dirName);
+    const existingSource = config.sources[dirName];
+    
+    // 检查是否是 git 仓库
+    const isGitRepo = await fs.pathExists(path.join(dirPath, '.git'));
+    
+    if (existingSource) {
+      // 已存在配置
+      if (existingSource.type === 'git' && isGitRepo) {
+        result.skipped.push(dirName);
+      } else if (existingSource.type === 'local' && existingSource.path === dirPath) {
+        result.skipped.push(dirName);
+      } else {
+        // 配置不一致，更新为当前状态
+        if (isGitRepo) {
+          // 尝试获取远程 URL
+          try {
+            const remoteUrl = execSync(`git -C "${dirPath}" config --get remote.origin.url`, { encoding: 'utf-8' }).trim();
+            config.sources[dirName] = { type: 'git', url: remoteUrl };
+          } catch {
+            config.sources[dirName] = { type: 'local', path: dirPath };
+          }
+        } else {
+          config.sources[dirName] = { type: 'local', path: dirPath };
+        }
+        result.updated.push(dirName);
+      }
+    } else {
+      // 新发现的目录，添加到配置
+      if (isGitRepo) {
+        // 尝试获取远程 URL
+        try {
+          const remoteUrl = execSync(`git -C "${dirPath}" config --get remote.origin.url`, { encoding: 'utf-8' }).trim();
+          config.sources[dirName] = { type: 'git', url: remoteUrl };
+        } catch {
+          config.sources[dirName] = { type: 'local', path: dirPath };
+        }
+      } else {
+        config.sources[dirName] = { type: 'local', path: dirPath };
+      }
+      result.added.push(dirName);
+    }
+  }
+  
+  await saveGlobalConfig(config, configDir);
+  return result;
+}

package/src/index.ts

@@ -2,8 +2,8 @@
 
 import { Command } from 'commander';
 import { handleConfigSet, handleConfigGet, handleConfigList } from './commands/config';
-import { handleSourceAdd, handleSourceList, handleSourceRemove, handleSourceUpdate } from './commands/source';
-import { handleUse, handleList, handleRemove, handleStatus } from './commands/use';
+import { handleSourceAdd, handleSourceList, handleSourceRemove, handleSourceUpdate, handleSourceScan } from './commands/source';
+import { handleUse, handleList, handleRemove, handleStatus, handleProjectUpdate } from './commands/use';
 import { showHelp } from './commands/help';
 import { GLOBAL_CONFIG_DIR } from './utils/path';
 
@@ -50,11 +50,19 @@ sourceCmd
 sourceCmd
   .command('update [name]')
   .alias('up')
-  .description('Update source(s)')
+  .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')
@@ -111,6 +119,13 @@ program
     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')
@@ -147,8 +162,12 @@ program
           break;
         case 'update':
         case 'up':
+        case 'upgrade':
           await handleSourceUpdate(args[0]);
           break;
+        case 'scan':
+          await handleSourceScan();
+          break;
         default:
           console.log(`Unknown source command: ${cmd}`);
       }