@sylphx/flow 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @sylphx/flow
 
+## 1.3.1
+
+### Patch Changes
+
+- Redesign sync flow for better clarity:
+  - Remove duplicate config files in preserved list
+  - Show MCP check in preview upfront (not after confirmation)
+  - Combined preview: templates + MCP servers + preserved files
+  - Clear sections with emojis for easy scanning
+
 ## 1.3.0
 
 ### Minor Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sylphx/flow",
-  "version": "1.3.0",
+  "version": "1.3.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 } = await import('../utils/sync-utils.js');
+        const { buildSyncManifest, showSyncPreview, confirmSync, executeSyncDelete, checkMCPServers, selectServersToRemove, removeMCPServers } = await import('../utils/sync-utils.js');
 
         // Need target to build manifest
         const targetId = await selectAndValidateTarget(initOptions);
@@ -394,8 +394,11 @@ 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());
+
         console.log(chalk.cyan.bold('━━━ 🔄 Synchronizing Files\n'));
-        showSyncPreview(manifest, process.cwd());
+        showSyncPreview(manifest, process.cwd(), nonRegistryServers);
 
         const confirmed = await confirmSync();
         if (!confirmed) {
@@ -403,20 +406,17 @@ async function executeSetupPhase(prompt: string | undefined, options: FlowOption
           process.exit(0);
         }
 
+        // Delete templates
         const deletedCount = await executeSyncDelete(manifest);
-        console.log(chalk.green(`\n✓ Deleted ${deletedCount} files\n`));
-
-        // Check MCP servers
-        const { checkMCPServers, showNonRegistryServers, selectServersToRemove, removeMCPServers } = await import('../utils/sync-utils.js');
-        const nonRegistryServers = await checkMCPServers(process.cwd());
+        console.log(chalk.green(`\n✓ Deleted ${deletedCount} template files\n`));
 
+        // Handle MCP servers if any found
         if (nonRegistryServers.length > 0) {
-          showNonRegistryServers(nonRegistryServers);
           const serversToRemove = await selectServersToRemove(nonRegistryServers);
 
           if (serversToRemove.length > 0) {
             const removedCount = await removeMCPServers(process.cwd(), serversToRemove);
-            console.log(chalk.green(`\n✓ Removed ${removedCount} MCP server(s)\n`));
+            console.log(chalk.green(`✓ Removed ${removedCount} MCP server(s)\n`));
           }
         }
       } else if (!options.sync) {
@@ -709,7 +709,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 } = await import('../utils/sync-utils.js');
+        const { buildSyncManifest, showSyncPreview, confirmSync, executeSyncDelete, checkMCPServers, selectServersToRemove, removeMCPServers } = await import('../utils/sync-utils.js');
 
         // Need target to build manifest
         const targetId = await selectAndValidateTarget(initOptions);
@@ -723,8 +723,11 @@ 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());
+
         console.log(chalk.cyan.bold('━━━ 🔄 Synchronizing Files\n'));
-        showSyncPreview(manifest, process.cwd());
+        showSyncPreview(manifest, process.cwd(), nonRegistryServers);
 
         const confirmed = await confirmSync();
         if (!confirmed) {
@@ -732,20 +735,17 @@ async function executeFlowOnce(prompt: string | undefined, options: FlowOptions)
           process.exit(0);
         }
 
+        // Delete templates
         const deletedCount = await executeSyncDelete(manifest);
-        console.log(chalk.green(`\n✓ Deleted ${deletedCount} files\n`));
-
-        // Check MCP servers
-        const { checkMCPServers, showNonRegistryServers, selectServersToRemove, removeMCPServers } = await import('../utils/sync-utils.js');
-        const nonRegistryServers = await checkMCPServers(process.cwd());
+        console.log(chalk.green(`\n✓ Deleted ${deletedCount} template files\n`));
 
+        // Handle MCP servers if any found
         if (nonRegistryServers.length > 0) {
-          showNonRegistryServers(nonRegistryServers);
           const serversToRemove = await selectServersToRemove(nonRegistryServers);
 
           if (serversToRemove.length > 0) {
             const removedCount = await removeMCPServers(process.cwd(), serversToRemove);
-            console.log(chalk.green(`\n✓ Removed ${removedCount} MCP server(s)\n`));
+            console.log(chalk.green(`✓ Removed ${removedCount} MCP server(s)\n`));
           }
         }
       } else {

package/src/utils/sync-utils.ts

@@ -60,8 +60,6 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
     '.sylphx-flow/',
     '.secrets/',
     target.config.configFile || '',
-    '.mcp.json',
-    'opencode.jsonc',
   ]
     .filter(Boolean)
     .map((p) => path.join(cwd, p));
