@sylphx/flow 1.3.1 → 1.4.1

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @sylphx/flow
 
+## 1.4.1
+
+### Patch Changes
+
+- Fix rules scanning showing all project markdown files:
+  - Skip rules scanning for Claude Code (rules embedded in agent files)
+  - Only scan when target has explicit rulesFile config
+  - Prevent scanning entire project directory
+
+## 1.4.0
+
+### Minor Changes
+
+- Complete sync redesign with intelligent file categorization:
+  - Categorize all files: agents, commands, rules, MCP servers
+  - Separate Flow templates (auto-sync) from unknown files (user decides)
+  - New flow: preview → select unknowns → summary → confirm → execute
+  - Preserve user custom files by default (no accidental deletion)
+  - Multi-select UI for unknown files
+  - Clear visibility: what syncs, what's removed, what's preserved
+  - Remove all Chinese text (English only)
+
 ## 1.3.1
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylphx/flow",
-  "version": "1.3.1",
+  "version": "1.4.1",
   "description": "AI-powered development workflow automation with autonomous loop mode and smart configuration",
   "type": "module",
   "bin": {

package/src/commands/flow-command.ts

@@ -380,7 +380,7 @@ async function executeSetupPhase(prompt: string | undefined, options: FlowOption
 
       // Handle sync mode - delete template files first
       if (options.sync && !options.dryRun) {
-        const { buildSyncManifest, showSyncPreview, confirmSync, executeSyncDelete, checkMCPServers, selectServersToRemove, removeMCPServers } = await import('../utils/sync-utils.js');
+        const { buildSyncManifest, showSyncPreview, selectUnknownFilesToRemove, showFinalSummary, confirmSync, executeSyncDelete, removeMCPServers } = await import('../utils/sync-utils.js');
 
         // Need target to build manifest
         const targetId = await selectAndValidateTarget(initOptions);
@@ -394,31 +394,43 @@ async function executeSetupPhase(prompt: string | undefined, options: FlowOption
         const target = targetOption.value;
         const manifest = await buildSyncManifest(process.cwd(), target);
 
-        // Check MCP servers before showing preview
-        const nonRegistryServers = await checkMCPServers(process.cwd());
-
+        // Show preview
         console.log(chalk.cyan.bold('━━━ 🔄 Synchronizing Files\n'));
-        showSyncPreview(manifest, process.cwd(), nonRegistryServers);
+        showSyncPreview(manifest, process.cwd());
+
+        // Select unknown files to remove
+        const selectedUnknowns = await selectUnknownFilesToRemove(manifest);
+
+        // Show final summary
+        showFinalSummary(manifest, selectedUnknowns);
 
+        // Confirm
         const confirmed = await confirmSync();
         if (!confirmed) {
           console.log(chalk.yellow('\n✗ Sync cancelled\n'));
           process.exit(0);
         }
 
-        // Delete templates
-        const deletedCount = await executeSyncDelete(manifest);
-        console.log(chalk.green(`\n✓ Deleted ${deletedCount} template files\n`));
+        // Execute deletion
+        const { templates, unknowns } = await executeSyncDelete(manifest, selectedUnknowns);
 
-        // Handle MCP servers if any found
-        if (nonRegistryServers.length > 0) {
-          const serversToRemove = await selectServersToRemove(nonRegistryServers);
+        // Remove MCP servers
+        const mcpServersToRemove = selectedUnknowns.filter(s => !s.includes('/'));
+        let mcpRemoved = 0;
+        if (mcpServersToRemove.length > 0) {
+          mcpRemoved = await removeMCPServers(process.cwd(), mcpServersToRemove);
+        }
 
-          if (serversToRemove.length > 0) {
-            const removedCount = await removeMCPServers(process.cwd(), serversToRemove);
-            console.log(chalk.green(`✓ Removed ${removedCount} MCP server(s)\n`));
-          }
+        // Summary
+        console.log(chalk.green(`\n✓ Synced ${templates} templates`));
+        if (unknowns > 0 || mcpRemoved > 0) {
+          console.log(chalk.green(`✓ Removed ${unknowns + mcpRemoved} files`));
+        }
+        const preserved = manifest.agents.unknown.length + manifest.slashCommands.unknown.length + manifest.rules.unknown.length + manifest.mcpServers.notInRegistry.length - selectedUnknowns.length;
+        if (preserved > 0) {
+          console.log(chalk.green(`✓ Preserved ${preserved} custom files`));
         }
+        console.log('');
       } else if (!options.sync) {
         const targetId = await selectAndValidateTarget(initOptions);
         selectedTarget = targetId;
@@ -709,7 +721,7 @@ async function executeFlowOnce(prompt: string | undefined, options: FlowOptions)
 
       // Handle sync mode - delete template files first
       if (options.sync && !options.dryRun) {
-        const { buildSyncManifest, showSyncPreview, confirmSync, executeSyncDelete, checkMCPServers, selectServersToRemove, removeMCPServers } = await import('../utils/sync-utils.js');
+        const { buildSyncManifest, showSyncPreview, selectUnknownFilesToRemove, showFinalSummary, confirmSync, executeSyncDelete, removeMCPServers } = await import('../utils/sync-utils.js');
 
         // Need target to build manifest
         const targetId = await selectAndValidateTarget(initOptions);
@@ -723,31 +735,43 @@ async function executeFlowOnce(prompt: string | undefined, options: FlowOptions)
         const target = targetOption.value;
         const manifest = await buildSyncManifest(process.cwd(), target);
 
-        // Check MCP servers before showing preview
-        const nonRegistryServers = await checkMCPServers(process.cwd());
-
+        // Show preview
         console.log(chalk.cyan.bold('━━━ 🔄 Synchronizing Files\n'));
-        showSyncPreview(manifest, process.cwd(), nonRegistryServers);
+        showSyncPreview(manifest, process.cwd());
+
+        // Select unknown files to remove
+        const selectedUnknowns = await selectUnknownFilesToRemove(manifest);
+
+        // Show final summary
+        showFinalSummary(manifest, selectedUnknowns);
 
+        // Confirm
         const confirmed = await confirmSync();
         if (!confirmed) {
           console.log(chalk.yellow('\n✗ Sync cancelled\n'));
           process.exit(0);
         }
 
-        // Delete templates
-        const deletedCount = await executeSyncDelete(manifest);
-        console.log(chalk.green(`\n✓ Deleted ${deletedCount} template files\n`));
+        // Execute deletion
+        const { templates, unknowns } = await executeSyncDelete(manifest, selectedUnknowns);
 
-        // Handle MCP servers if any found
-        if (nonRegistryServers.length > 0) {
-          const serversToRemove = await selectServersToRemove(nonRegistryServers);
+        // Remove MCP servers
+        const mcpServersToRemove = selectedUnknowns.filter(s => !s.includes('/'));
+        let mcpRemoved = 0;
+        if (mcpServersToRemove.length > 0) {
+          mcpRemoved = await removeMCPServers(process.cwd(), mcpServersToRemove);
+        }
 
-          if (serversToRemove.length > 0) {
-            const removedCount = await removeMCPServers(process.cwd(), serversToRemove);
-            console.log(chalk.green(`✓ Removed ${removedCount} MCP server(s)\n`));
-          }
+        // Summary
+        console.log(chalk.green(`\n✓ Synced ${templates} templates`));
+        if (unknowns > 0 || mcpRemoved > 0) {
+          console.log(chalk.green(`✓ Removed ${unknowns + mcpRemoved} files`));
+        }
+        const preserved = manifest.agents.unknown.length + manifest.slashCommands.unknown.length + manifest.rules.unknown.length + manifest.mcpServers.notInRegistry.length - selectedUnknowns.length;
+        if (preserved > 0) {
+          console.log(chalk.green(`✓ Preserved ${preserved} custom files`));
         }
+        console.log('');
       } else {
         // Select and validate target (will use existing in repair mode, or prompt if needed)
         const targetId = await selectAndValidateTarget(initOptions);

package/src/utils/sync-utils.ts

@@ -5,23 +5,62 @@ import type { Target } from '../types.js';
 import { MCP_SERVER_REGISTRY } from '../config/servers.js';
 
 /**
- * Files to delete during sync for each target
+ * Flow template filenames (source of truth)
+ */
+const FLOW_AGENTS = ['coder.md', 'orchestrator.md', 'reviewer.md', 'writer.md'];
+const FLOW_SLASH_COMMANDS = ['commit.md', 'context.md', 'explain.md', 'review.md', 'test.md'];
+const FLOW_RULES = ['code-standards.md', 'core.md'];
+
+/**
+ * Categorized files for sync
+ */
+interface CategorizedFiles {
+  inFlow: string[];      // Files that exist in Flow templates
+  unknown: string[];     // Files not in Flow templates (custom or removed)
+}
+
+/**
+ * Sync manifest with categorization
  */
 interface SyncManifest {
-  agents: string[];
-  slashCommands: string[];
-  rules: string[];
+  agents: CategorizedFiles;
+  slashCommands: CategorizedFiles;
+  rules: CategorizedFiles;
+  mcpServers: {
+    inRegistry: string[];
+    notInRegistry: string[];
+  };
   preserve: string[];
 }
 
 /**
- * Build sync manifest - list files to delete and preserve
+ * Categorize files into Flow templates vs unknown
+ */
+function categorizeFiles(files: string[], flowTemplates: string[]): CategorizedFiles {
+  const inFlow: string[] = [];
+  const unknown: string[] = [];
+
+  for (const file of files) {
+    const basename = path.basename(file);
+    if (flowTemplates.includes(basename)) {
+      inFlow.push(file);
+    } else {
+      unknown.push(file);
+    }
+  }
+
+  return { inFlow, unknown };
+}
+
+/**
+ * Build sync manifest - categorize all files
  */
 export async function buildSyncManifest(cwd: string, target: Target): Promise<SyncManifest> {
   const manifest: SyncManifest = {
-    agents: [],
-    slashCommands: [],
-    rules: [],
+    agents: { inFlow: [], unknown: [] },
+    slashCommands: { inFlow: [], unknown: [] },
+    rules: { inFlow: [], unknown: [] },
+    mcpServers: { inRegistry: [], notInRegistry: [] },
     preserve: [],
   };
 
@@ -30,9 +69,11 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
     const agentsDir = path.join(cwd, target.config.agentDir);
     if (fs.existsSync(agentsDir)) {
       const files = fs.readdirSync(agentsDir, { withFileTypes: true });
-      manifest.agents = files
+      const agentFiles = files
         .filter((f) => f.isFile() && f.name.endsWith(target.config.agentExtension || '.md'))
         .map((f) => path.join(agentsDir, f.name));
+
+      manifest.agents = categorizeFiles(agentFiles, FLOW_AGENTS);
     }
   }
 
@@ -41,17 +82,58 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
     const commandsDir = path.join(cwd, target.config.slashCommandsDir);
     if (fs.existsSync(commandsDir)) {
       const files = fs.readdirSync(commandsDir, { withFileTypes: true });
-      manifest.slashCommands = files
+      const commandFiles = files
         .filter((f) => f.isFile() && f.name.endsWith('.md'))
         .map((f) => path.join(commandsDir, f.name));
+
+      manifest.slashCommands = categorizeFiles(commandFiles, FLOW_SLASH_COMMANDS);
     }
   }
 
-  // Rules files
+  // Rules files - only for targets with separate rules directory
+  // Claude Code has rules in agent files, so skip
   if (target.config.rulesFile) {
     const rulesPath = path.join(cwd, target.config.rulesFile);
+
+    // Check if it's a directory or file
     if (fs.existsSync(rulesPath)) {
-      manifest.rules.push(rulesPath);
+      const stat = fs.statSync(rulesPath);
+
+      if (stat.isDirectory()) {
+        // Scan directory for rule files
+        const files = fs.readdirSync(rulesPath, { withFileTypes: true });
+        const ruleFiles = files
+          .filter((f) => f.isFile() && f.name.endsWith('.md'))
+          .map((f) => path.join(rulesPath, f.name));
+
+        manifest.rules = categorizeFiles(ruleFiles, FLOW_RULES);
+      } else {
+        // Single rules file - check if it matches Flow templates
+        manifest.rules = categorizeFiles([rulesPath], FLOW_RULES);
+      }
+    }
+  }
+
+  // MCP servers
+  const mcpPath = path.join(cwd, '.mcp.json');
+  if (fs.existsSync(mcpPath)) {
+    try {
+      const content = await fs.promises.readFile(mcpPath, 'utf-8');
+      const mcpConfig = JSON.parse(content);
+
+      if (mcpConfig.mcpServers) {
+        const installedServers = Object.keys(mcpConfig.mcpServers);
+        const registryServers = Object.keys(MCP_SERVER_REGISTRY);
+
+        manifest.mcpServers.inRegistry = installedServers.filter(id =>
+          registryServers.includes(id)
+        );
+        manifest.mcpServers.notInRegistry = installedServers.filter(id =>
+          !registryServers.includes(id)
+        );
+      }
+    } catch (error) {
+      console.warn(chalk.yellow('⚠ Failed to read .mcp.json'));
     }
   }
 
@@ -68,156 +150,283 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
 }
 
 /**
- * Show sync preview - what will be deleted
+ * Show sync preview with categorization
  */
-export function showSyncPreview(
-  manifest: SyncManifest,
-  cwd: string,
-  nonRegistryServers: string[]
-): void {
-  console.log(chalk.cyan.bold('📋 Sync Preview\n'));
+export function showSyncPreview(manifest: SyncManifest, cwd: string): void {
+  console.log(chalk.cyan.bold('━━━ 🔄 Sync Preview\n'));
 
-  // Template files section
-  const allFiles = [...manifest.agents, ...manifest.slashCommands, ...manifest.rules];
+  // Will sync section
+  const hasFlowFiles =
+    manifest.agents.inFlow.length > 0 ||
+    manifest.slashCommands.inFlow.length > 0 ||
+    manifest.rules.inFlow.length > 0 ||
+    manifest.mcpServers.inRegistry.length > 0;
 
-  if (allFiles.length > 0) {
-    console.log(chalk.yellow('🔄 Templates (delete + reinstall):\n'));
+  if (hasFlowFiles) {
+    console.log(chalk.green('Will sync (delete + reinstall):\n'));
 
-    if (manifest.agents.length > 0) {
+    if (manifest.agents.inFlow.length > 0) {
       console.log(chalk.dim('  Agents:'));
-      manifest.agents.forEach((file) => {
-        const relative = path.relative(cwd, file);
-        console.log(chalk.dim(`    - ${relative}`));
+      manifest.agents.inFlow.forEach((file) => {
+        console.log(chalk.dim(`    ✓ ${path.basename(file)}`));
       });
       console.log('');
     }
 
-    if (manifest.slashCommands.length > 0) {
-      console.log(chalk.dim('  Slash Commands:'));
-      manifest.slashCommands.forEach((file) => {
-        const relative = path.relative(cwd, file);
-        console.log(chalk.dim(`    - ${relative}`));
+    if (manifest.slashCommands.inFlow.length > 0) {
+      console.log(chalk.dim('  Commands:'));
+      manifest.slashCommands.inFlow.forEach((file) => {
+        console.log(chalk.dim(`    ✓ ${path.basename(file)}`));
       });
       console.log('');
     }
 
-    if (manifest.rules.length > 0) {
+    if (manifest.rules.inFlow.length > 0) {
       console.log(chalk.dim('  Rules:'));
-      manifest.rules.forEach((file) => {
-        const relative = path.relative(cwd, file);
-        console.log(chalk.dim(`    - ${relative}`));
+      manifest.rules.inFlow.forEach((file) => {
+        console.log(chalk.dim(`    ✓ ${path.basename(file)}`));
+      });
+      console.log('');
+    }
+
+    if (manifest.mcpServers.inRegistry.length > 0) {
+      console.log(chalk.dim('  MCP Servers:'));
+      manifest.mcpServers.inRegistry.forEach((server) => {
+        console.log(chalk.dim(`    ✓ ${server}`));
       });
       console.log('');
     }
-  } else {
-    console.log(chalk.yellow('🔄 Templates: None found\n'));
   }
 
-  // MCP servers section
-  if (nonRegistryServers.length > 0) {
-    console.log(chalk.yellow('🔍 MCP Servers (not in registry):\n'));
-    nonRegistryServers.forEach((server) => {
-      console.log(chalk.dim(`    - ${server}`));
-    });
-    console.log(chalk.dim('\n  Possible reasons:'));
-    console.log(chalk.dim('    1. Removed from Flow registry'));
-    console.log(chalk.dim('    2. Custom installation\n'));
+  // Unknown files section
+  const hasUnknownFiles =
+    manifest.agents.unknown.length > 0 ||
+    manifest.slashCommands.unknown.length > 0 ||
+    manifest.rules.unknown.length > 0 ||
+    manifest.mcpServers.notInRegistry.length > 0;
+
+  if (hasUnknownFiles) {
+    console.log(chalk.yellow('Unknown files (not in Flow templates):\n'));
+
+    if (manifest.agents.unknown.length > 0) {
+      console.log(chalk.dim('  Agents:'));
+      manifest.agents.unknown.forEach((file) => {
+        console.log(chalk.dim(`    ? ${path.basename(file)}`));
+      });
+      console.log('');
+    }
+
+    if (manifest.slashCommands.unknown.length > 0) {
+      console.log(chalk.dim('  Commands:'));
+      manifest.slashCommands.unknown.forEach((file) => {
+        console.log(chalk.dim(`    ? ${path.basename(file)}`));
+      });
+      console.log('');
+    }
+
+    if (manifest.rules.unknown.length > 0) {
+      console.log(chalk.dim('  Rules:'));
+      manifest.rules.unknown.forEach((file) => {
+        console.log(chalk.dim(`    ? ${path.basename(file)}`));
+      });
+      console.log('');
+    }
+
+    if (manifest.mcpServers.notInRegistry.length > 0) {
+      console.log(chalk.dim('  MCP Servers:'));
+      manifest.mcpServers.notInRegistry.forEach((server) => {
+        console.log(chalk.dim(`    ? ${server}`));
+      });
+      console.log('');
+    }
   } else {
-    console.log(chalk.green('✓ MCP Servers: All in registry\n'));
+    console.log(chalk.green('✓ No unknown files\n'));
   }
 
-  // Preserved files section
-  console.log(chalk.green('✓ Preserved:\n'));
+  // Preserved section
+  console.log(chalk.green('Preserved:\n'));
   manifest.preserve.forEach((file) => {
     const relative = path.relative(cwd, file);
     if (fs.existsSync(file)) {
-      console.log(chalk.dim(`    - ${relative}`));
+      console.log(chalk.dim(`  ${relative}`));
     }
   });
   console.log('');
 }
 
 /**
- * Execute sync - delete template files
+ * Select unknown files to remove
  */
-export async function executeSyncDelete(manifest: SyncManifest): Promise<number> {
-  const allFiles = [...manifest.agents, ...manifest.slashCommands, ...manifest.rules];
-  let deletedCount = 0;
+export async function selectUnknownFilesToRemove(manifest: SyncManifest): Promise<string[]> {
+  const unknownFiles: Array<{ name: string; value: string; type: string }> = [];
+
+  // Collect all unknown files
+  manifest.agents.unknown.forEach((file) => {
+    unknownFiles.push({
+      name: `Agents: ${path.basename(file)}`,
+      value: file,
+      type: 'agent',
+    });
+  });
 
-  for (const file of allFiles) {
-    try {
-      await fs.promises.unlink(file);
-      deletedCount++;
-    } catch (error) {
-      // Ignore if file doesn't exist
-      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
-        console.warn(chalk.yellow(`⚠ Failed to delete: ${file}`));
-      }
-    }
-  }
+  manifest.slashCommands.unknown.forEach((file) => {
+    unknownFiles.push({
+      name: `Commands: ${path.basename(file)}`,
+      value: file,
+      type: 'command',
+    });
+  });
 
-  return deletedCount;
-}
+  manifest.rules.unknown.forEach((file) => {
+    unknownFiles.push({
+      name: `Rules: ${path.basename(file)}`,
+      value: file,
+      type: 'rule',
+    });
+  });
+
+  manifest.mcpServers.notInRegistry.forEach((server) => {
+    unknownFiles.push({
+      name: `MCP: ${server}`,
+      value: server,
+      type: 'mcp',
+    });
+  });
+
+  if (unknownFiles.length === 0) {
+    return [];
+  }
 
-/**
- * Confirm sync with user
- */
-export async function confirmSync(): Promise<boolean> {
   const { default: inquirer } = await import('inquirer');
-  const { confirm } = await inquirer.prompt([
+  const { selected } = await inquirer.prompt([
     {
-      type: 'confirm',
-      name: 'confirm',
-      message: 'Proceed with sync? This will delete the files listed above.',
-      default: false,
+      type: 'checkbox',
+      name: 'selected',
+      message: 'Select files to remove (space to select, enter to continue):',
+      choices: unknownFiles.map((f) => ({ name: f.name, value: f.value })),
     },
   ]);
-  return confirm;
+
+  return selected;
 }
 
 /**
- * Check MCP servers - find servers not in Flow registry
+ * Show final summary before execution
  */
-export async function checkMCPServers(cwd: string): Promise<string[]> {
-  const mcpPath = path.join(cwd, '.mcp.json');
+export function showFinalSummary(
+  manifest: SyncManifest,
+  selectedUnknowns: string[]
+): void {
+  console.log(chalk.cyan.bold('\n━━━ 📋 Final Summary\n'));
+
+  // Will delete + reinstall
+  const flowFiles = [
+    ...manifest.agents.inFlow,
+    ...manifest.slashCommands.inFlow,
+    ...manifest.rules.inFlow,
+  ];
+
+  if (flowFiles.length > 0 || manifest.mcpServers.inRegistry.length > 0) {
+    console.log(chalk.yellow('Delete + reinstall:\n'));
+    flowFiles.forEach((file) => {
+      console.log(chalk.dim(`  - ${path.basename(file)}`));
+    });
+    if (manifest.mcpServers.inRegistry.length > 0) {
+      manifest.mcpServers.inRegistry.forEach((server) => {
+        console.log(chalk.dim(`  - MCP: ${server}`));
+      });
+    }
+    console.log('');
+  }
 
-  if (!fs.existsSync(mcpPath)) {
-    return [];
+  // Will remove (selected unknowns)
+  if (selectedUnknowns.length > 0) {
+    console.log(chalk.red('Remove (selected):\n'));
+    selectedUnknowns.forEach((file) => {
+      const name = file.includes('/') ? path.basename(file) : file;
+      console.log(chalk.dim(`  - ${name}`));
+    });
+    console.log('');
   }
 
-  try {
-    const content = await fs.promises.readFile(mcpPath, 'utf-8');
-    const mcpConfig = JSON.parse(content);
+  // Will preserve
+  const preservedUnknowns = [
+    ...manifest.agents.unknown,
+    ...manifest.slashCommands.unknown,
+    ...manifest.rules.unknown,
+    ...manifest.mcpServers.notInRegistry,
+  ].filter((file) => !selectedUnknowns.includes(file));
+
+  if (preservedUnknowns.length > 0) {
+    console.log(chalk.green('Preserve:\n'));
+    preservedUnknowns.forEach((file) => {
+      const name = file.includes('/') ? path.basename(file) : file;
+      console.log(chalk.dim(`  - ${name}`));
+    });
+    console.log('');
+  }
+}
 
-    if (!mcpConfig.mcpServers) {
-      return [];
+/**
+ * Execute sync - delete Flow templates and selected unknowns
+ */
+export async function executeSyncDelete(
+  manifest: SyncManifest,
+  selectedUnknowns: string[]
+): Promise<{ templates: number; unknowns: number }> {
+  const flowFiles = [
+    ...manifest.agents.inFlow,
+    ...manifest.slashCommands.inFlow,
+    ...manifest.rules.inFlow,
+  ];
+
+  let templatesDeleted = 0;
+  let unknownsDeleted = 0;
+
+  // Delete Flow templates
+  for (const file of flowFiles) {
+    try {
+      await fs.promises.unlink(file);
+      templatesDeleted++;
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+        console.warn(chalk.yellow(`⚠ Failed to delete: ${file}`));
+      }
     }
+  }
 
-    const installedServers = Object.keys(mcpConfig.mcpServers);
-    const registryServers = Object.keys(MCP_SERVER_REGISTRY);
+  // Delete selected unknown files
+  for (const file of selectedUnknowns) {
+    // Skip MCP servers (handled separately)
+    if (!file.includes('/')) continue;
 
-    // Find servers not in registry
-    return installedServers.filter(id => !registryServers.includes(id));
-  } catch (error) {
-    console.warn(chalk.yellow('⚠ Failed to read .mcp.json'));
-    return [];
+    try {
+      await fs.promises.unlink(file);
+      unknownsDeleted++;
+    } catch (error) {
+      if ((error as NodeJS.ErrnoException).code !== 'ENOENT') {
+        console.warn(chalk.yellow(`⚠ Failed to delete: ${file}`));
+      }
+    }
   }
+
+  return { templates: templatesDeleted, unknowns: unknownsDeleted };
 }
 
 /**
- * Select servers to remove
+ * Confirm sync with user
  */
-export async function selectServersToRemove(servers: string[]): Promise<string[]> {
+export async function confirmSync(): Promise<boolean> {
   const { default: inquirer } = await import('inquirer');
-  const { selected } = await inquirer.prompt([
+  const { confirm } = await inquirer.prompt([
     {
-      type: 'checkbox',
-      name: 'selected',
-      message: '選擇要刪除既 servers:',
-      choices: servers.map(s => ({ name: s, value: s })),
+      type: 'confirm',
+      name: 'confirm',
+      message: 'Proceed with sync?',
+      default: false,
     },
   ]);
-  return selected;
+  return confirm;
 }
 
 /**