@@ -72,46 +70,64 @@ export async function buildSyncManifest(cwd: string, target: Target): Promise<Sy
 /**
  * Show sync preview - what will be deleted
  */
-export function showSyncPreview(manifest: SyncManifest, cwd: string): void {
+export function showSyncPreview(
+  manifest: SyncManifest,
+  cwd: string,
+  nonRegistryServers: string[]
+): void {
   console.log(chalk.cyan.bold('📋 Sync Preview\n'));
-  console.log(chalk.dim('The following files will be deleted and re-installed:\n'));
 
+  // Template files section
   const allFiles = [...manifest.agents, ...manifest.slashCommands, ...manifest.rules];
 
-  if (allFiles.length === 0) {
-    console.log(chalk.yellow('  No template files found\n'));
-    return;
-  }
+  if (allFiles.length > 0) {
+    console.log(chalk.yellow('🔄 Templates (delete + reinstall):\n'));
 
-  // Group by type
-  if (manifest.agents.length > 0) {
-    console.log(chalk.cyan('  Agents:'));
-    manifest.agents.forEach((file) => {
-      const relative = path.relative(cwd, file);
-      console.log(chalk.dim(`    - ${relative}`));
-    });
-    console.log('');
-  }
+    if (manifest.agents.length > 0) {
+      console.log(chalk.dim('  Agents:'));
+      manifest.agents.forEach((file) => {
+        const relative = path.relative(cwd, file);
+        console.log(chalk.dim(`    - ${relative}`));
+      });
+      console.log('');
+    }
 
-  if (manifest.slashCommands.length > 0) {
-    console.log(chalk.cyan('  Slash Commands:'));
-    manifest.slashCommands.forEach((file) => {
-      const relative = path.relative(cwd, file);
-      console.log(chalk.dim(`    - ${relative}`));
-    });
-    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}`));
+      });
+      console.log('');
+    }
+
+    if (manifest.rules.length > 0) {
+      console.log(chalk.dim('  Rules:'));
+      manifest.rules.forEach((file) => {
+        const relative = path.relative(cwd, file);
+        console.log(chalk.dim(`    - ${relative}`));
+      });
+      console.log('');
+    }
+  } else {
+    console.log(chalk.yellow('🔄 Templates: None found\n'));
   }
 
-  if (manifest.rules.length > 0) {
-    console.log(chalk.cyan('  Rules:'));
-    manifest.rules.forEach((file) => {
-      const relative = path.relative(cwd, file);
-      console.log(chalk.dim(`    - ${relative}`));
+  // 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('');
+    console.log(chalk.dim('\n  Possible reasons:'));
+    console.log(chalk.dim('    1. Removed from Flow registry'));
+    console.log(chalk.dim('    2. Custom installation\n'));
+  } else {
+    console.log(chalk.green('✓ MCP Servers: All in registry\n'));
   }
 
-  console.log(chalk.green('✓ Preserved:'));
+  // Preserved files section
+  console.log(chalk.green('✓ Preserved:\n'));
   manifest.preserve.forEach((file) => {
     const relative = path.relative(cwd, file);
     if (fs.existsSync(file)) {
@@ -188,26 +204,6 @@ export async function checkMCPServers(cwd: string): Promise<string[]> {
   }
 }
 
-/**
- * Show non-registry servers
- */
-export function showNonRegistryServers(servers: string[]): void {
-  if (servers.length === 0) {
-    return;
-  }
-
-  console.log(chalk.cyan.bold('\n📋 MCP Registry Check\n'));
-  console.log(chalk.yellow('⚠️  以下 MCP servers 唔係 Flow registry 入面:\n'));
-
-  servers.forEach(server => {
-    console.log(chalk.dim(`    - ${server}`));
-  });
-
-  console.log(chalk.dim('\n可能原因:'));
-  console.log(chalk.dim('  1. Flow registry 已移除'));
-  console.log(chalk.dim('  2. 你自己手動安裝\n'));
-}
-
 /**
  * Select servers to remove
  */